Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[7834] trunk
|
From: <dai...@us...> - 2017-09-17 01:31:59
|
Revision: 7834
http://sourceforge.net/p/web-erp/reponame/7834
Author: daintree
Date: 2017-09-17 01:31:57 +0000 (Sun, 17 Sep 2017)
Log Message:
-----------
VortecCPI SelectProduct image display reworked per WorkOrderEntry.php
Modified Paths:
--------------
trunk/SelectProduct.php
trunk/doc/Change.log
Removed Paths:
-------------
trunk/PcAuthorizeCash.php
Deleted: trunk/PcAuthorizeCash.php
===================================================================
--- trunk/PcAuthorizeCash.php 2017-09-11 15:50:42 UTC (rev 7833)
+++ trunk/PcAuthorizeCash.php 2017-09-17 01:31:57 UTC (rev 7834)
@@ -1,308 +0,0 @@
-<?php
-include('includes/session.php');
-$Title = _('Authorisation of Assigned Cash');
-/* webERP manual links before header.php */
-$ViewTopic = 'PettyCash';
-$BookMark = 'AuthorizeCash';
-include('includes/header.php');
-include('includes/SQL_CommonFunctions.inc');
-if (isset($_POST['SelectedTabs'])) {
- $SelectedTabs = mb_strtoupper($_POST['SelectedTabs']);
-} elseif (isset($_GET['SelectedTabs'])) {
- $SelectedTabs = mb_strtoupper($_GET['SelectedTabs']);
-}
-if (isset($_POST['SelectedIndex'])) {
- $SelectedIndex = $_POST['SelectedIndex'];
-} elseif (isset($_GET['SelectedIndex'])) {
- $SelectedIndex = $_GET['SelectedIndex'];
-}
-if (isset($_POST['Days'])) {
- $Days = filter_number_format($_POST['Days']);
-} elseif (isset($_GET['Days'])) {
- $Days = filter_number_format($_GET['Days']);
-}
-if (isset($_POST['Process'])) {
- if ($SelectedTabs == '') {
- prnMsg(_('You must first select a petty cash tab to authorise'), 'error');
- unset($SelectedTabs);
- }
-}
-if (isset($_POST['Go'])) {
- if ($Days <= 0) {
- prnMsg(_('The number of days must be a positive number'), 'error');
- $Days = 30;
- }
-}
-
-echo '<p class="page_title_text">
- <img src="', $RootPath, '/css/', $_SESSION['Theme'], '/images/magnifier.png" title="', _('Petty Cash'), '" alt="" />', _('Authorisation of Assigned Cash '), '
- </p>';
-
-if (isset($SelectedTabs)) {
-echo '<br /><table class="selection">';
-echo ' <tr>
- <td>' . _('Petty Cash Tab') . ':</td>
- <td>' . $SelectedTabs . '</td>
- </tr>';
-echo '</table>';
-}
-
-if (isset($_POST['Submit']) or isset($_POST['update']) or isset($SelectedTabs) or isset($_POST['GO'])) {
- echo '<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '">';
- echo '<input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />';
- if (!isset($Days)) {
- $Days = 30;
- }
- echo '<input type="hidden" name="SelectedTabs" value="', $SelectedTabs, '" />';
- echo '<table class="selection">
- <tr>
- <th colspan="6">', _('Detail of Tab Movements For Last '), ':
- <input type="text" class="number" name="Days" value="', $Days, '" maxlength="3" size="4" />', _('Days'), '
- <input type="submit" name="Go" value="', _('Go'), '" />
- </th>
- </tr>';
- $SQL = "SELECT pcashdetails.counterindex,
- pcashdetails.tabcode,
- pcashdetails.date,
- pcashdetails.codeexpense,
- pcashdetails.amount,
- pcashdetails.authorized,
- pcashdetails.posted,
- pcashdetails.notes,
- pcashdetails.receipt,
- pctabs.glaccountassignment,
- pctabs.glaccountpcash,
- pctabs.usercode,
- pctabs.currency,
- currencies.rate,
- currencies.decimalplaces
- FROM pcashdetails, pctabs, currencies
- WHERE pcashdetails.tabcode = pctabs.tabcode
- AND pctabs.currency = currencies.currabrev
- AND pcashdetails.tabcode = '" . $SelectedTabs . "'
- AND pcashdetails.date >= DATE_SUB(CURDATE(), INTERVAL '" . $Days . "' DAY)
- AND pcashdetails.codeexpense='ASSIGNCASH'
- ORDER BY pcashdetails.date, pcashdetails.counterindex ASC";
- $Result = DB_query($SQL);
- echo '<tr>
- <th>', _('Date'), '</th>
- <th>', _('Expense Code'), '</th>
- <th>', _('Amount'), '</th>
- <th>', _('Notes'), '</th>
- <th>', _('Receipt'), '</th>
- <th>', _('Date Authorised'), '</th>
- </tr>';
- $k = 0; //row colour counter
- $CurrDecimalPlaces = 2;
- while ($MyRow = DB_fetch_array($Result)) {
- $CurrDecimalPlaces = $MyRow['decimalplaces'];
- //update database if update pressed
- if (isset($_POST['Submit']) and $_POST['Submit'] == _('Update') and isset($_POST[$MyRow['counterindex']])) {
- $PeriodNo = GetPeriod(ConvertSQLDate($MyRow['date']), $db);
- if ($MyRow['rate'] == 1) { // functional currency
- $Amount = $MyRow['amount'];
- } else { // other currencies
- $Amount = $MyRow['amount'] / $MyRow['rate'];
- }
- if ($MyRow['codeexpense'] == 'ASSIGNCASH') {
- $type = 2;
- $AccountFrom = $MyRow['glaccountassignment'];
- $AccountTo = $MyRow['glaccountpcash'];
- $TagTo = 0;
- } else {
- $type = 1;
- $Amount = -$Amount;
- $AccountFrom = $MyRow['glaccountpcash'];
- $SQLAccExp = "SELECT glaccount,
- tag
- FROM pcexpenses
- WHERE codeexpense = '" . $MyRow['codeexpense'] . "'";
- $ResultAccExp = DB_query($SQLAccExp);
- $MyRowAccExp = DB_fetch_array($ResultAccExp);
- $AccountTo = $MyRowAccExp['glaccount'];
- $TagTo = $MyRowAccExp['tag'];
- }
- //get typeno
- $typeno = GetNextTransNo($type,$db);
- //build narrative
- $Narrative = _('PettyCash') . ' - ' . $MyRow['tabcode'] . ' - ' . $MyRow['codeexpense'] . ' - ' . DB_escape_string($MyRow['notes']) . ' - ' . $MyRow['receipt'];
- //insert to gltrans
- DB_Txn_Begin();
- $SQLFrom = "INSERT INTO `gltrans` (`counterindex`,
- `type`,
- `typeno`,
- `chequeno`,
- `trandate`,
- `periodno`,
- `account`,
- `narrative`,
- `amount`,
- `posted`,
- `jobref`,
- `tag`)
- VALUES (NULL,
- '" . $type . "',
- '" . $typeno . "',
- 0,
- '" . $MyRow['date'] . "',
- '" . $PeriodNo . "',
- '" . $AccountFrom . "',
- '" . $Narrative . "',
- '" . -$Amount . "',
- 0,
- '',
- '" . $TagTo ."')";
- $ResultFrom = DB_Query($SQLFrom, '', '', true);
- $SQLTo = "INSERT INTO `gltrans` (`counterindex`,
- `type`,
- `typeno`,
- `chequeno`,
- `trandate`,
- `periodno`,
- `account`,
- `narrative`,
- `amount`,
- `posted`,
- `jobref`,
- `tag`
- ) VALUES (NULL,
- '" . $type . "',
- '" . $typeno . "',
- 0,
- '" . $MyRow['date'] . "',
- '" . $PeriodNo . "',
- '" . $AccountTo . "',
- '" . $Narrative . "',
- '" . $Amount . "',
- 0,
- '',
- '" . $TagTo ."'
- )";
- $ResultTo = DB_Query($SQLTo, '', '', true);
- if ($MyRow['codeexpense'] == 'ASSIGNCASH') {
- // if it's a cash assignation we need to updated banktrans table as well.
- $ReceiptTransNo = GetNextTransNo(2, $db);
- $SQLBank = "INSERT INTO banktrans (transno,
- type,
- bankact,
- ref,
- exrate,
- functionalexrate,
- transdate,
- banktranstype,
- amount,
- currcode
- ) VALUES (
- '" . $ReceiptTransNo . "',
- 1,
- '" . $AccountFrom . "',
- '" . $Narrative . "',
- 1,
- '" . $MyRow['rate'] . "',
- '" . $MyRow['date'] . "',
- 'Cash',
- '" . -$MyRow['amount'] . "',
- '" . $MyRow['currency'] . "'
- )";
- $ErrMsg = _('Cannot insert a bank transaction because');
- $DbgMsg = _('Cannot insert a bank transaction with the SQL');
- $ResultBank = DB_query($SQLBank, $ErrMsg, $DbgMsg, true);
- }
- $SQL = "UPDATE pcashdetails
- SET authorized = CURRENT_DATE,
- posted = 1
- WHERE counterindex = '" . $MyRow['counterindex'] . "'";
- $Resultupdate = DB_query($SQL, '', '', true);
- DB_Txn_Commit();
- prnMsg(_('Assigned cash has been correctly authorised'), 'success');
- unset($_POST['Submit']);
- unset($SelectedTabs);
- unset($_POST['SelectedTabs']);
- }
- if ($k == 1) {
- echo '<tr class="EvenTableRows">';
- $k = 0;
- } else {
- echo '<tr class="OddTableRows">';
- $k = 1;
- }
-
- /*
- if ($MyRow['posted'] == 0) {
- $Posted = _('No');
- } else {
- $Posted = _('Yes');
- }
- */
-
- echo '<td>', ConvertSQLDate($MyRow['date']), '</td>
- <td>', $MyRow['codeexpense'], '</td>
- <td class="number">', locale_number_format($MyRow['amount'], $CurrDecimalPlaces), '</td>
- <td>', $MyRow['notes'], '</td>
- <td>', $MyRow['receipt'], '</td>';
- if (isset($_POST[$MyRow['counterindex']])) {
- echo '<td>' . ConvertSQLDate(Date('Y-m-d'));
- } else {
- //compare against raw SQL format date, then convert for display.
- if (($MyRow['authorized'] != '0000-00-00')) {
- echo '<td>', ConvertSQLDate($MyRow['authorized']);
- } else {
- echo '<td align="right"><input type="checkbox" name="', $MyRow['counterindex'], '" />';
- }
- }
- echo '<input type="hidden" name="SelectedIndex" value="', $MyRow['counterindex'], '" />
- </td>
- </tr>';
- } //end of looping
- $SQLamount = "SELECT sum(amount)
- FROM pcashdetails
- WHERE tabcode='" . $SelectedTabs . "'
- AND codeexpense='ASSIGNCASH'";
- $ResultAmount = DB_query($SQLamount);
- $Amount = DB_fetch_array($ResultAmount);
- if (!isset($Amount['0'])) {
- $Amount['0'] = 0;
- }
- echo '<tr>
- <td colspan="2" class="number">', _('Current balance'), ':</td>
- <td class="number">', locale_number_format($Amount['0'], $CurrDecimalPlaces), '</td>
- </tr>';
- // Do the postings
- include('includes/GLPostings.inc');
- echo '</table>';
- echo '<div class="centre">
- <input type="submit" name="Submit" value="', _('Update'), '" />
- </div>
- </form>';
-} else {
- /*The option to submit was not hit so display form */
- echo '<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '">';
- echo '<input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />';
- $SQL = "SELECT tabcode
- FROM pctabs
- WHERE authorizer='" . $_SESSION['UserID'] . "'";
- $Result = DB_query($SQL);
- echo '<table class="selection">
- <tr>
- <td>', _('Authorise cash assigned to petty cash tab'), ':</td>
- <td><select required="required" name="SelectedTabs">';
- while ($MyRow = DB_fetch_array($Result)) {
- if (isset($_POST['SelectTabs']) and $MyRow['tabcode'] == $_POST['SelectTabs']) {
- echo '<option selected="selected" value="', $MyRow['tabcode'], '">', $MyRow['tabcode'], '</option>';
- } else {
- echo '<option value="', $MyRow['tabcode'], '">', $MyRow['tabcode'], '</option>';
- }
- } //end while loop get type of tab
- echo '</select>
- </td>
- </tr>';
- echo '</table>'; // close main table
- echo '<div class="centre">
- <input type="submit" name="Process" value="', _('Accept'), '" />
- <input type="submit" name="Cancel" value="', _('Cancel'), '" />
- </div>';
- echo '</form>';
-}
-/*end of else not submit */
-include('includes/footer.php');
-?>
\ No newline at end of file
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2017-09-11 15:50:42 UTC (rev 7833)
+++ trunk/SelectProduct.php 2017-09-17 01:31:57 UTC (rev 7834)
@@ -858,26 +858,30 @@
} else {
$ItemStatus ='';
}
- $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
- if (!empty($imagefile)){
- $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
- '&StockID='.urlencode($myrow['stockid']).
- '&text='. $myrow['stockid'] .
- '&width=100'.
- '&height=100'.
- '" alt="" />';
- }else{
- $StockImgLink = '<p>'._('No Image').'</p>';
- }
+ $SupportedImgExt = array('png','jpg','jpeg');
+ $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
+ if(extension_loaded('gd') && function_exists('gd_info') && file_exists ($imagefile) ) {
+ $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode($myrow['stockid']).
+ '&text='. //$myrow['stockid'] .
+ '&width=100'.
+ '&height=100'.
+ '" alt="" />';
+ } else if(file_exists ($imagefile)) {
+ $StockImgLink = '<img src="' . $imagefile . '" height="100" width="100" />';
+ } else {
+ $StockImgLink = '<p>'._('No Image').'</p>';
+ }
+
echo '<td>' . $ItemStatus . '</td>
- <td><input type="submit" name="Select" value="' . $myrow['stockid'] . '" /></td>
- <td>'.$StockImgLink.'</td>
- <td title="'. $myrow['longdescription'] . '">' . $myrow['description'] . '</td>
- <td class="number">' . $qoh . '</td>
- <td>' . $myrow['units'] . '</td>
- <td><a target="_blank" href="' . $RootPath . '/StockStatus.php?StockID=' . urlencode($myrow['stockid']).'">' . _('View') . '</a></td>
- </tr>';
+ <td><input type="submit" name="Select" value="' . $myrow['stockid'] . '" /></td>
+ <td>'.$StockImgLink.'</td>
+ <td title="'. $myrow['longdescription'] . '">' . $myrow['description'] . '</td>
+ <td class="number">' . $qoh . '</td>
+ <td>' . $myrow['units'] . '</td>
+ <td><a target="_blank" href="' . $RootPath . '/StockStatus.php?StockID=' . urlencode($myrow['stockid']).'">' . _('View') . '</a></td>
+ </tr>';
/*
$j++;
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-09-11 15:50:42 UTC (rev 7833)
+++ trunk/doc/Change.log 2017-09-17 01:31:57 UTC (rev 7834)
@@ -1,5 +1,6 @@
webERP Change Log
+17/9/17 VortecCPI: SelectProduct.php made image dispay code match that used in WorkOrderEntry.php
11/9/17 Andy Couling: Fixed the onclick delete confirmation box call in ContractBOM.php, was 'MakeConfirm'.
11/9/17 Andy Couling: Code consistency in PO_Items.php. http://www.weberp.org/forum/showthread.php?tid=4355
8/9/17 PaulT: Z_ChangeLocationCode.php: Add missing locationusers table update, reported by Paul Becker in forums.
|
