Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[4649] trunk
|
From: <dai...@us...> - 2011-08-04 10:18:20
|
Revision: 4649
http://web-erp.svn.sourceforge.net/web-erp/?rev=4649&view=rev
Author: daintree
Date: 2011-08-04 10:18:14 +0000 (Thu, 04 Aug 2011)
Log Message:
-----------
fix for GPPercent reported on discount matrix updates
Modified Paths:
--------------
trunk/DebtorsAtPeriodEnd.php
trunk/PDFOrderStatus.php
trunk/SelectOrderItems.php
trunk/SelectSalesOrder.php
trunk/doc/Change.log
Modified: trunk/DebtorsAtPeriodEnd.php
===================================================================
--- trunk/DebtorsAtPeriodEnd.php 2011-08-04 09:12:45 UTC (rev 4648)
+++ trunk/DebtorsAtPeriodEnd.php 2011-08-04 10:18:14 UTC (rev 4649)
@@ -91,7 +91,7 @@
$TotBal += $Balance;
$LeftOvers = $pdf->addTextWrap($Left_Margin+3,$YPos,220-$Left_Margin,$FontSize,$DebtorBalances['debtorno'] .
- ' - ' . html_entity_decode($DebtorBalances['name']),'left');
+ ' - ' . html_entity_decode($DebtorBalances['name'],ENT_QUOTES,'UTF-8'),'left');
$LeftOvers = $pdf->addTextWrap(220,$YPos,60,$FontSize,$DisplayBalance,'right');
$LeftOvers = $pdf->addTextWrap(280,$YPos,60,$FontSize,$DisplayFXBalance,'right');
$LeftOvers = $pdf->addTextWrap(350,$YPos,100,$FontSize,$DebtorBalances['currency'],'left');
Modified: trunk/PDFOrderStatus.php
===================================================================
--- trunk/PDFOrderStatus.php 2011-08-04 09:12:45 UTC (rev 4648)
+++ trunk/PDFOrderStatus.php 2011-08-04 10:18:14 UTC (rev 4649)
@@ -295,7 +295,7 @@
$YPos -= $line_height;
$LeftOvers = $pdf->addTextWrap($Left_Margin+2,$YPos,40,$FontSize,$myrow['orderno'], 'left');
- $LeftOvers = $pdf->addTextWrap($Left_Margin+40,$YPos,150,$FontSize,html_entity_decode($myrow['name']), 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+40,$YPos,150,$FontSize,html_entity_decode($myrow['name'],ENT_QUOTES,'UTF-8'), 'left');
$LeftOvers = $pdf->addTextWrap($Left_Margin+190,$YPos,110,$FontSize,$myrow['brname'], 'left');
$LeftOvers = $pdf->addTextWrap($Left_Margin+300,$YPos,60,$FontSize,ConvertSQLDate($myrow['orddate']), 'left');
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2011-08-04 09:12:45 UTC (rev 4648)
+++ trunk/SelectOrderItems.php 2011-08-04 10:18:14 UTC (rev 4649)
@@ -1207,7 +1207,7 @@
foreach ($_SESSION['Items'.$identifier]->LineItems as $OrderLine_2) {
if ($OrderLine_2->DiscCat==$OrderLine->DiscCat){
$_SESSION['Items'.$identifier]->LineItems[$OrderLine_2->LineNumber]->DiscountPercent = $DiscountMatrixRate;
- $_SESSION['Items'.$identifier]->LineItems[$OrderLine_2->LineNumber]->GPPercent = (($_SESSION['Items'.$identifier]->LineItems[$OrderLine_2->LineNumber]->Price*(1-($DiscountMatrixRate/100))) - $_SESSION['Items'.$identifier]->LineItems[$OrderLine_2->LineNumber]->StandardCost*$ExRate)/($_SESSION['Items'.$identifier]->LineItems[$OrderLine_2->LineNumber]->Price *(1-$DiscountMatrixRate)/100);
+ $_SESSION['Items'.$identifier]->LineItems[$OrderLine_2->LineNumber]->GPPercent = (($_SESSION['Items'.$identifier]->LineItems[$OrderLine_2->LineNumber]->Price*(1-$DiscountMatrixRate)) - $_SESSION['Items'.$identifier]->LineItems[$OrderLine_2->LineNumber]->StandardCost*$ExRate)/($_SESSION['Items'.$identifier]->LineItems[$OrderLine_2->LineNumber]->Price *(1-$DiscountMatrixRate)/100);
}
}
}
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2011-08-04 09:12:45 UTC (rev 4648)
+++ trunk/SelectSalesOrder.php 2011-08-04 10:18:14 UTC (rev 4649)
@@ -816,8 +816,8 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td class=number>%s</td>
- <td><input type=checkbox name="PlacePO_%s" value><input type="hidden" name="OrderNo_PO_%s" value="%s"></td>
+ <td class="number">%s</td>
+ <td><input type="checkbox" name="PlacePO_%s" value /><input type="hidden" name="OrderNo_PO_%s" value="%s" /></td>
</tr>',
$ModifyPage,
$myrow['orderno'],
@@ -828,7 +828,7 @@
$myrow['customerref'],
$FormatedOrderDate,
$FormatedDelDate,
- html_entity_decode($myrow['deliverto'],ENT_QUOTES,UTF-8),
+ html_entity_decode($myrow['deliverto'],ENT_QUOTES,'UTF-8'),
$FormatedOrderValue,
$i,
$i,
@@ -843,7 +843,7 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td class=number>%s</td>
+ <td class="number">%s</td>
</tr>',
$ModifyPage,
$myrow['orderno'],
@@ -854,7 +854,7 @@
$myrow['customerref'],
$FormatedOrderDate,
$FormatedDelDate,
- html_entity_decode($myrow['deliverto'],ENT_QUOTES,UTF-8),
+ html_entity_decode($myrow['deliverto'],ENT_QUOTES,'UTF-8'),
$FormatedOrderValue);
}
@@ -867,7 +867,7 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td class=number>%s</td>
+ <td class="number">%s</td>
</tr>',
$ModifyPage,
$myrow['orderno'],
@@ -877,7 +877,7 @@
$myrow['customerref'],
$FormatedOrderDate,
$FormatedDelDate,
- html_entity_decode($myrow['deliverto'],ENT_QUOTES,UTF-8),
+ html_entity_decode($myrow['deliverto'],ENT_QUOTES,'UTF-8'),
$FormatedOrderValue);
}
$i++;
@@ -898,15 +898,14 @@
} else {
echo '<b>' . _('Total Quotation(s) Value in');
}
- echo ' ' . $_SESSION['CompanyRecord']['currencydefault'] . ' :</b></td><td class="number"><b>' . number_format($OrdersTotal,2) . '</b></td></tr>
+ echo ' ' . $_SESSION['CompanyRecord']['currencydefault'] . ' :</b></td><td class="number"><b>' . number_format($OrdersTotal,$_SESSION['CompanyRecord']['decimalplaces']) . '</b></td></tr>
</table>';
} //end if there are some orders to show
}
-?>
-</form>
+echo '</form>';
-<?php } //end StockID already selected
+} //end StockID already selected
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-08-04 09:12:45 UTC (rev 4648)
+++ trunk/doc/Change.log 2011-08-04 10:18:14 UTC (rev 4649)
@@ -1,6 +1,7 @@
webERP Change Log
4/8/11 Phil: Fix GP Percent reported when discounts updated by discount matrix
+4/8/11 Phil: Make PO_SelectOSPurchOrder.php behave similarly to SelectPurchOrder.php (for inquiries) where the order number is the link that takes you to the order
4/8/11 Ricard: SalesInquiry.php now shows net sales after discounts
31/7/11 Phil: PO_Header.php - was not updating when update hit as reported by Klaus(opto)
31/7/11 Phil: BackupDatabase.php script
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
