[Weberp-svn] SF.net SVN: weberp:[9257] trunk

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 9257
          http://weberp.svn.sourceforge.net/weberp/?rev=9257&view=rev
Author:   tim_schofield
Date:     2012-06-29 19:55:35 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Add in possibility to print quotations in landscape or portrait

Modified Paths:
--------------
    trunk/DeliveryDetails.php
    trunk/SelectSalesOrder.php

Modified: trunk/DeliveryDetails.php
===================================================================

--- trunk/DeliveryDetails.php	2012-06-29 19:55:24 UTC (rev 9256)
+++ trunk/DeliveryDetails.php	2012-06-29 19:55:35 UTC (rev 9257)
@@ -806,16 +806,50 @@
 	} /* updated line items into sales order details */
 
 	$Result=DB_Txn_Commit($db);
-
+	$Quotation = $_SESSION['Items'.$identifier]->Quotation;
 	unset($_SESSION['Items'.$identifier]->LineItems);
 	unset($_SESSION['Items'.$identifier]);
 
-	prnMsg(_('Order Number') .' ' . $_SESSION['ExistingOrder'.$identifier] . ' ' . _('has been updated'),'success');
+	if($Quotation){ //handle Quotations and Orders print after modification
+		prnMsg(_('Quotation Number') .' ' . $_SESSION['ExistingOrder'.$identifier] . ' ' . _('has been updated'),'success');
 
-	echo '<br /><table class="selection"><tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" /></td><td><a href="' . $rootpath . '/PrintCustOrder.php?identifier='.$identifier  . '&TransNo=' . $_SESSION['ExistingOrder'.$identifier] . '">'. _('Print packing slip - pre-printed stationery') .'</a></td></tr>';
-	echo '<tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" /></td><td><a  target="_blank" href="' . $rootpath . '/PrintCustOrder_generic.php?identifier='.$identifier  . '&TransNo=' . $_SESSION['ExistingOrder'.$identifier] . '">'. _('Print packing slip') . ' (' . _('Laser') . ')' .'</a></td></tr>';
-	echo '<tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Invoice') . '" alt="" /></td><td><a href="' . $rootpath .'/ConfirmDispatch_Invoice.php?identifier='.$identifier  . '&OrderNumber=' . $_SESSION['ExistingOrder'.$identifier] . '">'. _('Confirm Order Delivery Quantities and Produce Invoice') .'</a></td></tr>';
-	echo '<tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/sales.png" title="' . _('Order') . '" alt="" /></td><td><a href="' . $rootpath .'/SelectSalesOrder.php?identifier='.$identifier   . '">'. _('Select A Different Order') .'</a></td></tr></table>';
+		/*link to print the quotation */
+		echo '<br /><table class="selection">
+				<tr>
+					<td><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Order') . '" alt=""></td>
+					<td>' . ' ' . '<a href="' . $rootpath . '/PDFQuotation.php?identifier='.$identifier . '&amp;QuotationNo=' . $_SESSION['ExistingOrder'.$identifier] . '">'. _('Print Quotation (Landscape)') .'</a></td>
+				</tr>
+				</table>';
+		echo '<br /><table class="selection">
+				<tr>
+					<td><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Order') . '" alt="" /></td>
+					<td>' . ' ' . '<a href="' . $rootpath . '/PDFQuotationPortrait.php?identifier='.$identifier . '&amp;QuotationNo=' . $_SESSION['ExistingOrder'.$identifier] . '">'. _('Print Quotation (Portrait)') .'</a></td>
+				</tr>
+				</table>';
+	}else{
+
+		prnMsg(_('Order Number') .' ' . $_SESSION['ExistingOrder'.$identifier] . ' ' . _('has been updated'),'success');
+
+		echo '<br />
+				<table class="selection">
+				<tr>
+					<td><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" /></td>
+					<td><a target="_blank" href="' . $rootpath . '/PrintCustOrder.php?identifier='.$identifier  . '&amp;TransNo=' . $_SESSION['ExistingOrder'.$identifier] . '">'. _('Print packing slip - pre-printed stationery') .'</a></td>
+				</tr>';
+		echo '<tr>
+				<td><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" /></td>
+				<td><a  target="_blank" href="' . $rootpath . '/PrintCustOrder_generic.php?identifier='.$identifier  . '&amp;TransNo=' . $_SESSION['ExistingOrder'.$identifier] . '">'. _('Print packing slip') . ' (' . _('Laser') . ')' .'</a></td>
+			</tr>';
+		echo '<tr>
+				<td><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Invoice') . '" alt="" /></td>
+				<td><a href="' . $rootpath .'/ConfirmDispatch_Invoice.php?identifier='.$identifier  . '&amp;OrderNumber=' . $_SESSION['ExistingOrder'.$identifier] . '">'. _('Confirm Order Delivery Quantities and Produce Invoice') .'</a></td>
+			</tr>';
+		echo '<tr>
+				<td><img src="'.$rootpath.'/css/'.$theme.'/images/sales.png" title="' . _('Order') . '" alt="" /></td>
+				<td><a href="' . $rootpath .'/SelectSalesOrder.php?identifier='.$identifier   . '">'. _('Select A Different Order') .'</a></td>
+			</tr>
+		</table>';
+	}//end of print orders
 	include('includes/footer.inc');
 	exit;
 }

Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php	2012-06-29 19:55:24 UTC (rev 9256)
+++ trunk/SelectSalesOrder.php	2012-06-29 19:55:35 UTC (rev 9257)
@@ -875,6 +875,7 @@
 				$PrintDispatchNote = $rootpath . '/PrintCustOrder.php?TransNo=' . $myrow['orderno'];
 			}
 			$PrintQuotation = $rootpath . '/PDFQuotation.php?QuotationNo=' . $myrow['orderno'];
+			$PrintQuotationPortrait = $rootpath . '/PDFQuotationPortrait.php?QuotationNo=' . $myrow['orderno'];
 			$FormatedDelDate = ConvertSQLDate($myrow['deliverydate']);
 			$FormatedOrderDate = ConvertSQLDate($myrow['orddate']);
 			$FormatedOrderValue = locale_money_format($myrow['ordervalue'],$_SESSION['CompanyRecord']['currencydefault']);
@@ -942,25 +943,26 @@
 
 			} else { //must be quotes only
 				printf('<td><a href="%s">%s</a></td>
-					<td> <a href="%s" >' . $PrintText . '</a> </td>
-					<td>%s</td>
-					<td>%s</td>
-					<td>%s</td>
-					<td>%s</td>
-					<td>%s</td>
-					<td>%s</td>
-					<td class="number">%s</td>
-					</tr>',
-					$ModifyPage,
-					$myrow['orderno'],
-					$PrintQuotation,
-					$myrow['name'],
-					$myrow['brname'],
-					$myrow['customerref'],
-					$FormatedOrderDate,
-					$FormatedDelDate,
-					$myrow['deliverto'],
-					$FormatedOrderValue);
+						<td><a target="_blank" href="%s">' . _('Landscape') . '</a>&nbsp;&nbsp;<a target="_blank" href="%s">' . _('Portrait') . '</a></td>
+						<td>%s</td>
+						<td>%s</td>
+						<td>%s</td>
+						<td>%s</td>
+						<td>%s</td>
+						<td>%s</td>
+						<td class="number">%s</td>
+						</tr>',
+						$ModifyPage,
+						$myrow['orderno'],
+						$PrintQuotation,
+						$PrintQuotationPortrait,
+						$myrow['name'],
+						$myrow['brname'],
+						$myrow['customerref'],
+						$FormatedOrderDate,
+						$FormatedDelDate,
+						html_entity_decode($myrow['deliverto'],ENT_QUOTES,'UTF-8'),
+						$FormatedOrderValue);
 			}
 					$i++;
 			$j++;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



