Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[6070] trunk
|
From: <ice...@us...> - 2013-07-10 11:38:07
|
Revision: 6070
http://sourceforge.net/p/web-erp/reponame/6070
Author: icedlava
Date: 2013-07-10 11:38:04 +0000 (Wed, 10 Jul 2013)
Log Message:
-----------
Consistency changes for fixed assets docs with contents, menu title, maintenance entry and small grammar changes.
Modified Paths:
--------------
trunk/FixedAssetRegister.php
trunk/MaintenanceTasks.php
trunk/MaintenanceUserSchedule.php
trunk/doc/Manual/ManualFixedAssets.html
trunk/doc/Manual/ManualOutline.php
Modified: trunk/FixedAssetRegister.php
===================================================================
--- trunk/FixedAssetRegister.php 2013-07-10 02:24:38 UTC (rev 6069)
+++ trunk/FixedAssetRegister.php 2013-07-10 11:38:04 UTC (rev 6070)
@@ -2,6 +2,9 @@
include ('includes/session.inc');
$Title = _('Fixed Asset Register');
+
+$ViewTopic = 'FixedAssets';
+$BookMark = 'AssetRegister';
$csv_output = '';
// Reports being generated in HTML, PDF and CSV/EXCEL format
if (isset($_POST['submit']) OR isset($_POST['pdf']) OR isset($_POST['csv'])) {
Modified: trunk/MaintenanceTasks.php
===================================================================
--- trunk/MaintenanceTasks.php 2013-07-10 02:24:38 UTC (rev 6069)
+++ trunk/MaintenanceTasks.php 2013-07-10 11:38:04 UTC (rev 6070)
@@ -4,7 +4,11 @@
include('includes/session.inc');
-$Title = _('Maintenance Tasks');
+$Title = _('Fixed Asset Maintenance Tasks');
+
+$ViewTopic = 'FixedAssets';
+$BookMark = 'AssetMaintenance';
+
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/group_add.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />';
@@ -47,7 +51,7 @@
userresponsible='" . $_POST['UserResponsible'] . "',
manager='" . $_POST['Manager'] . "'
WHERE taskid='".$_POST['TaskID']."'";
-
+
$ErrMsg = _('The task details cannot be updated because');
$Result=DB_query($sql,$db,$ErrMsg);
unset($_POST['AssetID']);
@@ -75,10 +79,10 @@
userresponsible,
realname,
manager
- FROM fixedassettasks
- INNER JOIN fixedassets
+ FROM fixedassettasks
+ INNER JOIN fixedassets
ON fixedassettasks.assetid=fixedassets.assetid
- INNER JOIN www_users
+ INNER JOIN www_users
ON fixedassettasks.userresponsible=www_users.userid";
$ErrMsg = _('The maintenance task details cannot be retrieved because');
@@ -95,7 +99,7 @@
</tr>';
while ($myrow=DB_fetch_array($Result)) {
-
+
if ($myrow['manager']!=''){
$ManagerResult = DB_query("SELECT realname FROM www_users WHERE userid='" . $myrow['manager'] . "'",$db);
$ManagerRow = DB_fetch_array($ManagerResult);
@@ -103,7 +107,7 @@
} else {
$ManagerName = _('No Manager Set');
}
-
+
echo '<tr>
<td>' . $myrow['taskid'] . '</td>
<td>' . $myrow['description'] . '</td>
@@ -182,7 +186,7 @@
<td>'._('Task Description').':</td>
<td><textarea name="TaskDescription" cols="40" rows="3">' . $_POST['TaskDescription'] . '</textarea></td>
</tr>';
-
+
echo '<tr>
<td>'._('Days Before Task Due').':</td>
<td><input type="text" class="number" name="FrequencyDays" size="5" maxlength="5" value="' . $_POST['FrequencyDays'] . '" /></td>
Modified: trunk/MaintenanceUserSchedule.php
===================================================================
--- trunk/MaintenanceUserSchedule.php 2013-07-10 02:24:38 UTC (rev 6069)
+++ trunk/MaintenanceUserSchedule.php 2013-07-10 11:38:04 UTC (rev 6070)
@@ -5,6 +5,12 @@
include('includes/session.inc');
$Title = _('My Maintenance Jobs');
+
+$Title = _('Fixed Assets Maintenance Schedule');
+
+$ViewTopic = 'FixedAssets';
+$BookMark = 'AssetMaintenance';
+
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/group_add.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />';
@@ -25,12 +31,12 @@
userresponsible,
realname,
manager
- FROM fixedassettasks
- INNER JOIN fixedassets
+ FROM fixedassettasks
+ INNER JOIN fixedassets
ON fixedassettasks.assetid=fixedassets.assetid
- INNER JOIN www_users
+ INNER JOIN www_users
ON fixedassettasks.userresponsible=www_users.userid
- WHERE userresponsible='" . $_SESSION['UserID'] . "'
+ WHERE userresponsible='" . $_SESSION['UserID'] . "'
OR manager = '" . $_SESSION['UserID'] . "'
ORDER BY ADDDATE(lastcompleted,frequencydays) DESC";
@@ -50,7 +56,7 @@
</tr>';
while ($myrow=DB_fetch_array($Result)) {
-
+
if ($myrow['manager']!=''){
$ManagerResult = DB_query("SELECT realname FROM www_users WHERE userid='" . $myrow['manager'] . "'",$db);
$ManagerRow = DB_fetch_array($ManagerResult);
@@ -58,7 +64,7 @@
} else {
$ManagerName = _('No Manager Set');
}
-
+
echo '<tr>
<td>' . $myrow['taskid'] . '</td>
<td>' . $myrow['description'] . '</td>
Modified: trunk/doc/Manual/ManualFixedAssets.html
===================================================================
--- trunk/doc/Manual/ManualFixedAssets.html 2013-07-10 02:24:38 UTC (rev 6069)
+++ trunk/doc/Manual/ManualFixedAssets.html 2013-07-10 11:38:04 UTC (rev 6070)
@@ -1,64 +1,85 @@
-<h1><a id="Fixed Assets">Fixed Assets</a></h1>
+<h1><a id="FixedAssets">Fixed Assets Manager</a></h1>
-<h2>Features Overview</h2>
+<div id="manualpage">
+ <h2><a id="FixedAssetOverview">Features Overview</a></h2>
-<p>The Fixed Assets module allows for recording a database of the individual assets with integration back to the webERP general ledger.</p>
+ <p>The Fixed Assets Manager module allows the recording of individual fixed assets into the database and integration back to the webERP General Ledger.</p>
-<ul>
- <li>Assets are assigned a unique id number</li>
+ <ul>
+ <li>Assets are assigned a unique id number.</li>
- <li>Any number of fixed asset categories can be defined eg. Plant, Equipment, Buildings etc. </li>
+ <li>Any number of fixed asset categories can be defined eg. Plant, Equipment, Buildings etc. </li>
- <li>Assets can be depreciated using either striaght line or diminishing value depreciation methods</li>
+ <li>Assets can be depreciated using either straight line or diminishing value depreciation methods.</li>
- <li>Each asset can have it's own depreciation rate</li>
+ <li>Each asset can have it's own depreciation rate.</li>
- <li>Any number of fixed asset locations can be defined. Assets can only belong to one location. Assets can be listed by category and location so they can be readily identified in a fixed asset audit.</li>
+ <li>Any number of fixed asset locations can be defined. Assets can only belong to one location. </li>
- <li>Depreciation calculation and posting run checks if previously run and defaults the run date to avoid duplicated depreciation runs.</li>
+ <li>Assets can be listed by category and location so they can be readily identified in a fixed asset audit.</li>
- <li>A transaction log of depreciation, additions and disposals is maintained</li>
+ <li>Depreciation calculation and posting run checks if it has been previously run, and defaults the run date to avoid duplicated depreciation runs.</li>
- <li>Full fixed asset schedule of any date period range is possible</li>
+ <li>A transaction log of depreciation, additions and disposals is maintained by the system.</li>
- <li>Fixed asset general ledger posting is performed based on the gl accounts in any number user defined fixed asset categories</li>
-</ul>
+ <li>Full fixed asset schedule of any date period range is possible.</li>
-<h2>Creating a New Fixed Asset</h2>
+ <li>Fixed asset general ledger posting is performed based on the GL accounts specified in any number of user defined, fixed asset categories.</li>
-<p>The sequence of events in creating a new fixed asset is as follows:</p>
+ <li>Fixed asset maintenance tasks can be logged and assigned to an individual and manager which are used when a maintenance schedule is generated.</li>
+ </ul>
+ <div class="floatright">
+ <a class="minitext" href="#top">⬆ Top</a>
+ </div>
+ <h2><a id="CreatingAnAsset">Creating a New Fixed Asset</a></h2>
-<ul>
- <li><h3><a id="AssetCategories">Define Fixed Asset Categories</a></h3>Any number of fixed asset categories are defined - from Fixed Asset Module -> Fixed Asset Categories. These are the groupings of like assets e.g. Plant, IT equipment, Buildings, Land etc. The general ledger accounts for depreciation, fixed asset cost and accumulated depreciation are all defined for all assets of the same category at this level.</li>
+ <p>The sequence of events in creating a new fixed asset is as follows:</p>
- <li><h3><a id="AssetLocations">Define Fixed Asset Locations</a></h3>Fixed asset locations must be defined. These can be in a heirarchical manner e.g. "Head Office" may have a sub-location of "Server Room".</li>
+ <ul>
+ <li><h3><a id="AssetCategories">Define Fixed Asset Categories</a></h3>Any number of fixed asset categories are defined - from Fixed Asset Module -> Fixed Asset Categories. These are the groupings of like assets e.g. Plant, IT equipment, Buildings, Land etc. The general ledger accounts for depreciation, fixed asset cost and accumulated depreciation are all defined for all assets of the same category at this level.</li>
- <li><h3><a id="AssetItems">Add Fixed Asset Items</a></h3>A fixed asset is created from the Fixed Assets module -> Add Fixed Asset. This process allows the description and a long description to be recorded, together with the asset's serial number or barcode, the category of fixed asset it belongs to and it's location in the business. The depreciation method and rate is also specified. At this point there is no cost (nor accumulated depreciation)associated with the asset</li>
+ <li><h3><a id="AssetLocations">Define Fixed Asset Locations</a></h3>Fixed asset locations must be defined. These can be in a heirarchical manner e.g. "Head Office" may have a sub-location of "Server Room".</li>
- <li><h3>Purchase Orders For Fixed assets</h3>A purchase order is placed for the asset as a non-stock item. There is provision to enter the asset id of the asset into the purchase order. When the asset is received - the cost is posted to the general ledger account specified by the asset's category. It is also possible to add cost to existing assets in this way. Each cost added is recorded in the fixed asset transaction log so additions over a period can be identified easily.</li>
+ <li><h3><a id="AssetItems">Add Fixed Asset Items</a></h3>A fixed asset is created from the Fixed Assets module -> Add Fixed Asset. This process allows the description and a long description to be recorded, together with the asset's serial number or barcode, the category of fixed asset it belongs to and it's location in the business. The depreciation method and rate is also specified. At this point there is no cost (nor accumulated depreciation)associated with the asset</li>
- <li><h3><a id="AssetInvoices">Purchase an Item Directly With Supplier Invoice</a></h3>Instead of entering a purchase order with the asset specified directly it is possible to enter a purchase invoice directly allocating the charges to any number of fixed assets. The supplier invoice form allows entry against fixed assets directly. All assets created - but with no cost will show in a select box - any of these can be selected or if the asset id is known it can be entered manually. In this way it is possible to add to existing assets. Depreciation will calculate on the new total cost of the asset (or book value if DV depreciation is being used).</li>
-</ul>
+ <li><h3>Purchase Orders For Fixed assets</h3>A purchase order is placed for the asset as a non-stock item. There is provision to enter the asset id of the asset into the purchase order. When the asset is received - the cost is posted to the general ledger account specified by the asset's category. It is also possible to add cost to existing assets in this way. Each cost added is recorded in the fixed asset transaction log so additions over a period can be identified easily.</li>
-<h2><a id="AssetSelection">Selecting A Fixed Asset</a></h2>
+ <li><h3><a id="AssetInvoices">Purchase an Item Directly With Supplier Invoice</a></h3>Instead of entering a purchase order with the asset specified directly it is possible to enter a purchase invoice directly allocating the charges to any number of fixed assets. The supplier invoice form allows entry against fixed assets directly. All assets created - but with no cost will show in a select box - any of these can be selected or if the asset id is known it can be entered manually. In this way it is possible to add to existing assets. Depreciation will calculate on the new total cost of the asset (or book value if DV depreciation is being used).</li>
+ </ul>
+ <div class="floatright">
+ <a class="minitext" href="#top">⬆ Top</a>
+ </div>
+ <h2><a id="AssetSelection">Selecting A Fixed Asset</a></h2>
-<p>From the main menu -> Fixed Assets Module tab -> Select Asset. There are options to select the asset category and the asset location and just look at assets for the given category and location. Alternatively the asset id can be entered or any part of the description.</p>
+ <p>From the main menu -> Fixed Assets Module tab -> Select Asset. There are options to select the asset category and the asset location and just look at assets for the given category and location. Alternatively the asset id can be entered or any part of the description.</p>
-<p>Once and item is selected - the details of the asset shows including the cost and accumulated depreciation with all entered transactions reflected. The cost and accumulated depreciation cannot be entered or altered manually. The asset cost will always come from the accounts payable module and depreciation will always come from the automatic calculation of depreciation. However, all other details of the asset can be modified when an asset is selected. The description, serial number, barcode, category, location, depreciation type and rate etc can all be modified at will.</p>
+ <p>Once and item is selected - the details of the asset shows including the cost and accumulated depreciation with all entered transactions reflected. The cost and accumulated depreciation cannot be entered or altered manually. The asset cost will always come from the accounts payable module and depreciation will always come from the automatic calculation of depreciation. However, all other details of the asset can be modified when an asset is selected. The description, serial number, barcode, category, location, depreciation type and rate etc can all be modified at will.</p>
-<h2><a id="AssetDepreciation">Fixed Asset Depreciation Run</a></h2>
+ <h2><a id="AssetDepreciation">Fixed Asset Depreciation Run</a></h2>
-<p>The depreciation run must be run monthly to create the general ledger journals for depreciation at the rates and depreciation methods defined for the assets. In addition to the general ledger journals a log of the depreciation transactions is also created. The depreciation run checks the last month it was run and defaults to run for the following month ... in this way every time it is run it is self evident whether it has been run for the month under review. There is no functionality to reverse a depreciation run.</p>
+ <p>The depreciation run must be run monthly to create the general ledger journals for depreciation at the rates and depreciation methods defined for the assets. In addition to the general ledger journals a log of the depreciation transactions is also created. The depreciation run checks the last month it was run and defaults to run for the following month ... in this way every time it is run it is self evident whether it has been run for the month under review. There is no functionality to reverse a depreciation run.</p>
-<h2><a id="AssetTransfer">Change Location of a Fixed Asset</a></h2>
+ <h2><a id="AssetTransfer">Change Location of a Fixed Asset</a></h2>
-<p>Assets can be transferred to a different location. This enables the company to keep track of the location of their assets. To do this select 'Change Asset Location' from the Transactions menu of the Asset Manager module. Then just select the new location of the asset and all reports will be updated with this new location.</p>
+ <p>Assets can be transferred to a different location. This enables the company to keep track of the location of their assets. To do this select 'Change Asset Location' from the Transactions menu of the Asset Manager module. Then just select the new location of the asset and all reports will be updated with this new location.</p>
-<h2>Fixed Asset Disposals</h2>
+ <h2>Fixed Asset Disposals</h2>
-<p>To dispose of a fixed - an invoice is raised for a fixed asset in the usual order entry screen. Instead of selecting a stock item, there is a button that allows a fixed asset to be selected. By selecting a fixed asset to be sold, the system creates a stock item for the fixed asset. When the sales order is confirmed for invoicing and if the debtors ledger is integrated into the general ledger then entries to dispose of the asset to the general ledger accounts defined in the fixed asset category of the asset are created. The fixed asset transaction is created for the disposal and the fixed asset updated to show the date it was disposed and the proceeds on the disposal.</p>
+ <p>To dispose of a fixed - an invoice is raised for a fixed asset in the usual order entry screen. Instead of selecting a stock item, there is a button that allows a fixed asset to be selected. By selecting a fixed asset to be sold, the system creates a stock item for the fixed asset. When the sales order is confirmed for invoicing and if the debtors ledger is integrated into the general ledger then entries to dispose of the asset to the general ledger accounts defined in the fixed asset category of the asset are created. The fixed asset transaction is created for the disposal and the fixed asset updated to show the date it was disposed and the proceeds on the disposal.</p>
-<h2>Fixed Asset Schedule</h2>
+ <h2>Fixed Asset Schedule</h2>
-<p>The fixed asset schedule requires the entry of a starting date and an end date. The script can produce a pdf report, comma separated values for importing into a spreadsheet, or just view in html on screen. It shows the cost b/fwd at the start date, the total of any additions subsequent to the start date, the depreciation brought forward and the depreciation charged over the period, together with the carried forward cost, accumulated depreciation and net book value.</p><!-- Help End: Fixed Assets -->
+ <p>The fixed asset schedule requires the entry of a starting date and an end date. The script can produce a pdf report, comma separated values for importing into a spreadsheet, or just view in html on screen. It shows the cost b/fwd at the start date, the total of any additions subsequent to the start date, the depreciation brought forward and the depreciation charged over the period, together with the carried forward cost, accumulated depreciation and net book value.</p><!-- Help End: Fixed Assets -->
+
+ <div class="floatright">
+ <a class="minitext" href="#top">⬆ Top</a>
+ </div>
+
+
+ <h2><a id="AssetMaintenance">Fixed Asset Maintenance</a></h2>
+
+ <p>Maintenance Task enables addition of maintenance tasks for any existing asset, with task description, person responsible, manager and days before due date. </p>
+ <p>The My Maintenance Schedule inquiry outputs a listing of all outstanding maintenance tasks in reverse due date order. From this Schedule tasks can also be marked as complete.</p>
+
+</div>
\ No newline at end of file
Modified: trunk/doc/Manual/ManualOutline.php
===================================================================
--- trunk/doc/Manual/ManualOutline.php 2013-07-10 02:24:38 UTC (rev 6069)
+++ trunk/doc/Manual/ManualOutline.php 2013-07-10 11:38:04 UTC (rev 6070)
@@ -249,12 +249,13 @@
'EDI',
'EDI setup',
'Sending EDI Invoices'),
- 'FixedAssets' => array('Fixed assets',
+ 'FixedAssets' => array('Fixed Assets Manager',
'Fixed assets overview',
'Creating a fixed asset',
'Selecting fixed assets',
'Depreciation run',
- 'Fixed asset schedule'),
+ 'Fixed asset schedule',
+ 'Maintenance tasks'),
'ReportBuilder' => array('SQL Report Writer',
'Report writer introduction',
'Reports administration',
|
