Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[4514] trunk
|
From: <dai...@us...> - 2011-03-18 22:51:14
|
Revision: 4514
http://web-erp.svn.sourceforge.net/web-erp/?rev=4514&view=rev
Author: daintree
Date: 2011-03-18 22:51:07 +0000 (Fri, 18 Mar 2011)
Log Message:
-----------
add country to packing slips
Modified Paths:
--------------
trunk/PrintCustOrder_generic.php
trunk/SelectSalesOrder.php
trunk/doc/Change.log.html
trunk/includes/PDFOrderPageHeader.inc
trunk/includes/PDFOrderPageHeader_generic.inc
Modified: trunk/PrintCustOrder_generic.php
===================================================================
--- trunk/PrintCustOrder_generic.php 2011-03-18 05:48:23 UTC (rev 4513)
+++ trunk/PrintCustOrder_generic.php 2011-03-18 22:51:07 UTC (rev 4514)
@@ -4,8 +4,6 @@
/* $Revision: 1.20 $ */
-//$PageSecurity = 2;
-
include('includes/session.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -14,12 +12,12 @@
If (!isset($_GET['TransNo']) OR $_GET['TransNo']==""){
$title = _('Select Order To Print');
include('includes/header.inc');
- echo '<div class=centre><br><br><br>';
+ echo '<div class=centre><br /><br /><br />';
prnMsg( _('Select an Order Number to Print before calling this page') , 'error');
- echo '<br><br><br><table class="table_index"><tr><td class="menu_group_item">
- <li><a href="'. $rootpath . '/SelectSalesOrder.php?'. SID .'">' . _('Outstanding Sales Orders') . '</a></li>
- <li><a href="'. $rootpath . '/SelectCompletedOrder.php?'. SID .'">' . _('Completed Sales Orders') . '</a></li>
- </td></tr></table></div><br><br><br>';
+ echo '<br /><br /><br /><table class="table_index"><tr><td class="menu_group_item">
+ <li><a href="'. $rootpath . '/SelectSalesOrder.php?">' . _('Outstanding Sales Orders') . '</a></li>
+ <li><a href="'. $rootpath . '/SelectCompletedOrder.php">' . _('Completed Sales Orders') . '</a></li>
+ </td></tr></table></div><br /><br /><br />';
include('includes/footer.inc');
exit();
}
@@ -65,12 +63,12 @@
if (DB_num_rows($result)==0){
$title = _('Print Packing Slip Error');
include('includes/header.inc');
- echo '<div class=centre><br><br><br>';
+ echo '<div class=centre><br /><br /><br />';
prnMsg( _('Unable to Locate Order Number') . ' : ' . $_GET['TransNo'] . ' ', 'error');
- echo '<br><br><br><table class="table_index"><tr><td class="menu_group_item">
- <li><a href="'. $rootpath . '/SelectSalesOrder.php?'. SID .'">' . _('Outstanding Sales Orders') . '</a></li>
- <li><a href="'. $rootpath . '/SelectCompletedOrder.php?'. SID .'">' . _('Completed Sales Orders') . '</a></li>
- </td></tr></table></div><br><br><br>';
+ echo '<br /><br /><br /><table class="table_index"><tr><td class="menu_group_item">
+ <li><a href="'. $rootpath . '/SelectSalesOrder.php">' . _('Outstanding Sales Orders') . '</a></li>
+ <li><a href="'. $rootpath . '/SelectCompletedOrder.php">' . _('Completed Sales Orders') . '</a></li>
+ </td></tr></table></div><br /><br /><br />';
include('includes/footer.inc');
exit();
} elseif (DB_num_rows($result)==1){ /*There is only one order header returned - thats good! */
@@ -85,17 +83,17 @@
echo '<p>';
prnMsg( _('The packing slip for order number') . ' ' . $_GET['TransNo'] . ' ' .
_('has previously been printed') . '. ' . _('It was printed on'). ' ' . ConvertSQLDate($myrow['datepackingslipprinted']) .
- '<br>' . _('This check is there to ensure that duplicate packing slips are not produced and dispatched more than once to the customer'), 'warn' );
- echo '<p><a href="' . $rootpath . '/PrintCustOrder.php?' . SID . '&TransNo=' . $_GET['TransNo'] . '&Reprint=OK">'
+ '<br />' . _('This check is there to ensure that duplicate packing slips are not produced and dispatched more than once to the customer'), 'warn' );
+ echo '<p><a href="' . $rootpath . '/PrintCustOrder.php?TransNo=' . $_GET['TransNo'] . '&Reprint=OK">'
. _('Do a Re-Print') . ' (' . _('On Pre-Printed Stationery') . ') ' . _('Even Though Previously Printed') . '</a><p>' .
- '<a href="' . $rootpath. '/PrintCustOrder_generic.php?' . SID . '&TransNo=' . $_GET['TransNo'] . '&Reprint=OK">'. _('Do a Re-Print') . ' (' . _('Plain paper') . ' - ' . _('A4') . ' ' . _('landscape') . ') ' . _('Even Though Previously Printed'). '</a>';
+ '<a href="' . $rootpath. '/PrintCustOrder_generic.php?TransNo=' . $_GET['TransNo'] . '&Reprint=OK">'. _('Do a Re-Print') . ' (' . _('Plain paper') . ' - ' . _('A4') . ' ' . _('landscape') . ') ' . _('Even Though Previously Printed'). '</a>';
- echo '<br><br><br>';
+ echo '<br /><br /><br />';
echo _('Or select another Order Number to Print');
echo '<table class="table_index"><tr><td class="menu_group_item">
- <li><a href="'. $rootpath . '/SelectSalesOrder.php?'. SID .'">' . _('Outstanding Sales Orders') . '</a></li>
- <li><a href="'. $rootpath . '/SelectCompletedOrder.php?'. SID .'">' . _('Completed Sales Orders') . '</a></li>
- </td></tr></table></div><br><br><br>';
+ <li><a href="'. $rootpath . '/SelectSalesOrder.php">' . _('Outstanding Sales Orders') . '</a></li>
+ <li><a href="'. $rootpath . '/SelectCompletedOrder.php">' . _('Completed Sales Orders') . '</a></li>
+ </td></tr></table></div><br /><br /><br />';
include('includes/footer.inc');
exit;
@@ -115,8 +113,9 @@
$FontSize=12;
$line_height=24;
$PageNumber = 1;
+$Copy = 'Office';
-$ListCount = 0; // UldisN
+$ListCount = 0;
for ($i=1;$i<=2;$i++){ /*Print it out twice one copy for customer and one for office */
if ($i==2){
@@ -173,28 +172,15 @@
} /*end for loop to print the whole lot twice */
-//$pdfcode = $pdf->output();
-//$len = strlen($pdfcode);
-//if ($len<=20){
if ($ListCount == 0) { //UldisN
$title = _('Print Packing Slip Error');
include('includes/header.inc');
echo '<p>'. _('There were no outstanding items on the order to deliver') . '. ' . _('A packing slip cannot be printed').
- '<br><a href="' . $rootpath . '/SelectSalesOrder.php?' . SID . '">'. _('Print Another Packing Slip/Order').
- '</a>' . '<br>'. '<a href="' . $rootpath . '/index.php?' . SID . '">' . _('Back to the menu') . '</a>';
+ '<br /><a href="' . $rootpath . '/SelectSalesOrder.php">'. _('Print Another Packing Slip/Order').
+ '</a>' . '<br />'. '<a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>';
include('includes/footer.inc');
exit;
} else {
-/* UldisN
- header('Content-type: application/pdf');
- header('Content-Length: ' . $len);
- header('Content-Disposition: inline; filename=PackingSlip.pdf');
- header('Expires: 0');
- header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
- header('Pragma: public');
-
- $pdf->Output('PrintCustOrder.pdf', 'I');
-*/
$pdf->OutputD($_SESSION['DatabaseName'] . '_PackingSlip_' . date('Y-m-d') . '.pdf');//UldisN
$pdf->__destruct(); //UldisN
$sql = "UPDATE salesorders SET printedpackingslip=1, datepackingslipprinted='" . Date('Y-m-d') . "' WHERE salesorders.orderno='" .$_GET['TransNo'] . "'";
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2011-03-18 05:48:23 UTC (rev 4513)
+++ trunk/SelectSalesOrder.php 2011-03-18 22:51:07 UTC (rev 4514)
@@ -885,7 +885,7 @@
}
$i++;
$j++;
- $TotalOrders += $myrow['ordervalue'];
+ $OrdersTotal += $myrow['ordervalue'];
if ($j == 12){
$j=1;
echo $tableheader;
@@ -901,7 +901,7 @@
} else {
echo '<b>' . _('Total Quotation(s) Value in');
}
- echo ' ' . $_SESSION['CompanyRecord']['currencydefault'] . ' :</b></td><td class="number"><b>' . number_format($TotalOrders,2) . '</b></td></tr>
+ echo ' ' . $_SESSION['CompanyRecord']['currencydefault'] . ' :</b></td><td class="number"><b>' . number_format($OrdersTotal,2) . '</b></td></tr>
</table>';
} //end if there are some orders to show
}
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2011-03-18 05:48:23 UTC (rev 4513)
+++ trunk/doc/Change.log.html 2011-03-18 22:51:07 UTC (rev 4514)
@@ -1,7 +1,8 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p>
-<p>18/3/11: Marcos Garcia Trejo Added Z_ChangeSupplierCode.php
-<p>18/3/11: Ricard add orderby transdate to DailyBankTransactions.php
+<p>19/3/11: Phil added country to packing slips </p>
+<p>18/3/11: Marcos Garcia Trejo Added Z_ChangeSupplierCode.php </p>
+<p>18/3/11: Ricard add orderby transdate to DailyBankTransactions.php</p>
<p>18/3/11: Phil check for Customers.php CustomerBranches.php and Stocks.php now traps codes containing spaces - as well as other illegal characters</p>
<p>15/3/11: Phil PricesByCost.php - made it update prices where there is already a price starting on today's date</p>
<p>15/3/11: Phil SelectOrderItems.php customer selection now done using a hidden $_POST rather than parsing debtorno hyphen branchcode.</p>
Modified: trunk/includes/PDFOrderPageHeader.inc
===================================================================
--- trunk/includes/PDFOrderPageHeader.inc 2011-03-18 05:48:23 UTC (rev 4513)
+++ trunk/includes/PDFOrderPageHeader.inc 2011-03-18 22:51:07 UTC (rev 4514)
@@ -11,14 +11,14 @@
$pdf->addText($XPos, $YPos,$FontSize, $myrow['deliverto']);
$pdf->addText($XPos, $YPos-13,$FontSize, $myrow['deladd1']);
$pdf->addText($XPos, $YPos-26,$FontSize, $myrow['deladd2']);
-$pdf->addText($XPos, $YPos-39,$FontSize, $myrow['deladd3'] . ' ' . $myrow['deladd4'] . ' ' . $myrow['deladd5']);
+$pdf->addText($XPos, $YPos-39,$FontSize, $myrow['deladd3'] . ' ' . $myrow['deladd4'] . ' ' . $myrow['deladd5'] . ' ' . $myrow['deladd6']);
$YPos = 510;
$pdf->addText($XPos, $YPos,$FontSize, $myrow['name']);
$pdf->addText($XPos, $YPos-13,$FontSize, $myrow['address1']);
$pdf->addText($XPos, $YPos-26,$FontSize, $myrow['address2']);
-$pdf->addText($XPos, $YPos-39,$FontSize, $myrow['address3'] . ' ' . $myrow['address4'] . ' ' . $myrow['address5']);
+$pdf->addText($XPos, $YPos-39,$FontSize, $myrow['address3'] . ' ' . $myrow['address4'] . ' ' . $myrow['address5']. ' ' . $myrow['deladd6']);
/*Print Dispatch Date - as current date
Modified: trunk/includes/PDFOrderPageHeader_generic.inc
===================================================================
--- trunk/includes/PDFOrderPageHeader_generic.inc 2011-03-18 05:48:23 UTC (rev 4513)
+++ trunk/includes/PDFOrderPageHeader_generic.inc 2011-03-18 22:51:07 UTC (rev 4514)
@@ -41,7 +41,7 @@
$pdf->addText($XPos, $YPos-15,$FontSize, $myrow['deliverto']);
$pdf->addText($XPos, $YPos-30,$FontSize, $myrow['deladd1']);
$pdf->addText($XPos, $YPos-45,$FontSize, $myrow['deladd2']);
-$pdf->addText($XPos, $YPos-60,$FontSize, $myrow['deladd3'] . ' ' . $myrow['deladd4'] . ' ' . $myrow['deladd5']);
+$pdf->addText($XPos, $YPos-60,$FontSize, $myrow['deladd3'] . ' ' . $myrow['deladd4'] . ' ' . $myrow['deladd5'] . ' ' . $myrow['deladd6']);
$YPos -= 80;
@@ -49,7 +49,7 @@
$pdf->addText($XPos, $YPos-15,$FontSize, $myrow['name']);
$pdf->addText($XPos, $YPos-30,$FontSize, $myrow['address1']);
$pdf->addText($XPos, $YPos-45,$FontSize, $myrow['address2']);
-$pdf->addText($XPos, $YPos-60,$FontSize, $myrow['address3'] . ' ' . $myrow['address4'] . ' ' . $myrow['address5']);
+$pdf->addText($XPos, $YPos-60,$FontSize, $myrow['address3'] . ' ' . $myrow['address4'] . ' ' . $myrow['address5']. ' ' . $myrow['address6']);
$pdf->addText($XPos, $YPos-82,$FontSize, _('Customer No.'). ' : ' . $myrow['debtorno']);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
