Menu
▾
▴
[Weberp-cvs] SF.net SVN: web-erp:[3417] trunk
|
From: <tim...@us...> - 2010-04-14 15:21:17
|
Revision: 3417
http://web-erp.svn.sourceforge.net/web-erp/?rev=3417&view=rev
Author: tim_schofield
Date: 2010-04-14 15:21:11 +0000 (Wed, 14 Apr 2010)
Log Message:
-----------
Tim: SelectOrdderitems.php and DeliveryDetails.php - Improvements to layout.
Modified Paths:
--------------
trunk/DeliveryDetails.php
trunk/SelectOrderItems.php
trunk/css/silverwolf/default.css
trunk/doc/Change.log.html
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2010-04-08 08:26:24 UTC (rev 3416)
+++ trunk/DeliveryDetails.php 2010-04-14 15:21:11 UTC (rev 3417)
@@ -573,19 +573,19 @@
if ($_POST['Quotation']==0) { /*then its not a quotation its a real order */
- echo '<div style="text-align:center"><p><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="">' . ' ' . '<a target="_blank" href="' . $rootpath . '/PrintCustOrder.php?' . SID .'identifier='.$identifier . '&TransNo=' . $OrderNo . '">'. _('Print packing slip') . ' (' . _('Preprinted stationery') . ')' .'</a>';
- echo '<p><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="">' . ' ' . '<a target="_blank" href="' . $rootpath . '/PrintCustOrder_generic.php?' . SID .'identifier='.$identifier . '&TransNo=' . $OrderNo . '">'. _('Print packing slip') . ' (' . _('Laser') . ')' .'</a>';
+ echo '<br><table class=selection><tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt=""></td><td>' . ' ' . '<a target="_blank" href="' . $rootpath . '/PrintCustOrder.php?' . SID .'identifier='.$identifier . '&TransNo=' . $OrderNo . '">'. _('Print packing slip') . ' (' . _('Preprinted stationery') . ')' .'</a></td></tr>';
+ echo '<tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt=""></td><td>' . ' ' . '<a target="_blank" href="' . $rootpath . '/PrintCustOrder_generic.php?' . SID .'identifier='.$identifier . '&TransNo=' . $OrderNo . '">'. _('Print packing slip') . ' (' . _('Laser') . ')' .'</a></td></tr>';
- echo '<p><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Invoice') . '" alt="">' . ' ' . '<a href="' . $rootpath . '/ConfirmDispatch_Invoice.php?' . SID .'identifier='.$identifier . '&OrderNumber=' . $OrderNo .'">'. _('Confirm Dispatch and Produce Invoice') .'</a>';
+ echo '<tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Invoice') . '" alt=""></td><td>' . ' ' . '<a href="' . $rootpath . '/ConfirmDispatch_Invoice.php?' . SID .'identifier='.$identifier . '&OrderNumber=' . $OrderNo .'">'. _('Confirm Dispatch and Produce Invoice') .'</a></td></tr>';
//Add option to Print Sales Orders or Proforma invoice
- echo '<p><img src="'.$rootpath.'/css/'.$theme.'/images/pdf.png" title="' . _('Sales Order') . '" alt="">' . ' ' . '<a href="' . $rootpath . '/PrintSalesOrder_generic.php?' . SID .'identifier='.$identifier . '&TransNo=' . $OrderNo .'">'. _('Print Sales Order / Pro-forma Invoice') .'</a></div>';
+ echo '<tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/pdf.png" title="' . _('Sales Order') . '" alt=""></td><td>' . ' ' . '<a href="' . $rootpath . '/PrintSalesOrder_generic.php?' . SID .'identifier='.$identifier . '&TransNo=' . $OrderNo .'">'. _('Print Sales Order / Pro-forma Invoice') .'</a></td></tr></table>';
} else {
/*link to print the quotation */
- echo '<p><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Order') . '" alt="">' . ' ' . '<a href="' . $rootpath . '/PDFQuotation.php?' . SID .'identifier='.$identifier . '&QuotationNo=' . $OrderNo . '">'. _('Print Quotation') .'</a>';
+ echo '<br><table class=selection><tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Order') . '" alt=""></td><td>' . ' ' . '<a href="' . $rootpath . '/PDFQuotation.php?' . SID .'identifier='.$identifier . '&QuotationNo=' . $OrderNo . '">'. _('Print Quotation') .'</a></td></tr></table>';
}
- echo '<div class="centre"><p><img src="'.$rootpath.'/css/'.$theme.'/images/sales.png" title="' . _('Order') . '" alt="">' . ' ' . '<a href="'. $rootpath .'/SelectOrderItems.php?' . SID .'identifier='.$identifier . '&NewOrder=Yes">'. _('Add Sales Order') .'</a></div>';
+ echo '<br><table class=selection><tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/sales.png" title="' . _('Order') . '" alt=""></td><td>' . ' ' . '<a href="'. $rootpath .'/SelectOrderItems.php?' . SID .'identifier='.$identifier . '&NewOrder=Yes">'. _('Add Another Sales Order') .'</a></td></tr></table>';
} else {
/*its a customer logon so thank them */
prnMsg(_('Thank you for your business'),'success');
@@ -672,10 +672,10 @@
prnMsg(_('Order Number') .' ' . $_SESSION['ExistingOrder'] . ' ' . _('has been updated'),'success');
- echo '<br><a href="' . $rootpath . '/PrintCustOrder.php?' . SID.'identifier='.$identifier . '&TransNo=' . $_SESSION['ExistingOrder'] . '">'. _('Print packing slip - pre-printed stationery') .'</a>';
- echo '<p><a href="' . $rootpath .'/ConfirmDispatch_Invoice.php?' . SID.'identifier='.$identifier . '&OrderNumber=' . $_SESSION['ExistingOrder'] . '">'. _('Confirm Order Delivery Quantities and Produce Invoice') .'</a>';
- echo '<br><a target="_blank" href="' . $rootpath . '/PrintCustOrder_generic.php?' . SID.'identifier='.$identifier . '&TransNo=' . $_SESSION['ExistingOrder'] . '">'. _('Print packing slip') . ' (' . _('Laser') . ')' .'</a>';
- echo '<p><a href="' . $rootpath .'/SelectSalesOrder.php?' . SID.'identifier='.$identifier . '">'. _('Select A Different Order') .'</a>';
+ echo '<br><table class=selection><tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt=""></td><td><a href="' . $rootpath . '/PrintCustOrder.php?' . SID.'identifier='.$identifier . '&TransNo=' . $_SESSION['ExistingOrder'] . '">'. _('Print packing slip - pre-printed stationery') .'</a></td></tr>';
+ echo '<tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt=""></td><td><a target="_blank" href="' . $rootpath . '/PrintCustOrder_generic.php?' . SID.'identifier='.$identifier . '&TransNo=' . $_SESSION['ExistingOrder'] . '">'. _('Print packing slip') . ' (' . _('Laser') . ')' .'</a></td></tr>';
+ echo '<tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Invoice') . '" alt=""></td><td><a href="' . $rootpath .'/ConfirmDispatch_Invoice.php?' . SID.'identifier='.$identifier . '&OrderNumber=' . $_SESSION['ExistingOrder'] . '">'. _('Confirm Order Delivery Quantities and Produce Invoice') .'</a></td></tr>';
+ echo '<tr><td><img src="'.$rootpath.'/css/'.$theme.'/images/sales.png" title="' . _('Order') . '" alt=""></td><td><a href="' . $rootpath .'/SelectSalesOrder.php?' . SID.'identifier='.$identifier . '">'. _('Select A Different Order') .'</a></td></tr></table>';
include('includes/footer.inc');
exit;
}
@@ -757,7 +757,7 @@
$DisplayVolume = number_format($_SESSION['Items'.$identifier]->totalVolume,2);
$DisplayWeight = number_format($_SESSION['Items'.$identifier]->totalWeight,2);
- echo '<br><table class=selection><tr>
+ echo '<br><table><tr class="EvenTableRows">
<td>'. _('Total Weight') .':</td>
<td>'.$DisplayWeight.'</td>
<td>'. _('Total Volume') .':</td>
@@ -1015,7 +1015,7 @@
echo '</table>';
-echo '<br><div class="centre"><input type=submit name="BackToLineDetails" value="' . _('Modify Order Lines') . '">';
+echo '<br><div class="centre"><input type=submit name="BackToLineDetails" value="' . _('Modify Order Lines') . '"><br>';
if ($_SESSION['ExistingOrder']==0){
echo '<br><br><input type=submit name="ProcessOrder" value="' . _('Place Order') . '">';
@@ -1026,4 +1026,4 @@
echo '</div></form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2010-04-08 08:26:24 UTC (rev 3416)
+++ trunk/SelectOrderItems.php 2010-04-14 15:21:11 UTC (rev 3417)
@@ -374,7 +374,7 @@
if (DB_num_rows($result_CustSelect)==1){
$myrow=DB_fetch_array($result_CustSelect);
- $_POST['Select'] = $myrow['debtorno'] . ' - ' . $myrow['branchname'];
+ $_POST['Select'] = $myrow['debtorno'] . ' - ' . $myrow['branchcode'];
} elseif (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');
}
@@ -386,15 +386,8 @@
// record returned from a search so parse the $Select string into customer code and branch code */
if (isset($_POST['Select']) AND $_POST['Select']!='') {
- $branchsql='SELECT branchcode
- FROM custbranch
- WHERE brname="'.substr($_POST['Select'],strpos($_POST['Select'],' - ')+3).'"
- AND debtorno="'.substr($_POST['Select'],0,strpos($_POST['Select'],' - ')).'"';
+ $_SESSION['Items'.$identifier]->Branch = substr($_POST['Select'],strpos($_POST['Select'],' - ')+3);
- $branchresult=DB_query($branchsql, $db);
- $branchrow=DB_fetch_row($branchresult);
- $_SESSION['Items'.$identifier]->Branch = $branchrow[0];
-
$_POST['Select'] = substr($_POST['Select'],0,strpos($_POST['Select'],' - '));
// Now check to ensure this account is not on hold */
@@ -562,6 +555,7 @@
// the order process will ask for branch details later anyway
$sql = "SELECT custbranch.brname,
+ custbranch.branchcode,
custbranch.braddress1,
custbranch.braddress2,
custbranch.braddress3,
@@ -660,17 +654,18 @@
echo '<tr class="OddTableRows">';
$k=1;
}
+ echo '<form action="' . $_SERVER['PHP_SELF'] . '?' . SID .'identifier='.$identifier . '"& name="SelectParts" method=post>';
if ($LastCustomer != $myrow['name']) {
echo '<td>'.$myrow['name'].'</td>';
} else {
echo '<td></td>';
}
- echo '<td><input tabindex='.number_format($j+5).' type=submit name="Select" value="'.$myrow['debtorno'].' - '.$myrow['brname'].'"</td>
- <td>'.$myrow['brname'].'</td>
+ echo '<td><input tabindex='.number_format($j+5).' type=submit name="Submit" value="'.$myrow['brname'].'"</td>
+ <input type=hidden name="Select" value="'.$myrow['debtorno'].' - '.$myrow['branchcode'].'">
<td>'.$myrow['contactname'].'</td>
<td>'.$myrow['phoneno'].'</td>
<td>.'.$myrow['faxno'].'</td>
- </tr>';
+ </tr></form>';
$LastCustomer=$myrow['name'];
$j++;
//end of page full new headings if
@@ -1319,7 +1314,7 @@
$DisplayVolume = number_format($_SESSION['Items'.$identifier]->totalVolume,2);
$DisplayWeight = number_format($_SESSION['Items'.$identifier]->totalWeight,2);
- echo '<table border=1><tr><td>' . _('Total Weight') . ':</td>
+ echo '<table><tr class="EvenTableRows"><td>' . _('Total Weight') . ':</td>
<td>' . $DisplayWeight . '</td>
<td>' . _('Total Volume') . ':</td>
<td>' . $DisplayVolume . '</td>
Modified: trunk/css/silverwolf/default.css
===================================================================
--- trunk/css/silverwolf/default.css 2010-04-08 08:26:24 UTC (rev 3416)
+++ trunk/css/silverwolf/default.css 2010-04-14 15:21:11 UTC (rev 3417)
@@ -41,7 +41,7 @@
/*links before selection */
a {
font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 12px;
+ font-size: 10px;
font-weight: normal;
text-decoration: none;
color: #00f;
@@ -61,7 +61,7 @@
th {
font-weight: normal;
background-color: #cccce5;
- font-size: 12px;
+ font-size: 10px;
color: #300;
text-align: center;
vertical-align: center;
@@ -76,7 +76,7 @@
/*table detail items default format */
td {
font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 12px;
+ font-size: 10px;
text-align: left;
}
@@ -171,9 +171,24 @@
margin: 0 auto;
}
+textarea {
+ font-family: Arial, Verdana, Helvetica, sans-serif;
+ font-size: 10px;
+ background-color: #e3e1e1;
+ 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;
+}
+
input {
font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 12px;
+ font-size: 10px;
background-color: #e3e1e1;
border-width:1px;
border-bottom-color: gray;
@@ -186,6 +201,21 @@
border-right-style: solid;
}
+input:hover {
+ font-family: Arial, Verdana, Helvetica, sans-serif;
+ font-size: 10px;
+ background-color: #e3e5f5;
+ 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;
+}
+
input.number {
text-align: right;
}
@@ -196,7 +226,7 @@
select {
font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 12px;
+ font-size: 10px;
}
font.good {
@@ -330,7 +360,7 @@
width: 100%;
margin: 0px;
padding: 0px;
- font-size: 12px;
+ font-size: 10px;
}
/* Main page heading with quick menu within */
@@ -356,7 +386,7 @@
.quick_menu_left {
background: none;
font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 12px;
+ font-size: 10px;
font-weight: bold;
border: none;
white-space: nowrap;
@@ -427,12 +457,12 @@
}
.system_menu_tabs a {
- font-size: 12px;
+ font-size: 10px;
color: black;
}
.system_menu_tabs a:hover {
- font-size: 12px;
+ font-size: 10px;
color: black;
}
@@ -503,7 +533,7 @@
span.main_menu_nolink {
font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 12px;
+ font-size: 10px;
font-weight: bold;
color: #777;
text-decoration: none;
@@ -545,7 +575,7 @@
.menu_group_headers_text {
font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 12px;
+ font-size: 10px;
font-weight: bold;
color: black;
}
@@ -572,7 +602,7 @@
padding-top: 2px;
padding-bottom: 2px;
font-weight: bold;
- font-size: 12px;
+ font-size: 10px;
color: black;
background-color: #cccce5;
width: 33%;
@@ -631,7 +661,7 @@
span.menu_group_nolink {
font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 12px;
+ font-size: 10px;
font-weight: normal;
color: #777;
text-decoration: none;
@@ -727,7 +757,7 @@
.label {
font-weight:bold;
font-style:normal;
- font-size:12px;
+ font-size:10px;
color:black;
background-color:#ccc;
}
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-04-08 08:26:24 UTC (rev 3416)
+++ trunk/doc/Change.log.html 2010-04-14 15:21:11 UTC (rev 3417)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>14/04/10 Tim: SelectOrdderitems.php and DeliveryDetails.php - Improvements to layout and design of sales order entry</p>
<p>08/04/10 Tim: SuppTransGLAnalysis.php - Correct typo in sql statement.</p>
<p>07/04/10 Tim: SelectOrdderitems.php and DeliveryDetails.php - Improvements to layout.</p>
<p>07/04/10 Tim: Improvements to the silverwolf theme.</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
