Changed copyright notice in installer files to credit the original copyrighter. GPLv3.

Updated the install.html and created a doc txt file, about sales quotations.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 201cfcac234856d2170cca30d4052a0dc60620f0..e85d2645d7158e90dd4924d220c629d7a13922e3 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,15 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+22-Sep-2009 Joe Hunt
+! Changed copyright notice in installer files to credit the original copyrighter. GPLv3.
+$ /install/index.php
+  /install/save.php
+! Updated the install.html and created a doc txt file, about sales quotations.
+$ install.html
+  /doc/2.2_Beta.txt
+  /doc/sales_quotations.txt
+  
 21-Sep-2009 Janusz Dobrowolski/Tom Hallman
 ! Added info on timeout and default bank accounts.
 $ /doc/2.2_Beta.txt

diff --git a/doc/2.2_Beta.txt b/doc/2.2_Beta.txt
index c19b6c745d359671f7b5f3ada769da90739bb24d..57376f1f5a57a3bcb918682baf5b80387f237cb4 100644 (file)
--- a/doc/2.2_Beta.txt
+++ b/doc/2.2_Beta.txt
@@ -12,7 +12,7 @@ Common
 - Audit Trail for all operations with Report
 - Bank Charge field in Customer/Supplier Payment.
 - New default fields in Company table for Bank Charge, Retained Earnings and Profit/Loss Year. 
-- Direct Allocations of Invoices in Customer/Supplier Payments
+- Direct Allocation of Invoices in Customer/Supplier Payments
 - New Access Levels/Security Roles system enables fine tunning person access rights.
 - Item Tax Types moved to Setup module
 - Default Start-up Tab set by user.
@@ -31,7 +31,7 @@ Purchasing
 Items and Inventory
 -------------------
 - Item Categories contains default parameters for new items.
-- Non Sale Items from Categories.
+- Excluded from Sale. Non Sales Items from Categories.
 - GRN Valuation Report
 - Automatic price-calculation of Items from Std. Cost (if no prices set on items)
 - Rounding of prices to nearest XX Cent after calculations.
@@ -51,7 +51,7 @@ Banking and General Ledger
 - Journal Enquiry
 - Edition/view of Journal Entries.
 - Group Sorting by Id in Account Selectors
-- Default per currency bank accounts (used in reports)
+- Default per currency bank accounts (used in reports). The Bank Account selection on documents has been replaced by this.
 
 Bugs fixed in this release
 --------------------------

diff --git a/doc/sales_quotatoins.txt b/doc/sales_quotatoins.txt
new file mode 100644 (file)
index 0000000..a6c1f35
--- /dev/null
+++ b/doc/sales_quotatoins.txt
@@ -0,0 +1,17 @@
+Sales Quotations as a separate menu option
+------------------------------------------
+
+You can now create Sales Quotations in a separate form. You enter the 'Valid until' date. These Sales Quotations
+can later be used for creating a Sales Order.
+
+There is a new menu choice under Inquiries, Sales Quotation Inquiry. If the 'Valid until' has been passed, the
+Sales Quotation is not shown. But you can select 'Show All' and all the Sales Quotation inside the period will be shown.
+
+In this Inquiry you have the option to look at the entire Quotation, edit the Quotation, print the Quotation and make a
+Sales Order from the Quotation.
+
+The Sales Quotations will not be deleted, so it is possible to use it agan and maybe edit it for use again.
+
+The Sales Quotations can however be deleted when editing. And when deleting a fiscal year, the Quotations will be deleted.
+
+The Sales Order print out can still be selected to be printed as a Quote should you prefer that.

diff --git a/install.html b/install.html
index 7e3ec85ef22cbb7247f23ef2f4512c5350cfeb0f..b92912bcde2066f45e1f8fefed3780a7763250bd 100644 (file)
--- a/install.html
+++ b/install.html
@@ -63,7 +63,7 @@ the username and password for the database. You will need these
 informations during the wizard install. </li>
 <li>Enter <strong><em>your_url/account/install</em></strong>
 (or whatever directory you entered). This will run the install wizard,
-setup a drill company and populating with initial data. You can later
+setup a drill company and optional populating with initial demo data. You can later
 on create your own real company. It is a good idea to get familiar with
 the system before starting your own company.&nbsp; </li>
 <li>After successfully install, remove or rename your install
@@ -153,7 +153,7 @@ on the server is <strong>writable</strong>. </li>
 directory where FrontAccounting is installed. </li>
 <li>Enter the user name:&nbsp; '<strong>admin</strong>'
 </li>
-<li>Enter the password: '<strong>password</strong>'
+<li>Enter the password: '<strong>password</strong>'. If you used the automatic installer, then use your own password.
 </li>
 <li>(NB : enter without quotation marks). </li>
 <li>

diff --git a/install/index.php b/install/index.php
index 0372573a21e4360545b82db09ba17bf87d757979..7ba272d47f6ed941151922f8fd650ab4c7d98a83 100644 (file)
--- a/install/index.php
+++ b/install/index.php
@@ -1,13 +1,10 @@
 <?php
 /**********************************************************************
-    Copyright (C) FrontAccounting, LLC.
-       Released under the terms of the GNU General Public License, GPL, 
-       as published by the Free Software Foundation, either version 3 
-       of the License, or (at your option) any later version.
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+       This installer is based on code from the        
+       Website Baker Project <http://www.websitebaker.org/>
+       Copyright (C) 2004-2007, Ryan Djurovich.
+       The code is released under GPLv3
+       modified by FrontAcounting, LLC.
 ***********************************************************************/
 error_reporting(E_ALL);
 ini_set("display_errors", "On");

diff --git a/install/save.php b/install/save.php
index 30d2fa5f9ce5158188a7403f636d6111427c4cb8..facba388023fd0d12373970195782b271b0d1f04 100644 (file)
--- a/install/save.php
+++ b/install/save.php
@@ -1,13 +1,10 @@
 <?php
 /**********************************************************************
-    Copyright (C) FrontAccounting, LLC.
-       Released under the terms of the GNU General Public License, GPL, 
-       as published by the Free Software Foundation, either version 3 
-       of the License, or (at your option) any later version.
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+       This installer is based on code from the        
+       Website Baker Project <http://www.websitebaker.org/>
+       Copyright (C) 2004-2007, Ryan Djurovich.
+       The code is released under GPLv3
+       modified by FrontAcounting, LLC.
 ***********************************************************************/
 error_reporting(E_ALL);
 ini_set("display_errors", "On");