From: Janusz Dobrowolski Date: Thu, 22 Nov 2012 15:21:58 +0000 (+0100) Subject: Merged changes form stable branch up to 2.3.13 X-Git-Tag: v2.4.2~19^2~337 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=264c09696d65efe4532c197f317162daf8c24f32;p=fa-stable.git Merged changes form stable branch up to 2.3.13 --- 264c09696d65efe4532c197f317162daf8c24f32 diff --cc CHANGELOG.txt index 33849299,5ca0cacc..6130f276 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@@ -10,81 -10,368 +10,282 @@@ ------------ This is a changelog for FrontAccounting All releases. ++<<<<<<< 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-09-15 09:39 +0200 Janusz Dobrowolski -(3057) UPdate language template - lang/new_language_template/LC_MESSAGES/empty.po - -2012-09-14 23:49 +0200 Janusz Dobrowolski -(3056) Added prevention against brute force atacks on login page. - access/login.php - config.default.php - includes/current_user.inc - includes/session.inc - -2012-09-13 00:15 +0200 Janusz Dobrowolski -(3055) Fixed incorect selection of invoices in Customer Payments/Payments To Supplier when search customer/supplier option is used. - purchasing/supplier_payment.php - sales/customer_payments.php - -2012-09-12 14:06 +0200 Joe Hunt -(3054) 0001775: Hard coded theme path fixed - includes/ui/ui_input.inc - reporting/includes/reports_classes.inc - -2012-09-11 08:27 +0200 Joe Hunt -(3053) Adding an already existing GL Account Code does not report as error - gl/manage/gl_accounts.php - -2012-09-09 09:42 +0200 Janusz Dobrowolski -(3052) Security cleanups in access roles and db_pager. - admin/security_roles.php - includes/db_pager.inc - -2012-09-08 13:25 +0200 Janusz Dobrowolski -(3051) Security cleanup on 'where' parameter in a couple of list helpers. - includes/ui/ui_lists.inc - -2012-09-08 13:06 +0200 Janusz Dobrowolski -(3050) Login screen company box/input configuration option made backward compatible. - access/login.php - config.default.php - -2012-09-08 19:11 +0200 Joe Hunt -(3049) Hide Menu options if not authorized, rerun - config.default.php - -2012-09-08 19:07 +0200 Joe Hunt -(3048) Hide Menu options if not authorized - themes/aqua/renderer.php - themes/cool/renderer.php - themes/default/renderer.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-09-08 09:54 +0200 Janusz Dobrowolski -(3047) Added check not empty location code in Inventory Locations. - inventory/manage/locations.php +2012-06-22 16:03 +0200 Janusz Dobrowolski +(3030) Small fixes to deliveries sent in prepayment cycle. + sales/customer_delivery.php -2012-09-06 19:43 +0200 Janusz Dobrowolski -(3046) Fixed get_sales_order_header and get_debtor_trans queries to avoid errors on empty ship_via field. - sales/includes/db/cust_trans_db.inc +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 - sales/sales_order_entry.php - -2012-09-06 19:27 +0200 Janusz Dobrowolski -(3045) Improved error handling in printer class. - includes/remote_url.inc - reporting/includes/printer_class.inc - -2012-09-08 08:21 +0200 Joe Hunt -(3044) 0001768: Login Company Select Box to EditBox Switch Flag + Fix - access/login.php - config.default.php - includes/session.inc - -2012-09-08 08:20 +0200 Joe Hunt -(3043) 0001767: Company Creation assigning externally created database + Fix - includes/db/connect_db.inc - -2012-08-26 22:54 +0200 Joe Hunt -(3042) Removed obsolete exchange rate check on Sales Pricing page. - inventory/prices.php - -2012-08-26 19:47 +0200 Janusz Dobrowolski -(3041) Removed obsolete exchange rate check on Purchasing Pricing page. - inventory/purchasing_data.php - -2012-08-25 20:01 +0200 Janusz Dobrowolski -(3040) Fixed access control issues on finish page of Direct Sales and Purchase Invoice - purchasing/po_entry_items.php - sales/sales_order_entry.php - -2012-08-25 18:28 +0200 Janusz Dobrowolski -(3039) Fixed creation of invalid Direct Sales Invoice when operation is continued after previous entry cancelation. - sales/sales_order_entry.php - -2012-07-14 22:18 +0200 Janusz Dobrowolski -(3038) Improved date input fields keyboard support (fast day/day+month edition) - includes/ui/ui_input.inc - js/inserts.js - -2012-07-14 22:12 +0200 Janusz Dobrowolski -(3037) Small fixes in attachments upload. - admin/attachments.php - lang/new_language_template/LC_MESSAGES/empty.po + sql/en_US-demo.sql + sql/en_US-new.sql -2012-08-18 23:53 +0200 Joe Hunt -(3036) Bug 0001669: get_exchange_rate not raising error - gl/bank_transfer.php +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 - inventory/prices.php - inventory/purchasing_data.php purchasing/po_entry_items.php - purchasing/supplier_payment.php - sales/customer_payments.php + purchasing/supplier_credit.php + purchasing/supplier_invoice.php + sales/customer_delivery.php + sales/customer_invoice.php sales/sales_order_entry.php - -2012-08-15 16:18 +0200 Joe Hunt -(3035) Location Transfer should not be included in journal_type_list. - includes/ui/ui_lists.inc - -2012-07-16 23:29 +0200 Joe Hunt -(3034) Purchases - Direct Invoice - Database Error in some mysql configurations - purchasing/po_entry_items.php - -2012-06-28 12:23 +0200 Joe Hunt -(3033) Remember last document date also in Bank Transfer. - gl/bank_transfer.php - -2012-05-28 08:43 +0200 Joe Hunt -(3021) Rerun of /admin/create_coy.php - admin/create_coy.php - -2012-05-28 08:25 +0200 Joe Hunt -(3020) When creating new company and adm. password is blank the password is now password as default. - admin/create_coy.php - -2012-05-27 22:38 +0200 Joe Hunt -(3019) 0001606: Statement are not sent to general contact - includes/db/crm_contacts_db.inc - sales/includes/db/customers_db.inc + sql/alter2.4.sql sql/en_US-demo.sql + sql/en_US-new.sql -2012-05-21 11:47 +0200 Janusz Dobrowolski -(3018) Added tag version_2_3_11 for changeset 06e6f1abb26e - .hgtags - -2012-05-21 10:57 +0200 Joe Hunt -(3017) New CHANGELOG.txt - CHANGELOG.txt - -2012-05-21 10:54 +0200 Joe Hunt -(3016) Release 2.3.11 - version.php - -2012-05-03 08:25 +0200 Joe Hunt -(3015) Rerun of /includes/ui/ui_view.inc - includes/ui/ui_view.inc - -2012-05-03 01:03 +0200 Joe Hunt -(3014) Cosmetic fix in viewing supp invoice payments section. +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 - -2012-05-02 22:52 +0200 Joe Hunt -(3013) Rerun of /sales/includes/cart_class.inc. - sales/includes/cart_class.inc - -2012-05-02 18:57 +0200 Joe Hunt -(3012) Better check for duplicate references in multiuser environments for sales documents. - sales/create_recurrent_invoices.php - sales/credit_note_entry.php - sales/customer_credit_invoice.php + 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 diff --cc includes/current_user.inc index 90a91a9c,e393252d..ae0a4d75 --- a/includes/current_user.inc +++ b/includes/current_user.inc @@@ -58,7 -58,7 +58,7 @@@ class current_use function login($company, $loginname, $password) { - global $security_areas, $security_groups, $security_headings, $path_to_root, $dflt_lang; - global $security_areas, $security_groups, $security_headings, $path_to_root, $login_delay; ++ global $security_areas, $security_groups, $security_headings, $path_to_root, $dflt_lang, $login_delay; $this->set_company($company); $this->logged = false; diff --cc includes/session.inc index 52d16bdf,9eb70019..9a3efc26 --- a/includes/session.inc +++ b/includes/session.inc @@@ -354,9 -354,8 +354,10 @@@ foreach ($installed_extensions as $ext // ini_set('session.save_path', dirname(__FILE__).'/../tmp/'); ini_set('session.gc_maxlifetime', 36000); // 10hrs + ini_set('session.cache_limiter', 'private'); // prevent 'page expired' errors +hook_session_start(@$_POST["company_login_name"]); + $Session_manager = new SessionManager(); $Session_manager->sessionStart('FA'.md5(dirname(__FILE__))); @@@ -366,9 -365,11 +367,12 @@@ header("Cache-control: private") include_once($path_to_root . "/config.php"); get_text_init(); + if ($login_delay > 0) + @include_once($path_to_root . "/faillog.php"); + // Page Initialisation -if (!isset($_SESSION['language']) || !method_exists($_SESSION['language'], 'set_language')) +if (!isset($_SESSION['wa_current_user']) || !$_SESSION['wa_current_user']->logged_in() + || !isset($_SESSION['language']) || !method_exists($_SESSION['language'], 'set_language')) { $l = array_search_value($dflt_lang, $installed_languages, 'code'); $_SESSION['language'] = new language($l['name'], $l['code'], $l['encoding'], diff --cc purchasing/includes/ui/invoice_ui.inc index af1ba202,370cd5f2..062ff8f4 --- a/purchasing/includes/ui/invoice_ui.inc +++ b/purchasing/includes/ui/invoice_ui.inc @@@ -31,10 -30,8 +31,10 @@@ function copy_to_trans(&$supp_trans $supp_trans->due_date = $_POST['due_date']; $supp_trans->supp_reference = $_POST['supp_reference']; $supp_trans->reference = $_POST['reference']; + if (isset($_POST['tax_algorithm'])) + $supp_trans->tax_algorithm = $_POST['tax_algorithm']; - $supp_trans->ov_amount = 0; /* for starters */ + $supp_trans->ov_amount = $supp_trans->ov_discount = 0; /* for starters */ if (count($supp_trans->grn_items) > 0) { foreach ( $supp_trans->grn_items as $grn)