+<<<<<<< local
+2012-09-09 08:07 +0200 Janusz Dobrowolski
+(3033) Security cleanup on 'where' parameter in a couple of list helpers
+ includes/ui/ui_lists.inc
+=======
+2012-11-15 16:45 +0100 Joe Hunt
+(3104) Updated update.html
+ update.html
+>>>>>>> other
+
+<<<<<<< local
+2012-06-25 12:56 +0200 Janusz Dobrowolski
+(3032) Switching database to UTF8 encoding on upgrade to FA 2.4.
+ admin/db/maintenance_db.inc
+ admin/inst_upgrade.php
+ doc/api_changes.txt
+=======
+2012-11-15 16:38 +0100 Joe Hunt
+(3103) Rollback of Session Abondoned Error and new variable, $no_check_edit_conflicts in config.php.
+ config.default.php
+ includes/session.inc
+ sales/includes/sales_ui.inc
+
+2012-11-15 15:23 +0100 Joe Hunt
+(3102) New Changelog.txt
+ CHANGELOG.txt
+
+2012-11-15 15:18 +0100 Joe Hunt
+(3101) Release 2.3.13
+ version.php
+
+2012-11-15 15:18 +0100 Joe Hunt
+(3100) Fixed session abandoned error in Windows Servers
+ includes/session.inc
+
+2012-11-12 13:09 +0100 Janusz Dobrowolski
+(3099) Prevent 'Page expired' messages when 'Back' link is used after login.
+ includes/session.inc
+
+2012-11-12 09:52 +0100 Janusz Dobrowolski
+(3098) Cleanup in curent_user.inc/session.inc
+>>>>>>> other
+ includes/current_user.inc
+<<<<<<< local
+ includes/db/connect_db.inc
+ includes/lang/language.php
+=======
+>>>>>>> other
+ includes/session.inc
+<<<<<<< local
+ sql/alter2.4.php
+=======
+
+2012-11-12 09:39 +0100 Janusz Dobrowolski
+(3097) Fixed small bug in mail class, added text/hmtl mime type.
+ includes/ui/view_package.php
+ reporting/includes/class.mail.inc
+
+2012-11-10 00:29 +0100 Joe Hunt
+(3096) Dimensions not utilized in Direct Invoice/Delivery
+ sales/includes/cart_class.inc
+
+2012-11-09 09:58 +0100 Joe Hunt
+(3095) Sales quotation and Sales order should not require sufficient stock.
+ sales/includes/ui/sales_order_ui.inc
+
+2012-11-05 23:33 +0100 Janusz Dobrowolski
+(3094) Fixed confirmation on ajax reloaded buttons (small fix for Gecko like browsers).
+ js/utils.js
+
+2012-11-05 17:49 +0100 Janusz Dobrowolski
+(3093) 0001879,0001880: Fixes in htaccess constraints, restricting System Diagnostic view to admin (ApMuthu)
+ .htaccess
+ applications/setup.php
+
+2012-11-05 08:30 +0100 Janusz Dobrowolski
+(3092) Fixed error messages on Sales Groups, updated gettext template.
+ lang/new_language_template/LC_MESSAGES/empty.po
+ sales/manage/sales_groups.php
+
+2012-11-03 22:46 +0100 Janusz Dobrowolski
+(3091) Improved error checking during extension packages installation.
+ includes/packages.inc
+ includes/remote_url.inc
+
+2012-11-03 22:34 +0100 Janusz Dobrowolski
+(3090) Fixed error message in recurrent invoices.
+ sales/manage/recurrent_invoices.php
+
+2012-11-01 01:02 +0100 Joe Hunt
+(3089) Replaced the transaction list in attachments with a pager and made the sorting descent.
+ admin/attachments.php
+ admin/db/attachments_db.inc
+
+2012-10-31 08:56 +0100 Joe Hunt
+(3088) Filter for non-zero values in Bank Statement Report
+ reporting/rep601.php
+ reporting/reports_main.php
+
+2012-10-28 07:30 +0100 Joe Hunt
+(3087) Removed commented deprecated Session_register().
+ includes/page/header.inc
+ inventory/adjustments.php
+ inventory/transfers.php
+ manufacturing/work_order_issue.php
+ purchasing/allocations/supplier_allocate.php
+ sales/allocations/customer_allocate.php
+
+2012-10-17 09:17 +0200 Joe Hunt
+(3086) Db error in invoice.ui.inc for certain MySql setup/releases.
+ purchasing/includes/ui/invoice_ui.inc
+
+2012-10-17 09:00 +0200 Joe Hunt
+(3085) Db error in po_entry_items.php was already fixed. Look at the line below.
+ purchasing/po_entry_items.php
+
+2012-10-16 17:00 +0200 Joe Hunt
+(3083) Cannot insert a supplier transaction record in Direct Supplier Invoice (certain MySql versions and setup).
+ purchasing/po_entry_items.php
+
+2012-10-11 15:18 +0200 Joe Hunt
+(3082) Date format helper complete.
+ js/inserts.js
+
+2012-10-11 15:09 +0200 Joe Hunt
+(3081) Purchase order/Direct GRN/Direct Invoice showed inactive items in item list.
+ purchasing/includes/ui/po_ui.inc
+
+2012-10-11 08:35 +0200 Joe Hunt
+(3080) Small fix and rerun of inserts.js.
+ js/inserts.js
+
+2012-10-11 08:18 +0200 Joe Hunt
+(3078) Fixed date_fix to act like before. day and day-month entrance only.
+ js/inserts.js
+
+2012-10-05 11:17 +0200 Joe Hunt
+(3076) Bug in function is_date when implementing new date formats.
+ includes/date_functions.inc
+
+2012-10-04 10:18 +0200 Joe Hunt
+(3075) Moved declaration of short monthnames from config.default.php. Too early for translations.
+ config.default.php
+ includes/sysnames.inc
+
+2012-10-04 00:58 +0200 Joe Hunt
+(3074) Minor improvement to add_days/months/years for the new dateformats.
+ includes/date_functions.inc
+
+2012-10-02 22:50 +0200 Joe Hunt
+(3073) 0001806: Date problems fixed and new date formats MmmDDYYYY, DDMmmYYYY and YYYYMmmDD implemented.
+ admin/display_prefs.php
+ config.default.php
+ includes/date_functions.inc
+ includes/prefs/userprefs.inc
+ includes/ui/ui_input.inc
+ includes/ui/ui_view.inc
+ js/inserts.js
+
+2012-10-02 13:22 +0200 Janusz Dobrowolski
+(3071) Fixed void_stock_move() to avoid sparse lines in Inventory Items Movements register after DN edition.
+ includes/db/inventory_db.inc
+
+2012-10-02 09:42 +0200 Joe Hunt
+(3070) Having memo or comment displayed on bank_inquiry.php.
+ gl/inquiry/bank_inquiry.php
+
+2012-10-01 01:12 +0200 Joe Hunt
+(3069) Improved headers in printing Purchase Orders.
+ reporting/includes/doctext.inc
+ reporting/includes/pdf_report.inc
+ reporting/rep209.php
+
+2012-09-25 18:06 +0200 Joe Hunt
+(3068) Moved access functions from renderer to current_user. They were cluttered into all themes.
+ includes/current_user.inc
+ themes/aqua/renderer.php
+ themes/cool/renderer.php
+ themes/default/renderer.php
+
+2012-09-23 17:56 +0200 Janusz Dobrowolski
+(3067) Invalid input description in account groups for account class parameter.
+ gl/manage/gl_account_types.php
+
+2012-09-17 13:25 +0200 Janusz Dobrowolski
+(3066) Cleanup in check_faillog().
+ includes/session.inc
+
+2012-09-23 09:23 +0200 Joe Hunt
+(3065) 0001792: BLOOMBERG added to Exchange Rate Providers and config fix, improvement
+ gl/includes/db/gl_db_rates.inc
+
+2012-09-22 10:31 +0200 Joe Hunt
+(3064) 0001792: BLOOMBERG added to Exchange Rate Providers and config fix.
+ config.default.php
+ gl/includes/db/gl_db_rates.inc
+ gl/manage/exchange_rates.php
+ lang/new_language_template/LC_MESSAGES/empty.po
+
+2012-09-15 10:34 +0200 Janusz Dobrowolski
+(3061) Added tag version_2_3_12 for changeset 05b037ff3c0b
+ .hgtags
+
+2012-09-15 10:09 +0200 Joe Hunt
+(3060) Changelog.txt
+ CHANGELOG.txt
+
+2012-09-15 10:07 +0200 Joe Hunt
+(3059) Changelog.txt
+ CHANGELOG.txt
+
+2012-09-15 10:04 +0200 Joe Hunt
+(3058) Release 2.3.12
+ update.html
+>>>>>>> other
+ version.php
+
+2012-06-22 16:05 +0200 Janusz Dobrowolski
+(3031) Standard invoicing icon used in prepayment invoicing inquire.
+ sales/inquiry/sales_orders_view.php
+
+2012-06-22 16:03 +0200 Janusz Dobrowolski
+(3030) Small fixes to deliveries sent in prepayment cycle.
+ sales/customer_delivery.php
+
+2012-06-18 21:13 +0200 Janusz Dobrowolski
+(3029) Further fixes to prepayment mode (updated init scripts and sql query in get_sales_order_header)
+ sales/includes/db/sales_order_db.inc
+ sql/en_US-demo.sql
+ sql/en_US-new.sql
+
+2012-06-17 22:18 +0200 Janusz Dobrowolski
+(3028) 0000696: Additional permission level for other user's transactions edition.
+ gl/gl_bank.php
+ gl/gl_journal.php
+ includes/access_levels.inc
+ includes/current_user.inc
+ includes/data_checks.inc
+ purchasing/po_entry_items.php
+ purchasing/supplier_credit.php
+ purchasing/supplier_invoice.php
+ sales/customer_delivery.php
+ sales/customer_invoice.php
+ sales/sales_order_entry.php
+ sql/alter2.4.sql
+ sql/en_US-demo.sql
+ sql/en_US-new.sql
+
+2012-06-16 11:44 +0200 Janusz Dobrowolski
+(3010) 0000593,0001093: Prepayments made against orders implemented.
+ admin/gl_setup.php
+ applications/customers.php
+ applications/suppliers.php
+ gl/includes/db/gl_db_accounts.inc
+ gl/includes/db/gl_db_trans.inc
+ includes/data_checks.inc
+ includes/db/allocations_db.inc
+ includes/db_pager.inc
+ includes/ui/allocation_cart.inc
+ includes/ui/ui_lists.inc
+ includes/ui/ui_view.inc
+ lang/new_language_template/LC_MESSAGES/empty.po
+ purchasing/includes/db/invoice_db.inc
+ purchasing/includes/db/po_db.inc
+ purchasing/includes/db/suppalloc_db.inc
+ purchasing/includes/po_class.inc
+ purchasing/includes/purchasing_db.inc
+ purchasing/includes/ui/po_ui.inc
+ purchasing/po_entry_items.php
+ purchasing/view/view_po.php
+ reporting/includes/doctext.inc
+ reporting/includes/pdf_report.inc
+ reporting/rep107.php
+ reporting/rep109.php
+ reporting/rep112.php
+ reporting/rep210.php
+ sales/customer_delivery.php
+ sales/customer_invoice.php
+ sales/includes/cart_class.inc
+ sales/includes/db/cust_trans_db.inc
+ sales/includes/db/custalloc_db.inc
+ sales/includes/db/sales_delivery_db.inc
+ sales/includes/db/sales_invoice_db.inc
+ sales/includes/db/sales_order_db.inc
+ sales/includes/sales_db.inc
+ sales/includes/ui/sales_order_ui.inc
+ sales/inquiry/customer_allocation_inquiry.php
+ sales/inquiry/sales_orders_view.php
+ sales/sales_order_entry.php
+ sales/view/view_invoice.php
+ sales/view/view_sales_order.php
+ sql/alter2.4.sql
+ sql/en_US-demo.sql
+ sql/en_US-new.sql
+
+2012-06-15 13:36 +0200 Janusz Dobrowolski
+(3009) Fixes in sales reports to use debtor_trans.tax_included field instead of trans_tax_details.included_in_price
+ reporting/rep107.php
+ reporting/rep110.php
+ reporting/rep113.php
+ sql/alter2.4.sql
+
+2012-04-15 14:17 +0200 Janusz Dobrowolski
+(3008) Deny access to error.log via http.
+ .htaccess
+
+2012-04-15 13:43 +0200 Janusz Dobrowolski
+(3007) Cleanups
+ gl/gl_bank.php
+ gl/includes/db/gl_db_accounts.inc
+
+2012-04-15 11:23 +0200 Janusz Dobrowolski
+(3006) Correction in accruals to avoid skipping shorter months.
+ gl/accruals.php
+
+2012-04-15 11:10 +0200 Janusz Dobrowolski
+(3005) Cleanup in bank_account_reconcile.
+ gl/bank_account_reconcile.php
+
+2012-04-09 11:32 +0200 Joe Hunt
+(3004) Changed hardcoded trans days in inquiries (30) to be a user preference.
+ admin/display_prefs.php
+ gl/inquiry/bank_inquiry.php
+ gl/inquiry/gl_account_inquiry.php
+ gl/inquiry/gl_trial_balance.php
+ gl/inquiry/profit_loss.php
+ gl/inquiry/tax_inquiry.php
+ gl/view/accrual_trans.php
+ includes/current_user.inc
+ includes/prefs/userprefs.inc
+ inventory/inquiry/stock_movements.php
+ purchasing/includes/ui/invoice_ui.inc
+ purchasing/inquiry/po_search.php
+ purchasing/inquiry/po_search_completed.php
+ purchasing/inquiry/supplier_allocation_inquiry.php
+ purchasing/inquiry/supplier_inquiry.php
+ sales/inquiry/customer_allocation_inquiry.php
+ sales/inquiry/customer_inquiry.php
+ sales/inquiry/sales_deliveries_view.php
+ sales/inquiry/sales_orders_view.php
+ sql/alter2.4.sql
+ sql/en_US-demo.sql
+ sql/en_US-new.sql
+
+2012-04-09 10:13 +0200 Joe Hunt
+(3003) 0001503: Request - fee account included in bank account table
+ gl/bank_transfer.php
+ gl/includes/db/gl_db_bank_accounts.inc
+ gl/includes/db/gl_db_banking.inc
+ gl/manage/bank_accounts.php
+ purchasing/includes/db/supp_payment_db.inc
+ purchasing/supplier_payment.php
+ sales/customer_payments.php
+ sales/includes/db/payment_db.inc
+ sql/alter2.4.sql
+ sql/en_US-demo.sql
+ sql/en_US-new.sql
+
+2012-03-29 22:58 +0200 Joe Hunt
+(2991) Default Receival Days implemented. Maintained in System and GL Setup.
+ CHANGELOG.txt
+ admin/gl_setup.php
+ includes/prefs/sysprefs.inc
+ purchasing/includes/ui/po_ui.inc
+ sql/alter2.4.php
+ sql/en_US-demo.sql
+ sql/en_US-new.sql
+
projects / fa-stable.git / blobdiff