X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=CHANGELOG.txt;h=367afd8f54b6a57c78f77b596c40eb07a64d6191;hb=9478a0cdeaf9201d2f3947e11e58d90354050025;hp=8d71f2ef6d7f621a75fd2cc111cc8fe76e7d483a;hpb=d3f047621e21e734300f97c1361a4c7b96e0f385;p=fa-stable.git

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 8d71f2ef..367afd8f 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,65 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+
+20-Jan-2010 Merged changes from main trunk 2.2.3-2.2.4 as follows
+------------------------------- Release 2.2.4 ----------------------------------
+17-Jan-2010 Joe Hunt
+! Release 2.2.4
+$ $config.default.php
+  update.html
+
+17-Jan-2010 Janusz Dobrowolski
+! Improved error checking.in company update/creation.
+$ /admin/create_coy.php
+# Fixed default value for stock_category.dflt_tax_type
+$ /sql/en_US-new.sql
+# Fixed errors display in ajax mode.
+$ /includes/errors.inc
+# Fixed checks for deleting POS
+$ /sales/manage/sales_points.php
+
+15-Jan-2010 Janusz Dobrowolski
+! Changed so GL Account Types id allows up to 10 digits.
+$ /gl/manage/gl_account_types.php
+# [0000187] Category and description reset after failed check;
+$ /inventory/manage/sales_kits.php
+# Cleaned warnings in errorlog.
+$ /sales/includes/sales_db.inc
+! Default 0 on empty amount fields
+$ /includes/data_checks.inc
+! Empty numeric input fields globaly defaulted to 0.
+$ /includes/data_checks.inc
+  /includes/ui/ui_input.inc
+
+15-Jan-2010 Joe Hunt
+# [0000190] Back link on confirmation only pages removed.
+$ /includes/page/footer.inc
+  /includes/ui/ui_view.inc
+  /includes/main.inc
+# Removed a comma after last item in structure for 0_tax_types, line 1596
+$ /sql/en_US-new.sql
+
+14-Jan-2010 Joe Hunt
+# A couple of small bugs were fixed in average material cost
+$ /purchasing/includes/db/grn_db.inc
+  /purchasing/includes/db/invoice_db.inc
+  /manufacturing/includes/db/work_orders_db.inc
+
+13-Jan-2010 Joe Hunt
+! Changed so also Item Adjustment and Cost Update allow more than 2 dec in price
+$ /inventory/cost_update.php
+  /inventory/includes/item_adjustments_ui.inc
+  /inventory/view/view_adjustment.php
+! Changed so GL Account Types id allows up to 6 digits.
+$ /gl/manage/gl_account_types.php
+  
+12-Jan-2010 Janusz Dobrowolski
+# Fixed buggy exemptions display
+$ /taxes/item_tax_types.php
+
+---------- End of changes from main trunk 2.2.3-2.2.4
+
 12-Jan-2010 Janusz Dobrowolski
 ! Added sorting by branch_ref
 $ /sales/includes/db/branches_db.inc