From: <dai...@us...> - 2011-07-31 04:42:16
|
Revision: 4646 http://web-erp.svn.sourceforge.net/web-erp/?rev=4646&view=rev Author: daintree Date: 2011-07-31 04:42:09 +0000 (Sun, 31 Jul 2011) Log Message: ----------- was not updating form variables on update Modified Paths: -------------- trunk/PO_Header.php trunk/doc/Change.log Modified: trunk/PO_Header.php =================================================================== --- trunk/PO_Header.php 2011-07-31 01:31:41 UTC (rev 4645) +++ trunk/PO_Header.php 2011-07-31 04:42:09 UTC (rev 4646) @@ -184,7 +184,7 @@ } -if (isset($_POST['EnterLines'])){ +if (isset($_POST['EnterLines']) OR isset($_POST['AllowRePrint'])){ /*User hit the button to enter line items - * ensure session variables updated then meta refresh to PO_Items.php*/ @@ -216,7 +216,7 @@ $_SESSION['PO'.$identifier]->Tel = $_POST['Tel']; $_SESSION['PO'.$identifier]->Port = $_POST['Port']; - if (isset($_POST['RePrint']) and $_POST['RePrint']==1){ + if (isset($_POST['RePrint']) AND $_POST['RePrint']==1){ $_SESSION['PO'.$identifier]->AllowPrintPO=1; @@ -229,14 +229,15 @@ } else { $_POST['RePrint'] = 0; } - - echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/PO_Items.php?identifier='.$identifier. '">'; - echo '<p>'; - prnMsg(_('You should automatically be forwarded to the entry of the purchase order line items page') . '. ' . - _('If this does not happen') . ' (' . _('if the browser does not support META Refresh') . ') ' . - '<a href="' . $rootpath . '/PO_Items.php?identifier='.$identifier . '">' . _('click here') . '</a> ' . _('to continue'),'info'); + if (!isset($_POST['AllowRePrint'])){ // user only hit update not "Enter Lines" + echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/PO_Items.php?identifier='.$identifier. '">'; + echo '<p>'; + prnMsg(_('You should automatically be forwarded to the entry of the purchase order line items page') . '. ' . + _('If this does not happen') . ' (' . _('if the browser does not support META Refresh') . ') ' . + '<a href="' . $rootpath . '/PO_Items.php?identifier='.$identifier . '">' . _('click here') . '</a> ' . _('to continue'),'info'); include('includes/footer.inc'); exit; + } } /* end of if isset _POST'EnterLines' */ echo '<span style="float:left"><a href="'. $rootpath . '/PO_SelectOSPurchOrder.php?identifier='.$identifier.'">'. _('Back to Purchase Orders'). '</a></span>'; Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2011-07-31 01:31:41 UTC (rev 4645) +++ trunk/doc/Change.log 2011-07-31 04:42:09 UTC (rev 4646) @@ -1,5 +1,6 @@ webERP Change Log +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 30/7/11 Phil: SelectCreditItems.php made it so if several sessions creating a credit note they no longer over-write each other. 30/7/11 Ricard: POItems.php now checks for return of more than 1 purchasing data from the supplier and takes the newest record This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |