From: <dai...@us...> - 2016-09-25 02:00:32
|
Revision: 7634 http://sourceforge.net/p/web-erp/reponame/7634 Author: daintree Date: 2016-09-25 02:00:30 +0000 (Sun, 25 Sep 2016) Log Message: ----------- Simon Kelly: fix to SelectSalesOrder.php to place POs correctly Modified Paths: -------------- trunk/SelectSalesOrder.php trunk/doc/Change.log trunk/doc/Manual/ManualContributors.html Modified: trunk/SelectSalesOrder.php =================================================================== --- trunk/SelectSalesOrder.php 2016-09-24 22:52:11 UTC (rev 7633) +++ trunk/SelectSalesOrder.php 2016-09-25 02:00:30 UTC (rev 7634) @@ -30,12 +30,12 @@ /*Note the button would not have been displayed if the user had no authority to create purchase orders */ $OrdersToPlacePOFor = ''; - for ($i=1;$i<count($_POST);$i++){ - if (isset($_POST['PlacePO_' . $i])) { //checkboxes only set if they are checked + for ($i=0;$i<=count($_POST['PlacePO_']);$i++){ + if (isset($_POST['PlacePO_'][$i])) { //checkboxes only set if they are checked if ($OrdersToPlacePOFor==''){ - $OrdersToPlacePOFor .= " orderno='" . $_POST['OrderNo_PO_'.$i] . "'"; + $OrdersToPlacePOFor .= " orderno='" . $_POST['OrderNo_PO_'][$i] . "'"; } else { - $OrdersToPlacePOFor .= " OR orderno='" . $_POST['OrderNo_PO_'.$i] . "'"; + $OrdersToPlacePOFor .= " OR orderno='" . $_POST['OrderNo_PO_'][$i] . "'"; } } } @@ -782,7 +782,7 @@ <td>%s</td> <td>%s</td> <td class="number">%s</td> - <td><input type="checkbox" name="PlacePO_%s" /><input type="hidden" name="OrderNo_PO_%s" value="%s" /></td> + <td><input type="checkbox" name="PlacePO_[]" /><input type="hidden" name="OrderNo_PO_[]" value="%s" /></td> </tr>', $ModifyPage, $myrow['orderno'], @@ -854,7 +854,11 @@ if ($_POST['Quotations']=='Orders_Only' AND $AuthRow['cancreate']==0){ //cancreate==0 means can create POs - echo '<tfoot><tr><td colspan="11" class="number"><input type="submit" name="PlacePO" value="' . _('Place') . " " . _('PO') . '" onclick="return confirm(\'' . _('This will create purchase orders for all the items on the checked sales orders above, based on the preferred supplier purchasing data held in the system. Are You Absolutely Sure?') . '\');" /></td></tr></tfoot>'; + echo '<tfoot> + <tr> + <td colspan="11" class="number"><input type="submit" name="PlacePO" value="' . _('Place') . " " . _('PO') . '" onclick="return confirm(\'' . _('This will create purchase orders for all the items on the checked sales orders above, based on the preferred supplier purchasing data held in the system. Are You Absolutely Sure?') . '\');" /></td> + </tr> + </tfoot>'; } echo '<tfoot><tr><td colspan="9" class="number">'; if ($_POST['Quotations']=='Orders_Only'){ Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2016-09-24 22:52:11 UTC (rev 7633) +++ trunk/doc/Change.log 2016-09-25 02:00:30 UTC (rev 7634) @@ -1,5 +1,6 @@ webERP Change Log +24/10/16 Simon Kelly: Fixed placing POs for sales orders using array form variable 24/09/16 waynemcdougall: Fixed missing date in Sales Price history 24/09/16 Exson: Make Justify feature workable in addTextWrap in class.pdf.php. 24/09/16 Exson: Fixed the AddTextWrap missing characters errors when there is space and make it more reliable. Modified: trunk/doc/Manual/ManualContributors.html =================================================================== --- trunk/doc/Manual/ManualContributors.html 2016-09-24 22:52:11 UTC (rev 7633) +++ trunk/doc/Manual/ManualContributors.html 2016-09-25 02:00:30 UTC (rev 7634) @@ -41,6 +41,7 @@ <p>Nico Kaiser (php-gettext)</p> <p>CQZ,KE</p> <p>Mo Kelly - due dates and customer po by sales order line</p> + <p>Simon Kelly</p> <p>Meraj Khattak - database diagram</p> <p>Steve Kitchen</p> <p>Ditesh Kumar</p> |