Thread: [Weberp-svn] SF.net SVN: weberp:[8529] trunk (Page 10)
Brought to you by:
sotandeka,
tim_schofield
Menu
▾
▴
weberp-svn
|
From: <Tu...@us...> - 2012-02-19 00:54:11
|
Revision: 8529
http://weberp.svn.sourceforge.net/weberp/?rev=8529&view=rev
Author: TurboPT
Date: 2012-02-19 00:54:04 +0000 (Sun, 19 Feb 2012)
Log Message:
-----------
Correct function call name case.
Modified Paths:
--------------
trunk/Customers.php
trunk/RecurringSalesOrders.php
trunk/reportwriter/FormMaker.php
trunk/reportwriter/ReportMaker.php
trunk/reportwriter/admin/ReportCreator.php
Modified: trunk/Customers.php
===================================================================
--- trunk/Customers.php 2012-02-19 00:09:08 UTC (rev 8528)
+++ trunk/Customers.php 2012-02-19 00:54:04 UTC (rev 8529)
@@ -1012,7 +1012,7 @@
echo '<meta http-equiv="Refresh" content="0; url=' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?DebtorNo='.$DebtorNo.'">';
echo '<br />'.$SQl;
- prnmsg('Contact Deleted','success');
+ prnMsg('Contact Deleted','success');
}
Modified: trunk/RecurringSalesOrders.php
===================================================================
--- trunk/RecurringSalesOrders.php 2012-02-19 00:09:08 UTC (rev 8528)
+++ trunk/RecurringSalesOrders.php 2012-02-19 00:54:04 UTC (rev 8529)
@@ -280,7 +280,7 @@
$Ins_LineItemResult = DB_query($LineItemsSQL,$db,$ErrMsg,$DbgMsg,true);
} /* inserted line items into sales order details */
- prnmsg(_('The new recurring order template has been added'),'success');
+ prnMsg(_('The new recurring order template has been added'),'success');
} else { /* must be updating an existing recurring order */
$HeaderSQL = "UPDATE recurringsalesorders SET
@@ -291,7 +291,7 @@
$ErrMsg = _('The recurring order cannot be updated because');
$UpdateQryResult = DB_query($HeaderSQL,$db,$ErrMsg);
- prnmsg(_('The recurring order template has been updated'),'success');
+ prnMsg(_('The recurring order template has been updated'),'success');
}
echo '<p><a href="'.$rootpath.'/SelectOrderItems.php?NewOrder=Yes">'. _('Enter New Sales Order') .'</a></p>';
Modified: trunk/reportwriter/FormMaker.php
===================================================================
--- trunk/reportwriter/FormMaker.php 2012-02-19 00:09:08 UTC (rev 8528)
+++ trunk/reportwriter/FormMaker.php 2012-02-19 00:54:04 UTC (rev 8529)
@@ -125,7 +125,7 @@
} // end switch 'todo'
include ($PathPrefix . 'includes/header.inc');
-if ($usrMsg) foreach ($usrMsg as $temp) prnmsg($temp['message'],$temp['level']);
+if ($usrMsg) foreach ($usrMsg as $temp) prnMsg($temp['message'],$temp['level']);
include ($IncludePage);
include ( $PathPrefix . 'includes/footer.inc');
// End main body
Modified: trunk/reportwriter/ReportMaker.php
===================================================================
--- trunk/reportwriter/ReportMaker.php 2012-02-19 00:09:08 UTC (rev 8528)
+++ trunk/reportwriter/ReportMaker.php 2012-02-19 00:54:04 UTC (rev 8529)
@@ -169,7 +169,7 @@
} // end if (!isset($_POST['todo']))
include ($PathPrefix . 'includes/header.inc');
-if ($usrMsg) foreach ($usrMsg as $temp) prnmsg($temp['message'],$temp['level']);
+if ($usrMsg) foreach ($usrMsg as $temp) prnMsg($temp['message'],$temp['level']);
include ($IncludePage);
include ( $PathPrefix . 'includes/footer.inc');
// End main body
Modified: trunk/reportwriter/admin/ReportCreator.php
===================================================================
--- trunk/reportwriter/admin/ReportCreator.php 2012-02-19 00:09:08 UTC (rev 8528)
+++ trunk/reportwriter/admin/ReportCreator.php 2012-02-19 00:54:04 UTC (rev 8529)
@@ -689,7 +689,7 @@
$title = $FormParams['title']; // fetch the title for the header.inc file
include ($PathPrefix . 'includes/header.inc');
-if ($usrMsg) foreach ($usrMsg as $temp) prnmsg($temp['message'],$temp['level']);
+if ($usrMsg) foreach ($usrMsg as $temp) prnMsg($temp['message'],$temp['level']);
include ($FormParams['IncludePage']);
include ($PathPrefix . 'includes/footer.inc');
// End main body
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Tu...@us...> - 2012-02-20 06:01:59
|
Revision: 8537
http://weberp.svn.sourceforge.net/weberp/?rev=8537&view=rev
Author: TurboPT
Date: 2012-02-20 06:01:53 +0000 (Mon, 20 Feb 2012)
Log Message:
-----------
Modified so that html elements that existed outside of PHP code to be output with PHP.
Modified Paths:
--------------
trunk/CounterSales.php
trunk/Shipt_Select.php
trunk/WorkOrderEntry.php
trunk/WorkOrderIssue.php
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2012-02-20 05:51:17 UTC (rev 8536)
+++ trunk/CounterSales.php 2012-02-20 06:01:53 UTC (rev 8537)
@@ -2227,20 +2227,25 @@
}
}
- ?>
+ if (!isset($_POST['Keywords'])) {
+ $_POST['Keywords']='';
+ }
+
+ if (!isset($_POST['StockCode'])) {
+ $_POST['StockCode']='';
+ }
- </select></td>
- <td><b><?php echo _('Enter partial Description'); ?>:</b>
- <input tabindex="2" type="text" name="Keywords" size="20" maxlength="25" value="<?php if (isset($_POST['Keywords'])) echo $_POST['Keywords']; ?>" /></td>
+ echo '</select></td>
+ <td><b>' . _('Enter partial Description') . ':</b>
+ <input tabindex="2" type="text" name="Keywords" size="20" maxlength="25" value="' . $_POST['Keywords'] . '" /></td>
- <td align="right"><b><?php echo _('OR'); ?> </b><b><?php echo _('Enter extract of the Stock Code'); ?>:</b>
- <input tabindex="3" type="text" name="StockCode" size="15" maxlength="18" value="<?php if (isset($_POST['StockCode'])) echo $_POST['StockCode']; ?>" /></td>
+ <td align="right"><b>' . _('OR') . ' </b><b>' . _('Enter extract of the Stock Code') . ':</b>
+ <input tabindex="3" type="text" name="StockCode" size="15" maxlength="18" value="' . $_POST['StockCode'] . '" /></td>
</tr><tr>
- <td style="text-align:center" colspan="1"><input tabindex="4" type="submit" name="Search" value="<?php echo _('Search Now'); ?>" /></td>
- <td style="text-align:center" colspan="1"><input tabindex="5" type="submit" name="QuickEntry" value="<?php echo _('Use Quick Entry'); ?>" /></td>
+ <td style="text-align:center"><input tabindex="4" type="submit" name="Search" value="' . _('Search Now') . '" /></td>
+ <td style="text-align:center"><input tabindex="5" type="submit" name="QuickEntry" value="' . _('Use Quick Entry') . '" /></td>';
- <?php
if (!isset($_POST['PartSearch'])) {
echo '<script type="text/javascript">if (document.SelectParts) {defaultControl(document.SelectParts.Keywords);}</script>';
}
Modified: trunk/Shipt_Select.php
===================================================================
--- trunk/Shipt_Select.php 2012-02-20 05:51:17 UTC (rev 8536)
+++ trunk/Shipt_Select.php 2012-02-20 06:01:53 UTC (rev 8537)
@@ -147,11 +147,10 @@
echo '<table class="selection">';
echo '<tr><th colspan="5"><font size="3" color="#616161">'._('To search for shipments for a specific part use the part selection facilities below') . '</font></th></tr>';
-?>
-<tr>
-<td><font size="1"><?php echo _('Select a stock category');?>:</font>
-<select name="StockCat">
-<?php
+echo '<tr>
+<td><font size="1">' . _('Select a stock category') . ':</font>
+<select name="StockCat">';
+
while ($myrow1 = DB_fetch_array($result1)) {
if (isset($_POST['StockCat']) and $myrow1['categoryid']==$_POST['StockCat']){
echo '<option selected="True" value="'. $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
@@ -159,17 +158,16 @@
echo '<option value="'. $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
}
}
-?>
-</select>
-<td><font size="1"><?php echo _('Enter text extracts in the');?> <b><?php echo _('description');?></b>:</font></td>
+
+echo '</select>
+<td><font size="1">' . _('Enter text extracts in the') . ' <b>' . _('description') . '</b>:</font></td>
<td><input type="text" name="Keywords" size="20" maxlength="25" /></td></tr>
-<tr><td></td>
-<td><font size="3"><b><?php echo _('OR');?> </b></font><font size="1"><?php echo _('Enter extract of the');?> <b><?php echo _('Stock Code');?></b>:</font></td>
+<tr><td> </td>
+<td><font size="3"><b>' . _('OR') . ' </b></font><font size="1">' . _('Enter extract of the') . ' <b>' . _('Stock Code') . '</b>:</font></td>
<td><input type="text" name="StockCode" size="15" maxlength="18" /></td>
</tr>
-</table><br />
+</table><br />';
-<?php
echo '<div class="centre"><input type="submit" name="SearchParts" value="'._('Search Parts Now').'" />';
echo '<input type="submit" name="ResetPart" value="'. _('Show All') .'" /></div><br />';
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2012-02-20 05:51:17 UTC (rev 8536)
+++ trunk/WorkOrderEntry.php 2012-02-20 06:01:53 UTC (rev 8537)
@@ -557,7 +557,7 @@
echo '<br /><input type="submit" name="delete" value="' . _('Delete This Work Order') . '" onclick="return confirm(\'' . _('Are You Sure?') . '\');" />';
-echo '<br /></div>';
+echo '</div><br />';
$SQL="SELECT categoryid,
categorydescription
@@ -583,21 +583,24 @@
echo '<option value='. $myrow1['categoryid'] . '>' . $myrow1['categorydescription'] . '</option>';
}
}
-?>
-</select>
-<td><?php echo _('Enter text extracts in the'); ?> <b><?php echo _('description'); ?></b>:</td>
-<td><input type="text" name="Keywords" size="20" maxlength="25" value="<?php if (isset($_POST['Keywords'])) echo $_POST['Keywords']; ?>" /></td></tr>
-<tr><td></td>
- <td><font size="3"><b><?php echo _('OR'); ?> </b></font><?php echo _('Enter extract of the'); ?> <b><?php echo _('Stock Code'); ?></b>:</td>
- <td><input type="text" name="StockCode" size="15" maxlength="18" value="<?php if (isset($_POST['StockCode'])) echo $_POST['StockCode']; ?>" /></td>
- </tr>
- </table>
- <br /><div class="centre"><input type="submit" name="Search" value=" <?php echo _('Search Now'); ?>" />
+if (!isset($_POST['Keywords'])) {
+ $_POST['Keywords']='';
+}
-<?php
+if (!isset($_POST['StockCode'])) {
+ $_POST['StockCode']='';
+}
-echo '</div>';
+echo '</select>
+ <td>' . _('Enter text extracts in the') . ' <b>' . _('description') . '</b>:</td>
+ <td><input type="text" name="Keywords" size="20" maxlength="25" value="' . $_POST['Keywords'] . '" /></td></tr>
+ <tr><td> </td>
+ <td><font size="3"><b>' . _('OR') . ' </b></font>' . _('Enter extract of the') . ' <b>' . _('Stock Code') . '</b>:</td>
+ <td><input type="text" name="StockCode" size="15" maxlength="18" value="' . $_POST['StockCode'] . '" /></td>
+ </tr>
+ </table>
+ <br /><div class="centre"><input type="submit" name="Search" value="' . _('Search Now') . '" /></div>';
if (isset($SearchResult)) {
Modified: trunk/WorkOrderIssue.php
===================================================================
--- trunk/WorkOrderIssue.php 2012-02-20 05:51:17 UTC (rev 8536)
+++ trunk/WorkOrderIssue.php 2012-02-20 06:01:53 UTC (rev 8537)
@@ -640,28 +640,27 @@
echo '<option value='. $myrow1['categoryid'] . '>' . $myrow1['categorydescription'] . '</option>';
}
}
- ?>
- </select>
- <td><?php echo _('Enter text extracts in the'); ?> <b><?php echo _('description'); ?></b>:</td>
- <td><input type="text" name="Keywords" size="20" maxlength="25" value=" <?php if (isset($_POST['Keywords'])) echo $_POST['Keywords']; ?>" /></td></tr>
+ if (!isset($_POST['Keywords'])) {
+ $_POST['Keywords']='';
+ }
+
+ if (!isset($_POST['StockCode'])) {
+ $_POST['StockCode']='';
+ }
+
+echo '</select>
+ <td>' . _('Enter text extracts in the') . ' <b>' . _('description') . '</b>:</td>
+ <td><input type="text" name="Keywords" size="20" maxlength="25" value="' . $_POST['Keywords'] . '" /></td></tr>
<tr><td></td>
- <td><font size="3"><b><?php echo _('OR'); ?> </b></font><?php echo _('Enter extract of the'); ?> <b><?php echo _('Stock Code'); ?></b>:</td>
- <td><input type="text" name="StockCode" size="15" maxlength="18" value=" <?php if (isset($_POST['StockCode'])) echo $_POST['StockCode']; ?>" /></td>
- </tr>
- </table>
- <br /><div class="centre"><input type="submit" name="Search" value=" <?php echo _('Search Now'); ?>" />
+ <td><font size="3"><b>' . _('OR') . ' </b></font>' . _('Enter extract of the') . ' <b>' . _('Stock Code') . '</b>:</td>
+ <td><input type="text" name="StockCode" size="15" maxlength="18" value="' . $_POST['StockCode'] . '" /></td>
+ </tr>
+ </table>
+ <br /><div class="centre"><input type="submit" name="Search" value="' . _('Search Now') . '" /></div>';
- <script language='JavaScript' type='text/javascript'>
+echo '<script type="text/javascript">defaultControl(document.forms[0].StockCode);</script>';
- document.forms[0].StockCode.select();
- document.forms[0].StockCode.focus();
-
- </script>
-
- <?php
- echo '</div>';
-
if (isset($SearchResult)) {
if (DB_num_rows($SearchResult)>1){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-04-01 13:25:26
|
Revision: 8608
http://weberp.svn.sourceforge.net/weberp/?rev=8608&view=rev
Author: tim_schofield
Date: 2012-04-01 13:25:20 +0000 (Sun, 01 Apr 2012)
Log Message:
-----------
database upgrades for pro forma invoices
Modified Paths:
--------------
trunk/includes/session.inc
Added Paths:
-----------
trunk/sql/mysql/updates/108.php
Modified: trunk/includes/session.inc
===================================================================
--- trunk/includes/session.inc 2012-04-01 13:25:08 UTC (rev 8607)
+++ trunk/includes/session.inc 2012-04-01 13:25:20 UTC (rev 8608)
@@ -13,7 +13,7 @@
header('Location:' . $rootpath . '/install/index.php');
}
include($PathPrefix . 'config.php');
-$DBVersion=107;
+$DBVersion=108;
if (isset($SessionSavePath)){
session_save_path($SessionSavePath);
}
Added: trunk/sql/mysql/updates/108.php
===================================================================
--- trunk/sql/mysql/updates/108.php (rev 0)
+++ trunk/sql/mysql/updates/108.php 2012-04-01 13:25:20 UTC (rev 8608)
@@ -0,0 +1,53 @@
+<?php
+
+/* Include the new script for printing quotations in Portrait
+ */
+
+InsertRecord('pagesecurity', array('script', 'security'), array('ConfirmProForma_Invoice.php',2), array('script', 'security'), array('ConfirmProForma_Invoice.php',2), $db);
+
+InsertRecord('systypes', array('typeid'), array('13'), array('typeid', 'typename', 'typeno'), array('13', 'Proforma Invoices', '0'), $db);
+
+CreateTable('proformatrans', "CREATE TABLE `proformatrans` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `transno` int(11) NOT NULL DEFAULT '0',
+ `type` smallint(6) NOT NULL DEFAULT '0',
+ `stockid` varchar(20) NOT NULL DEFAULT '',
+ `debtorno` varchar(10) NOT NULL DEFAULT '',
+ `branchcode` varchar(10) NOT NULL DEFAULT '',
+ `trandate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+ `inputdate` datetime NOT NULL,
+ `prd` smallint(6) NOT NULL DEFAULT '0',
+ `settled` tinyint(4) NOT NULL DEFAULT '0',
+ `reference` varchar(20) NOT NULL DEFAULT '',
+ `tpe` char(2) NOT NULL DEFAULT '',
+ `order_` int(11) NOT NULL DEFAULT '0',
+ `rate` double NOT NULL DEFAULT '0',
+ `ovamount` double NOT NULL DEFAULT '0',
+ `ovgst` double NOT NULL DEFAULT '0',
+ `ovfreight` double NOT NULL DEFAULT '0',
+ `ovdiscount` double NOT NULL DEFAULT '0',
+ `diffonexch` double NOT NULL DEFAULT '0',
+ `alloc` double NOT NULL DEFAULT '0',
+ `invtext` text,
+ `shipvia` int(11) NOT NULL DEFAULT '0',
+ `edisent` tinyint(4) NOT NULL DEFAULT '0',
+ `consignment` varchar(15) NOT NULL DEFAULT '',
+ PRIMARY KEY (`id`),
+ KEY `DebtorNo` (`debtorno`,`branchcode`),
+ KEY `Order_` (`order_`),
+ KEY `Prd` (`prd`),
+ KEY `Tpe` (`tpe`),
+ KEY `Type` (`type`),
+ KEY `Settled` (`settled`),
+ KEY `TranDate` (`trandate`),
+ KEY `TransNo` (`transno`),
+ KEY `Type_2` (`type`,`transno`),
+ KEY `EDISent` (`edisent`),
+ CONSTRAINT `proformatrans_ibfk_2` FOREIGN KEY (`type`) REFERENCES `systypes` (`typeid`),
+ CONSTRAINT `proformatrans_ibfk_3` FOREIGN KEY (`prd`) REFERENCES `periods` (`periodno`),
+ CONSTRAINT `proformatrans_ibfk_4` FOREIGN KEY (`stockid`) REFERENCES `stockmaster` (`stockid`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8", $db);
+
+UpdateDBNo(108, $db);
+
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-04-02 21:56:19
|
Revision: 8615
http://weberp.svn.sourceforge.net/weberp/?rev=8615&view=rev
Author: tim_schofield
Date: 2012-04-02 21:56:09 +0000 (Mon, 02 Apr 2012)
Log Message:
-----------
New script to maintain a supplier price list
Modified Paths:
--------------
trunk/css/gel/default.css
trunk/css/gel/images/credit.gif
trunk/css/gel/images/email.gif
trunk/css/gel/images/preview.gif
trunk/css/gel/login.css
trunk/css/silverwolf/default.css
trunk/css/silverwolf/images/credit.gif
trunk/css/silverwolf/images/email.gif
trunk/css/silverwolf/images/preview.gif
trunk/css/silverwolf/login.css
trunk/includes/IndexArray.php
trunk/includes/session.inc
Added Paths:
-----------
trunk/SupplierPriceList.php
trunk/css/aguapop/images/tick.png
trunk/css/default/images/tick.png
trunk/css/fresh/images/tick.png
trunk/css/gel/images/tick.png
trunk/css/jelly/images/tick.png
trunk/css/professional/images/tick.png
trunk/css/professional-rtl/images/tick.png
trunk/css/silverwolf/images/tick.png
trunk/sql/mysql/updates/109.php
Property Changed:
----------------
trunk/css/gel/default.css
trunk/css/gel/images/credit.gif
trunk/css/gel/images/email.gif
trunk/css/gel/images/preview.gif
trunk/css/gel/login.css
trunk/css/silverwolf/default.css
trunk/css/silverwolf/images/credit.gif
trunk/css/silverwolf/images/email.gif
trunk/css/silverwolf/images/preview.gif
trunk/css/silverwolf/login.css
Added: trunk/SupplierPriceList.php
===================================================================
--- trunk/SupplierPriceList.php (rev 0)
+++ trunk/SupplierPriceList.php 2012-04-02 21:56:09 UTC (rev 8615)
@@ -0,0 +1,589 @@
+<?php
+
+include ('includes/session.inc');
+
+$title = _('Supplier Purchasing Data');
+
+include ('includes/header.inc');
+
+if (isset($_POST['StockSearch'])) {
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<input type="hidden" value="' . $_POST['SupplierID'] . '" name="SupplierID" />';
+
+ echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Search for Inventory Items'). '</p>';
+ echo '<table class="selection"><tr>';
+ echo '<td>' . _('In Stock Category') . ':';
+ echo '<select name="StockCat">';
+ if (!isset($_POST['StockCat'])) {
+ $_POST['StockCat'] = '';
+ }
+ if ($_POST['StockCat'] == 'All') {
+ echo '<option selected="True" value="All">' . _('All').'</option>';
+ } else {
+ echo '<option value="All">' . _('All').'</option>';
+ }
+ $SQL = "SELECT categoryid,
+ categorydescription
+ FROM stockcategory
+ ORDER BY categorydescription";
+ $result1 = DB_query($SQL, $db);
+ while ($myrow1 = DB_fetch_array($result1)) {
+ if ($myrow1['categoryid'] == $_POST['StockCat']) {
+ echo '<option selected="True" value="' . $myrow1['categoryid'] . '">' . $myrow1['categorydescription'].'</option>';
+ } else {
+ echo '<option value="' . $myrow1['categoryid'] . '">' . $myrow1['categorydescription'].'</option>';
+ }
+ }
+ echo '</select></td>';
+ echo '<td>' . _('Enter partial') . '<b> ' . _('Description') . '</b>:</td><td>';
+ if (isset($_POST['Keywords'])) {
+ echo '<input type="search" name="Keywords" value="' . $_POST['Keywords'] . '" size="34" maxlength="25" />';
+ } else {
+ echo '<input type="search" name="Keywords" size="34" maxlength="25" placeholder="Enter part of the item description" />';
+ }
+ echo '</td></tr><tr><td></td>';
+ echo '<td><font size="3"><b>' . _('OR') . ' ' . '</b></font>' . _('Enter partial') . ' <b>' . _('Stock Code') . '</b>:</td>';
+ echo '<td>';
+ if (isset($_POST['StockCode'])) {
+ echo '<input type="text" name="StockCode" value="' . $_POST['StockCode'] . '" size="15" maxlength="18" />';
+ } else {
+ echo '<input type="text" name="StockCode" size="15" maxlength="18" />';
+ }
+ echo '</td></tr></table><br />';
+ echo '<div class="centre"><input type="submit" name="Search" value="' . _('Search Now') . '" /></div><br />';
+ echo '<script type="text/javascript">defaultControl(document.forms[0].StockCode);</script>';
+ echo '</form>';
+ include('includes/footer.inc');
+ exit;
+}
+
+if (isset($_POST['Search']) OR isset($_POST['Go']) OR isset($_POST['Next']) OR isset($_POST['Previous'])) {
+ if (!isset($_POST['Go']) AND !isset($_POST['Next']) AND !isset($_POST['Previous'])) {
+ // if Search then set to first page
+ $_POST['PageOffset'] = 1;
+ }
+ if ($_POST['Keywords'] AND $_POST['StockCode']) {
+ prnMsg (_('Stock description keywords have been used in preference to the Stock code extract entered'), 'info');
+ }
+ if ($_POST['Keywords']) {
+ //insert wildcard characters in spaces
+ $_POST['Keywords'] = mb_strtoupper($_POST['Keywords']);
+ $SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
+ if ($_POST['StockCat'] == 'All') {
+ $SQL = "SELECT stockmaster.stockid,
+ stockmaster.description,
+ SUM(locstock.quantity) AS qoh,
+ stockmaster.units,
+ stockmaster.mbflag,
+ stockmaster.discontinued,
+ stockmaster.decimalplaces
+ FROM stockmaster
+ LEFT JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid,
+ locstock
+ WHERE stockmaster.stockid=locstock.stockid
+ AND stockmaster.description " . LIKE . " '$SearchString'
+ GROUP BY stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.units,
+ stockmaster.mbflag,
+ stockmaster.discontinued,
+ stockmaster.decimalplaces
+ ORDER BY stockmaster.stockid";
+ } else {
+ $SQL = "SELECT stockmaster.stockid,
+ stockmaster.description,
+ SUM(locstock.quantity) AS qoh,
+ stockmaster.units,
+ stockmaster.mbflag,
+ stockmaster.discontinued,
+ stockmaster.decimalplaces
+ FROM stockmaster,
+ locstock
+ WHERE stockmaster.stockid=locstock.stockid
+ AND description " . LIKE . " '$SearchString'
+ AND categoryid='" . $_POST['StockCat'] . "'
+ GROUP BY stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.units,
+ stockmaster.mbflag,
+ stockmaster.discontinued,
+ stockmaster.decimalplaces
+ ORDER BY stockmaster.stockid";
+ }
+ } elseif (isset($_POST['StockCode'])) {
+ $_POST['StockCode'] = mb_strtoupper($_POST['StockCode']);
+ if ($_POST['StockCat'] == 'All') {
+ $SQL = "SELECT stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.mbflag,
+ stockmaster.discontinued,
+ SUM(locstock.quantity) AS qoh,
+ stockmaster.units,
+ stockmaster.decimalplaces
+ FROM stockmaster
+ INNER JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid,
+ locstock
+ WHERE stockmaster.stockid=locstock.stockid
+ AND stockmaster.stockid " . LIKE . " '%" . $_POST['StockCode'] . "%'
+ GROUP BY stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.units,
+ stockmaster.mbflag,
+ stockmaster.discontinued,
+ stockmaster.decimalplaces
+ ORDER BY stockmaster.stockid";
+ } else {
+ $SQL = "SELECT stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.mbflag,
+ stockmaster.discontinued,
+ sum(locstock.quantity) as qoh,
+ stockmaster.units,
+ stockmaster.decimalplaces
+ FROM stockmaster,
+ locstock
+ WHERE stockmaster.stockid=locstock.stockid
+ AND stockmaster.stockid " . LIKE . " '%" . $_POST['StockCode'] . "%'
+ AND categoryid='" . $_POST['StockCat'] . "'
+ GROUP BY stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.units,
+ stockmaster.mbflag,
+ stockmaster.discontinued,
+ stockmaster.decimalplaces
+ ORDER BY stockmaster.stockid";
+ }
+ } elseif (!isset($_POST['StockCode']) AND !isset($_POST['Keywords'])) {
+ if ($_POST['StockCat'] == 'All') {
+ $SQL = "SELECT stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.mbflag,
+ stockmaster.discontinued,
+ SUM(locstock.quantity) AS qoh,
+ stockmaster.units,
+ stockmaster.decimalplaces
+ FROM stockmaster
+ LEFT JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid,
+ locstock
+ WHERE stockmaster.stockid=locstock.stockid
+ GROUP BY stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.units,
+ stockmaster.mbflag,
+ stockmaster.discontinued,
+ stockmaster.decimalplaces
+ ORDER BY stockmaster.stockid";
+ } else {
+ $SQL = "SELECT stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.mbflag,
+ stockmaster.discontinued,
+ SUM(locstock.quantity) AS qoh,
+ stockmaster.units,
+ stockmaster.decimalplaces
+ FROM stockmaster,
+ locstock
+ WHERE stockmaster.stockid=locstock.stockid
+ AND categoryid='" . $_POST['StockCat'] . "'
+ GROUP BY stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.units,
+ stockmaster.mbflag,
+ stockmaster.discontinued,
+ stockmaster.decimalplaces
+ ORDER BY stockmaster.stockid";
+ }
+ }
+ $ErrMsg = _('No stock items were returned by the SQL because');
+ $DbgMsg = _('The SQL that returned an error was');
+ $searchresult = DB_query($SQL, $db, $ErrMsg, $DbgMsg);
+ if (DB_num_rows($searchresult) == 0) {
+ prnMsg(_('No stock items were returned by this search please re-enter alternative criteria to try again'), 'info');
+ }
+ unset($_POST['Search']);
+}
+/* end query for list of records */
+/* display list if there is more than one record */
+if (isset($searchresult) AND !isset($_POST['Select'])) {
+ echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Search for Inventory Items'). '</p>';
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<input type="hidden" value="' . $_POST['SupplierID'] . '" name="SupplierID" />';
+ $ListCount = DB_num_rows($searchresult);
+ if ($ListCount > 0) {
+ // If the user hit the search button and there is more than one item to show
+ $ListPageMax = ceil($ListCount / $_SESSION['DisplayRecordsMax']);
+ if (isset($_POST['Next'])) {
+ if ($_POST['PageOffset'] < $ListPageMax) {
+ $_POST['PageOffset'] = $_POST['PageOffset'] + 1;
+ }
+ }
+ if (isset($_POST['Previous'])) {
+ if ($_POST['PageOffset'] > 1) {
+ $_POST['PageOffset'] = $_POST['PageOffset'] - 1;
+ }
+ }
+ if ($_POST['PageOffset'] > $ListPageMax) {
+ $_POST['PageOffset'] = $ListPageMax;
+ }
+ if ($ListPageMax > 1) {
+ echo '<div class="centre"><br /> ' . $_POST['PageOffset'] . ' ' . _('of') . ' ' . $ListPageMax . ' ' . _('pages') . '. ' . _('Go to Page') . ': ';
+ echo '<select name="PageOffset">';
+ $ListPage = 1;
+ while ($ListPage <= $ListPageMax) {
+ if ($ListPage == $_POST['PageOffset']) {
+ echo '<option value=' . $ListPage . ' selected>' . $ListPage . '</option>';
+ } else {
+ echo '<option value=' . $ListPage . '>' . $ListPage . '</option>';
+ }
+ $ListPage++;
+ }
+ echo '</select>
+ <input type="submit" name="Go" value="' . _('Go') . '" />
+ <input type="submit" name="Previous" value="' . _('Previous') . '" />
+ <input type="submit" name="Next" value="' . _('Next') . '" />';
+ echo '<input type="hidden" name=Keywords value="'.$_POST['Keywords'].'" />';
+ echo '<input type="hidden" name=StockCat value="'.$_POST['StockCat'].'" />';
+ echo '<input type="hidden" name=StockCode value="'.$_POST['StockCode'].'" />';
+// echo '<input type="hidden" name=Search value="Search" />';
+ echo '<br /></div>';
+ }
+ echo '<table class="selection">';
+ echo'<tr>
+ <th>' . _('Code') . '</th>
+ <th>' . _('Description') . '</th>
+ <th>' . _('Units') . '</th>
+ </tr>';
+ $j = 1;
+ $k = 0; //row counter to determine background colour
+ $RowIndex = 0;
+ if (DB_num_rows($searchresult) <> 0) {
+ DB_data_seek($searchresult, ($_POST['PageOffset'] - 1) * $_SESSION['DisplayRecordsMax']);
+ }
+ while (($myrow = DB_fetch_array($searchresult)) AND ($RowIndex <> $_SESSION['DisplayRecordsMax'])) {
+ if ($k == 1) {
+ echo '<tr class="EvenTableRows">';
+ $k = 0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k++;
+ }
+
+ echo '<td><input type="submit" name="Select" value="' . $myrow['stockid'] . '" /></td>
+ <td>' . $myrow['description'] . '</td>
+ <td>' . $myrow['units'] . '</td>
+ </tr>';
+ $RowIndex = $RowIndex + 1;
+ //end of page full new headings if
+ }
+ //end of while loop
+ echo '</table></form><br />';
+ include('includes/footer.inc');
+ exit;
+ }
+}
+
+foreach ($_POST as $key=>$value) {
+ if (mb_substr($key,0,6)=='Update') {
+ $Index = mb_substr($key,6,mb_strlen($key)-6);
+ $StockID=$_POST['StockID'.$Index];
+ $Price=$_POST['Price'.$Index];
+ $SuppUOM=$_POST['SuppUOM'.$Index];
+ $ConversionFactor=$_POST['ConversionFactor'.$Index];
+ $DecimalPlaces=$_POST['DecimalPlaces'.$Index];
+ $SupplierDescription=$_POST['SupplierDescription'.$Index];
+ $LeadTime=$_POST['LeadTime'.$Index];
+ if (isset($_POST['Preferred'.$Index])) {
+ $Preferred=1;
+ } else {
+ $Preferred=0;
+ }
+ $EffectiveFrom=$_POST['EffectiveFrom'.$Index];
+ $SupplierPartNo=$_POST['SupplierPartNo'.$Index];
+ $MinOrderQty=$_POST['MinOrderQty'.$Index];
+ $sql="UPDATE purchdata SET price='" . $Price . "',
+ suppliersuom='" . $SuppUOM . "',
+ conversionfactor='" . $ConversionFactor . "',
+ uomdecimalplaces='" . $DecimalPlaces . "',
+ supplierdescription='" . $SupplierDescription . "',
+ leadtime='" . $LeadTime . "',
+ preferred='" . $Preferred . "',
+ effectivefrom='" . FormatDateForSQL($EffectiveFrom) . "',
+ suppliers_partno='" . $SupplierPartNo . "',
+ minorderqty='" . $MinOrderQty . "'
+ WHERE supplierno='" . $_POST['SupplierID'] . "'
+ AND stockid='" . $StockID . "'";
+ $result=DB_query($sql, $db);
+ }
+ if (mb_substr($key,0,6)=='Insert') {
+ if (isset($_POST['Preferred0'])) {
+ $Preferred=1;
+ } else {
+ $Preferred=0;
+ }
+ $sql="INSERT INTO purchdata (stockid,
+ supplierno,
+ price,
+ suppliersuom,
+ conversionfactor,
+ uomdecimalplaces,
+ supplierdescription,
+ leadtime,
+ preferred,
+ effectivefrom,
+ suppliers_partno,
+ minorderqty
+ ) VALUES (
+ '" . $_POST['StockID0'] . "',
+ '" . $_POST['SupplierID'] . "',
+ '" . $_POST['Price0'] . "',
+ '" . $_POST['SuppUOM0'] . "',
+ '" . $_POST['ConversionFactor0'] . "',
+ '" . $_POST['DecimalPlaces0'] . "',
+ '" . $_POST['SupplierDescription0'] . "',
+ '" . $_POST['LeadTime0'] . "',
+ '" . $Preferred . "',
+ '" . FormatDateForSQL($_POST['EffectiveFrom0']) . "',
+ '" . $_POST['SupplierPartNo0'] . "',
+ '" . $_POST['MinOrderQty0'] . "'
+ )";
+ $result=DB_query($sql, $db);
+ }
+}
+
+if (isset($_GET['SupplierID'])) {
+ $SupplierID = trim(mb_strtoupper($_GET['SupplierID']));
+} elseif (isset($_POST['SupplierID'])) {
+ $SupplierID = trim(mb_strtoupper($_POST['SupplierID']));
+}
+
+if (isset($SupplierID) AND $SupplierID != '' AND !isset($_POST['SearchSupplier'])) { /*NOT EDITING AN EXISTING BUT SUPPLIER selected OR ENTERED*/
+ $sql = "SELECT suppliers.suppname, suppliers.currcode FROM suppliers WHERE supplierid='".$SupplierID."'";
+ $ErrMsg = _('The supplier details for the selected supplier could not be retrieved because');
+ $DbgMsg = _('The SQL that failed was');
+ $SuppSelResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
+ if (DB_num_rows($SuppSelResult) == 1) {
+ $myrow = DB_fetch_array($SuppSelResult);
+ $SuppName = $myrow['suppname'];
+ $CurrCode = $myrow['currcode'];
+ } else {
+ prnMsg(_('The supplier code') . ' ' . $SupplierID . ' ' . _('is not an existing supplier in the database') . '. ' . _('You must enter an alternative supplier code or select a supplier using the search facility below'), 'error');
+ unset($SupplierID);
+ }
+} else {
+ if ($NoPurchasingData=0) {
+ echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' .
+ $title . ' ' . _('For Stock Code') . ' - ' . $StockID . '</p><br />';
+ }
+ if (!isset($_POST['SearchSupplier'])) {
+ echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/supplier.png" title="' . _('Search') . '" alt="" />' . _('Search for a supplier') . '</p><br />';
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">
+ <table cellpadding="3" class="selection"><tr>';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<td>' . _('Text in the Supplier') . ' <b>' . _('NAME') . '</b>:</font></td>';
+ echo '<td><input type="text" name="Keywords" size="20" maxlength="25" /></td>';
+ echo '<td><font size="3"><b>' . _('OR') . '</b></font></td>';
+ echo '<td>' . _('Text in Supplier') . ' <b>' . _('CODE') . '</b>:</font></td>';
+ echo '<td><input type="text" name="SupplierCode" size="15" maxlength="18" /></td>';
+ echo '</tr></table><br />';
+ echo '<div class="centre"><input type="submit" name="SearchSupplier" value="' . _('Find Suppliers Now') . '" /></div></form>';
+ include ('includes/footer.inc');
+ exit;
+ };
+}
+
+if (isset($_POST['SearchSupplier'])) {
+ if ($_POST['Keywords'] == '' AND $_POST['SupplierCode'] == '') {
+ $_POST['Keywords'] = ' ';
+ }
+ if (mb_strlen($_POST['Keywords']) > 0) {
+ //insert wildcard characters in spaces
+ $SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
+
+ $SQL = "SELECT suppliers.supplierid,
+ suppliers.suppname,
+ suppliers.currcode,
+ suppliers.address1,
+ suppliers.address2,
+ suppliers.address3
+ FROM suppliers WHERE suppliers.suppname " . LIKE . " '".$SearchString."'";
+ } elseif (mb_strlen($_POST['SupplierCode']) > 0) {
+ $SQL = "SELECT suppliers.supplierid,
+ suppliers.suppname,
+ suppliers.currcode,
+ suppliers.address1,
+ suppliers.address2,
+ suppliers.address3
+ FROM suppliers
+ WHERE suppliers.supplierid " . LIKE . " '%" . $_POST['SupplierCode'] . "%'";
+ } //one of keywords or SupplierCode was more than a zero length string
+ $ErrMsg = _('The suppliers matching the criteria entered could not be retrieved because');
+ $DbgMsg = _('The SQL to retrieve supplier details that failed was');
+ $SuppliersResult = DB_query($SQL, $db, $ErrMsg, $DbgMsg);
+} //end of if search
+
+if (isset($SuppliersResult)) {
+ echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/supplier.png" title="' . _('Search') . '" alt="" />' . _('Select a supplier') . '</p><br />';
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">
+ <table cellpadding="2" class="selection">';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ $TableHeader = '<tr><th>' . _('Code') . '</th>
+ <th>' . _('Supplier Name') . '</th>
+ <th>' . _('Currency') . '</th>
+ <th>' . _('Address 1') . '</th>
+ <th>' . _('Address 2') . '</th>
+ <th>' . _('Address 3') . '</th>
+ </tr>';
+ echo $TableHeader;
+ $k = 0;
+ while ($myrow = DB_fetch_array($SuppliersResult)) {
+ if ($k==1){
+ echo '<tr class="EvenTableRows">';
+ $k=0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k++;
+ }
+ printf('<td><font size="1"><input type="submit" name="SupplierID" value="%s" /></font></td>
+ <td><font size="1">%s</font></td>
+ <td><font size="1">%s</font></td>
+ <td><font size="1">%s</font></td>
+ <td><font size="1">%s</font></td>
+ <td><font size="1">%s</font></td>
+ </tr>',
+ $myrow['supplierid'],
+ $myrow['suppname'],
+ $myrow['currcode'],
+ $myrow['address1'],
+ $myrow['address2'],
+ $myrow['address3']
+ );
+
+ }
+ //end of while loop
+ echo '</table><br/></form>';
+ include('includes/footer.inc');
+ exit;
+}
+//end if results to show
+
+if (isset($_POST['SupplierID'])) {
+ echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/supplier.png" title="' . _('Search') . '" alt="" />' . _('Supplier Purchasing Data') . '</p><br />';
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ $SQL="SELECT purchdata.stockid,
+ stockmaster.description,
+ price,
+ suppliersuom,
+ conversionfactor,
+ uomdecimalplaces,
+ supplierdescription,
+ leadtime,
+ preferred,
+ effectivefrom,
+ suppliers_partno,
+ minorderqty
+ FROM purchdata
+ INNER JOIN stockmaster
+ ON purchdata.stockid=stockmaster.stockid
+ WHERE supplierno='".$_POST['SupplierID']."'";
+
+ $result=DB_query($SQL, $db);
+
+ $UOMSQL = "SELECT unitid,
+ unitname
+ FROM unitsofmeasure";
+ $UOMResult = DB_query($UOMSQL, $db);
+ echo '<input type="hidden" value="' . $_POST['SupplierID'] . '" name="SupplierID" />';
+ echo '<table class="selection">';
+ echo '<tr><th colspan="8" style="text-align: left"><font color="navy" size="3">' . _('Supplier purchasing data for') . ' ' . $_POST['SupplierID'] . '</font></th>';
+ echo '<th colspan="5" style="text-align: right"><font color="navy" size="2">' . _('Find new Item Code') . '</font>
+ <button type="submit" name="StockSearch"><img width="15px" src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" /></button></th></tr>';
+ echo '<tr>
+ <th>' . _('StockID') . '</th>
+ <th>' . _('Description') . '</th>
+ <th>' . _('Price') . '</th>
+ <th>' . _('Suppliers UOM') . '</th>
+ <th>' . _('Conversion Factor') . '</th>
+ <th>' . _('Decimal Places'). '</th>
+ <th>' . _('Suppliers Description') . '</th>
+ <th>' . _('Lead Time') . '</th>
+ <th>' . _('Preferred') . '</th>
+ <th>' . _('Effective From') . '</th>
+ <th>' . _('Suppliers Item Code') . '</th>
+ <th>' . _('Min Order Qty') . '</th>
+ </tr>';
+
+ if (isset($_POST['Select'])) {
+ $StockSQL="SELECT description, units FROM stockmaster WHERE stockid='" . $_POST['Select'] . "'";
+ $StockResult=DB_query($StockSQL, $db);
+ $StockRow=DB_fetch_array($StockResult);
+ echo '<tr bgcolor="#847F7F">
+ <td><input type="hidden" value="' . $_POST['Select'] . '" name="StockID0" />' . $_POST['Select'] . '</td>
+ <td>' . $StockRow['description'] . '</td>
+ <td><input type="text" class="number" size="11" value="0.0000" name="Price0" /></td>
+ <td><select name="SuppUOM0">';
+ while ($UOMRow=DB_fetch_array($UOMResult)) {
+ if ($UOMRow['unitid']==$StRowoc['units']) {
+ echo '<option selected="selected" value="'.$UOMRow['unitid'].'">' . $UOMRow['unitname'] . '</option>';
+ } else {
+ echo '<option value="'.$UOMRow['unitid'].'">' . $UOMRow['unitname'] . '</option>';
+ }
+ }
+ DB_data_seek($UOMResult, 0);
+ echo '</select></td>
+ <td><input type="text" class="number" size="11" value="1" name="ConversionFactor0" /></td>
+ <td><input type="text" class="number" size="11" value="2" name="DecimalPlaces0" /></td>
+ <td><input type="text" size="30" maxlength="50" value="" name="SupplierDescription0" /></td>
+ <td><input type="text" class="number" size="11" value="1" name="LeadTime0" /></td>';
+ echo '<td><input type="checkbox" name="Preferred0" /></td>';
+ echo '<td><input type="text" class="date" size="11" value="' . date( $_SESSION['DefaultDateFormat']) . '" alt="' . $_SESSION['DefaultDateFormat'] . '" name="EffectiveFrom0" /></td>
+ <td><input type="text" size="20" maxlength="50" value="" name="SupplierPartNo0" /></td>
+ <td><input type="text" class="number" size="11" value="1" name="MinOrderQty0" /></td>
+ <td><button type="submit" style="width:100%;text-align:left" name="Insert"><img width="15px" src="' . $rootpath . '/css/' . $theme . '/images/tick.png" /></button></td>
+ </tr>';
+ }
+
+ $RowCounter=1;
+ while ($myrow=DB_fetch_array($result)) {
+ echo '<tr>
+ <td><input type="hidden" value="' . $myrow['stockid'] . '" name="StockID'.$RowCounter.'" />' . $myrow['stockid'] . '</td>
+ <td>' . $myrow['description'] . '</td>
+ <td><input type="text" class="number" size="11" value="' . $myrow['price'] . '" name="Price'.$RowCounter.'" /></td>
+ <td><select name="SuppUOM'.$RowCounter.'">';
+ DB_data_seek($UOMResult, 0);
+ while ($UOMRow=DB_fetch_array($UOMResult)) {
+ if ($UOMRow['unitid']==$myrow['suppliersuom']) {
+ echo '<option selected="selected" value="'.$UOMRow['unitid'].'">' . $UOMRow['unitname'] . '</option>';
+ } else {
+ echo '<option value="'.$UOMRow['unitid'].'">' . $UOMRow['unitname'] . '</option>';
+ }
+ }
+ echo '</select></td>
+ <td><input type="text" class="number" size="11" value="' . $myrow['conversionfactor'] . '" name="ConversionFactor'.$RowCounter.'" /></td>
+ <td><input type="text" class="number" size="11" value="' . $myrow['uomdecimalplaces'] . '" name="DecimalPlaces'.$RowCounter.'" /></td>
+ <td><input type="text" size="30" maxlength="50" value="' . $myrow['supplierdescription'] . '" name="SupplierDescription'.$RowCounter.'" /></td>
+ <td><input type="text" class="number" size="11" value="' . $myrow['leadtime'] . '" name="LeadTime'.$RowCounter.'" /></td>';
+ if ($myrow['preferred']==1) {
+ echo '<td><input type="checkbox" checked="checked" name="Preferred'.$RowCounter.'" /></td>';
+ } else {
+ echo '<td><input type="checkbox" name="Preferred'.$RowCounter.'" /></td>';
+ }
+ echo '<td><input type="text" class="date" size="11" value="' . ConvertSQLDate($myrow['effectivefrom']) . '" alt="' . $_SESSION['DefaultDateFormat'] . '" name="EffectiveFrom'.$RowCounter.'" /></td>
+ <td><input type="text" size="20" maxlength="50" value="' . $myrow['suppliers_partno'] . '" name="SupplierPartNo'.$RowCounter.'" /></td>
+ <td><input type="text" class="number" size="11" value="' . $myrow['minorderqty'] . '" name="MinOrderQty'.$RowCounter.'" /></td>
+ <td><button type="submit" style="width:100%;text-align:left" name="Update'.$RowCounter.'"><img width="15px" src="' . $rootpath . '/css/' . $theme . '/images/tick.png" /></button></td>
+ </tr>';
+ $RowCounter++;
+ }
+ echo '</table>';
+ echo '</form>';
+ include('includes/footer.inc');
+ exit;
+}
+
+?>
\ No newline at end of file
Added: trunk/css/aguapop/images/tick.png
===================================================================
--- trunk/css/aguapop/images/tick.png (rev 0)
+++ trunk/css/aguapop/images/tick.png 2012-04-02 21:56:09 UTC (rev 8615)
@@ -0,0 +1,329 @@
+\x89PNG
+
+ |
|
From: <tim...@us...> - 2012-04-05 13:02:12
|
Revision: 8626
http://weberp.svn.sourceforge.net/weberp/?rev=8626&view=rev
Author: tim_schofield
Date: 2012-04-05 13:02:01 +0000 (Thu, 05 Apr 2012)
Log Message:
-----------
Provide link to supplier price lists from Select Supplier screen
Modified Paths:
--------------
trunk/SelectSupplier.php
trunk/SupplierPriceList.php
Modified: trunk/SelectSupplier.php
===================================================================
--- trunk/SelectSupplier.php 2012-04-04 21:53:13 UTC (rev 8625)
+++ trunk/SelectSupplier.php 2012-04-05 13:02:01 UTC (rev 8626)
@@ -171,6 +171,7 @@
echo '<a href="' . $rootpath . '/Suppliers.php?">' . _('Add a New Supplier') . '</a><br />';
echo '<a href="' . $rootpath . '/Suppliers.php?SupplierID=' . urlencode(stripslashes($_SESSION['SupplierID'])) . '">' . _('Modify Or Delete Supplier Details') . '</a>';
echo '<br /><a href="' . $rootpath . '/SupplierContacts.php?&SupplierID=' . stripslashes($_SESSION['SupplierID']) . '">' . _('Add/Modify/Delete Supplier Contacts') . '</a>';
+ echo '<br /><a href="' . $rootpath . '/SupplierPriceList.php?&SupplierID=' . stripslashes($_SESSION['SupplierID']) . '">' . _('Add or Modify Supplier Price List') . '</a>';
echo '<br />';
echo '<br /><a href="'.$rootpath.'/Shipments.php?NewShipment=Yes">' . _('Set Up A New Shipment') . '</a>';
echo '<br /><a href="'.$rootpath.'/SuppLoginSetup.php">' . _('Supplier Login Configuration') . '</a>';
Modified: trunk/SupplierPriceList.php
===================================================================
--- trunk/SupplierPriceList.php 2012-04-04 21:53:13 UTC (rev 8625)
+++ trunk/SupplierPriceList.php 2012-04-05 13:02:01 UTC (rev 8626)
@@ -6,6 +6,12 @@
include ('includes/header.inc');
+if (isset($_GET['SupplierID'])) {
+ $SupplierID = trim(mb_strtoupper($_GET['SupplierID']));
+} elseif (isset($_POST['SupplierID'])) {
+ $SupplierID = trim(mb_strtoupper($_POST['SupplierID']));
+}
+
if (isset($_POST['StockSearch'])) {
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -358,12 +364,6 @@
}
}
-if (isset($_GET['SupplierID'])) {
- $SupplierID = trim(mb_strtoupper($_GET['SupplierID']));
-} elseif (isset($_POST['SupplierID'])) {
- $SupplierID = trim(mb_strtoupper($_POST['SupplierID']));
-}
-
if (isset($SupplierID) AND $SupplierID != '' AND !isset($_POST['SearchSupplier'])) { /*NOT EDITING AN EXISTING BUT SUPPLIER selected OR ENTERED*/
$sql = "SELECT suppliers.suppname, suppliers.currcode FROM suppliers WHERE supplierid='".$SupplierID."'";
$ErrMsg = _('The supplier details for the selected supplier could not be retrieved because');
@@ -474,7 +474,7 @@
}
//end if results to show
-if (isset($_POST['SupplierID'])) {
+if (isset($SupplierID)) {
echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/supplier.png" title="' . _('Search') . '" alt="" />' . _('Supplier Purchasing Data') . '</p><br />';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -493,7 +493,7 @@
FROM purchdata
INNER JOIN stockmaster
ON purchdata.stockid=stockmaster.stockid
- WHERE supplierno='".$_POST['SupplierID']."'
+ WHERE supplierno='".$SupplierID."'
ORDER BY purchdata.stockid, effectivefrom DESC";
$result=DB_query($SQL, $db);
@@ -502,11 +502,11 @@
unitname
FROM unitsofmeasure";
$UOMResult = DB_query($UOMSQL, $db);
- echo '<input type="hidden" value="' . $_POST['SupplierID'] . '" name="SupplierID" />';
+ echo '<input type="hidden" value="' . $SupplierID . '" name="SupplierID" />';
echo '<table class="selection">';
- echo '<tr><th colspan="8" style="text-align: left"><font color="navy" size="3">' . _('Supplier purchasing data for') . ' ' . $_POST['SupplierID'] . '</font></th>';
+ echo '<tr><th colspan="8" style="text-align: left"><font color="navy" size="3">' . _('Supplier purchasing data for') . ' ' . $SupplierID . '</font></th>';
echo '<th colspan="5" style="text-align: right"><font color="navy" size="2">' . _('Find new Item Code') . '</font>
- <button type="submit" name="StockSearch"><img width="15px" src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" /></button></th></tr>';
+ <button type="submit" name="StockSearch" title="' . _('Find an item code') . '"><img width="15px" src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" /></button></th></tr>';
echo '<tr>
<th>' . _('StockID') . '</th>
<th>' . _('Description') . '</th>
@@ -548,7 +548,7 @@
echo '<td><input type="text" class="date" size="11" value="' . date( $_SESSION['DefaultDateFormat']) . '" alt="' . $_SESSION['DefaultDateFormat'] . '" name="EffectiveFrom0" /></td>
<td><input type="text" size="20" maxlength="50" value="" name="SupplierPartNo0" /></td>
<td><input type="text" class="number" size="11" value="1" name="MinOrderQty0" /></td>
- <td><button type="submit" style="width:100%;text-align:left" name="Insert"><img width="15px" src="' . $rootpath . '/css/' . $theme . '/images/tick.png" /></button></td>
+ <td><button type="submit" style="width:100%;text-align:left" title="' . _('Insert this record') . '" name="Insert"><img width="15px" src="' . $rootpath . '/css/' . $theme . '/images/tick.png" /></button></td>
</tr>';
}
@@ -580,7 +580,7 @@
echo '<td><input type="text" class="date" size="11" value="' . ConvertSQLDate($myrow['effectivefrom']) . '" alt="' . $_SESSION['DefaultDateFormat'] . '" name="EffectiveFrom'.$RowCounter.'" /></td>
<td><input type="text" size="20" maxlength="50" value="' . $myrow['suppliers_partno'] . '" name="SupplierPartNo'.$RowCounter.'" /></td>
<td><input type="text" class="number" size="11" value="' . $myrow['minorderqty'] . '" name="MinOrderQty'.$RowCounter.'" /></td>
- <td><button type="submit" style="width:100%;text-align:left" name="Update'.$RowCounter.'"><img width="15px" src="' . $rootpath . '/css/' . $theme . '/images/tick.png" /></button></td>
+ <td><button type="submit" style="width:100%;text-align:left" title="' . _('Update this record') . '" name="Update'.$RowCounter.'"><img width="15px" src="' . $rootpath . '/css/' . $theme . '/images/tick.png" /></button></td>
</tr>';
$RowCounter++;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-04-25 19:42:39
|
Revision: 8655
http://weberp.svn.sourceforge.net/weberp/?rev=8655&view=rev
Author: tim_schofield
Date: 2012-04-25 19:42:33 +0000 (Wed, 25 Apr 2012)
Log Message:
-----------
New menu for utilities
Modified Paths:
--------------
trunk/WWW_Users.php
trunk/includes/IndexArray.php
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2012-04-25 19:39:13 UTC (rev 8654)
+++ trunk/WWW_Users.php 2012-04-25 19:42:33 UTC (rev 8655)
@@ -19,7 +19,8 @@
_('General Ledger'),
_('Asset Manager'),
_('Petty Cash'),
- _('Setup'));
+ _('Setup'),
+ _('Utilities'));
$PDFLanguages = array(_('Latin Western Languages'),
_('Eastern European Russian Japanese Korean Vietnamese Hebrew Arabic Thai'),
Modified: trunk/includes/IndexArray.php
===================================================================
--- trunk/includes/IndexArray.php 2012-04-25 19:39:13 UTC (rev 8654)
+++ trunk/includes/IndexArray.php 2012-04-25 19:42:33 UTC (rev 8655)
@@ -1,5 +1,5 @@
<?php
-$ModuleLink = array('orders', 'AR', 'AP', 'PO', 'stock', 'manuf', 'GL', 'FA', 'PC', 'system');
+$ModuleLink = array('orders', 'AR', 'AP', 'PO', 'stock', 'manuf', 'GL', 'FA', 'PC', 'system', 'Utilities');
$ReportList = array('orders'=>'ord',
'AR'=>'ar',
'AP'=>'ap',
@@ -9,7 +9,8 @@
'GL'=>'gl',
'FA'=>'fa',
'PC'=>'pc',
- 'system'=>'sys'
+ 'system'=>'sys',
+ 'Utilities'=>'utils'
);
/*The headings showing on the tabs accross the main index used also in WWW_Users for defining what should be visible to the user */
@@ -22,7 +23,8 @@
_('General Ledger'),
_('Asset Manager'),
_('Petty Cash'),
- _('Setup'));
+ _('Setup'),
+ _('Utilities'));
$MenuItems['orders']['Transactions']['Caption'] = array( _('Enter An Order or Quotation'),
_('Enter Counter Sales'),
@@ -528,4 +530,50 @@
'/BackupDatabase.php',
'/Departments.php'
);
+
+$MenuItems['Utilities']['Transactions']['Caption'] = array (_('Change A Customer Code'),
+ _('Change A Customer Branch Code'),
+ _('Change An Inventory Item Code'),
+ _('Change A Supplier Code'),
+ _('Update costs for all BOM items, from the bottom up'),
+ _('Re-apply costs to Sales Analysis'),
+ _('Delete sales transactions'),
+ _('Reverse all supplier payments on a specified date'));
+
+$MenuItems['Utilities']['Transactions']['URL'] = array ('/Z_ChangeCustomerCode.php',
+ '/Z_ChangeBranchCode.php',
+ '/Z_ChangeStockCode.php',
+ '/Z_ChangeSupplierCode.php',
+ '/Z_BottomUpCosts.php',
+ '/Z_ReApplyCostToSA.php',
+ '/Z_DeleteSalesTransActions.php',
+ '/Z_ReverseSuppPaymentRun.php');
+
+$MenuItems['Utilities']['Reports']['Caption'] = array (_('Show Local Currency Total Debtor Balances'),
+ _('Show Local Currency Total Suppliers Balances'),
+ _('Show General Transactions That Do Not Balance'));
+
+$MenuItems['Utilities']['Reports']['URL'] = array ('/Z_CurrencyDebtorsBalances.php',
+ '/Z_CurrencySuppliersBalances.php',
+ '/Z_CheckGLTransBalance.php');
+
+$MenuItems['Utilities']['Maintenance']['Caption'] = array (_('Maintain Language Files'),
+ _('Make New Company'),
+ _('Data Export Options'),
+ _('Import Stock Items from .csv'),
+ _('Import Fixed Assets from .csv file'),
+ _('Create new company template SQL file and submit to webERP'),
+ _('Re-calculate brought forward amounts in GL'),
+ _('Re-Post all GL transactions from a specified period')
+ );
+
+$MenuItems['Utilities']['Maintenance']['URL'] = array ('/Z_poAdmin.php',
+ '/Z_MakeNewCompany.php',
+ '/Z_DataExport.php',
+ '/Z_ImportStocks.php',
+ '/Z_ImportFixedAssets.php',
+ '/Z_CreateCompanyTemplateFile.php',
+ '/Z_UpdateChartDetailsBFwd.php',
+ '/Z_RePostGLFromPeriod.php'
+ );
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-04-26 13:49:59
|
Revision: 8656
http://weberp.svn.sourceforge.net/weberp/?rev=8656&view=rev
Author: tim_schofield
Date: 2012-04-26 13:49:49 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
Extract customer search code into separate file
Modified Paths:
--------------
trunk/SelectCustomer.php
Added Paths:
-----------
trunk/includes/CustomerSearch.php
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2012-04-25 19:42:33 UTC (rev 8655)
+++ trunk/SelectCustomer.php 2012-04-26 13:49:49 UTC (rev 8656)
@@ -5,6 +5,7 @@
$title = _('Search Customers');
include ('includes/header.inc');
include ('includes/SQL_CommonFunctions.inc');
+include ('includes/CustomerSearch.php');
if (isset($_GET['Select'])) {
$_SESSION['CustomerID'] = $_GET['Select'];
}
@@ -90,86 +91,7 @@
$_POST['PageOffset'] = 1;
}
}
-if (isset($_POST['Search']) OR isset($_POST['CSV']) OR isset($_POST['Go']) OR isset($_POST['Next']) OR isset($_POST['Previous'])) {
- if (isset($_POST['Search'])) {
- $_POST['PageOffset'] = 1;
- }
- if ($_POST['Keywords'] AND (($_POST['CustCode']) OR ($_POST['CustPhone']) OR ($_POST['CustType']))) {
- $_POST['Keywords'] = mb_strtoupper($_POST['Keywords']);
- }
- if (($_POST['Keywords'] == '') AND ($_POST['CustCode'] == '') AND ($_POST['CustPhone'] == '') AND ( $_POST['CustType'] == 'ALL') AND ($_POST['Area'] == 'ALL') AND ($_POST['CustAdd'] == '')) {
- //no criteria set then default to all customers
- $SQL = "SELECT debtorsmaster.debtorno,
- debtorsmaster.name,
- debtorsmaster.address1,
- debtorsmaster.address2,
- debtorsmaster.address3,
- debtorsmaster.address4,
- custbranch.branchcode,
- custbranch.brname,
- custbranch.contactname,
- debtortype.typename,
- custbranch.phoneno,
- custbranch.faxno
- FROM debtorsmaster LEFT JOIN custbranch
- ON debtorsmaster.debtorno = custbranch.debtorno
- INNER JOIN debtortype
- ON debtorsmaster.typeid = debtortype.typeid";
- } else {
- $SearchKeywords = mb_strtoupper(trim(str_replace(' ', '%', $_POST['Keywords'])));
- $_POST['CustCode'] = mb_strtoupper(trim($_POST['CustCode']));
- $_POST['CustPhone'] = trim($_POST['CustPhone']);
- $_POST['CustAdd'] = trim($_POST['CustAdd']);
- $SQL = "SELECT debtorsmaster.debtorno,
- debtorsmaster.name,
- debtorsmaster.address1,
- debtorsmaster.address2,
- debtorsmaster.address3,
- debtorsmaster.address4,
- custbranch.branchcode,
- custbranch.brname,
- custbranch.contactname,
- debtortype.typename,
- custbranch.phoneno,
- custbranch.faxno
- FROM debtorsmaster INNER JOIN debtortype
- ON debtorsmaster.typeid = debtortype.typeid
- LEFT JOIN custbranch
- ON debtorsmaster.debtorno = custbranch.debtorno
- WHERE debtorsmaster.name " . LIKE . " '%" . $SearchKeywords . "%'
- AND debtorsmaster.debtorno " . LIKE . " '%" . $_POST['CustCode'] . "%'
- AND custbranch.phoneno " . LIKE . " '%" . $_POST['CustPhone'] . "%'
- AND (debtorsmaster.address1 " . LIKE . " '%" . $_POST['CustAdd'] . "%'
- OR debtorsmaster.address2 " . LIKE . " '%" . $_POST['CustAdd'] . "%'
- OR debtorsmaster.address3 " . LIKE . " '%" . $_POST['CustAdd'] . "%'
- OR debtorsmaster.address4 " . LIKE . " '%" . $_POST['CustAdd'] . "%')";
-
- if (mb_strlen($_POST['CustType']) > 0 AND $_POST['CustType']!='ALL') {
- $SQL .= " AND debtortype.typename = '" . $_POST['CustType'] . "'";
- }
- if (mb_strlen($_POST['Area']) > 0 AND $_POST['Area']!='ALL') {
- $SQL .= " AND custbranch.area = '" . $_POST['Area'] . "'";
- }
- } //one of keywords or custcode or custphone was more than a zero length string
- if ($_SESSION['SalesmanLogin'] != '') {
- $SQL.= " AND custbranch.salesman='" . $_SESSION['SalesmanLogin'] . "'";
- }
- $SQL.= ' ORDER BY debtorsmaster.name';
- $ErrMsg = _('The searched customer records requested cannot be retrieved because');
-
- $result = DB_query($SQL, $db, $ErrMsg);
- if (DB_num_rows($result) == 1) {
- $myrow = DB_fetch_array($result);
- $_SESSION['CustomerID'] = $myrow['debtorno'];
- $_SESSION['BranchID'] = $myrow['branchcode'];
- unset($_POST['Search']);
- unset($result);
- } elseif (DB_num_rows($result) == 0) {
- prnMsg(_('No customer records contain the selected text') . ' - ' . _('please alter your search criteria and try again'), 'info');
- echo '<br />';
- }
-} //end of if search
-
+$result=CustomerSearchSQL($db);
if (isset($_POST['JustSelectedACustomer']) and empty($_SESSION['CustomerID'])){
/*Need to figure out the number of the form variable that the user clicked on */
for ($i=0; $i< count($_POST); $i++){ //loop through the returned customers
@@ -233,7 +155,7 @@
echo '</td>';
echo '</tr></table><br />';
} else {
- echo '<table width="90%"><tr><th width="33%">' . _('Customer Inquiries') . '</th>
+ echo '<table width="90%" class="selection"><tr><th width="33%">' . _('Customer Inquiries') . '</th>
<th width=33%>' . _('Customer Transactions') . '</th>
<th width=33%>' . _('Customer Maintenance') . '</th></tr>';
echo '<tr><td class="select">';
@@ -244,223 +166,13 @@
}
echo '</td></tr></table>';
}
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
-echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (mb_strlen($msg)>1){
prnMsg($msg, 'info');
}
-echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Search for Customers').'</p>';
-echo '<table cellpadding="3" class="selection">';
-echo '<tr><td colspan="2">' . _('Enter a partial Name') . ':</td><td>';
-if (isset($_POST['Keywords'])) {
- echo '<input type="text" name="Keywords" value="' . $_POST['Keywords'] . '" size="20" maxlength="25" />';
-} else {
- echo '<input type="text" name="Keywords" size="20" maxlength="25" />';
-}
-echo '</td><td><font size="3"><b>' . _('OR') . '</b></font></td><td>' . _('Enter a partial Code') . ':</td><td>';
-if (isset($_POST['CustCode'])) {
- echo '<input type="text" name="CustCode" value="' . $_POST['CustCode'] . '" size="15" maxlength="18" />';
-} else {
- echo '<input type="text" name="CustCode" size="15" maxlength="18" />';
-}
-echo '</td></tr><tr><td><font size="3"><b>' . _('OR') . '</b></font></td><td>' . _('Enter a partial Phone Number') . ':</td><td>';
-if (isset($_POST['CustPhone'])) {
- echo '<input type="text" name="CustPhone" value="' . $_POST['CustPhone'] . '" size="15" maxlength="18" />';
-} else {
- echo '<input type="text" name="CustPhone" size="15" maxlength="18" />';
-}
-echo '</td>';
-echo '<td><font size="3"><b>' . _('OR') . '</b></font></td><td>' . _('Enter part of the Address') . ':</td><td>';
-if (isset($_POST['CustAdd'])) {
- echo '<input type="text" name="CustAdd" value="' . $_POST['CustAdd'] . '" size="20" maxlength="25" />';
-} else {
- echo '<input type="text" name="CustAdd" size="20" maxlength="25" />';
-}
-echo '</td></tr>';
-/* End addded search feature. Gilles Deacur */
-echo '<tr><td><font size="3"><b>' . _('OR') . '</b></font></td><td>' . _('Choose a Type') . ':</td><td>';
-if (isset($_POST['CustType'])) {
- // Show Customer Type drop down list
- $result2 = DB_query("SELECT typeid, typename FROM debtortype", $db);
- // Error if no customer types setup
- if (DB_num_rows($result2) == 0) {
- $DataError = 1;
- echo '<a href="CustomerTypes.php?" target="_parent">Setup Types</a>';
- echo '<tr><td colspan="2">' . prnMsg(_('No Customer types defined'), 'error') . '</td></tr>';
- } else {
- // If OK show select box with option selected
- echo '<select name="CustType">';
- echo '<option value="ALL">' . _('Any') . '</option>';
- while ($myrow = DB_fetch_array($result2)) {
- if ($_POST['CustType'] == $myrow['typename']) {
- echo '<option selected="True" value="' . $myrow['typename'] . '">' . $myrow['typename'] . '</option>';
- } else {
- echo '<option value="' . $myrow['typename'] . '">' . $myrow['typename'] . '</option>';
- }
- } //end while loop
- DB_data_seek($result2, 0);
- echo '</select></td>';
- }
-} else {
- // No option selected yet, so show Customer Type drop down list
- $result2 = DB_query("SELECT typeid, typename FROM debtortype", $db);
- // Error if no customer types setup
- if (DB_num_rows($result2) == 0) {
- $DataError = 1;
- echo '<a href="CustomerTypes.php?" target="_parent">Setup Types</a>';
- echo '<tr><td colspan="2">' . prnMsg(_('No Customer types defined'), 'error') . '</td></tr>';
- } else {
- // if OK show select box with available options to choose
- echo '<select name="CustType">';
- echo '<option value="ALL">' . _('Any'). '</option>';
- while ($myrow = DB_fetch_array($result2)) {
- echo '<option value="' . $myrow['typename'] . '">' . $myrow['typename'] . '</option>';
- } //end while loop
- DB_data_seek($result2, 0);
- echo '</select></td>';
- }
-}
-
-/* Option to select a sales area */
-echo '<td><font size="3"><b>' . _('OR') . '</b></font></td><td>' . _('Choose an Area') . ':</td><td>';
-$result2 = DB_query("SELECT areacode, areadescription FROM areas", $db);
-// Error if no sales areas setup
-if (DB_num_rows($result2) == 0) {
- $DataError = 1;
- echo '<a href="Areas.php?" target="_parent">Setup Types</a>';
- echo '<tr><td colspan="2">' . prnMsg(_('No Sales Areas defined'), 'error') . '</td></tr>';
-} else {
- // if OK show select box with available options to choose
- echo '<select name="Area">';
- echo '<option value="ALL">' . _('Any') . '</option>';
- while ($myrow = DB_fetch_array($result2)) {
- if (isset($_POST['Area']) and $_POST['Area']==$myrow['areacode']) {
- echo '<option selected="True" value="' . $myrow['areacode'] . '">' . $myrow['areadescription'] . '</option>';
- } else {
- echo '<option value="' . $myrow['areacode'] . '">' . $myrow['areadescription'] . '</option>';
- }
- } //end while loop
- DB_data_seek($result2, 0);
- echo '</select></td></tr>';
-}
-
-echo '</td></tr></table><br />';
-echo '<div class="centre"><input type="submit" name="Search" value="' . _('Search Now') . '" /><input type="submit" name="CSV" value="' . _('CSV Format') . '" /></div>';
-if (isset($_SESSION['SalesmanLogin']) and $_SESSION['SalesmanLogin'] != '') {
- prnMsg(_('Your account enables you to see only customers allocated to you'), 'warn', _('Note: Sales-person Login'));
-}
+ShowCustomerSearchFields($rootpath, $theme, $db);
if (isset($result)) {
- unset($_SESSION['CustomerID']);
- $ListCount = DB_num_rows($result);
- $ListPageMax = ceil($ListCount / $_SESSION['DisplayRecordsMax']);
- if (!isset($_POST['CSV'])) {
- if (isset($_POST['Next'])) {
- if ($_POST['PageOffset'] < $ListPageMax) {
- $_POST['PageOffset'] = $_POST['PageOffset'] + 1;
- }
- }
- if (isset($_POST['Previous'])) {
- if ($_POST['PageOffset'] > 1) {
- $_POST['PageOffset'] = $_POST['PageOffset'] - 1;
- }
- }
- echo '<input type="hidden" name="PageOffset" value="' . $_POST['PageOffset'] . '" />';
- if ($ListPageMax > 1) {
- echo '<br /><div class="centre"> ' . $_POST['PageOffset'] . ' ' . _('of') . ' ' . $ListPageMax . ' ' . _('pages') . '. ' . _('Go to Page') . ': ';
- echo '<select name="PageOffset1">';
- $ListPage = 1;
- while ($ListPage <= $ListPageMax) {
- if ($ListPage == $_POST['PageOffset']) {
- echo '<option value=' . $ListPage . ' selected>' . $ListPage . '</option>';
- } else {
- echo '<option value=' . $ListPage . '>' . $ListPage . '</option>';
- }
- $ListPage++;
- }
- echo '</select>
- <input type="submit" name="Go1" value="' . _('Go') . '" />
- <input type="submit" name="Previous" value="' . _('Previous') . '" />
- <input type="submit" name="Next" value="' . _('Next') . '" />';
- echo '</div>';
- }
- echo '<br /><table cellpadding="2" class="selection">';
- $TableHeader = '<tr>
- <th>' . _('Code') . '</th>
- <th>' . _('Customer Name') . '</th>
- <th>' . _('Branch') . '</th>
- <th>' . _('Contact') . '</th>
- <th>' . _('Type') . '</th>
- <th>' . _('Phone') . '</th>
- <th>' . _('Fax') . '</th>
- </tr>';
- echo $TableHeader;
- $j = 1;
- $k = 0; //row counter to determine background colour
- $RowIndex = 0;
- }
- if (DB_num_rows($result) <> 0) {
- if (isset($_POST['CSV'])) {
- $FileName = $_SESSION['reports_dir'] . '/Customer_Listing_' . Date('Y-m-d') . '.csv';
- echo '<br /><p class="page_title_text"><a href="' . $FileName . '">' . _('Click to view the csv Search Result') . '</p>';
- $fp = fopen($FileName, 'w');
- while ($myrow2 = DB_fetch_array($result)) {
- fwrite($fp, $myrow2['debtorno'] . ',' . str_replace(',', '', $myrow2['name']) . ',' . str_replace(',', '', $myrow2['address1']) . ',' . str_replace(',', '', $myrow2['address2']) . ',' . str_replace(',', '', $myrow2['address3']) . ',' . str_replace(',', '', $myrow2['address4']) . ',' . str_replace(',', '', $myrow2['contactname']) . ',' . str_replace(',', '', $myrow2['typename']) . ',' . $myrow2['phoneno'] . ',' . $myrow2['faxno'] . "\n");
- }
- echo '</div>';
- }
- if (!isset($_POST['CSV'])) {
- DB_data_seek($result, ($_POST['PageOffset'] - 1) * $_SESSION['DisplayRecordsMax']);
- }
- $i=0; //counter for input controls
- while (($myrow = DB_fetch_array($result)) AND ($RowIndex <> $_SESSION['DisplayRecordsMax'])) {
- if ($k == 1) {
- echo '<tr class="EvenTableRows">';
- $k = 0;
- } else {
- echo '<tr class="OddTableRows">';
- $k = 1;
- }
- echo '<td><font size="1"><input type="submit" name="SubmitCustomerSelection' . $i .'" value="' . htmlentities($myrow['debtorno'].' '.$myrow['branchcode'],ENT_QUOTES,'UTF-8') . '" /></font></td>
- <input type="hidden" name="SelectedCustomer' . $i .'" value="'.$myrow['debtorno'].'" />
- <input type="hidden" name="SelectedBranch' . $i .'" value="'. $myrow['branchcode'].'" />
- <td><font size="1">' . $myrow['name'] . '</font></td>
- <td><font size="1">' . $myrow['brname'] . '</font></td>
- <td><font size="1">' . $myrow['contactname'] . '</font></td>
- <td><font size="1">' . $myrow['typename'] . '</font></td>
- <td><font size="1">' . $myrow['phoneno'] . '</font></td>
- <td><font size="1">' . $myrow['faxno'] . '</font></td></tr>';
- $i++;
- $j++;//row counter
- //end of page full new headings if
-
- }
- //end of while loop
- echo '</table>';
- echo '<input type="hidden" name="JustSelectedACustomer" value="Yes" />';
- }
+ ShowReturnedCustomers($result);
}
-//end if results to show
-if (!isset($_POST['CSV'])) {
- if (isset($ListPageMax) and $ListPageMax > 1) {
- echo '<br /><div class="centre"> ' . $_POST['PageOffset'] . ' ' . _('of') . ' ' . $ListPageMax . ' ' . _('pages') . '. ' . _('Go to Page') . ': ';
- echo '<select name="PageOffset2">';
- $ListPage = 1;
- while ($ListPage <= $ListPageMax) {
- if ($ListPage == $_POST['PageOffset']) {
- echo '<option value=' . $ListPage . ' selected>' . $ListPage . '</option>';
- } else {
- echo '<option value=' . $ListPage . '>' . $ListPage . '</option>';
- }
- $ListPage++;
- }
- echo '</select>
- <input type="submit" name="Go2" value="' . _('Go') . '" />
- <input type="submit" name="Previous" value="' . _('Previous') . '" />
- <input type="submit" name="Next" value="' . _('Next') . '" />';
- }
- //end if results to show
- echo '</div></form>';
-}
// Only display the geocode map if the integration is turned on, and there is a latitude/longitude to display
if (isset($_SESSION['CustomerID']) and $_SESSION['CustomerID'] != "") {
if ($_SESSION['geocode_integration'] == 1) {
@@ -469,7 +181,7 @@
echo '<div class="centre">' . _('Mapping is enabled, but no Mapping data to display for this Customer.') . '</div>';
} else {
echo '<tr><td colspan="2">';
- echo '<table width="45%" cellpadding="4">';
+ echo '<table width="45%" cellpadding="4" class="selection">';
echo '<tr><th width="33%">' . _('Customer Mapping') . '</th></tr>';
echo '</td><td valign="top">'; /* Mapping */
echo '<div class="centre">' . _('Mapping is enabled, Map will display below.') . '</div>';
@@ -558,7 +270,7 @@
ORDER BY contid";
$result = DB_query($sql, $db);
if (DB_num_rows($result) <> 0) {
- echo '<table width="45%">';
+ echo '<table width="45%" class="selection">';
echo '<br /><th colspan="7"><img src="' . $rootpath . '/css/' . $theme . '/images/group_add.png" title="' . _('Customer Contacts') . '" alt="" />' . ' ' . _('Customer Contacts') . '</th>';
echo '<tr>
<th>' . _('Name') . '</th>
@@ -605,7 +317,7 @@
$result = DB_query($sql, $db);
if (DB_num_rows($result) <> 0) {
echo '<br /><div class="centre"><img src="' . $rootpath . '/css/' . $theme . '/images/note_add.png" title="' . _('Customer Notes') . '" alt="" />' . ' ' . _('Customer Notes') . '</div><br />';
- echo '<table width="45%">';
+ echo '<table width="45%" class+"selection">';
echo '<tr>
<th>' . _('date') . '</th>
<th>' . _('note') . '</th>
@@ -651,7 +363,7 @@
$result = DB_query($sql, $db);
if (DB_num_rows($result) <> 0) {
echo '<br /><div class="centre"><img src="' . $rootpath . '/css/' . $theme . '/images/folder_add.png" title="' . _('Customer Type (Group) Notes') . '" alt="" />' . ' ' . _('Customer Type (Group) Notes for:' . '<b> ' . $CustomerTypeName . '</b>') . '</div><br />';
- echo '<table width="45%">';
+ echo '<table width="45%" class="selection">';
echo '<tr>
<th>' . _('date') . '</th>
<th>' . _('note') . '</th>
Added: trunk/includes/CustomerSearch.php
===================================================================
--- trunk/includes/CustomerSearch.php (rev 0)
+++ trunk/includes/CustomerSearch.php 2012-04-26 13:49:49 UTC (rev 8656)
@@ -0,0 +1,302 @@
+<?php
+
+function ShowCustomerSearchFields($rootpath, $theme, $db) {
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Search for Customers').'</p>';
+ echo '<table cellpadding="3" class="selection">';
+ echo '<tr><td colspan="2">' . _('Enter a partial Name') . ':</td><td>';
+ if (isset($_POST['Keywords'])) {
+ echo '<input type="text" name="Keywords" value="' . $_POST['Keywords'] . '" size="20" maxlength="25" />';
+ } else {
+ echo '<input type="text" name="Keywords" size="20" maxlength="25" />';
+ }
+ echo '</td><td><font size="3"><b>' . _('OR') . '</b></font></td><td>' . _('Enter a partial Code') . ':</td><td>';
+ if (isset($_POST['CustCode'])) {
+ echo '<input type="text" name="CustCode" value="' . $_POST['CustCode'] . '" size="15" maxlength="18" />';
+ } else {
+ echo '<input type="text" name="CustCode" size="15" maxlength="18" />';
+ }
+ echo '</td></tr><tr><td><font size="3"><b>' . _('OR') . '</b></font></td><td>' . _('Enter a partial Phone Number') . ':</td><td>';
+ if (isset($_POST['CustPhone'])) {
+ echo '<input type="text" name="CustPhone" value="' . $_POST['CustPhone'] . '" size="15" maxlength="18" />';
+ } else {
+ echo '<input type="text" name="CustPhone" size="15" maxlength="18" />';
+ }
+ echo '</td>';
+ echo '<td><font size="3"><b>' . _('OR') . '</b></font></td><td>' . _('Enter part of the Address') . ':</td><td>';
+ if (isset($_POST['CustAdd'])) {
+ echo '<input type="text" name="CustAdd" value="' . $_POST['CustAdd'] . '" size="20" maxlength="25" />';
+ } else {
+ echo '<input type="text" name="CustAdd" size="20" maxlength="25" />';
+ }
+ echo '</td></tr>';
+ /* End addded search feature. Gilles Deacur */
+ echo '<tr><td><font size="3"><b>' . _('OR') . '</b></font></td><td>' . _('Choose a Type') . ':</td><td>';
+ if (isset($_POST['CustType'])) {
+ // Show Customer Type drop down list
+ $result2 = DB_query("SELECT typeid, typename FROM debtortype", $db);
+ // Error if no customer types setup
+ if (DB_num_rows($result2) == 0) {
+ $DataError = 1;
+ echo '<a href="CustomerTypes.php?" target="_parent">Setup Types</a>';
+ echo '<tr><td colspan="2">' . prnMsg(_('No Customer types defined'), 'error') . '</td></tr>';
+ } else {
+ // If OK show select box with option selected
+ echo '<select name="CustType">';
+ echo '<option value="ALL">' . _('Any') . '</option>';
+ while ($myrow = DB_fetch_array($result2)) {
+ if ($_POST['CustType'] == $myrow['typename']) {
+ echo '<option selected="True" value="' . $myrow['typename'] . '">' . $myrow['typename'] . '</option>';
+ } else {
+ echo '<option value="' . $myrow['typename'] . '">' . $myrow['typename'] . '</option>';
+ }
+ } //end while loop
+ DB_data_seek($result2, 0);
+ echo '</select></td>';
+ }
+ } else {
+ // No option selected yet, so show Customer Type drop down list
+ $result2 = DB_query("SELECT typeid, typename FROM debtortype", $db);
+ // Error if no customer types setup
+ if (DB_num_rows($result2) == 0) {
+ $DataError = 1;
+ echo '<a href="CustomerTypes.php?" target="_parent">Setup Types</a>';
+ echo '<tr><td colspan="2">' . prnMsg(_('No Customer types defined'), 'error') . '</td></tr>';
+ } else {
+ // if OK show select box with available options to choose
+ echo '<select name="CustType">';
+ echo '<option value="ALL">' . _('Any'). '</option>';
+ while ($myrow = DB_fetch_array($result2)) {
+ echo '<option value="' . $myrow['typename'] . '">' . $myrow['typename'] . '</option>';
+ } //end while loop
+ DB_data_seek($result2, 0);
+ echo '</select></td>';
+ }
+ }
+
+ /* Option to select a sales area */
+ echo '<td><font size="3"><b>' . _('OR') . '</b></font></td><td>' . _('Choose an Area') . ':</td><td>';
+ $result2 = DB_query("SELECT areacode, areadescription FROM areas", $db);
+ // Error if no sales areas setup
+ if (DB_num_rows($result2) == 0) {
+ $DataError = 1;
+ echo '<a href="Areas.php?" target="_parent">Setup Types</a>';
+ echo '<tr><td colspan="2">' . prnMsg(_('No Sales Areas defined'), 'error') . '</td></tr>';
+ } else {
+ // if OK show select box with available options to choose
+ echo '<select name="Area">';
+ echo '<option value="ALL">' . _('Any') . '</option>';
+ while ($myrow = DB_fetch_array($result2)) {
+ if (isset($_POST['Area']) and $_POST['Area']==$myrow['areacode']) {
+ echo '<option selected="True" value="' . $myrow['areacode'] . '">' . $myrow['areadescription'] . '</option>';
+ } else {
+ echo '<option value="' . $myrow['areacode'] . '">' . $myrow['areadescription'] . '</option>';
+ }
+ } //end while loop
+ DB_data_seek($result2, 0);
+ echo '</select></td></tr>';
+ }
+
+ echo '</td></tr></table><br />';
+ echo '<div class="centre"><button type="submit" name="Search">' . _('Search Now') . '</button>
+ <button type="submit" name="CSV">' . _('CSV Format') . '</button></div>';
+ if (isset($_SESSION['SalesmanLogin']) and $_SESSION['SalesmanLogin'] != '') {
+ prnMsg(_('Your account enables you to see only customers allocated to you'), 'warn', _('Note: Sales-person Login'));
+ }
+}
+
+function CustomerSearchSQL($db) {
+ if (isset($_POST['Search']) OR isset($_POST['CSV']) OR isset($_POST['Go']) OR isset($_POST['Next']) OR isset($_POST['Previous'])) {
+ if (isset($_POST['Search'])) {
+ $_POST['PageOffset'] = 1;
+ }
+ if ($_POST['Keywords'] AND (($_POST['CustCode']) OR ($_POST['CustPhone']) OR ($_POST['CustType']))) {
+ $_POST['Keywords'] = mb_strtoupper($_POST['Keywords']);
+ }
+ if (($_POST['Keywords'] == '') AND ($_POST['CustCode'] == '') AND ($_POST['CustPhone'] == '') AND ( $_POST['CustType'] == 'ALL') AND ($_POST['Area'] == 'ALL') AND ($_POST['CustAdd'] == '')) {
+ //no criteria set then default to all customers
+ $SQL = "SELECT debtorsmaster.debtorno,
+ debtorsmaster.name,
+ debtorsmaster.address1,
+ debtorsmaster.address2,
+ debtorsmaster.address3,
+ debtorsmaster.address4,
+ custbranch.branchcode,
+ custbranch.brname,
+ custbranch.contactname,
+ debtortype.typename,
+ custbranch.phoneno,
+ custbranch.faxno
+ FROM debtorsmaster
+ LEFT JOIN custbranch
+ ON debtorsmaster.debtorno = custbranch.debtorno
+ INNER JOIN debtortype
+ ON debtorsmaster.typeid = debtortype.typeid";
+ } else {
+ $SearchKeywords = mb_strtoupper(trim(str_replace(' ', '%', $_POST['Keywords'])));
+ $_POST['CustCode'] = mb_strtoupper(trim($_POST['CustCode']));
+ $_POST['CustPhone'] = trim($_POST['CustPhone']);
+ $_POST['CustAdd'] = trim($_POST['CustAdd']);
+ $SQL = "SELECT debtorsmaster.debtorno,
+ debtorsmaster.name,
+ debtorsmaster.address1,
+ debtorsmaster.address2,
+ debtorsmaster.address3,
+ debtorsmaster.address4,
+ custbranch.branchcode,
+ custbranch.brname,
+ custbranch.contactname,
+ debtortype.typename,
+ custbranch.phoneno,
+ custbranch.faxno
+ FROM debtorsmaster
+ INNER JOIN debtortype
+ ON debtorsmaster.typeid = debtortype.typeid
+ LEFT JOIN custbranch
+ ON debtorsmaster.debtorno = custbranch.debtorno
+ WHERE debtorsmaster.name " . LIKE . " '%" . $SearchKeywords . "%'
+ AND debtorsmaster.debtorno " . LIKE . " '%" . $_POST['CustCode'] . "%'
+ AND custbranch.phoneno " . LIKE . " '%" . $_POST['CustPhone'] . "%'
+ AND (debtorsmaster.address1 " . LIKE . " '%" . $_POST['CustAdd'] . "%'
+ OR debtorsmaster.address2 " . LIKE . " '%" . $_POST['CustAdd'] . "%'
+ OR debtorsmaster.address3 " . LIKE . " '%" . $_POST['CustAdd'] . "%'
+ OR debtorsmaster.address4 " . LIKE . " '%" . $_POST['CustAdd'] . "%')";
+
+ if (mb_strlen($_POST['CustType']) > 0 AND $_POST['CustType']!='ALL') {
+ $SQL .= " AND debtortype.typename = '" . $_POST['CustType'] . "'";
+ }
+ if (mb_strlen($_POST['Area']) > 0 AND $_POST['Area']!='ALL') {
+ $SQL .= " AND custbranch.area = '" . $_POST['Area'] . "'";
+ }
+ } //one of keywords or custcode or custphone was more than a zero length string
+ if ($_SESSION['SalesmanLogin'] != '') {
+ $SQL.= " AND custbranch.salesman='" . $_SESSION['SalesmanLogin'] . "'";
+ }
+ $SQL.= " ORDER BY debtorsmaster.name";
+ $ErrMsg = _('The searched customer records requested cannot be retrieved because');
+
+ $result = DB_query($SQL, $db, $ErrMsg);
+ if (DB_num_rows($result) == 0) {
+ prnMsg(_('No customer records contain the selected text') . ' - ' . _('please alter your search criteria and try again'), 'info');
+ echo '<br />';
+ }
+ return $result;
+ } //end of if search
+}
+
+function ShowReturnedCustomers($result) {
+ unset($_SESSION['CustomerID']);
+ $ListCount = DB_num_rows($result);
+ $ListPageMax = ceil($ListCount / $_SESSION['DisplayRecordsMax']);
+ if (!isset($_POST['CSV'])) {
+ if (isset($_POST['Next'])) {
+ if ($_POST['PageOffset'] < $ListPageMax) {
+ $_POST['PageOffset'] = $_POST['PageOffset'] + 1;
+ }
+ }
+ if (isset($_POST['Previous'])) {
+ if ($_POST['PageOffset'] > 1) {
+ $_POST['PageOffset'] = $_POST['PageOffset'] - 1;
+ }
+ }
+ echo '<input type="hidden" name="PageOffset" value="' . $_POST['PageOffset'] . '" />';
+ if ($ListPageMax > 1) {
+ echo '<br /><div class="centre"> ' . $_POST['PageOffset'] . ' ' . _('of') . ' ' . $ListPageMax . ' ' . _('pages') . '. ' . _('Go to Page') . ': ';
+ echo '<select name="PageOffset1">';
+ $ListPage = 1;
+ while ($ListPage <= $ListPageMax) {
+ if ($ListPage == $_POST['PageOffset']) {
+ echo '<option value=' . $ListPage . ' selected>' . $ListPage . '</option>';
+ } else {
+ echo '<option value=' . $ListPage . '>' . $ListPage . '</option>';
+ }
+ $ListPage++;
+ }
+ echo '</select>
+ <button type="submit" name="Go1">' . _('Go') . '</button>
+ <button type="submit" name="Previous">' . _('Previous') . '</button>
+ <button type="submit" name="Next">' . _('Next') . '</button>';
+ echo '</div>';
+ }
+ echo '<br /><table cellpadding="2" class="selection">';
+ $TableHeader = '<tr>
+ <th>' . _('Code') . '</th>
+ <th>' . _('Customer Name') . '</th>
+ <th>' . _('Branch') . '</th>
+ <th>' . _('Contact') . '</th>
+ <th>' . _('Type') . '</th>
+ <th>' . _('Phone') . '</th>
+ <th>' . _('Fax') . '</th>
+ </tr>';
+ echo $TableHeader;
+ $j = 1;
+ $k = 0; //row counter to determine background colour
+ $RowIndex = 0;
+ }
+ if (DB_num_rows($result) <> 0) {
+ if (isset($_POST['CSV'])) {
+ $FileName = $_SESSION['reports_dir'] . '/Customer_Listing_' . Date('Y-m-d') . '.csv';
+ echo '<br /><p class="page_title_text"><a href="' . $FileName . '">' . _('Click to view the csv Search Result') . '</p>';
+ $fp = fopen($FileName, 'w');
+ while ($myrow2 = DB_fetch_array($result)) {
+ fwrite($fp, $myrow2['debtorno'] . ',' . str_replace(',', '', $myrow2['name']) . ',' . str_replace(',', '', $myrow2['address1']) . ',' . str_replace(',', '', $myrow2['address2']) . ',' . str_replace(',', '', $myrow2['address3']) . ',' . str_replace(',', '', $myrow2['address4']) . ',' . str_replace(',', '', $myrow2['contactname']) . ',' . str_replace(',', '', $myrow2['typename']) . ',' . $myrow2['phoneno'] . ',' . $myrow2['faxno'] . "\n");
+ }
+ echo '</div>';
+ }
+ if (!isset($_POST['CSV'])) {
+ DB_data_seek($result, ($_POST['PageOffset'] - 1) * $_SESSION['DisplayRecordsMax']);
+ }
+ $i=0; //counter for input controls
+ while (($myrow = DB_fetch_array($result)) AND ($RowIndex <> $_SESSION['DisplayRecordsMax'])) {
+ if ($k == 1) {
+ echo '<tr class="EvenTableRows">';
+ $k = 0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k = 1;
+ }
+ echo '<td><button type="submit" name="SubmitCustomerSelection' . $i .'" value="' . htmlentities($myrow['debtorno'].' '.$myrow['branchcode'],ENT_QUOTES,'UTF-8') . '">' . htmlentities($myrow['debtorno'].' '.$myrow['branchcode'],ENT_QUOTES,'UTF-8') . '</button></td>
+ <input type="hidden" name="SelectedCustomer' . $i .'" value="'.$myrow['debtorno'].'" />
+ <input type="hidden" name="SelectedBranch' . $i .'" value="'. $myrow['branchcode'].'" />
+ <td><font size="1">' . $myrow['name'] . '</font></td>
+ <td><font size="1">' . $myrow['brname'] . '</font></td>
+ <td><font size="1">' . $myrow['contactname'] . '</font></td>
+ <td><font size="1">' . $myrow['typename'] . '</font></td>
+ <td><font size="1">' . $myrow['phoneno'] . '</font></td>
+ <td><font size="1">' . $myrow['faxno'] . '</font></td></tr>';
+ $i++;
+ $j++;//row counter
+ //end of page full new headings if
+
+ }
+ //end of while loop
+ echo '</table>';
+ echo '<input type="hidden" name="JustSelectedACustomer" value="Yes" />';
+ }
+
+ //end if results to show
+ if (!isset($_POST['CSV'])) {
+ if (isset($ListPageMax) and $ListPageMax > 1) {
+ echo '<br /><div class="centre"> ' . $_POST['PageOffset'] . ' ' . _('of') . ' ' . $ListPageMax . ' ' . _('pages') . '. ' . _('Go to Page') . ': ';
+ echo '<select name="PageOffset2">';
+ $ListPage = 1;
+ while ($ListPage <= $ListPageMax) {
+ if ($ListPage == $_POST['PageOffset']) {
+ echo '<option value=' . $ListPage . ' selected>' . $ListPage . '</option>';
+ } else {
+ echo '<option value=' . $ListPage . '>' . $ListPage . '</option>';
+ }
+ $ListPage++;
+ }
+ echo '</select>
+ <button type="submit" name="Go2">' . _('Go') . '</button>
+ <button type="submit" name="Previous">' . _('Previous') . '</button>
+ <button type="submit" name="Next">' . _('Next') . '</button>';
+ }
+ //end if results to show
+ echo '</div></form>';
+ }
+}
+
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-04-26 23:57:00
|
Revision: 8661
http://weberp.svn.sourceforge.net/weberp/?rev=8661&view=rev
Author: tim_schofield
Date: 2012-04-26 23:56:53 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
Extract customer selection into an external file
Modified Paths:
--------------
trunk/Contracts.php
trunk/SelectCustomer.php
Modified: trunk/Contracts.php
===================================================================
--- trunk/Contracts.php 2012-04-26 20:37:43 UTC (rev 8660)
+++ trunk/Contracts.php 2012-04-26 23:56:53 UTC (rev 8661)
@@ -3,6 +3,7 @@
/* $Id: Contracts.php 3692 2010-08-15 09:22:08Z daintree $ */
include('includes/DefineContractClass.php');
+include('includes/CustomerSearch.php');
include('includes/session.inc');
if (isset($_GET['ModifyContractNo'])) {
@@ -598,105 +599,46 @@
} //end of if making a quotation
-if (isset($_POST['SearchCustomers'])){
+$result_CustSelect=CustomerSearchSQL($db);
- if (($_POST['CustKeywords']!='') AND (($_POST['CustCode']!='') OR ($_POST['CustPhone']!=''))) {
- prnMsg( _('Customer Branch Name keywords have been used in preference to the Customer Branch Code or Branch Phone Number entered'), 'warn');
- }
- if (($_POST['CustCode']!='') AND ($_POST['CustPhone']!='')) {
- prnMsg(_('Customer Branch Code has been used in preference to the Customer Branch Phone Number entered'), 'warn');
- }
- if (mb_strlen($_POST['CustKeywords'])>0) {
- //insert wildcard characters in spaces
- $_POST['CustKeywords'] = mb_strtoupper(trim($_POST['CustKeywords']));
- $SearchString = '%' . str_replace(' ', '%', $_POST['CustKeywords']) . '%';
-
- $SQL = "SELECT custbranch.brname,
- custbranch.contactname,
- custbranch.phoneno,
- custbranch.faxno,
- custbranch.branchcode,
- custbranch.debtorno,
- debtorsmaster.name
- FROM custbranch
- LEFT JOIN debtorsmaster
- ON custbranch.debtorno=debtorsmaster.debtorno
- WHERE custbranch.brname " . LIKE . " '$SearchString'
- AND custbranch.disabletrans=0
- ORDER BY custbranch.debtorno, custbranch.branchcode";
-
- } elseif (mb_strlen($_POST['CustCode'])>0){
-
- $_POST['CustCode'] = mb_strtoupper(trim($_POST['CustCode']));
-
- $SQL = "SELECT custbranch.brname,
- custbranch.contactname,
- custbranch.phoneno,
- custbranch.faxno,
- custbranch.branchcode,
- custbranch.debtorno,
- debtorsmaster.name
- FROM custbranch
- LEFT JOIN debtorsmaster
- ON custbranch.debtorno=debtorsmaster.debtorno
- WHERE custbranch.branchcode " . LIKE . " '%" . $_POST['CustCode'] . "%'
- AND custbranch.disabletrans=0
- ORDER BY custbranch.debtorno";
-
- } elseif (mb_strlen($_POST['CustPhone'])>0){
- $SQL = "SELECT custbranch.brname,
- custbranch.contactname,
- custbranch.phoneno,
- custbranch.faxno,
- custbranch.branchcode,
- custbranch.debtorno,
- debtorsmaster.name
- FROM custbranch
- LEFT JOIN debtorsmaster
- ON custbranch.debtorno=debtorsmaster.debtorno
- WHERE custbranch.phoneno " . LIKE . " '%" . $_POST['CustPhone'] . "%'
- AND custbranch.disabletrans=0
- ORDER BY custbranch.debtorno";
- } else {
- $SQL = "SELECT custbranch.brname,
- custbranch.contactname,
- custbranch.phoneno,
- custbranch.faxno,
- custbranch.branchcode,
- custbranch.debtorno,
- debtorsmaster.name
- FROM custbranch
- LEFT JOIN debtorsmaster
- ON custbranch.debtorno=debtorsmaster.debtorno
- WHERE custbranch.disabletrans=0
- ORDER BY custbranch.debtorno";
- }
-
- $ErrMsg = _('The searched customer records requested cannot be retrieved because');
- $result_CustSelect = DB_query($SQL,$db,$ErrMsg);
-
- if (DB_num_rows($result_CustSelect)==0){
- prnMsg(_('No Customer Branch records contain the search criteria') . ' - ' . _('please try again') . ' - ' . _('Note a Customer Branch Name may be different to the Customer Name'),'info');
- }
-} /*one of keywords or custcode was more than a zero length string */
-
if (isset($_POST['SelectedCustomer1'])) {
/* will only be true if page called from customer selection form
* or set because only one customer record returned from a search
* so parse the $Select string into debtorno and branch code */
-
- foreach ($_POST as $key => $value) {
- if (mb_substr($key, 0, 6)=='Submit') {
- $Index=mb_substr($key, 6, 1);
- $_POST['SelectedCustomer']=$_POST['SelectedCustomer'.$Index];
- $_POST['SelectedBranch']=$_POST['SelectedBranch'.$Index];
+ if (!isset($_POST['Search'])){
+ /*Need to figure out the number of the form variable that the user clicked on */
+ for ($i=0; $i< count($_POST); $i++){ //loop through the returned customers
+ if(isset($_POST['SubmitCustomerSelection'.$i])){
+ break;
+ }
}
+ if ($i==count($_POST)){
+ prnMsg(_('Unable to identify the selected customer'),'error');
+ } else {
+ $_POST['SelectedCustomer'] = $_POST['SelectedCustomer'.$i];
+ $_POST['SelectedBranch'] = $_POST['SelectedBranch'.$i];
+ unset($_POST['Search']);
+ $_SESSION['Contract'.$identifier]->DebtorNo = $_POST['SelectedCustomer'];
+ $_SESSION['Contract'.$identifier]->BranchCode = $_POST['SelectedBranch'];
+ }
}
- $_SESSION['Contract'.$identifier]->DebtorNo = $_POST['SelectedCustomer'];
- $_SESSION['Contract'.$identifier]->BranchCode = $_POST['SelectedBranch'];
+} //end if a customer has just been selected
+
+if (!isset($_SESSION['Contract'.$identifier]->DebtorNo)
+ OR $_SESSION['Contract'.$identifier]->DebtorNo=='' ) {
+
+ ShowCustomerSearchFields($rootpath, $theme, $db);
+
+ if (isset($result_CustSelect)) {
+ ShowReturnedCustomers($result_CustSelect);
+ }//end if results to show
+
+//end if RequireCustomerSelection
+} else { /*A customer is already selected so get into the contract setup proper */
+
$sql = "SELECT debtorsmaster.name,
custbranch.brname,
debtorsmaster.currcode,
@@ -739,80 +681,7 @@
}
}
} //a customer was retrieved ok
-} //end if a customer has just been selected
-
-if (!isset($_SESSION['Contract'.$identifier]->DebtorNo)
- OR $_SESSION['Contract'.$identifier]->DebtorNo=='' ) {
-
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/contract.png" title="' . _('Contract') . '" alt="" />' . ' ' . _('Contract: Select Customer') . '</p>';
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?identifier=' . $identifier .'" name="CustomerSelection" method="post">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-
- echo '<table cellpadding="3" class="selection">
- <tr>
- <td><h5>' . _('Part of the Customer Branch Name') . ':</h5></td>
- <td><input tabindex="1" type="text" name="CustKeywords" size="20" maxlength="25" /></td>
- <td><h2><b>' . _('OR') . '</b></h2></td>
- <td><h5>' . _('Part of the Customer Branch Code'). ':</h5></td>
- <td><input tabindex="2" type="text" name="CustCode" size="15" maxlength="18" /></td>
- <td><h2><b>' . _('OR') . '</b></h2></td>
- <td><h5>' . _('Part of the Branch Phone Number') . ':</h5></td>
- <td><input tabindex="3" type="text" name="CustPhone" size="15" maxlength="18" /></td>
- </tr>
- </table>
- <br /><div class="centre"><input tabindex="4" type="submit" name="SearchCustomers" value="' . _('Search Now') . '" />
- <input tabindex="5" type="submit" name="reset" value="' . _('Reset') .'" /></div>';
-
- if (isset($result_CustSelect)) {
-
- echo '<br /><table cellpadding="2" class="selection">';
-
- $TableHeader = '<tr>
- <th>' . _('Customer') . '</th>
- <th>' . _('Branch') . '</th>
- <th>' . _('Contact') . '</th>
- <th>' . _('Phone') . '</th>
- <th>' . _('Fax') . '</th>
- </tr>';
- echo $TableHeader;
-
- $j = 1;
- $k = 0; //row counter to determine background colour
- $LastCustomer='';
- while ($myrow=DB_fetch_array($result_CustSelect)) {
-
- if ($k==1){
- echo '<tr class="EvenTableRows">';
- $k=0;
- } else {
- echo '<tr class="OddTableRows">';
- $k=1;
- }
- if ($LastCustomer != $myrow['name']) {
- echo '<td>'.htmlentities($myrow['name'], ENT_QUOTES,'UTF-8').'</td>';
- } else {
- echo '<td></td>';
- }
- echo '<td><input type="submit" name="Submit'.$j.'" value="'.htmlentities($myrow['brname'], ENT_QUOTES,'UTF-8').'" /></td>
- <input type="hidden" name="SelectedCustomer'.$j.'" value="'.$myrow['debtorno'].'" />
- <input type="hidden" name="SelectedBranch'.$j.'" value="'.$myrow['branchcode'].'" />
- <td>'.htmlentities($myrow['contactname'], ENT_QUOTES,'UTF-8').'</td>
- <td>'.$myrow['phoneno'].'</td>
- <td>'.$myrow['faxno'].'</td>
- </tr>';
- $LastCustomer=$myrow['name'];
- $j++;
-//end of page full new headings if
- }
-//end of while loop
-
- echo '</table></form>';
- }//end if results to show
-
-//end if RequireCustomerSelection
-} else { /*A customer is already selected so get into the contract setup proper */
-
echo '<form name="ContractEntry" enctype="multipart/form-data" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?identifier=' . $identifier . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -1055,15 +924,15 @@
echo'<p></p>';
echo '<div class="centre">
- <input type="submit" name="EnterContractBOM" value="' . _('Enter Items Required') . '" />
- <input type="submit" name="EnterContractRequirements" value="' . _('Enter Other Requirements') .'" />';
+ <button type="submit" name="EnterContractBOM">' . _('Enter Items Required') . '</button>
+ <button type="submit" name="EnterContractRequirements">' . _('Enter Other Requirements') .'</button>';
if($_SESSION['Contract'.$identifier]->Status==0){ // not yet quoted
- echo '<input type="submit" name="CommitContract" value="' . _('Commit Changes') .'" />';
+ echo '<button type="submit" name="CommitContract">' . _('Commit Changes') .'</button>';
} elseif($_SESSION['Contract'.$identifier]->Status==1){ //quoted but not yet ordered
- echo '<input type="submit" name="CommitContract" value="' . _('Update Quotation') .'" />';
+ echo '<button type="submit" name="CommitContract">' . _('Update Quotation') .'</button>';
}
if($_SESSION['Contract'.$identifier]->Status==0){ //not yet quoted
- echo ' <input type="submit" name="CreateQuotation" value="' . _('Create Quotation') .'" />
+ echo ' <button type="submit" name="CreateQuotation">' . _('Create Quotation') .'</button>
</div>';
} else {
echo '</div>';
@@ -1071,7 +940,7 @@
if ($_SESSION['Contract'.$identifier]->Status!=2) {
echo '<div class="centre">
<br />
- <input type="submit" name="CancelContract" value="' . _('Cancel and Delete Contract') . '" />
+ <button type="submit" name="CancelContract">' . _('Cancel and Delete Contract') . '</button>
</div>';
}
echo '</form>';
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2012-04-26 20:37:43 UTC (rev 8660)
+++ trunk/SelectCustomer.php 2012-04-26 23:56:53 UTC (rev 8661)
@@ -174,7 +174,7 @@
ShowReturnedCustomers($result);
}
// Only display the geocode map if the integration is turned on, and there is a latitude/longitude to display
-if (isset($_SESSION['CustomerID']) and $_SESSION['CustomerID'] != "") {
+if (isset($_SESSION['CustomerID']) and $_SESSION['CustomerID'] != '') {
if ($_SESSION['geocode_integration'] == 1) {
echo '<br />';
if ($lat == 0) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-04-27 08:21:51
|
Revision: 8665
http://weberp.svn.sourceforge.net/weberp/?rev=8665&view=rev
Author: tim_schofield
Date: 2012-04-27 08:21:45 +0000 (Fri, 27 Apr 2012)
Log Message:
-----------
Layout improvements, new css and buttons
Modified Paths:
--------------
trunk/Z_Upgrade_3.07-3.08.php
trunk/Z_Upgrade_3.08-3.09.php
trunk/Z_Upgrade_3.09-3.10.php
Modified: trunk/Z_Upgrade_3.07-3.08.php
===================================================================
--- trunk/Z_Upgrade_3.07-3.08.php 2012-04-27 08:21:34 UTC (rev 8664)
+++ trunk/Z_Upgrade_3.07-3.08.php 2012-04-27 08:21:45 UTC (rev 8665)
@@ -9,10 +9,10 @@
echo '<p><form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '"></p>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<input type="submit" name="DoUpgrade" value="' . _('Perform Upgrade') . '" />';
+echo '<button type="submit" name="DoUpgrade">' . _('Perform Upgrade') . '</button>';
echo '</form>';
-if ($_POST['DoUpgrade'] == _('Perform Upgrade')){
+if (isset($_POST['DoUpgrade'])){
$SQLScriptFile = file('./sql/mysql/upgrade3.07-3.08.sql');
Modified: trunk/Z_Upgrade_3.08-3.09.php
===================================================================
--- trunk/Z_Upgrade_3.08-3.09.php 2012-04-27 08:21:34 UTC (rev 8664)
+++ trunk/Z_Upgrade_3.08-3.09.php 2012-04-27 08:21:45 UTC (rev 8665)
@@ -9,10 +9,10 @@
echo '<p><form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '"></p>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<input type="submit" name="DoUpgrade" value="' . _('Perform Upgrade') . '" />';
+echo '<button type="submit" name="DoUpgrade">' . _('Perform Upgrade') . '</button>';
echo '</form>';
-if ($_POST['DoUpgrade'] == _('Perform Upgrade')){
+if (isset($_POST['DoUpgrade'])){
$SQLScriptFile = file('./sql/mysql/upgrade3.08-3.09.sql');
Modified: trunk/Z_Upgrade_3.09-3.10.php
===================================================================
--- trunk/Z_Upgrade_3.09-3.10.php 2012-04-27 08:21:34 UTC (rev 8664)
+++ trunk/Z_Upgrade_3.09-3.10.php 2012-04-27 08:21:45 UTC (rev 8665)
@@ -9,10 +9,10 @@
echo '<p><form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '"></p>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<input type="submit" name="DoUpgrade" value="' . _('Perform Upgrade') . '" />';
+echo '<button type="submit" name="DoUpgrade">' . _('Perform Upgrade') . '</button>';
echo '</form>';
-if ($_POST['DoUpgrade'] == _('Perform Upgrade')){
+if (isset($_POST['DoUpgrade'])){
$SQLScriptFile = file('./sql/mysql/upgrade3.09-3.10.sql');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-04-27 08:23:07
|
Revision: 8673
http://weberp.svn.sourceforge.net/weberp/?rev=8673&view=rev
Author: tim_schofield
Date: 2012-04-27 08:22:58 +0000 (Fri, 27 Apr 2012)
Log Message:
-----------
Layout improvements, new css and buttons
Modified Paths:
--------------
trunk/Z_poEditLangHeader.php
trunk/Z_poEditLangModule.php
trunk/Z_poEditLangRemaining.php
Modified: trunk/Z_poEditLangHeader.php
===================================================================
--- trunk/Z_poEditLangHeader.php 2012-04-27 08:22:48 UTC (rev 8672)
+++ trunk/Z_poEditLangHeader.php 2012-04-27 08:22:58 UTC (rev 8673)
@@ -101,7 +101,7 @@
}
echo '</table>';
- echo '<br /><div class="centre"><input type="submit" name="submit" value="' . _('Modify') . '" /> ';
+ echo '<br /><div class="centre"><button type="submit" name="submit">' . _('Modify') . '</button> ';
echo '<input type="hidden" name="language" value="' . $_POST['language'] . '" /></div>';
echo '</form>';
}
Modified: trunk/Z_poEditLangModule.php
===================================================================
--- trunk/Z_poEditLangModule.php 2012-04-27 08:22:48 UTC (rev 8672)
+++ trunk/Z_poEditLangModule.php 2012-04-27 08:22:58 UTC (rev 8673)
@@ -163,7 +163,7 @@
echo '</td></tr>';
echo '</table>';
echo '<br /><div class="centre">';
- echo '<input type="submit" name="submit" value="' . _('Modify') . '" /> ';
+ echo '<button type="submit" name="submit">' . _('Modify') . '</button> ';
echo '<input type="hidden" name="module" value="' . $_POST['module'] . '" />';
echo '</form>';
@@ -225,8 +225,8 @@
echo '</tr></table>';
echo '<br />';
echo '<div class="centre">';
- echo '<input type="submit" name="proceed" value="' . _('Proceed') . '" /> ';
- echo '<br /><br /><input type="submit" name="ReMergePO" value="' . _('Refresh messages with latest strings') . '" />';
+ echo '<button type="submit" name="proceed">' . _('Proceed') . '</button> ';
+ echo '<br /><br /><button type="submit" name="ReMergePO">' . _('Refresh messages with latest strings') . '</button>';
echo '</div>';
echo '</form>';
echo '</td></tr></table>';
Modified: trunk/Z_poEditLangRemaining.php
===================================================================
--- trunk/Z_poEditLangRemaining.php 2012-04-27 08:22:48 UTC (rev 8672)
+++ trunk/Z_poEditLangRemaining.php 2012-04-27 08:22:58 UTC (rev 8673)
@@ -132,7 +132,7 @@
echo '</td></tr>';
echo '</table>';
echo '<br /><div class="centre">';
- echo '<input type="submit" name="submit" value="' . _('Modify') . '" /> ';
+ echo '<button type="submit" name="submit">' . _('Modify') . '</button> ';
echo '<input type="hidden" name="module" value="' . $_POST['module'] . '" />';
echo '</form>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-04-28 21:29:52
|
Revision: 8707
http://weberp.svn.sourceforge.net/weberp/?rev=8707&view=rev
Author: tim_schofield
Date: 2012-04-28 21:29:46 +0000 (Sat, 28 Apr 2012)
Log Message:
-----------
Layout improvements, new css and buttons
Modified Paths:
--------------
trunk/Tax.php
trunk/css/silverwolf/default.css
Modified: trunk/Tax.php
===================================================================
--- trunk/Tax.php 2012-04-28 21:29:37 UTC (rev 8706)
+++ trunk/Tax.php 2012-04-28 21:29:46 UTC (rev 8707)
@@ -340,7 +340,7 @@
echo '</table>
- <br /><div class="centre"><input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
+ <br /><div class="centre"><button type="submit" name="PrintPDF">' . _('Print PDF') . '</button>
</div>
</form>';
Modified: trunk/css/silverwolf/default.css
===================================================================
--- trunk/css/silverwolf/default.css 2012-04-28 21:29:37 UTC (rev 8706)
+++ trunk/css/silverwolf/default.css 2012-04-28 21:29:46 UTC (rev 8707)
@@ -94,7 +94,8 @@
table.selection {
margin-bottom: 5px;
- background-color:#DCDCDC;
+ background: -moz-linear-gradient(left, #DCDCDC, #8D98A6);
+ background: -webkit-linear-gradient(left, #DCDCDC, #8D98A6);
border: solid #A49999 1px;
border-radius: 5px;
-moz-box-shadow: 3px 3px 2px #888;
@@ -249,32 +250,6 @@
box-shadow: 0 1px 2px rgba(0,0,0,.2); border-right-style: solid;
}
-select {
- border-width:1px;
- border-bottom-color: gray;
- border-bottom-style: solid;
- border-top-color: gray;
- border-top-style: solid;
- border-left-color: gray;
- border-left-style: solid;
- border-right-color: gray;
- border-right-style: solid;
- margin: 0;
- -webkit-border-radius: .5em;
- -moz-border-radius: .5em;
- border-radius: .5em;
- -webkit-box-shadow: 0 3px 0 #ccc, 0 -1px #fff inset;
- -moz-box-shadow: 0 3px 0 #ccc, 0 -1px #fff inset;
- box-shadow: 0 3px 0 #ccc, 0 -1px #fff inset;
- background-color: #e3e1e1;
- color:#645959;
- display: inline-block;
- -webkit-appearance:none;
- -moz-appearance:none;
- appearance:none;
- cursor:pointer;
-}
-
input.number {
text-align: right;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-04-28 21:30:24
|
Revision: 8710
http://weberp.svn.sourceforge.net/weberp/?rev=8710&view=rev
Author: tim_schofield
Date: 2012-04-28 21:30:18 +0000 (Sat, 28 Apr 2012)
Log Message:
-----------
Layout improvements, new css and buttons
Modified Paths:
--------------
trunk/TaxAuthorityRates.php
trunk/css/silverwolf/default.css
Modified: trunk/TaxAuthorityRates.php
===================================================================
--- trunk/TaxAuthorityRates.php 2012-04-28 21:30:03 UTC (rev 8709)
+++ trunk/TaxAuthorityRates.php 2012-04-28 21:30:18 UTC (rev 8710)
@@ -76,7 +76,7 @@
if (DB_num_rows($TaxRatesResult)>0){
echo '<table cellpadding="2" class="selection">';
- echo '<tr><th colspan="3"><font size="3" color="#616161">' . _('Update') . ' ' . $myrow['description'] . ' ' . _('Rates') . '</font></th></tr>';
+ echo '<tr><th colspan="3" class="header">' . _('Update') . ' ' . $myrow['description'] . ' ' . _('Rates') . '</th></tr>';
$TableHeader = '<tr><th>' . _('Deliveries From') . '<br />' . _('Tax Province') . '</th>
<th>' . _('Tax Category') . '</th>
<th>' . _('Tax Rate') . ' %</th></tr>';
@@ -113,7 +113,7 @@
}
//end of while loop
echo '</table>';
-echo '<br /><div class="centre"><input type="submit" name="UpdateRates" value="' . _('Update Rates') . '" />';
+echo '<br /><div class="centre"><button type="submit" name="UpdateRates">' . _('Update Rates') . '</button>';
} //end if tax taxcatid/rates to show
else {
prnMsg(_('There are no tax rates to show - perhaps the dispatch tax province records have not yet been created?'),'warn');
Modified: trunk/css/silverwolf/default.css
===================================================================
--- trunk/css/silverwolf/default.css 2012-04-28 21:30:03 UTC (rev 8709)
+++ trunk/css/silverwolf/default.css 2012-04-28 21:30:18 UTC (rev 8710)
@@ -75,6 +75,17 @@
text-align: right;
vertical-align: middle;
}
+
+th.header {
+ font-weight: normal;
+ background: -moz-linear-gradient(left, #DCDCDC, #8D98A6);
+ background: -webkit-linear-gradient(left, #DCDCDC, #8D98A6);
+ font-size: 16px;
+ color: #616161;
+ text-align: center;
+ vertical-align: middle;
+}
+
.tableheader {
font-weight: normal;
background-color: #cccce5;
@@ -86,6 +97,7 @@
font-family: Arial, Helvetica, sans-serif;
font-size: 100%;
text-align: left;
+ border-radius: 5px;
}
td.select {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-04-28 21:30:46
|
Revision: 8712
http://weberp.svn.sourceforge.net/weberp/?rev=8712&view=rev
Author: tim_schofield
Date: 2012-04-28 21:30:40 +0000 (Sat, 28 Apr 2012)
Log Message:
-----------
Layout improvements, new css and buttons
Modified Paths:
--------------
trunk/TaxAuthorities.php
trunk/css/silverwolf/default.css
Modified: trunk/TaxAuthorities.php
===================================================================
--- trunk/TaxAuthorities.php 2012-04-28 21:30:27 UTC (rev 8711)
+++ trunk/TaxAuthorities.php 2012-04-28 21:30:40 UTC (rev 8712)
@@ -170,7 +170,7 @@
<td>%s</td>
<td><a href="%s&SelectedTaxAuthID=%s">' . _('Edit') . '</a></td>
<td><a href="%s&SelectedTaxAuthID=%s&delete=yes">' . _('Delete') . '</a></td>
- <td><td><a href="%s&TaxAuthority=%s">' . _('Edit Rates') . '</a></td>
+ <td><a href="%s&TaxAuthority=%s">' . _('Edit Rates') . '</a></td>
</tr>',
$myrow['taxid'],
$myrow['description'],
@@ -202,7 +202,7 @@
}
-echo '<br /><form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
+echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($SelectedTaxAuthID)) {
Modified: trunk/css/silverwolf/default.css
===================================================================
--- trunk/css/silverwolf/default.css 2012-04-28 21:30:27 UTC (rev 8711)
+++ trunk/css/silverwolf/default.css 2012-04-28 21:30:40 UTC (rev 8712)
@@ -60,7 +60,8 @@
th {
font-weight: normal;
- background-color: #C3C3C3;
+ background-color: transparent;
+ border: solid #A49999 1px;
font-size: 100%;
color: #300;
text-align: center;
@@ -97,7 +98,7 @@
font-family: Arial, Helvetica, sans-serif;
font-size: 100%;
text-align: left;
- border-radius: 5px;
+ background-color: transparent;
}
td.select {
@@ -110,9 +111,9 @@
background: -webkit-linear-gradient(left, #DCDCDC, #8D98A6);
border: solid #A49999 1px;
border-radius: 5px;
- -moz-box-shadow: 3px 3px 2px #888;
- -webkit-box-shadow: 3px 3px 2px #888;
- box-shadow: 3px 3px 2px #888;
+ -moz-box-shadow: 3px 3px 2px #B1B1B1;
+ -webkit-box-shadow: 3px 3px 2px #B1B1B1;
+ box-shadow: 3px 3px 2px #B1B1B1;
}
td.number {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-04-28 21:31:10
|
Revision: 8714
http://weberp.svn.sourceforge.net/weberp/?rev=8714&view=rev
Author: tim_schofield
Date: 2012-04-28 21:31:04 +0000 (Sat, 28 Apr 2012)
Log Message:
-----------
Layout improvements, new css and buttons
Modified Paths:
--------------
trunk/SuppTransGLAnalysis.php
trunk/css/silverwolf/default.css
Modified: trunk/SuppTransGLAnalysis.php
===================================================================
--- trunk/SuppTransGLAnalysis.php 2012-04-28 21:30:51 UTC (rev 8713)
+++ trunk/SuppTransGLAnalysis.php 2012-04-28 21:31:04 UTC (rev 8714)
@@ -29,7 +29,7 @@
/*If the user hit the Add to transaction button then process this first before showing all GL codes on the transaction otherwise it wouldnt show the latest addition*/
-if (isset($_POST['AddGLCodeToTrans']) and $_POST['AddGLCodeToTrans'] == _('Enter GL Line')){
+if (isset($_POST['AddGLCodeToTrans'])){
$InputError = False;
if ($_POST['GLCode'] == ''){
@@ -194,7 +194,7 @@
</tr>
</table><br />';
-echo '<div class="centre"><input type="submit" name="AddGLCodeToTrans" value="' . _('Enter GL Line') . '" /></div>';
+echo '<div class="centre"><button type="submit" name="AddGLCodeToTrans">' . _('Enter GL Line') . '</button></div>';
echo '</form>';
include('includes/footer.inc');
Modified: trunk/css/silverwolf/default.css
===================================================================
--- trunk/css/silverwolf/default.css 2012-04-28 21:30:51 UTC (rev 8713)
+++ trunk/css/silverwolf/default.css 2012-04-28 21:31:04 UTC (rev 8714)
@@ -78,7 +78,7 @@
}
th.header {
- font-weight: normal;
+ font-weight: bold;
background: -moz-linear-gradient(left, #DCDCDC, #8D98A6);
background: -webkit-linear-gradient(left, #DCDCDC, #8D98A6);
font-size: 16px;
@@ -107,8 +107,8 @@
table.selection {
margin-bottom: 5px;
- background: -moz-linear-gradient(left, #DCDCDC, #8D98A6);
- background: -webkit-linear-gradient(left, #DCDCDC, #8D98A6);
+ background: -moz-linear-gradient(left, #DCDCDC, #9CA4AE);
+ background: -webkit-linear-gradient(left, #DCDCDC, #9CA4AE);
border: solid #A49999 1px;
border-radius: 5px;
-moz-box-shadow: 3px 3px 2px #B1B1B1;
@@ -615,10 +615,12 @@
}
.menu_group_headers {
- background: #B3B3B3;
+ background: transparent;
+ font-weight: bold;
+ border: 1px solid #888;
+ border-radius: 5px;
width: 25%;
vertical-align: top;
- padding: 0 0 2px 0;
}
.menu_group_headers table {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-04-28 21:31:36
|
Revision: 8717
http://weberp.svn.sourceforge.net/weberp/?rev=8717&view=rev
Author: tim_schofield
Date: 2012-04-28 21:31:30 +0000 (Sat, 28 Apr 2012)
Log Message:
-----------
Layout improvements, new css and buttons
Modified Paths:
--------------
trunk/SuppPaymentRun.php
trunk/css/silverwolf/default.css
Modified: trunk/SuppPaymentRun.php
===================================================================
--- trunk/SuppPaymentRun.php 2012-04-28 21:31:20 UTC (rev 8716)
+++ trunk/SuppPaymentRun.php 2012-04-28 21:31:30 UTC (rev 8717)
@@ -353,8 +353,8 @@
echo '<tr><td>' . _('Starting Reference no (eg chq no)') . ':</td>
<td><input type="text" name="Ref" maxlength="11" size="12" value="' . $_POST['Ref'] . '" /></td></tr>';
- echo '</table><br /><div class="centre"><input type="submit" name="PrintPDF" value="' . _('Print PDF Only') . '" />
- <input type="submit" name="PrintPDFAndProcess" value="' . _('Print and Process Payments') . '" /></div>';
+ echo '</table><br /><div class="centre"><button type="submit" name="PrintPDF">' . _('Print PDF Only') . '</button>
+ <button type="submit" name="PrintPDFAndProcess">' . _('Print and Process Payments') . '</button></div>';
include ('includes/footer.inc');
} /*end of else not PrintPDF */
Modified: trunk/css/silverwolf/default.css
===================================================================
--- trunk/css/silverwolf/default.css 2012-04-28 21:31:20 UTC (rev 8716)
+++ trunk/css/silverwolf/default.css 2012-04-28 21:31:30 UTC (rev 8717)
@@ -215,7 +215,7 @@
input {
font-family: Arial, Helvetica, sans-serif;
font-size: 100%;
- background-color: #e3e1e1;
+ background-color: transparent;
border-width:1px;
color:#645959;
border-bottom-color: gray;
@@ -232,15 +232,15 @@
input:hover {
font-family: Arial, Helvetica, sans-serif;
font-size: 100%;
- background-color: #e3e5f5;
+ background-color: transparent;
border-width:1px;
- border-bottom-color: gray;
+ border-bottom-color: black;
border-bottom-style: solid;
- border-top-color: gray;
+ border-top-color: black;
border-top-style: solid;
- border-left-color: gray;
+ border-left-color: black;
border-left-style: solid;
- border-right-color: gray;
+ border-right-color: black;
border-right-style: solid;
border-radius: 3px;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-04-28 21:31:54
|
Revision: 8719
http://weberp.svn.sourceforge.net/weberp/?rev=8719&view=rev
Author: tim_schofield
Date: 2012-04-28 21:31:48 +0000 (Sat, 28 Apr 2012)
Log Message:
-----------
Layout improvements, new css and buttons
Modified Paths:
--------------
trunk/SupplierTypes.php
trunk/css/silverwolf/default.css
Modified: trunk/SupplierTypes.php
===================================================================
--- trunk/SupplierTypes.php 2012-04-28 21:31:39 UTC (rev 8718)
+++ trunk/SupplierTypes.php 2012-04-28 21:31:48 UTC (rev 8719)
@@ -50,7 +50,7 @@
WHERE typename = '" . $_POST['typename'] . "'";
$CheckResult=DB_query($CheckSQL, $db);
- if (DB_num_rows($CheckResult)>0) {
+ if (!isset($_POST['Update']) and DB_num_rows($CheckResult)>0) {
$InputError = 1;
echo prnMsg(_('You already have a supplier type called').' '.$_POST['typename'],'error');
$Errors[$i] = 'SupplierName';
@@ -150,7 +150,7 @@
echo '<table class="selection">';
echo '<br />';
- echo '<tr><th colspan="4"><font size="2" color="#616161">' . _('Supplier Types') . '</th></tr>';
+ echo '<tr><th colspan="4" class="header">' . _('Supplier Types') . '</th></tr>';
echo '<tr>
<th>' . _('Type ID') . '</th>
<th>' . _('Type Name') . '</th>
@@ -193,7 +193,7 @@
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="selection">'; //Main table
- echo '<tr><th colspan="2"><font size="2" color="#616161">' . _('Supplier Type Details') . '</th></tr>';
+ echo '<tr><th colspan="2" class="header">' . _('Supplier Type Details') . '</th></tr>';
// The user wish to EDIT an existing type
if ( isset($_GET['Edit']) ) {
@@ -222,7 +222,7 @@
echo '</table><br />'; // close main table
- echo '<div class="centre"><input type="submit" name="Update" value="' . _('Update') . '" /></div><br />';
+ echo '<div class="centre"><button type="submit" name="Update">' . _('Update') . '</button></div><br />';
} else {
@@ -233,7 +233,7 @@
echo '</table><br />'; // close main table
- echo '<div class="centre"><input type="submit" name="Submit" value="' . _('Insert') . '" /></div><br />';
+ echo '<div class="centre"><button type="submit" name="Submit">' . _('Insert') . '</button></div><br />';
}
echo '</form>';
Modified: trunk/css/silverwolf/default.css
===================================================================
--- trunk/css/silverwolf/default.css 2012-04-28 21:31:39 UTC (rev 8718)
+++ trunk/css/silverwolf/default.css 2012-04-28 21:31:48 UTC (rev 8719)
@@ -78,7 +78,7 @@
}
th.header {
- font-weight: bold;
+ font-weight: normal;
background: -moz-linear-gradient(left, #DCDCDC, #8D98A6);
background: -webkit-linear-gradient(left, #DCDCDC, #8D98A6);
font-size: 16px;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-04-28 21:32:13
|
Revision: 8721
http://weberp.svn.sourceforge.net/weberp/?rev=8721&view=rev
Author: tim_schofield
Date: 2012-04-28 21:32:07 +0000 (Sat, 28 Apr 2012)
Log Message:
-----------
Layout improvements, new css and buttons
Modified Paths:
--------------
trunk/SupplierTenderCreate.php
trunk/SupplierTenders.php
Modified: trunk/SupplierTenderCreate.php
===================================================================
--- trunk/SupplierTenderCreate.php 2012-04-28 21:31:57 UTC (rev 8720)
+++ trunk/SupplierTenderCreate.php 2012-04-28 21:32:07 UTC (rev 8721)
@@ -229,7 +229,7 @@
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="selection">';
echo '<tr>
- <th colspan="4"><font size="3" color="#616161">' . _('Tender header details') . '</font></th>
+ <th colspan="4" class="header">' . _('Tender header details') . '</th>
</tr>';
echo '<tr>
<td>' . _('Delivery Must Be Made Before') . '</td>
@@ -336,7 +336,7 @@
}
echo '</select>
- <input type="submit" name="LookupDeliveryAddress" value="' ._('Select') . '" /></td>
+ <button type="submit" name="LookupDeliveryAddress">' ._('Select') . '</button></td>
</tr>';
/* Display the details of the delivery location
@@ -385,7 +385,7 @@
<td valign="top">
<table class="selection">';
echo '<tr>
- <th colspan="4"><font size="3" color="#616161">' . _('Suppliers To Send Tender') . '</font></th>
+ <th colspan="4" class="header">' . _('Suppliers To Send Tender') . '</th>
</tr>';
echo '<tr>
<th>'. _('Supplier Code') . '</th>
@@ -404,7 +404,7 @@
/* Item Details
*/
echo '<td valign="top"><table class="selection">';
- echo '<tr><th colspan="6"><font size="3" color="#616161">' . _('Items in Tender') . '</font></th></tr>';
+ echo '<tr><th colspan="6" class="header">' . _('Items in Tender') . '</th></tr>';
echo '<tr>
<th>'._('Stock ID').'</th>
<th>'._('Description').'</th>
@@ -433,15 +433,15 @@
echo '</table></td></tr></table><br />';
echo '<div class="centre">
- <input type="submit" name="Suppliers" value="' . _('Select Suppliers') . '" />
- <input type="submit" name="Items" value="' . _('Select Item Details') . '" />
+ <button type="submit" name="Suppliers">' . _('Select Suppliers') . '</button>
+ <button type="submit" name="Items">' . _('Select Item Details') . '</button>
</div>
<br />';
if ($_SESSION['tender'.$identifier]->LinesOnTender > 0
and $_SESSION['tender'.$identifier]->SuppliersOnTender > 0) {
echo '<div class="centre">
- <input type="submit" name="Save" value="' . _('Save Tender') . '" />
+ <button type="submit" name="Save">' . _('Save Tender') . '</button>
</div>';
}
echo '</form>';
@@ -533,7 +533,7 @@
} else {
echo '<input type="text" name="SupplierCode" size="15" maxlength="18" />';
}
- echo '</td></tr></table><br /><div class="centre"><input type="submit" name="SearchSupplier" value="' . _('Search Now') . '" /></div>';
+ echo '</td></tr></table><br /><div class="centre"><button type="submit" name="SearchSupplier">' . _('Search Now') . '</button></div>';
echo '</form>';
}
@@ -565,16 +565,14 @@
$ListPage++;
}
echo '</select>
- <input type="submit" name="Go" value="' . _('Go') . '" />
- <input type="submit" name="Previous" value="' . _('Previous') . '" />
- <input type="submit" name="Next" value="' . _('Next') . '" />';
+ <button type="submit" name="Go">' . _('Go') . '</button>
+ <button type="submit" name="Previous">' . _('Previous') . '</button>
+ <button type="submit" name="Next">' . _('Next') . '</button>';
echo '<br />';
}
echo '<input type="hidden" name="Search" value="' . _('Search Now') . '" />';
echo '<br />
- <br />
- <br />
- <table cellpadding="2" colspan="7">';
+ <table cellpadding="2" colspan="7" class="selection">';
echo '<tr>
<th>' . _('Code') . '</th>
<th>' . _('Supplier Name') . '</th>
@@ -598,7 +596,7 @@
echo '<tr class="OddTableRows">';
$k = 1;
}
- echo '<td><input type="submit" name="SelectedSupplier" value="'.$myrow['supplierid'].'" /></td>
+ echo '<td><button type="submit" name="SelectedSupplier" value="'.$myrow['supplierid'].'" />'.$myrow['supplierid'].'</button></td>
<td>'.$myrow['suppname'].'</td>
<td>'.$myrow['currcode'].'</td>
<td>'.$myrow['address1'].'</td>
@@ -671,7 +669,7 @@
</table>
<br />
<div class="centre">
- <input type="submit" name="Search" value="' . _('Search Now') . '" />
+ <button type="submit" name="Search">' . _('Search Now') . '</button>
</div>
<br />
</form>';
@@ -803,7 +801,7 @@
if (isset($SearchResult)) {
- echo '<table cellpadding="1">';
+ echo '<table cellpadding="1" class="selection">';
echo '<tr>
<th>' . _('Code') . '</th>
<th>' . _('Description') . '</th>
@@ -852,7 +850,7 @@
echo '<a name="end"></a>
<br />
<div class="centre">
- <input type="submit" name="NewItem" value="' . _('Add to Tender') . '" />
+ <button type="submit" name="NewItem">' . _('Add to Tender') . '</button>
</div>';
}#end if SearchResults to show
Modified: trunk/SupplierTenders.php
===================================================================
--- trunk/SupplierTenders.php 2012-04-28 21:31:57 UTC (rev 8720)
+++ trunk/SupplierTenders.php 2012-04-28 21:32:07 UTC (rev 8721)
@@ -132,8 +132,8 @@
echo '<td>' . $LineItem->ExpiryDate . '</td>';
}
echo '</table><br />';
- echo '<div class="centre"><input type="submit" name="Confirm" value="' . _('Confirm and Send Email') . '" /><br />';
- echo '<br /><input type="submit" name="Cancel" value="' . _('Cancel Offer') . '" /></div>';
+ echo '<div class="centre"><button type="submit" name="Confirm">' . _('Confirm and Send Email') . '</button><br />';
+ echo '<button type="submit" name="Cancel">' . _('Cancel Offer') . '</button></div>';
echo '</form>';
include('includes/footer.inc');
exit;
@@ -157,7 +157,7 @@
echo '<option value="3">'._('View any open tenders without an offer from').' '.$Supplier .'</option>';
echo '</select></td></tr>';
echo '<input type="hidden" name="SupplierID" value="'.$_POST['SupplierID'].'" />';
- echo '<tr><td colspan="2"><div class="centre"><input type="submit" name="submit" value="' . _('Select') . '" /></div></td></tr>';
+ echo '<tr><td colspan="2"><div class="centre"><button type="submit" name="submit">' . _('Select') . '</button></div></td></tr>';
echo '</table></form>';
}
@@ -298,7 +298,7 @@
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'].'?identifier='.$identifier) . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/supplier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Items to offer from').' '.$Supplier .'</p>';
- echo '<table>';
+ echo '<table class="selection">';
echo '<tr>
<th>'._('Stock ID').'</th>
<th>'._('Description').'</th>
@@ -336,11 +336,11 @@
echo '</table>';
echo '<input type="hidden" name="TenderType" value="'.$_POST['TenderType'].'" />';
if ($_POST['TenderType']==1) {
- echo '<br /><div class="centre"><input type="submit" name="Update" value="Update offer" />';
- echo '<input type="submit" name="Refresh" value="Refresh screen" /></div>';
+ echo '<br /><div class="centre"><button type="submit" name="Update">' . _('Update offer') . '</button>';
+ echo '<button type="submit" name="Refresh">' . _('Refresh screen') . '</button></div>';
} else if ($_POST['TenderType']==2) {
- echo '<br /><div class="centre"><input type="submit" name="Save" value="Save offer">';
- echo '<input type="submit" name="Refresh" value="Refresh screen" /></div>';
+ echo '<br /><div class="centre"><button type="submit" name="Save">' . _('Save offer') . '</button>';
+ echo '<button type="submit" name="Refresh">' . _('Refresh screen') . '</button></div>';
}
echo '</form>';
}
@@ -356,9 +356,9 @@
echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Search for Inventory Items') . '</p>';
$sql = "SELECT categoryid,
- categorydescription
- FROM stockcategory
- ORDER BY categorydescription";
+ categorydescription
+ FROM stockcategory
+ ORDER BY categorydescription";
$result = DB_query($sql, $db);
if (DB_num_rows($result) == 0) {
@@ -403,7 +403,7 @@
echo '<input type="text" name="StockCode" size="15" maxlength="18" />';
}
echo '</td></tr></table><br />';
- echo '<div class="centre"><input type="submit" name="Search" value="' . _('Search Now') . '" /></div><br /></form>';
+ echo '<div class="centre"><button type="submit" name="Search">' . _('Search Now') . '</button></div><br /></form>';
echo '<script type="text/javascript">defaultControl(document.forms[0].StockCode);</script>';
echo '</form>';
}
@@ -455,7 +455,7 @@
echo '</td>';
echo '<th colspan="8" style="vertical-align:top"><font size="2" color="#616161">' . _('Tender Number') . ': ' .$myrow['tenderid'] . '</font></th>';
echo '<input type="hidden" value="' . $myrow['tenderid'] . '" name="Tender" />';
- echo '<th><input type="submit" value="' . _('Process') . "\n" . _('Tender') . '" name="Process" /></th></tr>';
+ echo '<th><button type="submit" value="" name="Process">' . _('Process') . "\n" . _('Tender') . '</button></th></tr>';
$ItemSQL="SELECT tenderitems.tenderid,
tenderitems.stockid,
stockmaster.description,
@@ -625,7 +625,7 @@
if (isset($SearchResult)) {
- echo '<table cellpadding="1">';
+ echo '<table cellpadding="1" class="selection">';
$tableheader = '<tr>
<th>' . _('Code') . '</th>
@@ -704,7 +704,7 @@
prnMsg( _('Only the first') . ' ' . $Maximum_Number_Of_Parts_To_Show . ' ' . _('can be displayed') . '. ' .
_('Please restrict your search to only the parts required'),'info');
}
- echo '<a name="end"></a><br /><div class="centre"><input type="submit" name="NewItem" value="Add to Offer" /></div>';
+ echo '<a name="end"></a><br /><div class="centre"><button type="submit" name="NewItem" value="" />' . _('Add to Offer') . '</button></div>';
}#end if SearchResults to show
echo '<input type="hidden" name="TenderType" value="'.$_POST['TenderType'].'" />';
echo '<input type="hidden" name="SupplierID" value="'.$_POST['SupplierID'].'" />';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-04-29 19:19:57
|
Revision: 8725
http://weberp.svn.sourceforge.net/weberp/?rev=8725&view=rev
Author: tim_schofield
Date: 2012-04-29 19:19:51 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
Layout improvements, new css and buttons
Modified Paths:
--------------
trunk/PDFPriceList.php
trunk/css/silverwolf/default.css
Modified: trunk/PDFPriceList.php
===================================================================
--- trunk/PDFPriceList.php 2012-04-28 21:32:33 UTC (rev 8724)
+++ trunk/PDFPriceList.php 2012-04-29 19:19:51 UTC (rev 8725)
@@ -299,7 +299,7 @@
<td><input type="text" size="11" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="EffectiveDate" value="' . Date($_SESSION['DefaultDateFormat']) . '" /></td>
</tr>';
- echo '</table><br /><div class="centre"><input type="submit" name="PrintPDF" value="'. _('Print PDF'). '" /></div>';
+ echo '</table><br /><div class="centre"><button type="submit" name="PrintPDF">'. _('Print PDF'). '</button></div>';
}
include('includes/footer.inc');
Modified: trunk/css/silverwolf/default.css
===================================================================
--- trunk/css/silverwolf/default.css 2012-04-28 21:32:33 UTC (rev 8724)
+++ trunk/css/silverwolf/default.css 2012-04-29 19:19:51 UTC (rev 8725)
@@ -279,6 +279,19 @@
select {
font-family: Arial, Helvetica, sans-serif;
font-size: 100%;
+ background: transparent;
+ border-width: 1px;
+ border-bottom-color: gray;
+ border-bottom-style: solid;
+ border-top-color: gray;
+ border-top-style: solid;
+ border-left-color: gray;
+ border-left-style: solid;
+ border-right-color: gray;
+ border-right-style: solid;
+ -webkit-border-radius: .5em;
+ -moz-border-radius: .5em;
+ border-radius: .5em;
}
font.good {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-04-29 19:20:22
|
Revision: 8727
http://weberp.svn.sourceforge.net/weberp/?rev=8727&view=rev
Author: tim_schofield
Date: 2012-04-29 19:20:15 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
Layout improvements, new css and buttons
Modified Paths:
--------------
trunk/SelectSupplier.php
trunk/css/silverwolf/default.css
Modified: trunk/SelectSupplier.php
===================================================================
--- trunk/SelectSupplier.php 2012-04-29 19:20:04 UTC (rev 8726)
+++ trunk/SelectSupplier.php 2012-04-29 19:20:15 UTC (rev 8727)
@@ -145,11 +145,11 @@
echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/supplier.png" title="' . _('Supplier') . '" alt="" />' . ' ' . _('Supplier') . ' : <b>' . stripslashes($_SESSION['SupplierID']) .
' - ' . $SupplierName . '</b> ' . _('has been selected') . '.</p>';
echo '<div class="page_help_text">' . _('Select a menu option to operate using this supplier.') . '</div>';
- echo '<br /><table width=90% cellpadding="4">';
+ echo '<br /><table width=90% cellpadding="4" class="selection">';
echo '<tr>
- <th width="33%">' . _('Supplier Inquiries') . '</th>
- <th width="33%">' . _('Supplier Transactions') . '</th>
- <th width="33%">' . _('Supplier Maintenance') . '</th>
+ <th width="33%" class="header">' . _('Supplier Inquiries') . '</th>
+ <th width="33%" class="header">' . _('Supplier Transactions') . '</th>
+ <th width="33%" class="header">' . _('Supplier Maintenance') . '</th>
</tr>';
echo '<tr><td valign="top" class="select">'; /* Inquiry Options */
echo '<a href="' . $rootpath . '/SupplierInquiry.php?SupplierID=' . stripslashes($_SESSION['SupplierID']) . '">' . _('Supplier Account Inquiry') . '</a><br />';
@@ -179,11 +179,11 @@
} else {
// Supplier is not selected yet
echo '<br />';
- echo '<table width="90%" cellpadding="4">';
+ echo '<table width="90%" cellpadding="4" class="selection">';
echo '<tr>
- <th width="33%">' . _('Supplier Inquiries') . '</th>
- <th width="33%">' . _('Supplier Transactions') . '</th>
- <th width="33%">' . _('Supplier Maintenance') . '</th>
+ <th width="33%" class="header">' . _('Supplier Inquiries') . '</th>
+ <th width="33%" class="header">' . _('Supplier Transactions') . '</th>
+ <th width="33%" class="header">' . _('Supplier Maintenance') . '</th>
</tr>';
echo '<tr><td valign=top class="select">'; /* Inquiry Options */
echo '</td><td valign=top class="select">'; /* Supplier Transactions */
@@ -206,7 +206,7 @@
} else {
echo '<input type="text" name="SupplierCode" size="15" maxlength="18" />';
}
-echo '</td></tr></table><br /><div class="centre"><input type="submit" name="Search" value="' . _('Search Now') . '" /></div>';
+echo '</td></tr></table><br /><div class="centre"><button type="submit" name="Search">' . _('Search Now') . '</button></div>';
//if (isset($result) AND !isset($SingleSupplierReturned)) {
if (isset($_POST['Search'])) {
$ListCount = DB_num_rows($result);
@@ -234,14 +234,14 @@
$ListPage++;
}
echo '</select>
- <input type="submit" name="Go" value="' . _('Go') . '" />
- <input type="submit" name="Previous" value="' . _('Previous') . '" />
- <input type="submit" name="Next" value="' . _('Next') . '" />';
+ <button type="submit" name="Go">' . _('Go') . '</button>
+ <button type="submit" name="Previous">' . _('Previous') . '</button>
+ <button type="submit" name="Next">' . _('Next') . '</button>';
echo '<br />';
}
echo '<input type="hidden" name="Search" value="' . _('Search Now') . '" />';
echo '<br /><br />';
- echo '<br /><table cellpadding="2">';
+ echo '<br /><table cellpadding="2" class="selection">';
$tableheader = '<tr>
<th>' . _('Code') . '</th>
<th>' . _('Supplier Name') . '</th>
@@ -266,7 +266,7 @@
echo '<tr class="OddTableRows">';
$k = 1;
}
- echo '<td><input type="submit" name="Select" value="'.DB_escape_string($myrow['supplierid']).'" /></td>
+ echo '<td><button type="submit" name="Select" value="'.DB_escape_string($myrow['supplierid']).'">'.DB_escape_string($myrow['supplierid']).'</button></td>
<td>'.$myrow['suppname'].'</td>
<td>'.$myrow['currcode'].'</td>
<td>'.$myrow['address1'].'</td>
@@ -294,9 +294,9 @@
$ListPage++;
}
echo '</select>
- <input type="submit" name="Go" value="' . _('Go') . '" />
- <input type="submit" name="Previous" value="' . _('Previous') . '" />
- <input type="submit" name="Next" value="' . _('Next') . '" />';
+ <button type="submit" name="Go">' . _('Go') . '</button>
+ <button type="submit" name="Previous">' . _('Previous') . '</button>
+ <button type="submit" name="Next">' . _('Next') . '</button>';
echo '<br />';
}
echo '</form>';
@@ -309,7 +309,7 @@
} else {
echo '<div class="centre"><br />';
echo '<tr><td colspan="2">';
- echo '<table width="45%" border="2" cellpadding="4">';
+ echo '<table width="45%" class="selection" cellpadding="4">';
echo '<tr><th width="33%">' . _('Supplier Mapping') . '</th></tr>';
echo '</td><td valign="top">'; /* Mapping */
echo '<div class="centre">' . _('Mapping is enabled, Map will display below.') . '</div>';
@@ -336,8 +336,8 @@
$row = DB_fetch_array($Total1Result);
echo '<br />';
echo '<tr><td colspan="2">';
- echo '<table width="45%" cellpadding="4">';
- echo '<tr><th width="33%" colspan="2">' . _('Supplier Data') . '</th></tr>';
+ echo '<table width="45%" cellpadding="4" class="selection">';
+ echo '<tr><th width="33%" colspan="2" class="header">' . _('Supplier Data') . '</th></tr>';
echo '<tr><td valign="top" class="select">'; /* Supplier Data */
//echo "Distance to this Supplier: <b>TBA</b><br />";
if ($myrow['lastpaiddate'] == 0) {
Modified: trunk/css/silverwolf/default.css
===================================================================
--- trunk/css/silverwolf/default.css 2012-04-29 19:20:04 UTC (rev 8726)
+++ trunk/css/silverwolf/default.css 2012-04-29 19:20:15 UTC (rev 8727)
@@ -79,8 +79,9 @@
th.header {
font-weight: normal;
- background: -moz-linear-gradient(left, #DCDCDC, #8D98A6);
- background: -webkit-linear-gradient(left, #DCDCDC, #8D98A6);
+ background: transparent;
+ border: solid #A49999 1px;
+ border-radius: 5px;
font-size: 16px;
color: #616161;
text-align: center;
@@ -102,7 +103,9 @@
}
td.select {
- background-color:#eee;
+ background-color:transparent;
+ border: solid #A49999 1px;
+ border-radius: 5px;
}
table.selection {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-04-29 19:20:42
|
Revision: 8729
http://weberp.svn.sourceforge.net/weberp/?rev=8729&view=rev
Author: tim_schofield
Date: 2012-04-29 19:20:36 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
Layout improvements, new css and buttons
Modified Paths:
--------------
trunk/SupplierCredit.php
trunk/css/silverwolf/default.css
Modified: trunk/SupplierCredit.php
===================================================================
--- trunk/SupplierCredit.php 2012-04-29 19:20:25 UTC (rev 8728)
+++ trunk/SupplierCredit.php 2012-04-29 19:20:36 UTC (rev 8729)
@@ -207,7 +207,7 @@
}
}
-if (isset($_POST['GRNS']) and $_POST['GRNS'] == _('Purchase Orders')){
+if (isset($_POST['GRNS'])){
/*This ensures that any changes in the page are stored in the session before calling the grn page */
@@ -231,7 +231,7 @@
include('includes/footer.inc');
exit;
}
-if (isset($_POST['GL']) and $_POST['GL'] == _('General Ledger')){
+if (isset($_POST['GL'])){
/*This ensures that any changes in the page are stored in the session before calling the shipments page */
@@ -243,7 +243,7 @@
include('includes/footer.inc');
exit;
}
-if (isset($_POST['Contracts']) and $_POST['Contracts'] == _('Contracts')){
+if (isset($_POST['Contracts'])){
/*This ensures that any changes in the page are stored in the session before calling the shipments page */
echo '<meta http-equiv="refresh" content="0; url=' . $rootpath . '/SuppContractChgs.php?">';
echo '<div class="centre">' . _('You should automatically be forwarded to the entry of supplier credit notes against contracts page') .
@@ -251,7 +251,7 @@
'<a href="' . $rootpath . '/SuppContractChgs.php?">' . _('click here') . '</a> ' . _('to continue') . '.</div><br />';
exit;
}
-if (isset($_POST['FixedAssets']) and $_POST['FixedAssets'] == _('Fixed Assets')){
+if (isset($_POST['FixedAssets'])){
/*This ensures that any changes in the page are stored in the session before calling the shipments page */
echo '<meta http-equiv="refresh" content="0; url=' . $rootpath . '/SuppFixedAssetChgs.php?">';
echo '<div class="centre">' . _('You should automatically be forwarded to the entry of invoices against fixed assets page') .
@@ -292,13 +292,13 @@
<td><input type="text" class="number" size="11" maxlength="10" name="ExRate" value="' . locale_money_format($_SESSION['SuppTrans']->ExRate, $_SESSION['SuppTrans']->CurrCode) . '" /></td></tr>';
echo '</table>';
-echo '<br /><div class="centre"><input type="submit" name="GRNS" value="' . _('Purchase Orders') . '" /> ';
-echo '<input type="submit" name="Shipts" value="' . _('Shipments') . '" /> ';
-echo '<input type="submit" name="Contracts" value="' . _('Contracts') . '" /> ';
+echo '<br /><div class="centre"><button type="submit" name="GRNS">' . _('Purchase Orders') . '</button>';
+echo '<button type="submit" name="Shipts">' . _('Shipments') . '</button>';
+echo '<button type="submit" name="Contracts">' . _('Contracts') . '</button>';
if ( $_SESSION['SuppTrans']->GLLink_Creditors ==1){
- echo '<input type="submit" name="GL" value="' . _('General Ledger') . '" /> ';
+ echo '<button type="submit" name="GL">' . _('General Ledger') . '</button>';
}
-echo '<input type="submit" name="FixedAssets" value="' . _('Fixed Assets') . '" /></div>';
+echo '<button type="submit" name="FixedAssets">' . _('Fixed Assets') . '</button></div>';
echo '<br />';
if (count($_SESSION['SuppTrans']->GRNs)>0){ /*if there are some GRNs selected for crediting then */
@@ -497,7 +497,7 @@
}
echo '<tr>
- <td colspan="2"><input type="submit" name="ToggleTaxMethod" value="' . _('Change Tax Calculation Method') . '" /></td>
+ <td colspan="2"><button type="submit" name="ToggleTaxMethod">' . _('Change Tax Calculation Method') . '</button></td>
<td><select name="OverRideTax" onChange="ReloadForm(form1.ToggleTaxMethod)">';
if ($_POST['OverRideTax']=='Man'){
@@ -566,7 +566,7 @@
echo '<table class="selection"><tr><td><font color="red">' . _('Comments') . '</font></td><td><textarea name="Comments" cols="40" rows="2">' .
$_SESSION['SuppTrans']->Comments . '</textarea></td></tr></table>';
-echo '<p><div class="centre"><input type="submit" name="PostCreditNote" value="' . _('Enter Credit Note') . '" /></div></p>';
+echo '<p><div class="centre"><button type="submit" name="PostCreditNote">' . _('Enter Credit Note') . '</button></div></p>';
if (isset($_POST['PostCreditNote'])){
Modified: trunk/css/silverwolf/default.css
===================================================================
--- trunk/css/silverwolf/default.css 2012-04-29 19:20:25 UTC (rev 8728)
+++ trunk/css/silverwolf/default.css 2012-04-29 19:20:36 UTC (rev 8729)
@@ -62,6 +62,7 @@
font-weight: normal;
background-color: transparent;
border: solid #A49999 1px;
+ border-radius: 5px;
font-size: 100%;
color: #300;
text-align: center;
@@ -71,6 +72,7 @@
th.number {
font-weight: normal;
background-color: #cccce5;
+ border-radius: 5px;
font-size: 100%;
color: #300;
text-align: right;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-04-29 19:21:11
|
Revision: 8732
http://weberp.svn.sourceforge.net/weberp/?rev=8732&view=rev
Author: tim_schofield
Date: 2012-04-29 19:21:05 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
Layout improvements, new css and buttons
Modified Paths:
--------------
trunk/SupplierAllocations.php
trunk/css/silverwolf/default.css
Modified: trunk/SupplierAllocations.php
===================================================================
--- trunk/SupplierAllocations.php 2012-04-29 19:20:54 UTC (rev 8731)
+++ trunk/SupplierAllocations.php 2012-04-29 19:21:05 UTC (rev 8732)
@@ -528,8 +528,8 @@
echo '<div class="centre"><input type="hidden" name="TotalNumberOfAllocs" value="' . $Counter . '" />';
- echo '<br /><input type="submit" name="RefreshAllocTotal" value="' . _('Recalculate Total To Allocate') . '" />';
- echo '<input type="submit" name="UpdateDatabase" value="' . _('Process Allocations') . '" /></div>';
+ echo '<br /><button type="submit" name="RefreshAllocTotal">' . _('Recalculate Total To Allocate') . '</button>';
+ echo '<button type="submit" name="UpdateDatabase">' . _('Process Allocations') . '</button></div></button>';
} elseif(isset($_GET['SupplierID'])){
Modified: trunk/css/silverwolf/default.css
===================================================================
--- trunk/css/silverwolf/default.css 2012-04-29 19:20:54 UTC (rev 8731)
+++ trunk/css/silverwolf/default.css 2012-04-29 19:21:05 UTC (rev 8732)
@@ -677,6 +677,8 @@
font-size: 150%;
color: white;
background-color: #7A7A89;
+ background: -moz-linear-gradient(left, #C3C0C0, #7A7A89);
+ background: -webkit-linear-gradient(left, #C3C0C0, #7A7A89);
width: 33%;
border-style: solid;
border-width: 1px;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-04-29 19:21:22
|
Revision: 8733
http://weberp.svn.sourceforge.net/weberp/?rev=8733&view=rev
Author: tim_schofield
Date: 2012-04-29 19:21:15 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
Layout improvements, new css and buttons
Modified Paths:
--------------
trunk/SuppInvGRNs.php
trunk/SupplierInvoice.php
Modified: trunk/SuppInvGRNs.php
===================================================================
--- trunk/SuppInvGRNs.php 2012-04-29 19:21:05 UTC (rev 8732)
+++ trunk/SuppInvGRNs.php 2012-04-29 19:21:15 UTC (rev 8733)
@@ -111,9 +111,9 @@
/*Show all the selected GRNs so far from the SESSION['SuppTrans']->GRNs array */
echo '<table cellpadding="1" class="selection">';
-echo '<tr><th colspan="6"><font size="3" color="#616161">' . _('Invoiced Goods Received Selected') . '</font></th></tr>';
+echo '<tr><th colspan="8" class="header">' . _('Invoiced Goods Received Selected') . '</th></tr>';
-$tableheader = '<tr bgcolor="#800000">
+$tableheader = '<tr>
<th>' . _('Sequence') . ' #</th>
<th>' . _('Item Code') . '</th>
<th>' . _('Description') . '</th>
@@ -262,7 +262,7 @@
echo '<input type="hidden" name="ShiptRef" value="' . $GRNTmp->ShiptRef . '" />';
// }
- echo '<div class="centre"><p><input type="submit" name="ModifyGRN" value="' . _('Modify Line') . '" /></p></div>';
+ echo '<div class="centre"><p><button type="submit" name="ModifyGRN">' . _('Modify Line') . '</button></p></div>';
echo '<input type="hidden" name="GRNNumber" value="' . $GRNTmp->GRNNo . '" />';
echo '<input type="hidden" name="ItemCode" value="' . $GRNTmp->ItemCode . '" />';
@@ -279,9 +279,9 @@
} else {
if (count( $_SESSION['SuppTransTmp']->GRNs)>0){ /*if there are any outstanding GRNs then */
echo '<table cellpadding="1" class="selection">';
- echo '<tr><th colspan="10"><font size="3" color="#616161">' . _('Goods Received Yet to be Invoiced From') . ' ' . $_SESSION['SuppTrans']->SupplierName.'</font></th></tr>';
+ echo '<tr><th colspan="10" class="header">' . _('Goods Received Yet to be Invoiced From') . ' ' . $_SESSION['SuppTrans']->SupplierName.'</th></tr>';
- $tableheader = '<tr bgcolor=#800000><th>' . _('Select') . '</th>
+ $tableheader = '<tr><th>' . _('Select') . '</th>
<th>' . _('Sequence') . ' #</th>
<th>' . _('Order') . '</th>
<th>' . _('Item Code') . '</th>
@@ -301,7 +301,7 @@
if (isset($POs[$GRNTmp->PONo]) and $POs[$GRNTmp->PONo] != $GRNTmp->PONo) {
$POs[$GRNTmp->PONo] = $GRNTmp->PONo;
- echo '<tr><td><input type="submit" name="AddPOToTrans" value="' . $GRNTmp->PONo . '" /></td><td colspan="3" />' . _('Add Whole PO to Invoice') . '</td></tr>';
+ echo '<tr><td><button type="submit" name="AddPOToTrans" value="' . $GRNTmp->PONo . '" />' . $GRNTmp->PONo . '</button></td><td colspan="3" />' . _('Add Whole PO to Invoice') . '</td></tr>';
}
if (isset($_POST['SelectAll'])) {
echo '<tr><td><input type="checkbox" checked name="GRNNo_' . $GRNTmp->GRNNo . '" /></td>';
@@ -320,9 +320,9 @@
</tr>';
}
echo '</table>';
- echo '<br /><div class="centre"><input type="submit" name="SelectAll" value="' . _('Select All') . '" />';
- echo '<input type="submit" name="DeSelectAll" value="' . _('Deselect All') . '" />';
- echo '<br /><input type="submit" name="AddGRNToTrans" value="' . _('Add to Invoice') . '" /></div>';
+ echo '<br /><div class="centre"><button type="submit" name="SelectAll">' . _('Select All') . '</button>';
+ echo '<button type="submit" name="DeSelectAll">' . _('Deselect All') . '</button>';
+ echo '<br /><button type="submit" name="AddGRNToTrans">' . _('Add to Invoice') . '</button></div>';
}
}
Modified: trunk/SupplierInvoice.php
===================================================================
--- trunk/SupplierInvoice.php 2012-04-29 19:21:05 UTC (rev 8732)
+++ trunk/SupplierInvoice.php 2012-04-29 19:21:15 UTC (rev 8733)
@@ -181,7 +181,7 @@
if (!isset($_POST['PostInvoice'])){
- if (isset($_POST['GRNS']) and $_POST['GRNS'] == _('Purchase Orders')){
+ if (isset($_POST['GRNS'])){
/*This ensures that any changes in the page are stored in the session before calling the grn page */
echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/SuppInvGRNs.php">';
echo '<div class="centre">' . _('You should automatically be forwarded to the entry of invoices against goods received page') .
@@ -189,7 +189,7 @@
'<a href="' . $rootpath . '/SuppInvGRNs.php">' . _('click here') . '</a> ' . _('to continue') . '</div><br />';
exit;
}
- if (isset($_POST['Shipts']) AND $_POST['Shipts'] == _('Shipments')){
+ if (isset($_POST['Shipts'])){
/*This ensures that any changes in the page are stored in the session before calling the shipments page */
echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/SuppShiptChgs.php">';
echo '<div class="centre">' . _('You should automatically be forwarded to the entry of invoices against shipments page') .
@@ -197,7 +197,7 @@
'<a href="' . $rootpath . '/SuppShiptChgs.php">' . _('click here') . '</a> ' . _('to continue') . '.</div><br />';
exit;
}
- if (isset($_POST['GL']) AND $_POST['GL'] == _('General Ledger')){
+ if (isset($_POST['GL'])){
/*This ensures that any changes in the page are stored in the session before calling the shipments page */
echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/SuppTransGLAnalysis.php">';
echo '<div class="centre">' . _('You should automatically be forwarded to the entry of invoices against the general ledger page') .
@@ -205,7 +205,7 @@
'<a href="' . $rootpath . '/SuppTransGLAnalysis.php">' . _('click here') . '</a> ' . _('to continue') . '.</div><br />';
exit;
}
- if (isset($_POST['Contracts']) AND $_POST['Contracts'] == _('Contracts')){
+ if (isset($_POST['Contracts'])){
/*This ensures that any changes in the page are stored in the session before calling the shipments page */
echo '<meta http-equiv="refresh" content="0; url=' . $rootpath . '/SuppContractChgs.php">';
echo '<div class="centre">' . _('You should automatically be forwarded to the entry of invoices against contracts page') .
@@ -213,7 +213,7 @@
'<a href="' . $rootpath . '/SuppContractChgs.php">' . _('click here') . '</a> ' . _('to continue') . '.</div><br />';
exit;
}
- if (isset($_POST['FixedAssets']) AND $_POST['FixedAssets'] == _('Fixed Assets')){
+ if (isset($_POST['FixedAssets'])){
/*This ensures that any changes in the page are stored in the session before calling the shipments page */
echo '<meta http-equiv="refresh" content="0; url=' . $rootpath . '/SuppFixedAssetChgs.php">';
echo '<DIV class="centre">' . _('You should automatically be forwarded to the entry of invoice amounts against fixed assets page') .
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-04-29 19:21:35
|
Revision: 8734
http://weberp.svn.sourceforge.net/weberp/?rev=8734&view=rev
Author: tim_schofield
Date: 2012-04-29 19:21:28 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
Layout improvements, new css and buttons
Modified Paths:
--------------
trunk/SuppFixedAssetChgs.php
trunk/SupplierInvoice.php
Modified: trunk/SuppFixedAssetChgs.php
===================================================================
--- trunk/SuppFixedAssetChgs.php 2012-04-29 19:21:15 UTC (rev 8733)
+++ trunk/SuppFixedAssetChgs.php 2012-04-29 19:21:28 UTC (rev 8734)
@@ -22,7 +22,9 @@
/*It all stops here if there aint no supplier selected and invoice/credit initiated ie $_SESSION['SuppTrans'] started off*/
}
-$_POST['Amount'] = filter_currency_input($_POST['Amount']);
+if (isset($_POST['Amount'])) {
+ $_POST['Amount'] = filter_currency_input($_POST['Amount']);
+}
if (isset($_POST['AddAssetToInvoice'])){
@@ -141,7 +143,7 @@
<td><input type="text" class="number" name="Amount" size="12" maxlength="11" value="' . locale_money_format($_POST['Amount'], $_SESSION['SuppTrans']->CurrCode) . '" /></td></tr>';
echo '</table>';
-echo '<br /><div class="centre"><input type="submit" name="AddAssetToInvoice" value="' . _('Enter Fixed Asset') . '" /></div>';
+echo '<br /><div class="centre"><button type="submit" name="AddAssetToInvoice">' . _('Enter Fixed Asset') . '</button></div>';
echo '</form>';
include('includes/footer.inc');
Modified: trunk/SupplierInvoice.php
===================================================================
--- trunk/SupplierInvoice.php 2012-04-29 19:21:15 UTC (rev 8733)
+++ trunk/SupplierInvoice.php 2012-04-29 19:21:28 UTC (rev 8734)
@@ -275,7 +275,7 @@
echo '<br /><table cellpadding="2" class="selection">
<tr><th colspan="6">' . _('Purchase Order Charges') . '</th></tr>';
- $tableheader = '<tr bgcolor=#800000>
+ $tableheader = '<tr>
<th>' . _('Seq') . ' #</th>
<th>' . _('Item Code') . '</th>
<th>' . _('Description') . '</th>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-04-29 19:21:44
|
Revision: 8735
http://weberp.svn.sourceforge.net/weberp/?rev=8735&view=rev
Author: tim_schofield
Date: 2012-04-29 19:21:38 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
Layout improvements, new css and buttons
Modified Paths:
--------------
trunk/SuppCreditGRNs.php
trunk/css/silverwolf/default.css
Modified: trunk/SuppCreditGRNs.php
===================================================================
--- trunk/SuppCreditGRNs.php 2012-04-29 19:21:28 UTC (rev 8734)
+++ trunk/SuppCreditGRNs.php 2012-04-29 19:21:38 UTC (rev 8735)
@@ -74,7 +74,7 @@
/*Show all the selected GRNs so far from the SESSION['SuppTrans']->GRNs array */
echo '<table cellpadding="0" class="selection">';
-echo '<tr><th colspan="6"><font size="3" color="#616161">' . _('Credits Against Goods Received Selected') . '</font></th></tr>';
+echo '<tr><th colspan="6" class="header">' . _('Credits Against Goods Received Selected') . '</th></tr>';
$TableHeader = '<tr><th>' . _('GRN') . '</th>
<th>' . _('Item Code') . '</th>
<th>' . _('Description') . '</th>
@@ -150,9 +150,8 @@
echo '<br /><table cellpadding="2" class="selection">';
-echo '<tr><th colspan="10"><font size="3" color="#616161">' . _('Show Goods Received Since') . ': </font>';
-echo '<input type="text" name="Show_Since" maxlength="11" size="12" class="date" alt='.$_SESSION['DefaultDateFormat'].' value="' . $_POST['Show_Since'] . '" />
- <font size="3" color="#616161"> ';
+echo '<tr><th colspan="10" class="header">' . _('Show Goods Received Since') . ': ';
+echo '<input type="text" name="Show_Since" maxlength="11" size="12" class="date" style="font-size: 10px" alt='.$_SESSION['DefaultDateFormat'].' value="' . $_POST['Show_Since'] . '" /> ';
echo _('From') . ' ' . $_SESSION['SuppTrans']->SupplierName . '</font></th></tr>';
$TableHeader = '<tr><th>' . _('GRN') . '</th>
@@ -180,7 +179,7 @@
}
}
if ($GRNAlreadyOnCredit == False){
- echo '<tr><td><input type="submit" name="GRNNo" value="' . $myrow['grnno'] . '" /></td>
+ echo '<tr><td><button type="submit" name="GRNNo" value="' . $myrow['grnno'] . '" />' . $myrow['grnno'] . '</button></td>
<td>' . $myrow['orderno'] . '</td>
<td>' . $myrow['itemcode'] . '</td>
<td>' . $myrow['itemdescription'] . '</td>
@@ -257,7 +256,7 @@
echo '<input type="hidden" name="ShiptRef" value="' . $myrow['shiptref'] . '" />';
}
- echo '<br /><div class="centre"><input type="submit" name="AddGRNToTrans" value="' . _('Add to Credit Note') . '" /></div>';
+ echo '<br /><div class="centre"><button type="submit" name="AddGRNToTrans">' . _('Add to Credit Note') . '</button></div>';
echo '<input type="hidden" name="GRNNumber" value="' . $_POST['GRNNo'] . '" />';
Modified: trunk/css/silverwolf/default.css
===================================================================
--- trunk/css/silverwolf/default.css 2012-04-29 19:21:28 UTC (rev 8734)
+++ trunk/css/silverwolf/default.css 2012-04-29 19:21:38 UTC (rev 8735)
@@ -79,6 +79,15 @@
vertical-align: middle;
}
+th.date {
+ font-weight: normal;
+ background-color: #cccce5;
+ border-radius: 5px;
+ font-size: 10px;
+ color: #300;
+ vertical-align: middle;
+}
+
th.header {
font-weight: normal;
background: transparent;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-04-29 19:22:02
|
Revision: 8737
http://weberp.svn.sourceforge.net/weberp/?rev=8737&view=rev
Author: tim_schofield
Date: 2012-04-29 19:21:56 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
Layout improvements, new css and buttons
Modified Paths:
--------------
trunk/StockUsage.php
trunk/css/silverwolf/default.css
Modified: trunk/StockUsage.php
===================================================================
--- trunk/StockUsage.php 2012-04-29 19:21:46 UTC (rev 8736)
+++ trunk/StockUsage.php 2012-04-29 19:21:56 UTC (rev 8737)
@@ -83,8 +83,8 @@
}
echo '</select>';
-echo '<input type="submit" name="ShowUsage" value="' . _('Show Stock Usage') . '" />';
-echo '<input type="submit" name="ShowGraphUsage" value="' . _('Show Graph Of Stock Usage') . '" /></td></tr></table><br />';
+echo '<button type="submit" name="ShowUsage">' . _('Show Stock Usage') . '</button>';
+echo '<button type="submit" name="ShowGraphUsage">' . _('Show Graph Of Stock Usage') . '</button></td></tr></table><br />';
/* $_SESSION['NumberOfPeriodsOfStockUsage'] is defined in config.php as a user definable variable
config.php is loaded by header.inc */
Modified: trunk/css/silverwolf/default.css
===================================================================
--- trunk/css/silverwolf/default.css 2012-04-29 19:21:46 UTC (rev 8736)
+++ trunk/css/silverwolf/default.css 2012-04-29 19:21:56 UTC (rev 8737)
@@ -689,10 +689,7 @@
background: -moz-linear-gradient(left, #C3C0C0, #7A7A89);
background: -webkit-linear-gradient(left, #C3C0C0, #7A7A89);
width: 33%;
- border-style: solid;
- border-width: 1px;
- border-color: #666;
- border-radius: 5px;
+ border-radius: 5px;
margin: 10px auto;
text-align:center;
-moz-box-shadow: 3px 3px 2px #888;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X