From: <dai...@us...> - 2012-02-05 22:00:54
|
Revision: 4874 http://web-erp.svn.sourceforge.net/web-erp/?rev=4874&view=rev Author: daintree Date: 2012-02-05 22:00:48 +0000 (Sun, 05 Feb 2012) Log Message: ----------- Modified Paths: -------------- trunk/PricesBasedOnMarkUp.php trunk/doc/README.txt trunk/doc/UPGRADING.txt Modified: trunk/PricesBasedOnMarkUp.php =================================================================== --- trunk/PricesBasedOnMarkUp.php 2012-02-05 16:15:00 UTC (rev 4873) +++ trunk/PricesBasedOnMarkUp.php 2012-02-05 22:00:48 UTC (rev 4874) @@ -35,13 +35,13 @@ echo '</select></td></tr>'; -$SQL = 'SELECT currency, currabrev FROM currencies'; +$SQL = "SELECT currency, currabrev FROM currencies"; $result = DB_query($SQL,$db); echo '<tr> - <td>' . _('Select the price list currency to update') . ':</td> - <td><select name="CurrCode">'; + <td>' . _('Select the price list currency to update') . ':</td> + <td><select name="CurrCode">'; if (!isset($_POST['CurrCode'])){ echo '<option selected="selected" value="0">' . _('No Price List Currency Selected') . '</option>'; @@ -102,7 +102,7 @@ echo '<tr><td>' . _('Stock Category From') . ':</td> <td><select name="StkCatFrom">'; -$sql = 'SELECT categoryid, categorydescription FROM stockcategory'; +$sql = "SELECT categoryid, categorydescription FROM stockcategory"; $ErrMsg = _('The stock categories could not be retrieved because'); $DbgMsg = _('The SQL used to retrieve stock categories and failed was'); @@ -119,8 +119,9 @@ DB_data_seek($result,0); -echo '<tr><td>' . _('Stock Category To') . ':</td> - <td><select name="StkCatTo">'; +echo '<tr> + <td>' . _('Stock Category To') . ':</td> + <td><select name="StkCatTo">'; while ($myrow=DB_fetch_array($result)){ if (isset($_POST['StkCatFrom']) and $myrow['categoryid']==$_POST['StkCatTo']){ Modified: trunk/doc/README.txt =================================================================== --- trunk/doc/README.txt 2012-02-05 16:15:00 UTC (rev 4873) +++ trunk/doc/README.txt 2012-02-05 22:00:48 UTC (rev 4874) @@ -32,7 +32,7 @@ SUPPORT -The primary means of support queries is through the user mailing list. +The primary means of support queries is through the forum at http://www.weberp.org/forum or the user mailing list. Please join the list at: http://lists.sourceforge.net/lists/listinfo/web-erp-users if you have queries. The archives of the mailing lists on sourceforge and the FAQ (see http://www.weberp.org/wikidocs/FrequentlyAskedQuestionsInstallation) contain the most common issues with respect to installation. Modified: trunk/doc/UPGRADING.txt =================================================================== --- trunk/doc/UPGRADING.txt 2012-02-05 16:15:00 UTC (rev 4873) +++ trunk/doc/UPGRADING.txt 2012-02-05 22:00:48 UTC (rev 4874) @@ -2,19 +2,11 @@ /* $Id$*/ -From version 4.01 database upgrades are now automatically processed if the version number of the code is different to the version number of the database. The first login will require the system administrator to allow the system to upgrade it's own database. A backup of the database prior to the running the upgrade is advisable. The new upgrade system will not be able to identify versions prior to 3.11 so it is necessary to select the version being upgraded from manaully. It can process database upgrades from version 3.00 onwards. +From versions 4.01 database upgrades are now automatically processed if the version number of the code is different to the version number of the database. The first login will require the system administrator to allow the system to upgrade it's own database. A backup of the database prior to the running the upgrade is advisable and a link is provided to download a backup of the database. The new upgrade system will not be able to identify versions prior to 3.11 so it is necessary to select the version being upgraded from manaully. It can process database upgrades from version 3.00 onwards. -From version 3.05 an upgrade script will be provided that applies the database modifications automatically and does any data conversions required for the new scripts to work. +The instructions to complete upgrades the old way are provided below if for some reason it becomes necessary: -The upgrade script to convert a 3.05 database to work with 3.06 scripts is: -Z_Upgrade_3.05-3.06.php - -Once the new scripts have been loaded onto the web-server and a backup of the old database taken this script should be opened in a URL - there are no links to this URL so it will need to be typed manually into the browser. - -Previous to version 3.05, the database conversion had to be done manually - the instructions to complete upgrades from older versions are provided below: - - CONVERTING THE DATABASE MANUALY - THE DETAIL As each new version is released the new php scripts will use new database fields or changed field names. A a consequence, the new scripts will most likely not work unless the database structure has been converted to the new database structure. Normally the changes to the database between versions are small. However, between 2.9b and 3.0 the changes were significant and the upgrade script may take some time to run. It should not be run from a phpMyAdmin window since PHP will time out long before the upgrade script will have finished. @@ -27,13 +19,12 @@ where XX.XX is the old version number and YY.YY is the new version number. -No other users should be using the database. The upgrade script will need to be edited to use the name of the database that your webERP installation was created with - by default this is weberp. If the default has not been changed then the following line will need to be added to the upgrade script - right at the beginning: +No other users should be using the database. The upgrade script will need to be edited to use the name of the database that your webERP installation was created with - by default this is weberpdemo. If the default has not been changed then the following line (or modified for your database name) will need to be added to the upgrade script - right at the beginning: - use weberp; + use weberpdemo; A similar line will be required but substituting the name of the database that your installation uses where the default database name has been changed. - Upgrading a mysql installation, the script should then be run through mysql from the command line: /usr/local/mysql/bin/mysql -u weberp_db_user -p weberp_db_pwd < path_to_upgraded_webERP_install/sql/mysql/upgradeXX.X-YY.Y.sql @@ -55,14 +46,12 @@ You will need to remove this yourself - otherwise you will not be able to create shipment charges. Using the new db scripts will of course generate dbs without this foreign key. - NOTES ON UPGRADING FROM 2.9B TO 3.0 There are extensive changes to the database and the upgrade2.9b-3.0.sql may take some time to run depending on how much data there is in the system. A backup of the 2.9b database dump should be taken prior to attempting to run the upgrade script. -IMPORTANT: Note that version of mysql 4.1.8 or greater is required because from the mysql change log: - "Fix two hangs: FOREIGN KEY constraints treated table and database names as case-insensitive. RENAME TABLE t TO T would hang in an endless loop if t had a foreign key constraint defined on it. Fix also a hang over the dictionary mutex that would occur if one tried in ALTER TABLE or RENAME TABLE to create a foreign key constraint name that collided with another existing name. (Bug -#3478)" +IMPORTANT: Note that mysql version 4.1.8 or greater is required because from the mysql change log: + "Fix two hangs: FOREIGN KEY constraints treated table and database names as case-insensitive. RENAME TABLE t TO T would hang in an endless loop if t had a foreign key constraint defined on it. Fix also a hang over the dictionary mutex that would occur if one tried in ALTER TABLE or RENAME TABLE to create a foreign key constraint name that collided with another existing name. (Bug #3478)" NOTES ON UPGRADING FROM 3.01 to 3.02 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |