From: <rc...@us...> - 2015-05-07 13:54:06
|
Revision: 7290 http://sourceforge.net/p/web-erp/reponame/7290 Author: rchacon Date: 2015-05-07 13:54:04 +0000 (Thu, 07 May 2015) Log Message: ----------- Hides submit button and 'More Info' columns when printing. Add thead tag to enable the table header to be printed at the top of each page. Modified Paths: -------------- trunk/SupplierInquiry.php trunk/doc/Change.log Modified: trunk/SupplierInquiry.php =================================================================== --- trunk/SupplierInquiry.php 2015-05-04 06:55:21 UTC (rev 7289) +++ trunk/SupplierInquiry.php 2015-05-07 13:54:04 UTC (rev 7290) @@ -1,8 +1,9 @@ <?php /* $Id$*/ +/* Inquiry showing invoices, credit notes and payments made to suppliers together with the amounts outstanding. */ include('includes/session.inc'); -$Title = _('Supplier Inquiry'); +$Title = _('Supplier Inquiry');// Screen identification. $ViewTopic = 'AccountsPayable';// Filename in ManualContents.php's TOC./* RChacon: Is there any content for Supplier Inquiry? */ $BookMark = 'AccountsPayable';// Anchor's id in the manual's html document. include('includes/header.inc'); @@ -114,7 +115,7 @@ $SupplierRecord['overdue2'] = 0; } include('includes/CurrenciesArray.php'); // To get the currency name from the currency code. -echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/supplier.png" title="' . _('Supplier') . '" alt="" /> ' . +echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.'/images/supplier.png" title="' . _('Supplier') . '" /> ' . _('Supplier') . ': ' . $SupplierID . ' - ' . $SupplierRecord['suppname'] . '<br />' . _('All amounts stated in') . ': ' . @@ -163,7 +164,7 @@ echo '<div> <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo _('Show all transactions after') . ': ' . '<input type="text" class="date" alt="' .$_SESSION['DefaultDateFormat'] .'" name="TransAfterDate" value="' . $_POST['TransAfterDate'] . '" maxlength="10" size="10" /> - <input type="submit" name="Refresh Inquiry" value="' . _('Refresh Inquiry') . '" /> + <input class="noprint" name="Refresh Inquiry" type="submit" value="' . _('Refresh Inquiry') . '" /> </div> </form> <br />'; @@ -204,7 +205,7 @@ /*show a table of the transactions returned by the SQL */ -echo '<table width="90%" class="selection"> +echo '<table class="selection"><thead> <tr> <th class="ascending">' . _('Date') . '</th> <th class="ascending">' . _('Type') . '</th> @@ -214,9 +215,10 @@ <th class="ascending">' . _('Total') . '</th> <th class="ascending">' . _('Allocated') . '</th> <th class="ascending">' . _('Balance') . '</th> - <th>' . _('More Info') . '</th> - <th>' . _('More Info') . '</th> - </tr>'; + <th class="noprint">' . _('More Info') . '</th> + <th class="noprint">' . _('More Info') . '</th> + </tr> + </thead><tbody>'; $j = 1; $k = 0;// Row colour counter. @@ -252,17 +254,17 @@ <td class="number">' . locale_number_format($myrow['allocated'],$SupplierRecord['currdecimalplaces']) . '</td> <td class="number">' . locale_number_format($myrow['totalamount']-$myrow['allocated'],$SupplierRecord['currdecimalplaces']) . '</td>'; - $PaymentTD1 = '<td><a href="' . $RootPath . '/PaymentAllocations.php?SuppID=%s&InvID=%s" title="' . + $PaymentTD1 = '<td class="noprint"><a href="' . $RootPath . '/PaymentAllocations.php?SuppID=%s&InvID=%s" title="' . _('Click to view payments') . '"><img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/money_delete.png" width="16"/> ' . _('Payments') . '</a></td>'; /* To do: $HoldValueTD1*/ - $AllocationTD1 = '<td><a href="' . $RootPath . '/SupplierAllocations.php?AllocTrans=%s" title="' . + $AllocationTD1 = '<td class="noprint"><a href="' . $RootPath . '/SupplierAllocations.php?AllocTrans=%s" title="' . _('Click to allocate funds') . '"><img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/allocation.png" /> ' . _('Allocation') . '</a></td>'; - $GLEntriesTD1 = '<td><a href="' . $RootPath . '/GLTransInquiry.php?TypeID=%s&TransNo=%s" target="_blank" title="' . + $GLEntriesTD1 = '<td class="noprint"><a href="' . $RootPath . '/GLTransInquiry.php?TypeID=%s&TransNo=%s" target="_blank" title="' . _('Click to view the GL entries') . '"><img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/gl.png" width="16" /> ' . _('GL Entries') . '</a></td>'; @@ -289,12 +291,12 @@ printf($BaseTD8); if ($AuthRow[0]==0) { - echo '<td><a href="' .htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?HoldType=' . $myrow['type'] . '&HoldTrans=' . $myrow['transno']. '&HoldStatus=' . $HoldValue . '&FromDate=' . $_POST['TransAfterDate'].'">' . $HoldValue . '</a></td>'; + echo '<td class="noprint"><a href="' .htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?HoldType=' . $myrow['type'] . '&HoldTrans=' . $myrow['transno']. '&HoldStatus=' . $HoldValue . '&FromDate=' . $_POST['TransAfterDate'].'">' . $HoldValue . '</a></td>'; } else { if ($HoldValue==_('Release')) { echo '<td>' . $HoldValue . '</a></td>'; } else { - echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'). '?HoldType=' . $myrow['type'] .'&HoldTrans=' . $myrow['transno'] . '&HoldStatus=' . $HoldValue . '&FromDate=' . $_POST['TransAfterDate'] .'">' . $HoldValue . '</a></td>'; + echo '<td class="noprint"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'). '?HoldType=' . $myrow['type'] .'&HoldTrans=' . $myrow['transno'] . '&HoldStatus=' . $HoldValue . '&FromDate=' . $_POST['TransAfterDate'] .'">' . $HoldValue . '</a></td>'; } } printf($GLEntriesTD1 . '</tr>', @@ -306,14 +308,13 @@ } else { if ($myrow['totalamount'] - $myrow['allocated'] == 0) { /*The trans is settled so don't show option to hold */ - printf($BaseTD8 . '<td> </td><td> </td></tr>'); + echo $BaseTD8 . '<td class="noprint"> </td><td class="noprint"> </td></tr>'; } else { - printf($BaseTD8); - echo ' - <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES,'UTF-8') . '/PaymentAllocations.php?SuppID=' . + echo $BaseTD8 . ' + <td class="noprint"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES,'UTF-8') . '/PaymentAllocations.php?SuppID=' . $myrow['type'] . '&InvID=' . $myrow['transno'] . '">' . _('View Payments') . '</a></td> - <td><a href="' . $HoldValue . '?HoldType=' . $_POST['TransAfterDate'] . '&HoldTrans=' . $HoldValue . '&HoldStatus=' . + <td class="noprint"><a href="' . $HoldValue . '?HoldType=' . $_POST['TransAfterDate'] . '&HoldTrans=' . $HoldValue . '&HoldStatus=' . $RootPath . '&FromDate='. $myrow['supplierno'] . '">' . $myrow['suppreference'] . '</a></td></tr>'; } } @@ -329,7 +330,7 @@ $myrow['transno']); } else { /*Not linked to GL */ - printf($BaseTD8 . $AllocationTD1 . '<td> </td></tr>', + printf($BaseTD8 . $AllocationTD1 . '<td class="noprint"> </td></tr>', // $AllocationTD1 parameters: $myrow['id']); @@ -337,6 +338,6 @@ }// End of page full new headings if }// End of while loop -echo '</table>'; +echo '</tbody></table>'; include('includes/footer.inc'); -?> +?> \ No newline at end of file Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-05-04 06:55:21 UTC (rev 7289) +++ trunk/doc/Change.log 2015-05-07 13:54:04 UTC (rev 7290) @@ -1,5 +1,6 @@ webERP Change Log +07/05/15 RChacon: Hides submit button and 'More Info' columns when printing. Add thead tag to enable the table header to be printed at the top of each page. 04/05/15 Exson: Make PO number searching also in compliance with location authority rules and make default search result as all if users have full location authority. 04/05/15 Exson: Make all option available for users who have authority for all locations and all option available for all stock categories in PO_SelectOSPurchOrder.php. 02/05/15 TeHonu: Added bankaccountusers table in Z_ChangeGLAccountCode.php |