Menu
▾
▴
[Weberp-cvs] SF.net SVN: web-erp:[4104] trunk
|
From: <dai...@us...> - 2010-10-22 04:40:23
|
Revision: 4104
http://web-erp.svn.sourceforge.net/web-erp/?rev=4104&view=rev
Author: daintree
Date: 2010-10-22 04:40:14 +0000 (Fri, 22 Oct 2010)
Log Message:
-----------
Fixed assets depreciation was posting to the credit of asset cost not accum depn - fixed
Modified Paths:
--------------
trunk/FixedAssetJournal.php
trunk/Suppliers.php
trunk/doc/Manual/ManualSalesOrders.html
trunk/index.php
trunk/sql/mysql/upgrade3.11.1-3.12.sql
trunk/sql/mysql/weberp-new.sql
Modified: trunk/FixedAssetJournal.php
===================================================================
--- trunk/FixedAssetJournal.php 2010-10-21 00:24:11 UTC (rev 4103)
+++ trunk/FixedAssetJournal.php 2010-10-22 04:40:14 UTC (rev 4104)
@@ -33,7 +33,7 @@
/* Get list of assets for journal */
$sql='SELECT assetmanager.*,
- stockcategory.stockact as bsdepn,
+ stockcategory.wipact as bsdepn,
stockcategory.adjglact as pldepn,
fixedassetlocations.locationdescription
FROM assetmanager
Modified: trunk/Suppliers.php
===================================================================
--- trunk/Suppliers.php 2010-10-21 00:24:11 UTC (rev 4103)
+++ trunk/Suppliers.php 2010-10-22 04:40:14 UTC (rev 4104)
@@ -905,8 +905,7 @@
echo "<br><p><div class='centre'><input type='Submit' name='submit' VALUE='" . _('Update Supplier') . "'></div><br>";
// echo '<p><font color=red><b>' . _('WARNING') . ': ' . _('There is no second warning if you hit the delete button below') . '. ' . _('However checks will be made to ensure there are no outstanding purchase orders or existing accounts payable transactions before the deletion is processed') . '<br></font></b>';
prnMsg(_('WARNING') . ': ' . _('There is no second warning if you hit the delete button below') . '. ' . _('However checks will be made to ensure there are no outstanding purchase orders or existing accounts payable transactions before the deletion is processed'), 'Warn');
- echo "<br><div class=centre><input type='Submit' name='delete' VALUE='" . _('Delete Supplier') . "' onclick=\"return confirm('" .
- _('Are you sure you wish to delete this supplier?') . "');\"></form>";
+ echo "<br><div class=centre><input type='Submit' name='delete' VALUE='" . _('Delete Supplier') . "' onclick=\"return confirm('" . _('Are you sure you wish to delete this supplier?') . "');\"></form>";
echo "<br><a href='$rootpath/SupplierContacts.php?" . SID . "SupplierID=$SupplierID'>" . _('Review Contact Details') . '</a></div>';
}
echo '</div>';
Modified: trunk/doc/Manual/ManualSalesOrders.html
===================================================================
--- trunk/doc/Manual/ManualSalesOrders.html 2010-10-21 00:24:11 UTC (rev 4103)
+++ trunk/doc/Manual/ManualSalesOrders.html 2010-10-22 04:40:14 UTC (rev 4104)
@@ -71,8 +71,13 @@
<br><br>
In version 3.12 of webERP a new feature was introduced which allowed for cash sales to be entered directly without first entering an order and then confirming a dispatch to invoice. This feature is known as "counter sales". From the main menu->Sales tab select Enter Counter Sales. Entry is similar to entering an order, by default the quick entry screen allows entry of item codes and quantities but it is also possible to select items by the search functions in much the same way as an order. The tax is calculated and the total amount to pay is shown. This page also expects the payment to be made and entered. The payment entered is automatically allocated to the sale.
<br><br>
-Behind the scenes this script produces all the database entries for an order and an invoice with sales analysis, stock movements etc etc all correctly created. The customer (and customer branch) used for the entries is derived from the user's default inventory location. webERP looks at the users default location and then looks up against the location record to find the cash sales debtor account (and branch) to use for counter sales entered this way. Obviously before the Counter Sales functionality is used the customer and branch must first be entered against the location records (Setup-> Inventory Location Maintenance) in the format customercode-branchcode in the field provided for this purpose.
+Behind the scenes this script produces all the database entries for an order and an invoice with sales analysis, stock movements etc etc all correctly created. The customer (and customer branch) used for the entries is derived from the user's default inventory location.
<br><br>
+<font size="+1"><b>Setting Up Counter Sales</b></font>
+<br><br>
+webERP looks at the user's default location and then looks up against the location record to find the cash sales debtor account (and branch) to use for counter sales entered. Each location for which counter sales are required must first be set up with the cash sales customer and branch which is to be used for counter sales entered. Note that the default location of the customer branch is ignored - the user's default location (see Setup->General->User Maintenance - the script webERP/WWW_Users.php) is used as the location and stock movements are all created from this location against the customer specified in the location record (Setup - > Inventory Setup -> Location Maintenance - the script webERP/Locations.php).
+To specify the customer and branch to use for counter sales for an inventory location (or warehouse), the customer code and branch code must be entered in the format customercode-branchcode in the field provided for this purpose. i.e. the customer code then a hyphen then the branch code.
+<br><br>
<!-- Help Begin: SelectSalesOrder -->
<font size="+1"><b>Modfiying An Order</b></font>
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2010-10-21 00:24:11 UTC (rev 4103)
+++ trunk/index.php 2010-10-22 04:40:14 UTC (rev 4104)
@@ -1292,8 +1292,19 @@
<tr>
<td class="menu_group_items"> <!-- Fixed Asset transactions options -->
<table width="100%" class="table_index">
+ <tr>
<tr>
<td class="menu_group_item">
+ <?php echo '<p>• <a href="' . $rootpath . '/FixedAssetItems.php?' . SID . '">' . _('Add a new Asset') . '</a></p>'; ?>
+ </td>
+ </tr>
+ <tr>
+ <td class="menu_group_item">
+ <?php echo '<p>• <a href="' . $rootpath . '/SelectAssetType.php?' . SID . '">' . _('Select an Asset') . '</a></p>'; ?>
+ </td>
+ </tr>
+ <tr>
+ <td class="menu_group_item">
<?php echo '<p>• <a href="' . $rootpath . '/FixedAssetTransfer.php?' . SID . '">' . _('Change Asset Location') . '</a></p>'; ?>
</td>
</tr>
@@ -1332,16 +1343,6 @@
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/FixedAssetItems.php?' . SID . '">' . _('Add a new Asset Type') . '</a></p>'; ?>
- </td>
- </tr>
- <tr>
- <td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/SelectAssetType.php?' . SID . '">' . _('Select an Asset Type') . '</a></p>'; ?>
- </td>
- </tr>
- <tr>
- <td class="menu_group_item">
<?php echo '<p>• <a href="' . $rootpath . '/FixedAssetLocations.php?' . SID . '">' . _('Add or Maintain Asset Locations') . '</a></p>'; ?>
</td>
</tr>
Modified: trunk/sql/mysql/upgrade3.11.1-3.12.sql
===================================================================
--- trunk/sql/mysql/upgrade3.11.1-3.12.sql 2010-10-21 00:24:11 UTC (rev 4103)
+++ trunk/sql/mysql/upgrade3.11.1-3.12.sql 2010-10-22 04:40:14 UTC (rev 4104)
@@ -1,15 +1,112 @@
SET FOREIGN_KEY_CHECKS=0;
-ALTER TABLE `workcentres` CONVERT TO CHARACTER SET utf8;
-ALTER TABLE `stockmaster` CONVERT TO CHARACTER SET utf8;
-ALTER TABLE `custbranch` CONVERT TO CHARACTER SET utf8;
-ALTER TABLE `stockcategory` CONVERT TO CHARACTER SET utf8;
-ALTER TABLE `locations` CONVERT TO CHARACTER SET utf8;
-ALTER TABLE `www_users` CONVERT TO CHARACTER SET utf8;
-ALTER TABLE `currencies` CONVERT TO CHARACTER SET utf8;
-ALTER TABLE `suppliers` CONVERT TO CHARACTER SET utf8;
+ALTER TABLE accountgroups CONVERT TO CHARACTER SET utf8;
+ALTER TABLE accountsection CONVERT TO CHARACTER SET utf8;
+ALTER TABLE areas CONVERT TO CHARACTER SET utf8;
+ALTER TABLE audittrail CONVERT TO CHARACTER SET utf8;
+ALTER TABLE bankaccounts CONVERT TO CHARACTER SET utf8;
+ALTER TABLE banktrans CONVERT TO CHARACTER SET utf8;
+ALTER TABLE bom CONVERT TO CHARACTER SET utf8;
+ALTER TABLE buckets CONVERT TO CHARACTER SET utf8;
+ALTER TABLE chartdetails CONVERT TO CHARACTER SET utf8;
+ALTER TABLE chartmaster CONVERT TO CHARACTER SET utf8;
+ALTER TABLE cogsglpostings CONVERT TO CHARACTER SET utf8;
+ALTER TABLE companies CONVERT TO CHARACTER SET utf8;
+ALTER TABLE config CONVERT TO CHARACTER SET utf8;
+ALTER TABLE currencies CONVERT TO CHARACTER SET utf8;
+ALTER TABLE custallocns CONVERT TO CHARACTER SET utf8;
+ALTER TABLE custbranch CONVERT TO CHARACTER SET utf8;
+ALTER TABLE custcontacts CONVERT TO CHARACTER SET utf8;
+ALTER TABLE custnotes CONVERT TO CHARACTER SET utf8;
+ALTER TABLE debtorsmaster CONVERT TO CHARACTER SET utf8;
+ALTER TABLE debtortrans CONVERT TO CHARACTER SET utf8;
+ALTER TABLE debtortranstaxes CONVERT TO CHARACTER SET utf8;
+ALTER TABLE debtortype CONVERT TO CHARACTER SET utf8;
+ALTER TABLE debtortypenotes CONVERT TO CHARACTER SET utf8;
+ALTER TABLE deliverynotes CONVERT TO CHARACTER SET utf8;
+ALTER TABLE discountmatrix CONVERT TO CHARACTER SET utf8;
+ALTER TABLE edi_orders_seg_groups CONVERT TO CHARACTER SET utf8;
+ALTER TABLE edi_orders_segs CONVERT TO CHARACTER SET utf8;
+ALTER TABLE ediitemmapping CONVERT TO CHARACTER SET utf8;
+ALTER TABLE edimessageformat CONVERT TO CHARACTER SET utf8;
+ALTER TABLE factorcompanies CONVERT TO CHARACTER SET utf8;
+ALTER TABLE freightcosts CONVERT TO CHARACTER SET utf8;
+ALTER TABLE geocode_param CONVERT TO CHARACTER SET utf8;
+ALTER TABLE gltrans CONVERT TO CHARACTER SET utf8;
+ALTER TABLE grns CONVERT TO CHARACTER SET utf8;
+ALTER TABLE holdreasons CONVERT TO CHARACTER SET utf8;
+ALTER TABLE lastcostrollup CONVERT TO CHARACTER SET utf8;
+ALTER TABLE locations CONVERT TO CHARACTER SET utf8;
+ALTER TABLE locstock CONVERT TO CHARACTER SET utf8;
+ALTER TABLE loctransfers CONVERT TO CHARACTER SET utf8;
+ALTER TABLE mrpcalendar CONVERT TO CHARACTER SET utf8;
+ALTER TABLE mrpdemands CONVERT TO CHARACTER SET utf8;
+ALTER TABLE mrpdemandtypes CONVERT TO CHARACTER SET utf8;
+ALTER TABLE orderdeliverydifferenceslog CONVERT TO CHARACTER SET utf8;
+ALTER TABLE paymentmethods CONVERT TO CHARACTER SET utf8;
+ALTER TABLE paymentterms CONVERT TO CHARACTER SET utf8;
+ALTER TABLE periods CONVERT TO CHARACTER SET utf8;
+ALTER TABLE prices CONVERT TO CHARACTER SET utf8;
+ALTER TABLE purchdata CONVERT TO CHARACTER SET utf8;
+ALTER TABLE purchorderauth CONVERT TO CHARACTER SET utf8;
+ALTER TABLE purchorderdetails CONVERT TO CHARACTER SET utf8;
+ALTER TABLE purchorders CONVERT TO CHARACTER SET utf8;
+ALTER TABLE recurringsalesorders CONVERT TO CHARACTER SET utf8;
+ALTER TABLE recurrsalesorderdetails CONVERT TO CHARACTER SET utf8;
+ALTER TABLE reportcolumns CONVERT TO CHARACTER SET utf8;
+ALTER TABLE reportfields CONVERT TO CHARACTER SET utf8;
+ALTER TABLE reportheaders CONVERT TO CHARACTER SET utf8;
+ALTER TABLE reportlinks CONVERT TO CHARACTER SET utf8;
+ALTER TABLE reports CONVERT TO CHARACTER SET utf8;
+ALTER TABLE salesanalysis CONVERT TO CHARACTER SET utf8;
+ALTER TABLE salescat CONVERT TO CHARACTER SET utf8;
+ALTER TABLE salescatprod CONVERT TO CHARACTER SET utf8;
+ALTER TABLE salesglpostings CONVERT TO CHARACTER SET utf8;
+ALTER TABLE salesman CONVERT TO CHARACTER SET utf8;
+ALTER TABLE salesorderdetails CONVERT TO CHARACTER SET utf8;
+ALTER TABLE salesorders CONVERT TO CHARACTER SET utf8;
+ALTER TABLE salestypes CONVERT TO CHARACTER SET utf8;
+ALTER TABLE scripts CONVERT TO CHARACTER SET utf8;
+ALTER TABLE securitygroups CONVERT TO CHARACTER SET utf8;
+ALTER TABLE securityroles CONVERT TO CHARACTER SET utf8;
+ALTER TABLE securitytokens CONVERT TO CHARACTER SET utf8;
+ALTER TABLE shipmentcharges CONVERT TO CHARACTER SET utf8;
+ALTER TABLE shipments CONVERT TO CHARACTER SET utf8;
+ALTER TABLE shippers CONVERT TO CHARACTER SET utf8;
+ALTER TABLE stockcategory CONVERT TO CHARACTER SET utf8;
+ALTER TABLE stockcatproperties CONVERT TO CHARACTER SET utf8;
+ALTER TABLE stockcheckfreeze CONVERT TO CHARACTER SET utf8;
+ALTER TABLE stockcounts CONVERT TO CHARACTER SET utf8;
+ALTER TABLE stockitemproperties CONVERT TO CHARACTER SET utf8;
+ALTER TABLE stockmaster CONVERT TO CHARACTER SET utf8;
+ALTER TABLE stockmoves CONVERT TO CHARACTER SET utf8;
+ALTER TABLE stockmovestaxes CONVERT TO CHARACTER SET utf8;
+ALTER TABLE stockserialitems CONVERT TO CHARACTER SET utf8;
+ALTER TABLE stockserialmoves CONVERT TO CHARACTER SET utf8;
+ALTER TABLE suppallocs CONVERT TO CHARACTER SET utf8;
+ALTER TABLE suppliercontacts CONVERT TO CHARACTER SET utf8;
+ALTER TABLE suppliers CONVERT TO CHARACTER SET utf8;
+ALTER TABLE supptrans CONVERT TO CHARACTER SET utf8;
+ALTER TABLE supptranstaxes CONVERT TO CHARACTER SET utf8;
+ALTER TABLE systypes CONVERT TO CHARACTER SET utf8;
+ALTER TABLE tags CONVERT TO CHARACTER SET utf8;
+ALTER TABLE taxauthorities CONVERT TO CHARACTER SET utf8;
+ALTER TABLE taxauthrates CONVERT TO CHARACTER SET utf8;
+ALTER TABLE taxcategories CONVERT TO CHARACTER SET utf8;
+ALTER TABLE taxgroups CONVERT TO CHARACTER SET utf8;
+ALTER TABLE taxgrouptaxes CONVERT TO CHARACTER SET utf8;
+ALTER TABLE taxprovinces CONVERT TO CHARACTER SET utf8;
+ALTER TABLE unitsofmeasure CONVERT TO CHARACTER SET utf8;
+ALTER TABLE woitems CONVERT TO CHARACTER SET utf8;
+ALTER TABLE worequirements CONVERT TO CHARACTER SET utf8;
+ALTER TABLE workcentres CONVERT TO CHARACTER SET utf8;
+ALTER TABLE workorders CONVERT TO CHARACTER SET utf8;
+ALTER TABLE woserialnos CONVERT TO CHARACTER SET utf8;
+ALTER TABLE www_users CONVERT TO CHARACTER SET utf8;
+
CREATE TABLE IF NOT EXISTS `fixedassetlocations` (
`locationid` char(6) NOT NULL default '',
`locationdescription` char(20) NOT NULL default '',
+ `parentlocationid` char(6) DEFAULT '',
PRIMARY KEY (`locationid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -23,15 +120,16 @@
`cost` double NOT NULL default '0',
`depn` double NOT NULL default '0',
`datepurchased` date NOT NULL default '0000-00-00',
+ `disposalvalue` int(11) NOT NULL DEFAULT 0,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
UPDATE `www_users` SET `modulesallowed`=(SELECT insert(`modulesallowed`, 15,0,"1,"));
INSERT INTO `config` (`confname`, `confvalue`) VALUES ('FrequentlyOrderedItems',0);
ALTER TABLE `www_users` CHANGE COLUMN `language` `language` varchar(10) NOT NULL DEFAULT 'en_GB.utf8';
-ALTER TABLE `assetmanager` ADD COLUMN `disposalvalue` int(11) NOT NULL DEFAULT 0;
+
ALTER TABLE `currencies` ADD COLUMN `decimalplaces` tinyint(3) NOT NULL DEFAULT 2 AFTER `hundredsname`;
-ALTER TABLE `fixedassetlocations` ADD COLUMN `parentlocationid` char(6) DEFAULT '';
+
INSERT INTO `config` (`confname`, `confvalue`) VALUES ('NumberOfMonthMustBeShown', '6');
ALTER TABLE `holdreasons` DROP INDEX `ReasonCode`;
Modified: trunk/sql/mysql/weberp-new.sql
===================================================================
--- trunk/sql/mysql/weberp-new.sql 2010-10-21 00:24:11 UTC (rev 4103)
+++ trunk/sql/mysql/weberp-new.sql 2010-10-22 04:40:14 UTC (rev 4104)
@@ -2351,10 +2351,8 @@
PRIMARY KEY (`supplierid`),
KEY `CurrCode` (`currcode`),
KEY `PaymentTerms` (`paymentterms`),
- KEY `SupplierID` (`supplierid`),
KEY `SuppName` (`suppname`),
KEY `taxgroupid` (`taxgroupid`),
- KEY `suppliers_ibfk_4` (`factorcompanyid`),
CONSTRAINT `suppliers_ibfk_1` FOREIGN KEY (`currcode`) REFERENCES `currencies` (`currabrev`),
CONSTRAINT `suppliers_ibfk_2` FOREIGN KEY (`paymentterms`) REFERENCES `paymentterms` (`termsindicator`),
CONSTRAINT `suppliers_ibfk_3` FOREIGN KEY (`taxgroupid`) REFERENCES `taxgroups` (`taxgroupid`)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
