From: <Ex...@us...> - 2012-03-02 09:24:41
|
Revision: 5000 http://web-erp.svn.sourceforge.net/web-erp/?rev=5000&view=rev Author: ExsonQu Date: 2012-03-02 09:24:30 +0000 (Fri, 02 Mar 2012) Log Message: ----------- 02/03/2012 Bugs fixed to add print modified quotations feature and redirect pdf output to blank windows in DeliveryDetails.php Reported by rfthomas. Modified Paths: -------------- trunk/DeliveryDetails.php Modified: trunk/DeliveryDetails.php =================================================================== --- trunk/DeliveryDetails.php 2012-03-01 23:29:59 UTC (rev 4999) +++ trunk/DeliveryDetails.php 2012-03-02 09:24:30 UTC (rev 5000) @@ -769,16 +769,29 @@ } /* 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]); + + 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 target="_blank" href="' .$rootpath.'/PDFQuotation.php?QuotationNo='.$_SESSION['ExistingOrder'.$identifier].'">'._('Print Quotation').'</a></td> + </tr> + </table>'; //end of print Quotation + }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 href="' . $rootpath . '/PrintCustOrder.php?identifier='.$identifier . '&TransNo=' . $_SESSION['ExistingOrder'.$identifier] . '">'. _('Print packing slip - pre-printed stationery') .'</a></td> + <td><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" /></td> + <td><a target="_blank" 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> @@ -793,6 +806,7 @@ <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; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |