Menu
▾
▴
web-erp-svn
|
From: <dai...@us...> - 2011-09-14 09:57:52
|
Revision: 4690
http://web-erp.svn.sourceforge.net/web-erp/?rev=4690&view=rev
Author: daintree
Date: 2011-09-14 09:57:45 +0000 (Wed, 14 Sep 2011)
Log Message:
-----------
number_formatting
Modified Paths:
--------------
trunk/PDFOrdersInvoiced.php
Modified: trunk/PDFOrdersInvoiced.php
===================================================================
--- trunk/PDFOrdersInvoiced.php 2011-09-14 08:06:45 UTC (rev 4689)
+++ trunk/PDFOrdersInvoiced.php 2011-09-14 09:57:45 UTC (rev 4690)
@@ -290,7 +290,7 @@
if($OrderNo != $myrow['orderno']){
if ($AccumOrderTotal !=0){
$LeftOvers = $pdf->addTextWrap($Left_Margin+250,$YPos,120,$FontSize,_('Total Invoiced for order') . ' ' . $OrderNo , 'left');
- $LeftOvers = $pdf->addTextWrap($Left_Margin+360,$YPos,80,$FontSize,locale_money_format(filter_number_format($AccumOrderTotal),$_SESSION['CompanyRecord']['decimalplaces']), 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+360,$YPos,80,$FontSize,locale_number_format(filter_number_format($AccumOrderTotal),$_SESSION['CompanyRecord']['decimalplaces']), 'right');
$YPos -= ($line_height);
$AccumOrderTotal =0;
}
@@ -399,8 +399,8 @@
$LeftOvers = $pdf->addTextWrap($Left_Margin+150,$YPos,90,$FontSize,$InvRow['typename'] . ' ' . $InvRow['transno'], 'left');
$LeftOvers = $pdf->addTextWrap($Left_Margin+240,$YPos,60,$FontSize,locale_number_format($InvRow['quantity'],$myrow['decimalplaces']), 'right');
- $LeftOvers = $pdf->addTextWrap($Left_Margin+300,$YPos,60,$FontSize,locale_money_format($InvRow['price'],$_SESSION['CompanyRecord']['decimalplaces']), 'right');
- $LeftOvers = $pdf->addTextWrap($Left_Margin+360,$YPos,80,$FontSize,locale_money_format($ValueInvoiced,$_SESSION['CompanyRecord']['decimalplaces']), 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+300,$YPos,60,$FontSize,locale_number_format($InvRow['price'],$_SESSION['CompanyRecord']['decimalplaces']), 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+360,$YPos,80,$FontSize,locale_number_format($ValueInvoiced,$_SESSION['CompanyRecord']['decimalplaces']), 'right');
$YPos -= ($line_height);
@@ -424,7 +424,7 @@
$YPos -= ($line_height);
$LeftOvers = $pdf->addTextWrap($Left_Margin+260,$YPos,100,$FontSize,_('GRAND TOTAL INVOICED'), 'right');
-$LeftOvers = $pdf->addTextWrap($Left_Margin+360,$YPos,80,$FontSize,locale_money_format(filter_number_format($AccumTotalInv),$_SESSION['CompanyRecord']['decimalplaces']), 'right');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+360,$YPos,80,$FontSize,locale_number_format(filter_number_format($AccumTotalInv),$_SESSION['CompanyRecord']['decimalplaces']), 'right');
$YPos -= ($line_height);
$pdf->OutputD($_SESSION['DatabaseName'] . '_OrdersInvoiced_' . date('Y-m-d') . '.pdf');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-09-14 09:57:52
|
Revision: 4690
http://web-erp.svn.sourceforge.net/web-erp/?rev=4690&view=rev
Author: daintree
Date: 2011-09-14 09:57:45 +0000 (Wed, 14 Sep 2011)
Log Message:
-----------
number_formatting
Modified Paths:
--------------
trunk/PDFOrdersInvoiced.php
Modified: trunk/PDFOrdersInvoiced.php
===================================================================
--- trunk/PDFOrdersInvoiced.php 2011-09-14 08:06:45 UTC (rev 4689)
+++ trunk/PDFOrdersInvoiced.php 2011-09-14 09:57:45 UTC (rev 4690)
@@ -290,7 +290,7 @@
if($OrderNo != $myrow['orderno']){
if ($AccumOrderTotal !=0){
$LeftOvers = $pdf->addTextWrap($Left_Margin+250,$YPos,120,$FontSize,_('Total Invoiced for order') . ' ' . $OrderNo , 'left');
- $LeftOvers = $pdf->addTextWrap($Left_Margin+360,$YPos,80,$FontSize,locale_money_format(filter_number_format($AccumOrderTotal),$_SESSION['CompanyRecord']['decimalplaces']), 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+360,$YPos,80,$FontSize,locale_number_format(filter_number_format($AccumOrderTotal),$_SESSION['CompanyRecord']['decimalplaces']), 'right');
$YPos -= ($line_height);
$AccumOrderTotal =0;
}
@@ -399,8 +399,8 @@
$LeftOvers = $pdf->addTextWrap($Left_Margin+150,$YPos,90,$FontSize,$InvRow['typename'] . ' ' . $InvRow['transno'], 'left');
$LeftOvers = $pdf->addTextWrap($Left_Margin+240,$YPos,60,$FontSize,locale_number_format($InvRow['quantity'],$myrow['decimalplaces']), 'right');
- $LeftOvers = $pdf->addTextWrap($Left_Margin+300,$YPos,60,$FontSize,locale_money_format($InvRow['price'],$_SESSION['CompanyRecord']['decimalplaces']), 'right');
- $LeftOvers = $pdf->addTextWrap($Left_Margin+360,$YPos,80,$FontSize,locale_money_format($ValueInvoiced,$_SESSION['CompanyRecord']['decimalplaces']), 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+300,$YPos,60,$FontSize,locale_number_format($InvRow['price'],$_SESSION['CompanyRecord']['decimalplaces']), 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+360,$YPos,80,$FontSize,locale_number_format($ValueInvoiced,$_SESSION['CompanyRecord']['decimalplaces']), 'right');
$YPos -= ($line_height);
@@ -424,7 +424,7 @@
$YPos -= ($line_height);
$LeftOvers = $pdf->addTextWrap($Left_Margin+260,$YPos,100,$FontSize,_('GRAND TOTAL INVOICED'), 'right');
-$LeftOvers = $pdf->addTextWrap($Left_Margin+360,$YPos,80,$FontSize,locale_money_format(filter_number_format($AccumTotalInv),$_SESSION['CompanyRecord']['decimalplaces']), 'right');
+$LeftOvers = $pdf->addTextWrap($Left_Margin+360,$YPos,80,$FontSize,locale_number_format(filter_number_format($AccumTotalInv),$_SESSION['CompanyRecord']['decimalplaces']), 'right');
$YPos -= ($line_height);
$pdf->OutputD($_SESSION['DatabaseName'] . '_OrdersInvoiced_' . date('Y-m-d') . '.pdf');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ex...@us...> - 2016-09-14 10:03:10
|
Revision: 7623
http://sourceforge.net/p/web-erp/reponame/7623
Author: exsonqu
Date: 2016-09-14 10:03:08 +0000 (Wed, 14 Sep 2016)
Log Message:
-----------
14/09/16 Exson: Add narrative, transaction date data to PDFOrdersInvoiced.php.
Modified Paths:
--------------
trunk/PDFOrdersInvoiced.php
Modified: trunk/PDFOrdersInvoiced.php
===================================================================
--- trunk/PDFOrdersInvoiced.php 2016-09-14 09:05:21 UTC (rev 7622)
+++ trunk/PDFOrdersInvoiced.php 2016-09-14 10:03:08 UTC (rev 7623)
@@ -49,7 +49,7 @@
<td>' . _('Inventory Category') . '</td>
<td>';
- $sql = "SELECT categorydescription, categoryid FROM stockcategory WHERE stocktype<>'D' AND stocktype<>'L'";
+ $sql = "SELECT categorydescription, categoryid FROM stockcategory";
$result = DB_query($sql);
echo '<select required="required" name="CategoryID">';
@@ -362,8 +362,10 @@
$sql = "SELECT debtortrans.order_,
systypes.typename,
debtortrans.transno,
+ debtortrans.trandate,
stockmoves.price *(1-stockmoves.discountpercent) AS netprice,
- -stockmoves.qty AS quantity
+ -stockmoves.qty AS quantity,
+ stockmoves.narrative
FROM debtortrans INNER JOIN stockmoves
ON debtortrans.type = stockmoves.type
AND debtortrans.transno=stockmoves.transno
@@ -373,24 +375,38 @@
$InvoicesResult =DB_query($sql);
if (DB_num_rows($InvoicesResult)>0){
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+60,$YPos,60,$FontSize,_('Date'),'center');
$LeftOvers = $pdf->addTextWrap($Left_Margin+150,$YPos,90,$FontSize,_('Transaction Number'), 'center');
$LeftOvers = $pdf->addTextWrap($Left_Margin+240,$YPos,60,$FontSize,_('Quantity'), 'center');
$LeftOvers = $pdf->addTextWrap($Left_Margin+300,$YPos,60,$FontSize,_('Price'), 'center');
$LeftOvers = $pdf->addTextWrap($Left_Margin+380,$YPos,60,$FontSize,_('Total'), 'centre');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+450,$YPos,100,$FontSize,_('Narrative'), 'centre');
$YPos -= ($line_height);
}
while ($InvRow=DB_fetch_array($InvoicesResult)){
$ValueInvoiced = $InvRow['netprice']*$InvRow['quantity'];
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+60,$YPos,60,$FontSize,ConvertSQLDate($InvRow['trandate']),'center');
$LeftOvers = $pdf->addTextWrap($Left_Margin+150,$YPos,90,$FontSize,$InvRow['typename'] . ' ' . $InvRow['transno'], 'left');
$LeftOvers = $pdf->addTextWrap($Left_Margin+240,$YPos,60,$FontSize,locale_number_format($InvRow['quantity'],$myrow['decimalplaces']), 'right');
$LeftOvers = $pdf->addTextWrap($Left_Margin+300,$YPos,60,$FontSize,locale_number_format($InvRow['netprice'],$_SESSION['CompanyRecord']['decimalplaces']), 'right');
$LeftOvers = $pdf->addTextWrap($Left_Margin+360,$YPos,80,$FontSize,locale_number_format($ValueInvoiced,$_SESSION['CompanyRecord']['decimalplaces']), 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+450,$YPos,100,$FontSize,$InvRow['narrative'], 'center');
+ if (mb_strlen($LeftOvers)>0) {
- $YPos -= ($line_height);
+ $YPos -= ($line_height);
+ if ($YPos - (2 *$line_height) < $Bottom_Margin){
+ /*Then set up a new page */
+ $PageNumber++;
+ include ('includes/PDFOrdersInvoicedPageHeader.inc');
+ } /*end of new page header */
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+450,$YPos,100,$FontSize,$LeftOvers, 'center');
+ }
+ $YPos -= ($line_height);
+
if ($YPos - (2 *$line_height) < $Bottom_Margin){
/*Then set up a new page */
$PageNumber++;
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X