If account code2 is used in the accounts the report Chart of Accounts gave a bad...

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 94c0fb24b45df94d31577260a7063efcddcbf49d..6ccd9e43974d0f9bf43fcfb54278dae764d6ddcc 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,10 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+20-Aug-2009 Joe Hunt
+# If account code2 is used in the accounts the report Chart of Accounts gave a bad index and didn't print the code.
+$ /gl/includes/gl_db_accounts.inc
+
 19-Aug-2009 Joe Hunt
 ! Change of Quick Entries to use the Tax Types instead, due to complexity using the Tax Groups in EU.
   If you for need more than one Tax Type row in a Quick Entry, please keep the rows together and use the same action type.

diff --git a/doc/quick_entries.txt b/doc/quick_entries.txt
index 1b9dfd5cf26adb65a1e0cdaaa99edfd4a039eb37..90db1293cce73404548ec88bc2b9946ff78d0694 100644 (file)
--- a/doc/quick_entries.txt
+++ b/doc/quick_entries.txt
@@ -20,8 +20,8 @@ Currently following type of operations are defined:
 
 a) Post constant amount to selected GL account.
 b) Post percent part of base amount to selected GL account
-c) Post taxes for selected item tax type, using base amount as net value.
-d) Post taxes for selected item tax type, using base amount as value with tax included.
+c) Post taxes for selected tax type, using base amount as net value.
+d) Post taxes for selected tax type, using base amount as value with tax included.
 e) Post remainder from previous calculations to selected GL acount.
 
 After most operations the base amount can be increased, decreased or not changed 
@@ -33,7 +33,8 @@ bill, gazolin or other kind of simple bills. Later on you can create
 more sophisticated entry lines.
 
 If tax should be includes in the base amount you can first select a line
-'Tax included, reduce base and select the correct item tax type.
+'Tax included, reduce base and select the correct tax type.
+If more lines with other Tax Types are needed, group them together and use the same action. 
 And a line with 'Remainder' put on the account you want to put the rest on.
 That's it!
 

diff --git a/gl/includes/db/gl_db_accounts.inc b/gl/includes/db/gl_db_accounts.inc
index 414ad8e277f727c92035c807c25051bba7ee691d..45fb83018d477915784c624e6109d8de0bbe7268 100644 (file)
--- a/gl/includes/db/gl_db_accounts.inc
+++ b/gl/includes/db/gl_db_accounts.inc
@@ -55,7 +55,8 @@ function get_gl_accounts_all($balance=-1)
                $where ="WHERE balance_sheet>0 AND balance_sheet<".CL_INCOME;
        elseif ($balance == 0)  
                $where ="WHERE balance_sheet>".CL_EQUITY." OR balance_sheet=0"; // backwards compatibility
-       $sql = "SELECT ".TB_PREF."chart_master.account_code, ".TB_PREF."chart_master.account_name, ".TB_PREF."chart_types.name AS AccountTypeName,".TB_PREF."chart_types.id AS AccountType,
+       $sql = "SELECT ".TB_PREF."chart_master.account_code, ".TB_PREF."chart_master.account_name, ".TB_PREF."chart_master.account_code2,
+               ".TB_PREF."chart_types.name AS AccountTypeName,".TB_PREF."chart_types.id AS AccountType,
                ".TB_PREF."chart_types.parent, ".TB_PREF."chart_class.class_name AS AccountClassName, ".TB_PREF."chart_class.cid AS ClassID, 
                ".TB_PREF."chart_class.balance_sheet AS ClassType
                FROM ".TB_PREF."chart_types INNER JOIN ".TB_PREF."chart_class ON ".TB_PREF."chart_types.class_id=".TB_PREF."chart_class.cid

diff --git a/update.html b/update.html
index b14ec82fde45709448207806c6b6c138400e7b8f..2d822faec7946e61d60798ce942fab3cd2b234ad 100644 (file)
--- a/update.html
+++ b/update.html
@@ -56,7 +56,9 @@ Mark the checkbox 'Install' and press 'Upgrade System'.  This will
 upgrade ALL your companies.</strong></li><li style="font-weight: bold;">If something goes wrong during upgrade, you can enter here again and try 'Force Upgrade', and press 'Upgrade System' again.</li><li><strong style="font-weight: bold;"></strong><strong>There are no database changes during a major and minor release. Like from 2.1 to 2.1.1 - 2.1.5 .</strong></li><li style="font-weight: bold;">When
 updating from release 2.1.2 to 2.1.3, please go into Bank and General
 Ledger tab. Enter Account Classes. Change the Class Types to a proper
-value for all classes.</li>
+value for all classes.</li><li style="font-weight: bold;">When updating from release 2.1.4 to 2.1.5, please go into Bank and General Ledger tab. Enter Quick Entries. <br />The&nbsp;Tax now uses Tax Types instead of Item Tax Types. The reason for changing this is for the complex rules inside the EU.<br />Change
+to correct Tax Type. If you need more Tax Type lines in the same Quick
+Entry, please group them together and use the same action type.</li>
 </ul>
 
 <p style="font-weight: bold;">&nbsp;</p>