Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[4997] trunk
|
From: <vv...@us...> - 2012-02-29 23:14:59
|
Revision: 4997
http://web-erp.svn.sourceforge.net/web-erp/?rev=4997&view=rev
Author: vvs2012
Date: 2012-02-29 23:14:53 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/WorkOrderReceive.php
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2012-02-29 09:19:58 UTC (rev 4996)
+++ trunk/AccountGroups.php 2012-02-29 23:14:53 UTC (rev 4997)
@@ -178,7 +178,7 @@
$myrow = DB_fetch_array($result);
if ($myrow['groups']>0) {
prnMsg( _('Cannot delete this account group because general ledger accounts have been created using this group'),'warn');
- echo '<br />' . _('There are') . ' ' . $myrow['groups'] . ' ' . _('general ledger accounts that refer to this account group') . '</font>';
+ echo '<br />' . _('There are') . ' ' . $myrow['groups'] . ' ' . _('general ledger accounts that refer to this account group');
} else {
$sql = "SELECT COUNT(groupname) groupnames FROM accountgroups WHERE parentgroupname = '" . $_GET['SelectedAccountGroup'] . "'";
@@ -188,7 +188,7 @@
$myrow = DB_fetch_array($result);
if ($myrow['groupnames']>0) {
prnMsg( _('Cannot delete this account group because it is a parent account group of other account group(s)'),'warn');
- echo '<br />' . _('There are') . ' ' . $myrow['groupnames'] . ' ' . _('account groups that have this group as its/there parent account group') . '</font>';
+ echo '<br />' . _('There are') . ' ' . $myrow['groupnames'] . ' ' . _('account groups that have this group as its/there parent account group');
} else {
$sql="DELETE FROM accountgroups WHERE groupname='" . $_GET['SelectedAccountGroup'] . "'";
$ErrMsg = _('An error occurred in deleting the account group');
@@ -222,7 +222,7 @@
$DbgMsg = _('The sql that was used to retrieve the account group information was ');
$ErrMsg = _('Could not get account groups because');
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg);
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'<br /></p>';
echo '<table class="selection">
<tr>
@@ -261,8 +261,8 @@
<td>' . $myrow['sequenceintb'] . '</td>
<td>' . $PandLText . '</td>
<td>' . $myrow['parentgroupname'] . '</td>';
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedAccountGroup=' . htmlspecialchars($myrow['groupname'], ENT_QUOTES,'UTF-8') . '">' . _('Edit') . '</a></td>';
- echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedAccountGroup=' . htmlspecialchars($myrow['groupname'], ENT_QUOTES,'UTF-8') . '&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this account group?') . '\');">' . _('Delete') .'</a></td></tr>';
+ echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?SelectedAccountGroup=' . urlencode($myrow['groupname']), ENT_QUOTES,'UTF-8') . '">' . _('Edit') . '</a></td>';
+ echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?SelectedAccountGroup=' . urlencode($myrow['groupname']), ENT_QUOTES,'UTF-8') . '&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this account group?') . '\');">' . _('Delete') .'</a></td></tr>';
} //END WHILE LIST LOOP
echo '</table>';
@@ -270,12 +270,13 @@
if (isset($_POST['SelectedAccountGroup']) or isset($_GET['SelectedAccountGroup'])) {
- echo '<br /><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">' . _('Review Account Groups') . '</a></div>';
+ echo '<div class="centre"><br /><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">' . _('Review Account Groups') . '</a></div>';
}
if (!isset($_GET['delete'])) {
- echo '<br /><form method="post" id="AccountGroups" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
+ echo '<form method="post" id="AccountGroups" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
+ echo '<div><br />';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($_GET['SelectedAccountGroup'])) {
@@ -307,10 +308,12 @@
echo '<table class="selection">';
echo '<tr>
- <th colspan="2"><font size="2" color="#616161">' . _('Edit Account Group Details') . '</th>
+ <th colspan="2">' . _('Edit Account Group Details') . '</th>
</tr>';
- echo '<input type="hidden" name="SelectedAccountGroup" value="' . $_GET['SelectedAccountGroup'] . '" />';
- echo '<input type="hidden" name="GroupName" value="' . $_POST['GroupName'] . '" />';
+ echo '<tr>
+ <td><input type="hidden" name="SelectedAccountGroup" value="' . $_GET['SelectedAccountGroup'] . '" /></td>
+ <td><input type="hidden" name="GroupName" value="' . $_POST['GroupName'] . '" /></td>
+ </tr>';
echo '<tr>
<td>' . _('Account Group') . ':' . '</td>
@@ -336,10 +339,12 @@
}
echo '<br /><table class="selection">';
- echo '<input type="hidden" name="SelectedAccountGroup" value="' . $_POST['SelectedAccountGroup'] . '" />';
echo '<tr>
- <th colspan="2"><font size="2" color="#616161">' . _('New Account Group Details') . '</th>
+ <th colspan="2">' . _('New Account Group Details') . '</th>
</tr>';
+ echo '<tr>
+ <td><input type="hidden" name="SelectedAccountGroup" value="' . $_POST['SelectedAccountGroup'] . '" /></td>
+ </tr>';
echo '<tr>
<td>' . _('Account Group Name') . ':' . '</td>
<td><input tabindex="1" ' . (in_array('GroupName',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="GroupName" size="50" maxlength="50" value="' . $_POST['GroupName'] . '" /></td>
@@ -413,7 +418,7 @@
echo '</table><br />';
echo '<script type="text/javascript">defaultControl(document.forms[0].GroupName);</script>';
-
+ echo '</div>';
echo '</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/WorkOrderReceive.php
===================================================================
--- trunk/WorkOrderReceive.php 2012-02-29 09:19:58 UTC (rev 4996)
+++ trunk/WorkOrderReceive.php 2012-02-29 23:14:53 UTC (rev 4997)
@@ -6,15 +6,18 @@
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
+echo '<div>';
echo '<a href="'. $rootpath . '/SelectWorkOrder.php">' . _('Back to Work Orders'). '</a>
<br />';
echo '<a href="'. $rootpath . '/WorkOrderCosting.php?WO=' . $_REQUEST['WO'] . '">' . _('Back to Costing'). '</a>
<br />';
+echo '</div>';
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/group_add.png" title="' .
_('Search') . '" alt="" />' . ' ' . $title.'</p>';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (!isset($_REQUEST['WO']) OR !isset($_REQUEST['StockID'])) {
@@ -66,6 +69,8 @@
if (DB_num_rows($WOResult)==0){
prnMsg(_('The selected work order item cannot be retrieved from the database'),'info');
+ echo '</div>';
+ echo '</form>';
include('includes/footer.inc');
exit;
}
@@ -234,7 +239,7 @@
'" . Date('Y-m-d') . "',
'" . $PeriodNo . "',
'" . $StockGLCode['adjglact'] . "',
- '" . DB_escape_string(_('Cost roll on release of WO') . ': ' . $_POST['WO'] . ' - ' . $_POST['StockID'] . ' ' . _('cost was') . ' ' . $ItemCostRow['cost'] . ' ' . _('changed to') . ' ' . $Cost . ' x ' . _('Quantity on hand of') . ' ' . $ItemCostRow['totalqoh']) . "',
+ '" . _('Cost roll on release of WO') . ': ' . $_POST['WO'] . ' - ' . $_POST['StockID'] . ' ' . _('cost was') . ' ' . $ItemCostRow['cost'] . ' ' . _('changed to') . ' ' . $Cost . ' x ' . _('Quantity on hand of') . ' ' . $ItemCostRow['totalqoh'] . "',
'" . (-$ValueOfChange) . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The GL credit for the stock cost adjustment posting could not be inserted because');
@@ -253,7 +258,7 @@
'" . Date('Y-m-d') . "',
'" . $PeriodNo . "',
'" . $StockGLCode['stockact'] . "',
- '" . DB_escape_string(_('Cost roll on release of WO') . ': ' . $_POST['WO'] . ' - ' . $_POST['StockID'] . ' ' . _('cost was') . ' ' . $ItemCostRow['cost'] . ' ' . _('changed to') . ' ' . $Cost . ' x ' . _('Quantity on hand of') . ' ' . $ItemCostRow['totalqoh']) . "',
+ '" . _('Cost roll on release of WO') . ': ' . $_POST['WO'] . ' - ' . $_POST['StockID'] . ' ' . _('cost was') . ' ' . $ItemCostRow['cost'] . ' ' . _('changed to') . ' ' . $Cost . ' x ' . _('Quantity on hand of') . ' ' . $ItemCostRow['totalqoh'] . "',
'" . $ValueOfChange . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The GL debit for stock cost adjustment posting could not be inserted because');
@@ -374,7 +379,7 @@
'" . Date('Y-m-d') . "',
'" . $PeriodNo . "',
'" . $StockGLCode['wipact'] . "',
- '" . DB_escape_string($_POST['WO'] . ' - ' . $_POST['StockID'] . ' ' . _('Component') . ': ' . $AutoIssueCompRow['stockid'] . ' - ' . $QuantityReceived . ' x ' . $AutoIssueCompRow['qtypu'] . ' @ ' . locale_number_format($AutoIssueCompRow['cost'],$_SESSION['CompanyRecord']['decimalplaces'])) . "',
+ '" . $_POST['WO'] . ' - ' . $_POST['StockID'] . ' ' . _('Component') . ': ' . $AutoIssueCompRow['stockid'] . ' - ' . $QuantityReceived . ' x ' . $AutoIssueCompRow['qtypu'] . ' @ ' . locale_number_format($AutoIssueCompRow['cost'],$_SESSION['CompanyRecord']['decimalplaces']) . "',
'" . ($AutoIssueCompRow['qtypu'] * $QuantityReceived * $AutoIssueCompRow['cost']) . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The WIP side of the work order issue GL posting could not be inserted because');
@@ -393,7 +398,7 @@
'" . Date('Y-m-d') . "',
'" . $PeriodNo . "',
'" . $AutoIssueCompRow['stockact'] . "',
- '" . DB_escape_string($_POST['WO'] . ' - ' . $_POST['StockID'] . ' -> ' . $AutoIssueCompRow['stockid'] . ' - ' . $QuantityReceived . ' x ' . $AutoIssueCompRow['qtypu'] . ' @ ' . locale_number_format($AutoIssueCompRow['cost'],$_SESSION['CompanyRecord']['decimalplaces'])) . "',
+ '" . $_POST['WO'] . ' - ' . $_POST['StockID'] . ' -> ' . $AutoIssueCompRow['stockid'] . ' - ' . $QuantityReceived . ' x ' . $AutoIssueCompRow['qtypu'] . ' @ ' . locale_number_format($AutoIssueCompRow['cost'],$_SESSION['CompanyRecord']['decimalplaces']) . "',
'" . -($AutoIssueCompRow['qtypu'] * $QuantityReceived * $AutoIssueCompRow['cost']) . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The stock side of the work order issue GL posting could not be inserted because');
@@ -628,7 +633,7 @@
'" . Date('Y-m-d') . "',
'" . $PeriodNo . "',
'" . $StockGLCode['stockact'] . "',
- '" . DB_escape_string($_POST['WO'] . " " . $_POST['StockID'] . " - " . $WORow['description'] . ' x ' . $QuantityReceived . " @ " . locale_number_format($WORow['stdcost'],$_SESSION['CompanyRecord']['decimalplaces'])) . "',
+ '" . $_POST['WO'] . " " . $_POST['StockID'] . " - " . DB_escape_string($WORow['description']) . ' x ' . $QuantityReceived . " @ " . locale_number_format($WORow['stdcost'],$_SESSION['CompanyRecord']['decimalplaces']) . "',
'" . ($WORow['stdcost'] * $QuantityReceived) . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The receipt of work order finished stock GL posting could not be inserted because');
@@ -648,7 +653,7 @@
'" . Date('Y-m-d') . "',
'" . $PeriodNo . "',
'" . $StockGLCode['wipact'] . "',
- '" . DB_escape_string($_POST['WO'] . " " . $_POST['StockID'] . " - " . $WORow['description'] . ' x ' . $QuantityReceived . " @ " . locale_number_format($WORow['stdcost'],$_SESSION['CompanyRecord']['decimalplaces'])) . "',
+ '" . $_POST['WO'] . " " . $_POST['StockID'] . " - " . DB_escape_string($WORow['description']) . ' x ' . $QuantityReceived . " @ " . locale_number_format($WORow['stdcost'],$_SESSION['CompanyRecord']['decimalplaces']) . "',
'" . -($WORow['stdcost'] * $QuantityReceived) . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The WIP credit on receipt of finished items from a work order GL posting could not be inserted because');
@@ -686,6 +691,8 @@
unset($_POST['QualityText'.$i]);
unset($_POST['QtyReqd'.$i]);
}
+ echo '</div>';
+ echo '</form>';
/*end of process work order goods received entry */
include('includes/footer.inc');
exit;
@@ -722,6 +729,8 @@
if (DB_num_rows($WOResult)==0){
prnMsg(_('The selected work order item cannot be retrieved from the database'),'info');
+ echo '</div>';
+ echo '</form>';
include('includes/footer.inc');
exit;
}
@@ -729,6 +738,8 @@
if ($WORow['closed']==1){
prnMsg(_('The selected work order has been closed and variances calculated and posted. No more receipts of manufactured items can be received against this work order. You should make up a new work order to receive this item against.'),'info');
+ echo '</div>';
+ echo '</form>';
include('includes/footer.inc');
exit;
}
@@ -842,8 +853,8 @@
if (!isset($i)){
$i=0;
}
+ echo '<td><input type="hidden" name="CountOfInputs" value="' . $i . '" /></td>';
echo '</tr>';
- echo '<input type="hidden" name="CountOfInputs" value="' . $i . '" />';
echo '<tr>
<td colspan="5"></td>
</tr>
@@ -893,7 +904,10 @@
<td><input type="textbox" class="number" name="Qty' . $i .'" /></td></tr>';
}
}
- echo '<input type="hidden" name="CountOfInputs" value="' . $i . '" /></table>';
+ echo '<tr>
+ <td><input type="hidden" name="CountOfInputs" value="' . $i . '" /></td>
+ </tr>
+ </table>';
echo '<br />
<div class="centre">
<input type="submit" name="Process" value="' . _('Process Manufactured Items Received') . '" />
@@ -901,8 +915,8 @@
} //end of lot/batch control
} else { //not controlled - an easy one!
- echo '<input type="hidden" name="CountOfInputs" value="1" />';
echo '<tr>
+ <td><input type="hidden" name="CountOfInputs" value="1" /></td>
<td>' . _('Quantity Received') . ':</td>
<td><input type="text" class="number" name="Qty" /></td>
</tr>
@@ -912,7 +926,7 @@
<input type="submit" name="Process" value="' . _('Process Manufactured Items Received') . '" />
</div>';
}
-
+echo '</div>';
echo '</form>';
include('includes/footer.inc');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
