Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[4828] trunk
|
From: <vv...@us...> - 2012-01-21 22:05:20
|
Revision: 4828
http://web-erp.svn.sourceforge.net/web-erp/?rev=4828&view=rev
Author: vvs2012
Date: 2012-01-21 22:05:14 +0000 (Sat, 21 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/CustomerReceipt.php
trunk/PDFPriceList.php
trunk/PricesBasedOnMarkUp.php
trunk/SpecialOrder.php
trunk/StockCategories.php
trunk/StockSerialItemResearch.php
trunk/Z_CreateCompanyTemplateFile.php
trunk/Z_ImportGLAccountSections.php
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2012-01-21 15:41:50 UTC (rev 4827)
+++ trunk/AccountGroups.php 2012-01-21 22:05:14 UTC (rev 4828)
@@ -276,7 +276,7 @@
echo '<br /><form method="post" id="AccountGroups" action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-
+ echo '<table class="selection"><tr><td>';
if (isset($_GET['SelectedAccountGroup'])) {
//editing an existing account group
@@ -304,7 +304,6 @@
$_POST['PandL'] = $myrow['pandl'];
$_POST['ParentGroupName'] = $myrow['parentgroupname'];
- echo '<table class="selection"><tr><td>';
echo '<input type="hidden" name="SelectedAccountGroup" value="' . $_GET['SelectedAccountGroup'] . '" />';
echo '<input type="hidden" name="GroupName" value="' . $_POST['GroupName'] . '" />';
@@ -330,7 +329,6 @@
$_POST['PandL']='';
}
- echo '<br /><table class="selection"><tr><td>';
echo '<input type="hidden" name="SelectedAccountGroup" value="' . $_POST['SelectedAccountGroup'] . '" />';
echo _('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></tr>';
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2012-01-21 15:41:50 UTC (rev 4827)
+++ trunk/CustomerReceipt.php 2012-01-21 22:05:14 UTC (rev 4828)
@@ -544,8 +544,8 @@
echo '<br />';
prnMsg( _('Receipt batch') . ' ' . $_SESSION['ReceiptBatch']->BatchNo . ' ' . _('has been successfully entered into the database'),'success');
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="">' . ' ' . '<a href="' . $rootpath . '/PDFBankingSummary.php?BatchNo=' . $_SESSION['ReceiptBatch']->BatchNo . '">' . _('Print PDF Batch Summary') . '</a></p>';
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/allocation.png" title="' . _('Allocate') . '" alt="">' . ' ' . '<a href="' . $rootpath . '/CustomerAllocations.php">' . _('Allocate Receipts') . '</a></p>';
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a href="' . $rootpath . '/PDFBankingSummary.php?BatchNo=' . $_SESSION['ReceiptBatch']->BatchNo . '">' . _('Print PDF Batch Summary') . '</a></p>';
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/allocation.png" title="' . _('Allocate') . '" alt="" />' . ' ' . '<a href="' . $rootpath . '/CustomerAllocations.php">' . _('Allocate Receipts') . '</a></p>';
echo '<p class="page_title_text"><a href="' . $rootpath . '/CustomerReceipt.php?NewReceipt=Yes&Type=Customer">' . _('Enter Receipts') . '</a>
</p>';
@@ -743,9 +743,9 @@
$AccountsResults = DB_query($SQL,$db,$ErrMsg,$DbgMsg);
if (isset($_POST['GLEntry'])) {
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('Enter Receipt') . '" alt="">' . ' ' . _('General Ledger Receipt Entry') . '</p>';
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('Enter Receipt') . '" alt="" />' . ' ' . _('General Ledger Receipt Entry') . '</p>';
} else {
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('Enter Receipt') . '" alt="">' . ' ' . _('Enter Customer Receipt') . '</p>';
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('Enter Receipt') . '" alt="" />' . ' ' . _('Enter Customer Receipt') . '</p>';
echo '<div class="page_help_text">' . _('To enter a payment TO a customer (ie. to pay out a credit note), enter a negative payment amount.') . '</div>';
}
echo '<br />
@@ -782,7 +782,7 @@
echo '<tr>
<td>' . _('Date Banked') . ':</td>
- <td><input tabindex="2" type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="DateBanked" maxlength="10" size="10" onChange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_SESSION['ReceiptBatch']->DateBanked . '"></td>
+ <td><input tabindex="2" type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="DateBanked" maxlength="10" size="10" onChange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_SESSION['ReceiptBatch']->DateBanked . '" /></td>
</tr>
<tr>
<td>' . _('Currency') . ':</td>
@@ -887,8 +887,8 @@
if (isset($_SESSION['ReceiptBatch'])){
/* Now show the entries made so far */
if (!$BankAccountEmpty) {
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('Banked') .
- '" alt="">' . ' ' . $_SESSION['ReceiptBatch']->ReceiptType . ' - ' . _('Banked into the') . " " .
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('Banked') . '" alt="" />
+ ' . ' ' . $_SESSION['ReceiptBatch']->ReceiptType . ' - ' . _('Banked into the') . " " .
$_SESSION['ReceiptBatch']->BankAccountName . ' ' . _('on') . ' ' . $_SESSION['ReceiptBatch']->DateBanked . '</p>';
}
@@ -1072,7 +1072,7 @@
<td>' . _('Amount of Discount') . ':</td>
<td><input tabindex="10" type="text" name="Discount" maxlength="12" size="13" class="number" value="' . $_POST['Discount'] . '" /> ' . _('agreed prompt payment discount is') . ' ' . $DisplayDiscountPercent . '</td></tr>';
} else {
- echo '<input tabindex=11 type="hidden" name="Discount" value="0" />';
+ echo '<input tabindex="11" type="hidden" name="Discount" value="0" />';
}
echo '<tr>
@@ -1080,7 +1080,7 @@
<td><input tabindex="12" type="text" name="PayeeBankDetail" maxlength="22" size="20" value="' . $_POST['PayeeBankDetail'] . '" /></td>
</tr>';
// echo '<tr><td>' . _('Narrative') . ':</td>
-// <td><input tabindex=13 type="text" name="Narrative" maxlength=30 size=32 value="' . $_POST['Narrative'] . '"></td></tr>';
+// <td><input tabindex="13" type="text" name="Narrative" maxlength="30" size="32" value="' . $_POST['Narrative'] . '" /></td></tr>';
echo '<td>' . _('Narrative') . ':</td>
<td><textarea name="Narrative" cols="40" rows="1"></textarea></td>
</tr>
@@ -1098,7 +1098,7 @@
echo '<br />';
echo '<p class="page_title_text">
- <img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="">' . ' ' . _('Select a Customer') . '</b>
+ <img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Select a Customer') . '</b>
<table class="selection">
<tr>
<td>' . _('Text in the Customer') . ' ' . '<b>' . _('name') . '</b>:</td>
@@ -1140,7 +1140,7 @@
echo '<tr class="EvenTableRows">';
$k=1;
}
- printf('<td><font size=1><input tabindex="'. strval(12+$j).'" type="submit" name="Select" value="%s" /></font></td>
+ printf('<td><input tabindex="'. strval(12+$j).'" type="submit" name="Select" value="%s" /></td>
<td>%s</td>
</tr>',
$myrow['debtorno'],
Modified: trunk/PDFPriceList.php
===================================================================
--- trunk/PDFPriceList.php 2012-01-21 15:41:50 UTC (rev 4827)
+++ trunk/PDFPriceList.php 2012-01-21 22:05:14 UTC (rev 4828)
@@ -251,8 +251,8 @@
$title= _('Price Listing');
include('includes/header.inc');
- echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/customer.png" title="' .
- _('Price List') . '" alt="" />' . ' ' . _('Print a price list') . '</p>';
+ echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/customer.png" title="' . _('Price List') . '" alt="" />
+ ' . ' ' . _('Print a price list') . '</p>';
if (!isset($_POST['FromCriteria']) or !isset($_POST['ToCriteria'])) {
@@ -302,7 +302,9 @@
echo '<option Value="Full Description">'. _('Full Description') . '</option>';
echo '</select></td></tr>';
- echo '<tr><td>' . _('Effective As At') . ':</td><td><input type="text" size=11 class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="EffectiveDate" value="' . Date($_SESSION['DefaultDateFormat']) . '">';
+ echo '<tr><td>' . _('Effective As At') . ':</td>';
+ echo '<td><input type="text" size="11" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="EffectiveDate" value="' . Date($_SESSION['DefaultDateFormat']) . '" />';
+ echo '</td></tr>';
echo '</table><br /><div class="centre"><input type=Submit Name="PrintPDF" Value="'. _('Print PDF'). '"></div>';
}
Modified: trunk/PricesBasedOnMarkUp.php
===================================================================
--- trunk/PricesBasedOnMarkUp.php 2012-01-21 15:41:50 UTC (rev 4827)
+++ trunk/PricesBasedOnMarkUp.php 2012-01-21 22:05:14 UTC (rev 4828)
@@ -5,8 +5,7 @@
$title=_('Update Pricing');
include('includes/header.inc');
-echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' . _('Search') .
- '" alt="" />' . $title.'</p>';
+echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' . _('Search') . '" alt="" />' . $title.'</p>';
echo '<br /><div class="page_help_text">' . _('This page adds new prices or updates already existing prices for a specified sales type (price list) and currency for the stock category selected - based on a percentage mark up from cost prices or from preferred supplier cost data or from another price list. The rounding factor ensures that prices are at least this amount or a multiple of it. A rounding factor of 5 would mean that prices would be a minimum of 5 and other prices would be expressed as multiples of 5.') . '</div><br /><div class="centre">';
@@ -145,13 +144,13 @@
}
echo '<tr><td>' . _('Rounding Factor') . ':</td>
- <td><input type="text" class=number name="RoundingFactor" size="6" maxlength="6" value=' . $_POST['RoundingFactor'] . '></td></tr>';
+ <td><input type="text" class="number" name="RoundingFactor" size="6" maxlength="6" value="' . $_POST['RoundingFactor'] . '" /></td></tr>';
echo '<tr><td>' . _('New Price To Be Effective From') . ':</td>
- <td><input type="text" class=date alt="' . $_SESSION['DefaultDateFormat'] . '" name="PriceStartDate" size="10" maxlength="10" value="' . $_POST['PriceStartDate'] . '"></td></tr>';
+ <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="PriceStartDate" size="10" maxlength="10" value="' . $_POST['PriceStartDate'] . '" /></td></tr>';
echo '<tr><td>' . _('New Price To Be Effective To (Blank = No End Date)') . ':</td>
- <td><input type="text" class=date alt="' . $_SESSION['DefaultDateFormat'] . '" name="PriceEndDate" size="10" maxlength="10" value="' . $_POST['PriceEndDate'] . '"></td></tr>';
+ <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="PriceEndDate" size="10" maxlength="10" value="' . $_POST['PriceEndDate'] . '" /></td></tr>';
if (!isset($_POST['IncreasePercent'])){
$_POST['IncreasePercent']=0;
@@ -161,7 +160,7 @@
<td><input type="text" name="IncreasePercent" class="number" size="4" maxlength="4" value="' . $_POST['IncreasePercent'] . '"></td></tr></table>';
-echo '<p><div class="centre"><input type="submit" name="UpdatePrices" value="' . _('Update Prices') . '\' onclick="return confirm(\'' . _('Are you sure you wish to update or add all the prices according to the criteria selected?') . '\');"></div>';
+echo '<p><div class="centre"><input type="submit" name="UpdatePrices" value="' . _('Update Prices') . '\' onclick="return confirm(\'' . _('Are you sure you wish to update or add all the prices according to the criteria selected?') . '\');" /></div>';
echo '</form>';
Modified: trunk/SpecialOrder.php
===================================================================
--- trunk/SpecialOrder.php 2012-01-21 15:41:50 UTC (rev 4827)
+++ trunk/SpecialOrder.php 2012-01-21 22:05:14 UTC (rev 4828)
@@ -740,10 +740,10 @@
<input type="submit" name="EnterLine" value="' . _('Add Item to Order') . '" />
<br />
<br />
- <input type="submit" name="Cancel" value="' . _('Start Again') . '">
+ <input type="submit" name="Cancel" value="' . _('Start Again') . '" />
<br />
<br />
- <input type="submit" name="Commit" value="' . _('Process This Order') . '">
+ <input type="submit" name="Commit" value="' . _('Process This Order') . '" />
</div>
</form>';
Modified: trunk/StockCategories.php
===================================================================
--- trunk/StockCategories.php 2012-01-21 15:41:50 UTC (rev 4827)
+++ trunk/StockCategories.php 2012-01-21 22:05:14 UTC (rev 4828)
@@ -8,8 +8,7 @@
include('includes/header.inc');
echo '<p class="page_title_text">
- <img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' .
- _('Inventory Adjustment') . '" alt="" />' . ' ' . $title . '
+ <img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Inventory Adjustment') . '" alt="" />' . ' ' . $title . '
</p>';
if (isset($_GET['SelectedCategory'])){
@@ -350,7 +349,7 @@
echo '<tr>
<td>' . _('Category Description') . ':</td>
- <td><input type="text" name="CategoryDescription" size=22 maxlength=20 value="' . $_POST['CategoryDescription'] . '" /></td></tr>';
+ <td><input type="text" name="CategoryDescription" size="22" maxlength="20" value="' . $_POST['CategoryDescription'] . '" /></td></tr>';
echo '<tr>
@@ -535,28 +534,26 @@
} else {
echo '<option value="2">' . _('Check Box') . '</option>';
}
- echo '</select></td>
- <td><input type="textbox" name="PropDefault' . $PropertyCounter . '" value="' . $myrow['defaultvalue'] . '"></td>
- <td><input type="checkbox" name="PropNumeric' . $PropertyCounter . '"';
-
- if ($myrow['numericvalue'] ==1){
- echo 'checked';
- }
- echo '"></td>
- <td><input type="textbox" class="number" name="PropMinimum' . $PropertyCounter . '" value="' . locale_number_format($myrow['minimumvalue'],'Variable') . '" /></td>
- <td><input type="textbox" class="number" name="PropMaximum' . $PropertyCounter . '" value="' . locale_number_format($myrow['maximumvalue'],'Variable') . '" /></td>';
+ echo '</select></td>';
+
+ echo '<td><input type="textbox" name="PropDefault' . $PropertyCounter . '" value="' . $myrow['defaultvalue'] . '" /></td>';
+ echo '<td><input type="checkbox" name="PropNumeric' . $PropertyCounter . '"';
+ if ($myrow['numericvalue'] == 1){
+ echo ' checked="checked"';
+ }
+ echo ' /></td>';
+
+ echo '<td><input type="textbox" class="number" name="PropMinimum' . $PropertyCounter . '" value="' . locale_number_format($myrow['minimumvalue'],'Variable') . '" /></td>';
+ echo '<td><input type="textbox" class="number" name="PropMaximum' . $PropertyCounter . '" value="' . locale_number_format($myrow['maximumvalue'],'Variable') . '" /></td>';
echo '<td align="center"><input type="checkbox" name="PropReqSO' . $PropertyCounter .'"';
+ if ($myrow['reqatsalesorder']==1){
+ echo ' checked="checked"';
+ }
+ echo ' /></td>';
+
+ echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF']) . '?DeleteProperty=' . $myrow['stkcatpropid'] .'&SelectedCategory=' . $SelectedCategory . '" onclick=\'return confirm("' . _('Are you sure you wish to delete this property? All properties of this type set up for stock items will also be deleted.') . '");\'>' . _('Delete') . '</td>';
+ echo '</tr>';
- if ($myrow['reqatsalesorder']==1){
- echo 'checked';
- } else {
- echo '';
- }
-
- echo ' /></td>
- <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF']) . '?DeleteProperty=' . $myrow['stkcatpropid'] .'&SelectedCategory=' . $SelectedCategory . '" onclick=\'return confirm("' . _('Are you sure you wish to delete this property? All properties of this type set up for stock items will also be deleted.') . '");\'>' . _('Delete') . '</td>
- </tr>';
-
$PropertyCounter++;
} //end loop around defined properties for this category
echo '<input type="hidden" name="PropID' . $PropertyCounter .'" value="NewProperty" />';
Modified: trunk/StockSerialItemResearch.php
===================================================================
--- trunk/StockSerialItemResearch.php 2012-01-21 15:41:50 UTC (rev 4827)
+++ trunk/StockSerialItemResearch.php 2012-01-21 22:05:14 UTC (rev 4828)
@@ -6,9 +6,8 @@
include('includes/header.inc');
echo '<p class="page_title_text">
- <img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . _('Inventory') .
-'" alt="" /><b>' . $title. '</b>
- </p>';
+ <img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . _('Inventory') . '" alt="" /><b>' . $title. '</b>
+ </p>';
//validate the submission
Modified: trunk/Z_CreateCompanyTemplateFile.php
===================================================================
--- trunk/Z_CreateCompanyTemplateFile.php 2012-01-21 15:41:50 UTC (rev 4827)
+++ trunk/Z_CreateCompanyTemplateFile.php 2012-01-21 22:05:14 UTC (rev 4828)
@@ -218,7 +218,7 @@
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
prnMsg(_('Running the create a new company template script will export all account groups, account codes and tax set up tables including tax groups, tax authorities, tax rates etc. However, no transactions or private data will be exported. There is opportunity to prevent specific general ledger accounts from being exported where these are considered private - again no transactional or balance data is exported and you can inspect the contents of the sql file. The template file will be emailed automatically to the webERP project'),'info');
-echo _('Enter the name of the template to be created') . ':<input type="text" name="TemplateName">';
+echo _('Enter the name of the template to be created') . ':<input type="text" name="TemplateName" />';
prnMsg(_('Warning: All selected accounts will be exported - please de-select the accounts you do not wish to export to the new template file'),'warn');
@@ -233,14 +233,14 @@
while ($ChartRow = DB_fetch_array($ChartResult)){
echo '<tr><td>' . $ChartRow['accountcode'] . '</td>
<td>' . $ChartRow['accountname'] . '</td>
- <td><input type="checkbox" name="IncludeAccount_' . $i . '" CHECKED></td>
+ <td><input type="checkbox" name="IncludeAccount_' . $i . '" checked="checked" /></td>
</tr>';
$i++;
}
echo '</table>';
echo '<hr>';
-echo '<center><input type="submit" name="CreateTemplate" value="' . _('Create Template and Email') . '"></center>';
+echo '<center><input type="submit" name="CreateTemplate" value="' . _('Create Template and Email') . '" /></center>';
echo '</form>';
include('includes/footer.inc');
Modified: trunk/Z_ImportGLAccountSections.php
===================================================================
--- trunk/Z_ImportGLAccountSections.php 2012-01-21 15:41:50 UTC (rev 4827)
+++ trunk/Z_ImportGLAccountSections.php 2012-01-21 22:05:14 UTC (rev 4828)
@@ -73,8 +73,8 @@
echo '<form name="ItemForm" enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '?' .SID .'">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table><tr><td>'._('File to import').'</td>'.
- '<td><input type="file" id="ImportFile" name="ImportFile"></td></tr></table>';
- echo '<div class= "centre"><input type="submit" name="update" value="Process"></div>';
+ '<td><input type="file" id="ImportFile" name="ImportFile" /></td></tr></table>';
+ echo '<div class= "centre"><input type="submit" name="update" value="Process" /></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.
|
