From: Janusz Dobrowolski Date: Tue, 18 Sep 2012 13:00:22 +0000 (+0200) Subject: Merged changes from stable branch up to 2.3.12 X-Git-Tag: v2.4.2~19^2~346 X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=commitdiff_plain;h=3f3cfa578adbc2b71f4fd9c8d0f5536d26af43d8 Merged changes from stable branch up to 2.3.12 --- 3f3cfa578adbc2b71f4fd9c8d0f5536d26af43d8 diff --cc CHANGELOG.txt index ab4599af,c55ee0b9..33849299 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@@ -1,7 -1,7 +1,7 @@@ /** * @version $Id$ * @package FrontAccounting - * @copyright (C) 2005 - 2012 FrontAccounting, LLC -* @copyright (C) 2005 - 2011 FrontAccounting, LLC ++* @copyright (C) 2005 - 2009 FrontAccounting, LLC * @license http://www.gnu.org/copyleft/gpl-3.0.html GNU/GPL * FrontAccounting is Free Software */ @@@ -10,6447 -10,1596 +10,6614 @@@ ------------ This is a changelog for FrontAccounting All releases. -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 - version.php - -2012-09-15 09:39 +0200 Janusz Dobrowolski -(3057) UPdate language template - lang/new_language_template/LC_MESSAGES/empty.po ++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-09-14 23:49 +0200 Janusz Dobrowolski -(3056) Added prevention against brute force atacks on login page. - access/login.php - config.default.php ++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 + includes/current_user.inc ++ includes/db/connect_db.inc ++ includes/lang/language.php + includes/session.inc ++ sql/alter2.4.php ++ version.php + -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 - sales/sales_order_entry.php - -2012-04-29 20:32 +0200 Joe Hunt -(3011) 0001561: Supplier Credit Notes rasies false error about QOH - purchasing/supplier_credit.php - -2012-04-29 20:21 +0200 Joe Hunt -(3010) The GRN Valuation Report had tax included in price if this was set on supplier. - reporting/rep305.php - -2012-04-28 01:22 +0200 Joe Hunt -(3009) 0001555: Problem (auto)creating customer branch: also no shipping location - sales/manage/customers.php - -2012-04-21 11:37 +0200 Joe Hunt -(3008) Improved report Journal Entries (rep702.php) to show memo in multiple lines. - reporting/rep702.php - -2012-04-20 11:33 +0200 Janusz Dobrowolski -(3007) Fixed lang domain switching in hooks_invoke_first/hook_invoke_last - includes/hooks.inc - -2012-04-19 21:45 +0200 Janusz Dobrowolski -(3006) Fixed false overdraft problem on cash accounts - gl/includes/db/gl_db_bank_trans.inc - -2012-04-19 21:44 +0200 Janusz Dobrowolski -(3005) Fixed login problem on IIS. - includes/session.inc - -2012-04-08 19:22 +0200 Janusz Dobrowolski -(3002) Fixed system tests and error handling for extension repository functions. - includes/packages.inc - includes/system_tests.inc - -2012-04-08 15:04 +0200 Joe Hunt -(3001) 0001502: Report uses default language, not user's preferred language - reporting/includes/pdf_report.inc - -2012-04-08 15:02 +0200 Joe Hunt -(3000) 0001501: Price null when editing an order with a price list - sales/includes/db/sales_order_db.inc - -2012-04-07 23:37 +0200 Joe Hunt -(2999) Layout improvements in Bank Transfer. - gl/bank_transfer.php - -2012-04-07 16:31 +0200 Joe Hunt -(2998) Rerun of /gl/includes/db/gl_db_trans.inc and /reporting/rep709.php. - gl/includes/db/gl_db_trans.inc - reporting/rep709.php - -2012-04-06 08:30 +0200 Joe Hunt -(2997) 0001497: Tax for journal entry the other way round - reporting/rep709.php - -2012-04-06 07:50 +0200 Joe Hunt -(2996) Rerun of sales_invoice_db. Parse error. - sales/includes/db/sales_invoice_db.inc - -2012-04-04 09:25 +0200 Joe Hunt -(2995) 0001488: Modifying Sales Invoice (with allocations) causes negative allocations ++ 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-04-03 14:47 +0200 Joe Hunt -(2994) Changing the Invoice date when creating recurrent invoices. - sales/create_recurrent_invoices.php ++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-01 08:16 +0200 Joe Hunt -(2993) Date-field increased from 9 to 10 characters. Problems on Mac to see it all. - includes/ui/ui_input.inc ++2012-04-15 14:17 +0200 Janusz Dobrowolski ++(3008) Deny access to error.log via http. ++ .htaccess + -2012-03-31 07:58 +0200 Janusz Dobrowolski -(2992) Fixed email multiplication when bulk work order report is generated. - reporting/rep409.php ++2012-04-15 13:43 +0200 Janusz Dobrowolski ++(3007) Cleanups ++ gl/gl_bank.php ++ gl/includes/db/gl_db_accounts.inc + -2012-03-29 11:12 +0200 Joe Hunt -(2990) Required Delivery Date was not implemented properly. - purchasing/includes/ui/po_ui.inc - sales/includes/ui/sales_order_ui.inc ++2012-04-15 11:23 +0200 Janusz Dobrowolski ++(3006) Correction in accruals to avoid skipping shorter months. ++ gl/accruals.php + -2012-03-13 09:18 +0100 Joe Hunt -(2989) Bug. WHERE clause version=1 in rep304.php should be skipped. - reporting/rep304.php ++2012-04-15 11:10 +0200 Janusz Dobrowolski ++(3005) Cleanup in bank_account_reconcile. ++ gl/bank_account_reconcile.php + -2012-03-13 09:13 +0100 Joe Hunt -(2988) Bug in floatcmp(). Missing parenthesis in the last condition. ++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-03-12 22:27 +0100 Joe Hunt -(2987) Rerun of autocreation branch location. - sales/manage/customers.php - -2012-03-12 16:50 +0100 Joe Hunt -(2986) When autocreating branch, no location were saved. - sales/manage/customers.php - -2012-03-07 20:51 +0100 Janusz Dobrowolski -(2985) Fixed multiplied amounts in Journal Inquiry. - gl/includes/db/gl_db_trans.inc ++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-07 20:50 +0100 Janusz Dobrowolski -(2984) Cleanups. - admin/attachments.php ++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 - install/lang/new_language_template/LC_MESSAGES/empty.po - lang/new_language_template/LC_MESSAGES/empty.po - sales/manage/sales_people.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 + -2012-03-05 14:14 +0100 Joe Hunt +2012-03-04 16:52 +0100 Joe Hunt (2982) Fixed typo in location variable. purchasing/includes/db/grn_db.inc - purchasing/includes/ui/grn_ui.inc - -2012-02-13 12:40 +0100 Janusz Dobrowolski -(2972) Fixed regression in gettext tests in System Diagnostics. - includes/system_tests.inc - -2012-02-12 12:02 +0100 Janusz Dobrowolski -(2971) Added tag version_2_3_8 for changeset b2ead0b2a3e3 - .hgtags - -2012-02-12 12:01 +0100 Janusz Dobrowolski -(2970) Added tag version_2_3_9 for changeset a8b119b77f05 - .hgtags -2012-02-12 11:59 +0100 Janusz Dobrowolski -(2969) Added tag version_2_3_10 for changeset 390d9d69797c +2012-03-03 22:35 +0100 Janusz Dobrowolski - (2980) Stable merged into unstable again (due to failure on binary file during previous merge). ++(2981) Stable merged into unstable again (due to failure on binary file during previous merge). .hgtags - -2012-02-11 21:06 +0100 Janusz Dobrowolski -(2968) Fixes for IE7/8 to avoid problems with javascript on some screens. - js/inserts.js - js/utils.js - -2012-02-11 20:52 +0100 Janusz Dobrowolski -(2967) Fixed bug in attachments uploading. - admin/attachments.php - -2012-02-08 01:00 +0100 Joe Hunt -(2966) Rerun of /includes/ui/ui_view.inc - includes/ui/ui_view.inc - -2012-02-08 00:42 +0100 Joe Hunt -(2965) Rounding error in includes/ui/ui_view.inc -> price_in_words() - includes/ui/ui_view.inc - -2012-02-03 10:13 +0100 Joe Hunt -(2964) Changelog.txt + .htaccess CHANGELOG.txt - -2012-02-03 09:48 +0100 Joe Hunt -(2963) Release 2.3.10 - version.php - -2012-02-02 08:24 +0100 Joe Hunt -(2962) Fixed small bugs in function void_stock_move in file /includes/db/inventory_db.inc. - includes/db/inventory_db.inc - -2012-01-27 14:37 +0100 Joe Hunt -(2961) Changed session gettext to use a global variable instead for smaller footprints in session files. + access/login.php + access/logout.php + access/timeout.php + admin/attachments.php + admin/backups.php + admin/change_current_user_password.php + admin/company_preferences.php + admin/create_coy.php + admin/db/attachments_db.inc + admin/db/company_db.inc + admin/db/fiscalyears_db.inc + admin/db/maintenance_db.inc + admin/db/printers_db.inc + admin/db/security_db.inc + admin/db/shipping_db.inc + admin/db/tags_db.inc + admin/db/transactions_db.inc admin/db/users_db.inc + admin/db/voiding_db.inc + admin/display_prefs.php + admin/fiscalyears.php + admin/forms_setup.php + admin/gl_setup.php admin/inst_lang.php + admin/inst_module.php + admin/inst_theme.php + admin/inst_upgrade.php + admin/payment_terms.php + admin/print_profiles.php + admin/printers.php + admin/security_roles.php + admin/shipping_companies.php + admin/system_diagnostics.php + admin/tags.php + admin/users.php + admin/view_print_transaction.php + admin/void_transaction.php + applications/application.php + applications/customers.php + applications/dimensions.php + applications/generalledger.php + applications/inventory.php + applications/manufacturing.php + applications/setup.php + applications/suppliers.php + company/0/images/102.jpg + config.default.php + dimensions/dimension_entry.php + dimensions/includes/dimensions_db.inc + dimensions/includes/dimensions_ui.inc + dimensions/inquiry/search_dimensions.php + dimensions/view/view_dimension.php + doc/2.1_Beta.txt + doc/2.2_Beta.txt + doc/access_levels.txt + doc/calculate_price.txt + doc/license.txt + doc/quick_entries.txt + frontaccounting.php + gl/accruals.php + gl/bank_account_reconcile.php + gl/bank_transfer.php + gl/gl_bank.php + gl/gl_budget.php + gl/gl_journal.php + gl/includes/db/gl_db_account_types.inc + gl/includes/db/gl_db_accounts.inc + gl/includes/db/gl_db_bank_accounts.inc + gl/includes/db/gl_db_bank_trans.inc + gl/includes/db/gl_db_banking.inc + gl/includes/db/gl_db_currencies.inc + gl/includes/db/gl_db_rates.inc + gl/includes/db/gl_db_trans.inc + gl/includes/gl_db.inc + gl/includes/gl_ui.inc + gl/includes/ui/gl_bank_ui.inc + gl/includes/ui/gl_journal_ui.inc + gl/inquiry/balance_sheet.php + gl/inquiry/bank_inquiry.php + gl/inquiry/gl_account_inquiry.php + gl/inquiry/gl_trial_balance.php + gl/inquiry/journal_inquiry.php + gl/inquiry/profit_loss.php + gl/inquiry/tax_inquiry.php + gl/manage/bank_accounts.php + gl/manage/close_period.php + gl/manage/currencies.php + gl/manage/exchange_rates.php + gl/manage/gl_account_classes.php + gl/manage/gl_account_types.php + gl/manage/gl_accounts.php + gl/manage/gl_quick_entries.php + gl/manage/revaluate_currencies.php + gl/view/bank_transfer_view.php + gl/view/gl_deposit_view.php + gl/view/gl_payment_view.php + gl/view/gl_trans_view.php + includes/JsHttpRequest.php + includes/access_levels.inc + includes/ajax.inc + includes/archive.inc + includes/banking.inc + includes/current_user.inc + includes/data_checks.inc + includes/date_functions.inc + includes/db/audit_trail_db.inc + includes/db/comments_db.inc + includes/db/connect_db.inc + includes/db/crm_contacts_db.inc + includes/db/inventory_db.inc + includes/db/manufacturing_db.inc + includes/db/references_db.inc + includes/db/sql_functions.inc + includes/db_pager.inc + includes/errors.inc + includes/hooks.inc includes/lang/gettext.php includes/lang/language.php + includes/main.inc + includes/manufacturing.inc + includes/packages.inc + includes/page/footer.inc + includes/page/header.inc + includes/prefs/sysprefs.inc + includes/prefs/userprefs.inc + includes/references.inc + includes/remote_url.inc + includes/session.inc + includes/sysnames.inc + includes/system_tests.inc + includes/systypes.inc + includes/types.inc + includes/ui.inc + includes/ui/allocation_cart.inc + includes/ui/contacts_view.inc + includes/ui/db_pager_view.inc + includes/ui/items_cart.inc + includes/ui/simple_crud_class.inc + includes/ui/ui_controls.inc + includes/ui/ui_globals.inc + includes/ui/ui_input.inc + includes/ui/ui_lists.inc + includes/ui/ui_msgs.inc + includes/ui/ui_view.inc + includes/ui/view_package.php + index.php + install.html + install/index.php + install/isession.inc + install/lang/ar_EG/LC_MESSAGES/ar_EG.mo + install/lang/ar_EG/LC_MESSAGES/ar_EG.po + install/lang/da_DK/LC_MESSAGES/da_DK.mo + install/lang/da_DK/LC_MESSAGES/da_DK.po + install/lang/fr_FR/LC_MESSAGES/fr_FR.mo + install/lang/fr_FR/LC_MESSAGES/fr_FR.po + install/lang/id_ID/LC_MESSAGES/id_ID.mo + install/lang/id_ID/LC_MESSAGES/id_ID.po + install/lang/in_ID/LC_MESSAGES/in_ID.mo + install/lang/in_ID/LC_MESSAGES/in_ID.po + install/lang/new_language_template/LC_MESSAGES/empty.po + install/lang/pl_PL/LC_MESSAGES/pl_PL.mo + install/lang/pl_PL/LC_MESSAGES/pl_PL.po + install/lang/pt_BR/LC_MESSAGES/pt_BR.mo + install/lang/pt_BR/LC_MESSAGES/pt_BR.po + install/lang/sv_SE/LC_MESSAGES/sv_SE.mo + install/lang/sv_SE/LC_MESSAGES/sv_SE.po + inventory/adjustments.php + inventory/cost_update.php + inventory/includes/db/items_adjust_db.inc + inventory/includes/db/items_category_db.inc + inventory/includes/db/items_codes_db.inc + inventory/includes/db/items_db.inc + inventory/includes/db/items_locations_db.inc + inventory/includes/db/items_prices_db.inc + inventory/includes/db/items_trans_db.inc + inventory/includes/db/items_transfer_db.inc + inventory/includes/db/items_units_db.inc + inventory/includes/db/movement_types_db.inc + inventory/includes/inventory_db.inc + inventory/includes/item_adjustments_ui.inc + inventory/includes/stock_transfers_ui.inc + inventory/inquiry/stock_movements.php + inventory/inquiry/stock_status.php + inventory/manage/item_categories.php + inventory/manage/item_codes.php + inventory/manage/item_units.php + inventory/manage/items.php + inventory/manage/locations.php + inventory/manage/movement_types.php + inventory/manage/sales_kits.php + inventory/prices.php + inventory/purchasing_data.php + inventory/reorder_level.php + inventory/transfers.php + inventory/view/view_adjustment.php + inventory/view/view_transfer.php + js/JsHttpRequest.js + js/allocate.js + js/behaviour.js + js/budget.js + js/inserts.js + js/payalloc.js + js/reconcile.js + js/utils.js + lang/en_US/LC_MESSAGES/en_US.mo + lang/new_language_template/LC_MESSAGES/empty.po + lang/new_language_template/locale.inc + manufacturing/includes/db/work_centres_db.inc + manufacturing/includes/db/work_order_issues_db.inc + manufacturing/includes/db/work_order_produce_items_db.inc + manufacturing/includes/db/work_order_requirements_db.inc + manufacturing/includes/db/work_orders_db.inc + manufacturing/includes/db/work_orders_quick_db.inc + manufacturing/includes/manufacturing_db.inc + manufacturing/includes/manufacturing_ui.inc + manufacturing/includes/work_order_issue_ui.inc + manufacturing/inquiry/bom_cost_inquiry.php + manufacturing/inquiry/where_used_inquiry.php + manufacturing/manage/bom_edit.php + manufacturing/manage/work_centres.php + manufacturing/search_work_orders.php + manufacturing/view/wo_issue_view.php + manufacturing/view/wo_production_view.php + manufacturing/view/work_order_view.php + manufacturing/work_order_add_finished.php + manufacturing/work_order_costs.php + manufacturing/work_order_entry.php + manufacturing/work_order_issue.php + manufacturing/work_order_release.php + purchasing/allocations/supplier_allocate.php + purchasing/allocations/supplier_allocation_main.php + purchasing/includes/db/grn_db.inc + purchasing/includes/db/invoice_db.inc + purchasing/includes/db/invoice_items_db.inc + purchasing/includes/db/po_db.inc + purchasing/includes/db/supp_payment_db.inc + purchasing/includes/db/supp_trans_db.inc + purchasing/includes/db/suppalloc_db.inc + purchasing/includes/db/suppliers_db.inc + purchasing/includes/po_class.inc + purchasing/includes/purchasing_db.inc + purchasing/includes/purchasing_ui.inc + purchasing/includes/supp_trans_class.inc + purchasing/includes/ui/grn_ui.inc + purchasing/includes/ui/invoice_ui.inc + purchasing/includes/ui/po_ui.inc + purchasing/inquiry/po_search.php + purchasing/inquiry/po_search_completed.php + purchasing/inquiry/supplier_allocation_inquiry.php + purchasing/inquiry/supplier_inquiry.php + purchasing/manage/suppliers.php + purchasing/po_entry_items.php + purchasing/po_receive_items.php + purchasing/supplier_credit.php + purchasing/supplier_invoice.php + purchasing/supplier_payment.php + purchasing/view/view_grn.php + purchasing/view/view_po.php + purchasing/view/view_supp_credit.php + purchasing/view/view_supp_invoice.php + purchasing/view/view_supp_payment.php + reporting/includes/Workbook.php + reporting/includes/class.graphic.inc + reporting/includes/class.mail.inc + reporting/includes/class.pdf.inc + reporting/includes/doctext.inc + reporting/includes/excel_report.inc + reporting/includes/fpdi/fpdi2tcpdf_bridge.php + reporting/includes/header2.inc + reporting/includes/pdf_report.inc + reporting/includes/reporting.inc + reporting/includes/reports_classes.inc + reporting/includes/tcpdf.php + reporting/prn_redirect.php + reporting/rep101.php + reporting/rep102.php + reporting/rep103.php + reporting/rep104.php + reporting/rep105.php + reporting/rep106.php + reporting/rep107.php + reporting/rep108.php + reporting/rep109.php + reporting/rep110.php + reporting/rep111.php + reporting/rep112.php + reporting/rep201.php + reporting/rep202.php + reporting/rep203.php + reporting/rep204.php + reporting/rep209.php + reporting/rep210.php + reporting/rep301.php + reporting/rep302.php + reporting/rep303.php + reporting/rep304.php + reporting/rep305.php + reporting/rep401.php + reporting/rep409.php + reporting/rep501.php + reporting/rep601.php + reporting/rep701.php + reporting/rep702.php + reporting/rep704.php + reporting/rep705.php + reporting/rep706.php + reporting/rep707.php + reporting/rep708.php + reporting/rep709.php + reporting/rep710.php + reporting/reports_main.php + sales/allocations/customer_allocate.php + sales/allocations/customer_allocation_main.php + sales/create_recurrent_invoices.php + sales/credit_note_entry.php + sales/customer_credit_invoice.php + sales/customer_delivery.php + sales/customer_invoice.php + sales/customer_payments.php + sales/includes/cart_class.inc + sales/includes/db/branches_db.inc + sales/includes/db/credit_status_db.inc + sales/includes/db/cust_trans_db.inc + sales/includes/db/cust_trans_details_db.inc + sales/includes/db/custalloc_db.inc + sales/includes/db/customers_db.inc + sales/includes/db/payment_db.inc + sales/includes/db/sales_credit_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/db/sales_points_db.inc + sales/includes/db/sales_types_db.inc + sales/includes/sales_db.inc + sales/includes/sales_ui.inc + sales/includes/ui/sales_credit_ui.inc + sales/includes/ui/sales_order_ui.inc + sales/inquiry/customer_allocation_inquiry.php + sales/inquiry/customer_inquiry.php + sales/inquiry/sales_deliveries_view.php + sales/inquiry/sales_orders_view.php + sales/manage/credit_status.php + sales/manage/customer_branches.php + sales/manage/customers.php + sales/manage/recurrent_invoices.php + sales/manage/sales_areas.php + sales/manage/sales_groups.php + sales/manage/sales_people.php + sales/manage/sales_points.php + sales/manage/sales_types.php + sales/sales_order_entry.php + sales/view/view_credit.php + sales/view/view_dispatch.php + sales/view/view_invoice.php + sales/view/view_receipt.php + sales/view/view_sales_order.php + sql/alter.sql + sql/alter2.1.php + sql/alter2.1.sql + sql/alter2.2.php + sql/alter2.2.sql + sql/alter2.2rc.sql + sql/alter2.3.php + sql/alter2.3.sql + sql/alter2.3rc.sql + sql/en_US-demo.sql + sql/en_US-new.sql + taxes/db/item_tax_types_db.inc + taxes/db/tax_groups_db.inc + taxes/db/tax_types_db.inc + taxes/item_tax_types.php + taxes/tax_calc.inc + taxes/tax_groups.php + taxes/tax_types.php + themes/aqua/default.css + themes/aqua/renderer.php + themes/cool/default.css + themes/cool/images/sort_asc.gif + themes/cool/images/sort_desc.gif + themes/cool/renderer.php + themes/default/default.css + themes/default/login.css + themes/default/renderer.php + update.html + version.php + +2012-02-16 23:04 +0100 Janusz Dobrowolski - (2979) Merged stable branch up to 2.3.10 ++(2980) Merged stable branch up to 2.3.10 + .hgtags + access/logout.php + admin/attachments.php + admin/db/company_db.inc + admin/db/maintenance_db.inc + admin/db/users_db.inc + admin/inst_lang.php + admin/void_transaction.php + config.default.php + dimensions/includes/dimensions_db.inc + gl/includes/db/gl_db_accounts.inc + gl/includes/db/gl_db_bank_trans.inc + gl/includes/db/gl_db_banking.inc + gl/includes/ui/gl_bank_ui.inc + gl/inquiry/journal_inquiry.php + gl/manage/bank_accounts.php + gl/manage/currencies.php + gl/manage/gl_account_types.php + gl/manage/gl_accounts.php + includes/current_user.inc + includes/db/inventory_db.inc + includes/errors.inc + includes/hooks.inc + includes/lang/gettext.php + includes/lang/language.php + includes/main.inc + includes/packages.inc + includes/page/footer.inc + includes/session.inc + includes/sysnames.inc + includes/system_tests.inc + includes/ui/ui_controls.inc + includes/ui/ui_input.inc + includes/ui/ui_lists.inc + includes/ui/ui_view.inc + install/index.php + install/isession.inc + +2012-02-16 13:57 +0100 Janusz Dobrowolski - (2978) [0000598] Added tax_included field to debtor_trans table. ++(2979) [0000598] Added tax_included field to debtor_trans table. + sales/includes/db/cust_trans_db.inc + sales/includes/db/sales_credit_db.inc + sales/includes/db/sales_delivery_db.inc + sales/includes/db/sales_invoice_db.inc + sql/alter2.4.sql + sql/en_US-demo.sql + sql/en_US-new.sql + +2012-02-16 12:25 +0100 Janusz Dobrowolski - (2977) Fixed 2.4 upgrade routines (column drop moved to post-upgrade cleanup). ++(2978) Fixed 2.4 upgrade routines (column drop moved to post-upgrade cleanup). + sql/alter2.4.php + sql/alter2.4.sql + +2012-02-16 11:19 +0100 Janusz Dobrowolski - (2976) [0001174] Added bank account in customer branch record. - sql/alter2.4.sql - sql/en_US-demo.sql - sql/en_US-new.sql - - 2012-02-16 10:40 +0100 Janusz Dobrowolski - (2975) [0001174] Adding bank account tnumber to customer branch record. - gl/includes/db/gl_db_bank_accounts.inc - includes/sysnames.inc - includes/types.inc - sales/includes/db/branches_db.inc - sales/manage/customer_branches.php ++(2977) [0001174] Added bank account in customer branch record. + sql/alter2.4.sql + sql/en_US-demo.sql + sql/en_US-new.sql + +2012-02-16 08:46 +0100 Joe Hunt - (2974) 0000684: Space for Legal Text is not enough. Extended to a text field. ++(2976) 0000684: Space for Legal Text is not enough. Extended to a text field. + sql/alter2.4.sql + sql/en_US-demo.sql + sql/en_US-new.sql + +2012-02-14 10:36 +0100 Joe Hunt - (2973) 0001161: Fix index on stk_code in sales_order_details and item_code in purch_order_details. ++(2975) 0001161: Fix index on stk_code in sales_order_details and item_code in purch_order_details. + sql/alter2.4.sql + sql/en_US-demo.sql + sql/en_US-new.sql + +2012-02-14 10:17 +0100 Joe Hunt - (2972) 0000698: Spare 'rate' field in tax_group_items ++(2974) 0000698: Spare 'rate' field in tax_group_items + sql/alter2.4.sql + sql/en_US-demo.sql + sql/en_US-new.sql + taxes/db/tax_groups_db.inc + taxes/tax_groups.php + ++2012-02-16 10:40 +0100 Janusz Dobrowolski ++(2919) [0001174] Adding bank account tnumber to customer branch record. ++ gl/includes/db/gl_db_bank_accounts.inc ++ includes/sysnames.inc ++ includes/types.inc ++ sales/includes/db/branches_db.inc ++ sales/manage/customer_branches.php ++ sql/alter2.4.sql ++ sql/en_US-demo.sql ++ sql/en_US-new.sql ++ +2011-09-18 11:03 +0200 Janusz Dobrowolski - (2879) Additional fixes to last merge. ++(2880) Additional fixes to last merge. + admin/db/company_db.inc + gl/includes/db/gl_db_accounts.inc + +2011-09-06 10:47 +0200 Janusz Dobrowolski - (2878) Added tag unstable_2_3_7 for changeset 4a14cd5b8bc8 ++(2879) Added tag unstable_2_3_7 for changeset 4a14cd5b8bc8 + .hgtags + +2011-09-06 10:47 +0200 Janusz Dobrowolski - (2877) Changes up to 2.3.7 merged into unstable branch. ++(2878) Changes up to 2.3.7 merged into unstable branch. + .hgtags + CHANGELOG.txt + admin/backups.php + admin/change_current_user_password.php + admin/create_coy.php + admin/crm_categories.php + admin/db/company_db.inc + admin/db/fiscalyears_db.inc + admin/db/transactions_db.inc + admin/db/users_db.inc + admin/db/voiding_db.inc + admin/gl_setup.php + admin/inst_module.php + admin/users.php + admin/void_transaction.php + gl/bank_account_reconcile.php + gl/bank_transfer.php + gl/gl_bank.php + gl/gl_journal.php + gl/includes/db/gl_db_accounts.inc + gl/includes/db/gl_db_bank_accounts.inc + gl/includes/db/gl_db_bank_trans.inc + gl/includes/db/gl_db_banking.inc + gl/includes/db/gl_db_rates.inc + gl/includes/db/gl_db_trans.inc + gl/includes/ui/gl_bank_ui.inc + gl/inquiry/balance_sheet.php + gl/inquiry/gl_account_inquiry.php + gl/inquiry/gl_trial_balance.php + gl/inquiry/journal_inquiry.php + gl/manage/bank_accounts.php + gl/manage/gl_accounts.php + gl/manage/gl_quick_entries.php + gl/manage/revaluate_currencies.php + gl/view/gl_deposit_view.php + includes/current_user.inc + includes/data_checks.inc + includes/db/audit_trail_db.inc + includes/db/inventory_db.inc + includes/errors.inc + includes/hooks.inc + includes/session.inc + includes/ui/ui_controls.inc + includes/ui/ui_lists.inc + includes/ui/ui_view.inc + +2011-08-31 23:39 +0200 Joe Hunt - (2873) 0001013: Bank Statement w/Reconcile for print incorporated in core. ++(2874) 0001013: Bank Statement w/Reconcile for print incorporated in core. + reporting/rep602.php + reporting/reports_main.php + +2011-08-19 10:04 +0200 Janusz Dobrowolski - (2867) Due date should be preserved on purchase invoice edition start. ++(2868) Due date should be preserved on purchase invoice edition start. + purchasing/includes/db/invoice_db.inc + +2011-07-13 14:52 +0200 Joe Hunt - (2840) Fixed print of taxes on documents ++(2841) Fixed print of taxes on documents + reporting/rep107.php + reporting/rep109.php + reporting/rep110.php + reporting/rep209.php + +2011-07-13 14:00 +0200 Joe Hunt - (2839) Rerun of tax_groups.php ++(2840) Rerun of tax_groups.php + taxes/tax_groups.php + +2011-07-13 10:57 +0200 Joe Hunt - (2838) Rerun of tax_groups_db.inc ++(2839) Rerun of tax_groups_db.inc + taxes/db/tax_groups_db.inc + +2011-07-13 10:52 +0200 Joe Hunt - (2837) Rerun of new tax group and shipping files ++(2838) Rerun of new tax group and shipping files + includes/ui/ui_view.inc + taxes/db/tax_groups_db.inc + taxes/tax_calc.inc + taxes/tax_groups.php + +2011-07-12 17:16 +0200 Joe Hunt - (2836) Update of default COAs ++(2837) Update of default COAs + sql/en_US-demo.sql + sql/en_US-new.sql + +2011-07-12 16:50 +0200 Joe Hunt - (2835) 0000710: Shipping tax on all tax groups. And marking with tax type(s) it shall have. ++(2836) 0000710: Shipping tax on all tax groups. And marking with tax type(s) it shall have. + sales/includes/cart_class.inc + sql/alter2.4.sql + taxes/db/tax_groups_db.inc + taxes/tax_calc.inc + taxes/tax_groups.php + +2011-07-10 23:01 +0200 Janusz Dobrowolski - (2832) Implemented journal entries with multiply virtual AR/AP subaccounts. ++(2793) Implemented journal entries with multiply virtual AR/AP subaccounts. + admin/db/fiscalyears_db.inc + gl/bank_account_reconcile.php + gl/gl_journal.php + gl/includes/db/gl_db_accounts.inc + gl/includes/db/gl_db_trans.inc + gl/includes/ui/gl_journal_ui.inc + gl/inquiry/bank_inquiry.php + gl/view/gl_deposit_view.php + gl/view/gl_payment_view.php + gl/view/gl_trans_view.php + includes/types.inc + includes/ui/items_cart.inc + includes/ui/ui_lists.inc + purchasing/includes/db/invoice_items_db.inc + purchasing/includes/ui/invoice_ui.inc + reporting/rep601.php + reporting/rep702.php + sql/alter2.4.sql + +2011-05-06 14:07 +0200 Janusz Dobrowolski - (2766) Added tag unstable_2_3_4 for changeset dd39e5e145c7 ++(2767) Added tag unstable_2_3_4 for changeset dd39e5e145c7 + .hgtags + +2011-05-06 14:05 +0200 Janusz Dobrowolski - (2765) Merged changes up to version 2.3.4 into unstable. ++(2758) Merged changes up to version 2.3.4 into unstable. + CHANGELOG.txt + access/login.php + access/logout.php + admin/create_coy.php + admin/db/maintenance_db.inc + admin/db/users_db.inc + admin/db/voiding_db.inc + admin/void_transaction.php + config.default.php + gl/accruals.php + gl/bank_transfer.php + gl/gl_bank.php + gl/includes/db/gl_db_bank_accounts.inc + gl/includes/db/gl_db_bank_trans.inc + gl/includes/db/gl_db_banking.inc + gl/includes/db/gl_db_rates.inc + gl/includes/db/gl_db_trans.inc + gl/includes/ui/gl_bank_ui.inc + gl/inquiry/bank_inquiry.php + gl/inquiry/gl_trial_balance.php + gl/manage/gl_account_types.php + gl/manage/gl_accounts.php + gl/view/gl_trans_view.php + includes/access_levels.inc + includes/data_checks.inc + includes/date_functions.inc + includes/db/connect_db.inc + includes/db/inventory_db.inc + includes/db/manufacturing_db.inc + includes/errors.inc + includes/hooks.inc + includes/lang/gettext.php + includes/packages.inc + includes/references.inc + includes/types.inc + includes/ui/items_cart.inc + includes/ui/ui_controls.inc + includes/ui/ui_input.inc + includes/ui/ui_msgs.inc + includes/ui/ui_view.inc + js/login.js + +2011-04-27 22:03 +0200 Janusz Dobrowolski - (2756) Added Purchase Invice edition. ++(2743) Added Purchase Invice edition. + includes/app_entries.inc + includes/db/inventory_db.inc + includes/references.inc + purchasing/includes/db/grn_db.inc + purchasing/includes/db/invoice_db.inc + purchasing/includes/db/invoice_items_db.inc + purchasing/includes/supp_trans_class.inc + purchasing/includes/ui/invoice_ui.inc + purchasing/inquiry/supplier_inquiry.php + purchasing/supplier_credit.php + purchasing/supplier_invoice.php + +2011-04-01 15:54 +0200 Janusz Dobrowolski - (2711) Added file for FA framework changes documentation. ++(2708) Added file for FA framework changes documentation. + doc/api_changes.txt + +2011-04-01 15:45 +0200 Janusz Dobrowolski - (2710) Fixed upgrade routines, reorganized db_export and company preferences related functions. ++(2707) Fixed upgrade routines, reorganized db_export and company preferences related functions. +This removes problems with databases spread over multiply hosts and make possible db_export to +central backup directory. + admin/db/company_db.inc + admin/db/maintenance_db.inc + admin/inst_upgrade.php + purchasing/includes/db/po_db.inc + sql/alter2.1.php + sql/alter2.2.php + sql/alter2.3.php + sql/alter2.4.php + +2011-03-23 18:42 +0100 Janusz Dobrowolski - (2693) Blocked purchase invoice and delivery entry for closed date. ++(2694) Blocked purchase invoice and delivery entry for closed date. + purchasing/po_entry_items.php + purchasing/po_receive_items.php + purchasing/supplier_invoice.php + +2011-01-26 15:01 +0000 Janusz Dobrowolski - (2629) Transactions will remain closed after after fiscal year was reopened. ++(2630) Transactions will remain closed after after fiscal year was reopened. + admin/db/fiscalyears_db.inc + +2011-01-26 14:58 +0000 Janusz Dobrowolski - (2628) Added date check against closed fiscal year. ++(2629) Added date check against closed fiscal year. + gl/manage/close_period.php + +2011-01-26 13:02 +0000 Janusz Dobrowolski - (2627) Added closing transactions on selected date, reorganized WO costing. ++(2628) Added closing transactions on selected date, reorganized WO costing. + CHANGELOG.txt + +2011-01-26 13:01 +0000 Janusz Dobrowolski - (2626) Fixed transaction date check messages. ++(2627) Fixed transaction date check messages. + gl/accruals.php + gl/bank_transfer.php + gl/gl_bank.php + gl/gl_journal.php + gl/manage/revaluate_currencies.php + inventory/adjustments.php + inventory/transfers.php + purchasing/supplier_credit.php + purchasing/supplier_payment.php + sales/create_recurrent_invoices.php + sales/credit_note_entry.php + sales/customer_credit_invoice.php + sales/customer_delivery.php + sales/customer_invoice.php + sales/customer_payments.php + sales/inquiry/customer_inquiry.php + sales/sales_order_entry.php + +2011-01-26 12:59 +0000 Janusz Dobrowolski - (2625) Reorganized work order costing to make corect registration of costs in journal. ++(2626) Reorganized work order costing to make corect registration of costs in journal. + includes/sysnames.inc + includes/types.inc + includes/ui/ui_view.inc + manufacturing/includes/db/work_order_costing_db.inc + manufacturing/includes/db/work_orders_db.inc + manufacturing/includes/db/work_orders_quick_db.inc + manufacturing/includes/manufacturing_db.inc + manufacturing/includes/manufacturing_ui.inc + manufacturing/view/wo_costs_view.php + manufacturing/work_order_costs.php + sql/alter2.4.php + sql/alter2.4.sql + +2011-01-26 12:56 +0000 Janusz Dobrowolski - (2624) Fixed transaction date check message. ++(2625) Fixed transaction date check message. + manufacturing/work_order_add_finished.php + manufacturing/work_order_entry.php + +2011-01-26 12:53 +0000 Janusz Dobrowolski - (2623) Added closing transactions up to selected date. ++(2624) Added closing transactions up to selected date. + applications/generalledger.php + config.default.php + gl/includes/db/gl_db_trans.inc + gl/inquiry/journal_inquiry.php + gl/manage/close_period.php + includes/access_levels.inc + includes/db/audit_trail_db.inc + includes/ui/ui_input.inc + purchasing/po_entry_items.php + themes/aqua/images/closed.png + themes/cool/images/closed.png + themes/default/images/closed.png + +2011-01-26 12:46 +0000 Janusz Dobrowolski - (2622) Added system tale for transaction edition entry points. ++(2623) Added system tale for transaction edition entry points. + includes/app_entries.inc + includes/session.inc + +2011-01-26 12:46 +0000 Janusz Dobrowolski - (2621) Added check_user_access helper. ++(2622) Added check_user_access helper. + includes/current_user.inc + +2011-01-26 12:45 +0000 Janusz Dobrowolski - (2620) Added check for closed transactions. ++(2621) Added check for closed transactions. + includes/data_checks.inc + +2011-01-26 12:45 +0000 Janusz Dobrowolski - (2619) Added check for closed date. ++(2620) Added check for closed date. + includes/date_functions.inc + +2011-01-26 12:44 +0000 Janusz Dobrowolski - (2618) Added missing tax_algorithm retrieval in read_po_header() ++(2619) Added missing tax_algorithm retrieval in read_po_header() + purchasing/includes/db/po_db.inc + +2011-01-26 12:42 +0000 Janusz Dobrowolski - (2617) Fixed bug in set_company_pref() ++(2618) Fixed bug in set_company_pref() + admin/db/company_db.inc + +2011-01-26 12:32 +0000 Janusz Dobrowolski - (2616) Fixed buggy qoh check message. ++(2617) Fixed buggy qoh check message. + manufacturing/work_order_issue.php + +2011-01-06 22:48 +0000 Janusz Dobrowolski - (2591) Upgrade procedures for 2.4 ++(2592) Upgrade procedures for 2.4 + sql/alter2.4.php + sql/alter2.4.sql + +2011-01-06 21:33 +0000 Janusz Dobrowolski - (2590) 'grn_clearing_act' pref initialization moved to 2.4 upgrade routines. ++(2591) 'grn_clearing_act' pref initialization moved to 2.4 upgrade routines. + admin/gl_setup.php + +2011-01-06 20:57 +0000 Janusz Dobrowolski - (2589) Initialized upgrade procedures for FA 2.4 ++(2590) Initialized upgrade procedures for FA 2.4 + CHANGELOG.txt + +2011-01-06 20:18 +0000 Janusz Dobrowolski - (2588) Added cash payment in purchasing Direct Invoice, added tax calculation algorithm selection for company/supplier. ++(2589) Added cash payment in purchasing Direct Invoice, added tax calculation algorithm selection for company/supplier. + CHANGELOG.txt + +2011-01-06 20:16 +0000 Janusz Dobrowolski - (2587) Added tax calcualtion algorithm selection in sales and purchasing, driven by company/supplier setting. ++(2588) Added tax calcualtion algorithm selection in sales and purchasing, driven by company/supplier setting. + admin/gl_setup.php + includes/sysnames.inc + includes/types.inc + includes/ui/ui_lists.inc + purchasing/includes/db/invoice_db.inc + purchasing/includes/db/po_db.inc + purchasing/includes/db/supp_trans_db.inc + purchasing/includes/db/suppliers_db.inc + purchasing/includes/po_class.inc + purchasing/includes/supp_trans_class.inc + purchasing/includes/ui/invoice_ui.inc + purchasing/manage/suppliers.php + purchasing/supplier_invoice.php + reporting/rep209.php + sql/en_US-demo.sql + sql/en_US-new.sql + taxes/tax_calc.inc + +2011-01-06 20:14 +0000 Janusz Dobrowolski - (2586) Added cash payment and tax calculation algorithm selection in pucrhase Direct Invoice. ++(2587) Added cash payment and tax calculation algorithm selection in pucrhase Direct Invoice. + purchasing/includes/ui/po_ui.inc + purchasing/po_entry_items.php + +2011-01-06 20:12 +0000 Janusz Dobrowolski - (2585) Updated sources version. ++(2586) Updated sources version. + version.php + +2011-01-04 17:32 +0000 Janusz Dobrowolski - (2584) Merged changes from mai trunk up to 2.3.1 ++(2585) Merged changes from mai trunk up to 2.3.1 + CHANGELOG.txt + admin/create_coy.php + admin/db/company_db.inc + admin/db/transactions_db.inc + admin/gl_setup.php + admin/void_transaction.php + applications/application.php + applications/customers.php + applications/dimensions.php + applications/generalledger.php + applications/inventory.php + applications/manufacturing.php + applications/setup.php + applications/suppliers.php + config.default.php + gl/bank_transfer.php + gl/gl_bank.php + gl/includes/db/gl_db_bank_accounts.inc + gl/includes/db/gl_db_trans.inc + gl/inquiry/balance_sheet.php + gl/inquiry/profit_loss.php + gl/manage/gl_quick_entries.php + includes/date_functions.inc + includes/db/inventory_db.inc + includes/errors.inc + includes/hooks.inc + includes/lang/gettext.php + includes/packages.inc + includes/session.inc + includes/ui/items_cart.inc + includes/ui/ui_lists.inc + install/index.php + install/isession.inc + js/reconcile.js + lang/new_language_template/LC_MESSAGES/empty.po + purchasing/includes/db/grn_db.inc + purchasing/includes/db/invoice_db.inc + purchasing/includes/db/po_db.inc + purchasing/includes/po_class.inc + purchasing/includes/ui/invoice_ui.inc + purchasing/includes/ui/po_ui.inc + purchasing/po_entry_items.php + purchasing/po_receive_items.php + purchasing/supplier_payment.php + reporting/includes/pdf_report.inc + sales/includes/db/cust_trans_db.inc + sales/sales_order_entry.php + sql/en_US-demo.sql + sql/en_US-new.sql + themes/aqua/images/menu_entry.png + themes/aqua/images/menu_inquiry.png + themes/aqua/images/menu_maintenance.png + themes/aqua/images/menu_report.png + themes/aqua/images/menu_settings.png + themes/aqua/images/menu_system.png + themes/aqua/images/menu_transaction.png + themes/aqua/images/menu_update.png + themes/aqua/renderer.php + themes/cool/images/menu_entry.png + themes/cool/images/menu_inquiry.png + themes/cool/images/menu_maintenance.png + themes/cool/images/menu_report.png + themes/cool/images/menu_settings.png + themes/cool/images/menu_system.png + themes/cool/images/menu_transaction.png + themes/cool/images/menu_update.png + themes/cool/renderer.php + themes/default/images/menu_entry.png + themes/default/images/menu_inquiry.png + themes/default/images/menu_maintenance.png + themes/default/images/menu_report.png + themes/default/images/menu_settings.png + themes/default/images/menu_system.png + themes/default/images/menu_transaction.png + themes/default/images/menu_update.png + themes/default/renderer.php + version.php + +2010-12-09 12:53 +0000 Janusz Dobrowolski - (2535) Release date in changelog fixed ++(2536) Release date in changelog fixed + CHANGELOG.txt + +2010-12-09 12:45 +0000 Joe Hunt - (2534) Release 2.3.0 ++(2535) Release 2.3.0 + CHANGELOG.txt + version.php + +2010-12-09 11:12 +0000 Janusz Dobrowolski - (2533) Fixed bugs 312-314, imporved debug error handling, updated gettext template. ++(2534) Fixed bugs 312-314, imporved debug error handling, updated gettext template. + CHANGELOG.txt + +2010-12-09 11:09 +0000 Janusz Dobrowolski - (2532) [0000313] Fixed multiply vulnerabilities. ++(2533) [0000313] Fixed multiply vulnerabilities. + dimensions/includes/dimensions_db.inc + includes/banking.inc + includes/data_checks.inc + includes/systypes.inc + purchasing/includes/ui/po_ui.inc + reporting/includes/header2.inc + sales/includes/sales_db.inc + +2010-12-09 11:07 +0000 Janusz Dobrowolski - (2531) Debug backtrace on all errors when go_debug is set to 2 ++(2532) Debug backtrace on all errors when go_debug is set to 2 + includes/errors.inc + includes/ui/ui_msgs.inc + includes/ui/ui_view.inc + +2010-12-09 11:06 +0000 Janusz Dobrowolski - (2530) Added SetFontSize method for better compatibility with pdf version. ++(2531) Added SetFontSize method for better compatibility with pdf version. + reporting/includes/excel_report.inc + +2010-12-09 11:06 +0000 Janusz Dobrowolski - (2529) Fixed sql assembly in get_account_types. ++(2530) Fixed sql assembly in get_account_types. + gl/includes/db/gl_db_account_types.inc + +2010-12-09 11:05 +0000 Janusz Dobrowolski - (2528) [0000312] Prevented directory traversal ++(2529) [0000312] Prevented directory traversal + admin/attachments.php + admin/company_preferences.php + admin/display_prefs.php + +2010-12-09 11:04 +0000 Janusz Dobrowolski - (2527) [0000314] Fixed session fixation vulnerability ++(2528) [0000314] Fixed session fixation vulnerability + includes/session.inc + +2010-12-09 11:03 +0000 Janusz Dobrowolski - (2526) Updated to current sorces ++(2527) Updated to current sorces + lang/new_language_template/LC_MESSAGES/empty.po + +2010-12-08 13:27 +0000 Janusz Dobrowolski - (2525) Added errors.inc inclusion in isession.inc ++(2526) Added errors.inc inclusion in isession.inc + CHANGELOG.txt + install/isession.inc + +2010-12-07 16:04 +0000 Janusz Dobrowolski - (2524) Additional fix to error handling. ++(2525) Additional fix to error handling. + CHANGELOG.txt + includes/errors.inc + +2010-12-07 12:09 +0000 Janusz Dobrowolski - (2523) Imporved eror handling, aded missing hooks class methods placeholders. ++(2524) Imporved eror handling, aded missing hooks class methods placeholders. + CHANGELOG.txt + +2010-12-07 12:08 +0000 Janusz Dobrowolski - (2522) Improved error handling. ++(2523) Improved error handling. + admin/inst_module.php + includes/main.inc + includes/session.inc + +2010-12-07 12:07 +0000 Janusz Dobrowolski - (2521) Added missing hook class methods placeholders. ++(2522) Added missing hook class methods placeholders. + includes/hooks.inc + +2010-12-07 12:05 +0000 Janusz Dobrowolski - (2520) Changes error_reporting parameter acording to tip in php manual. ++(2521) Changes error_reporting parameter acording to tip in php manual. + config.default.php + +2010-12-07 10:12 +0000 Janusz Dobrowolski - (2519) typo fixed ++(2520) typo fixed + config.default.php + +2010-12-07 10:12 +0000 Janusz Dobrowolski - (2518) Typo fixed. ++(2519) Typo fixed. + reporting/includes/tcpdf.php + +2010-12-07 08:05 +0000 Janusz Dobrowolski - (2517) Fixed multiply small issues mainly related to php5.3. ++(2518) Fixed multiply small issues mainly related to php5.3. + CHANGELOG.txt + +2010-12-07 08:04 +0000 Janusz Dobrowolski - (2516) Fixed multiply strict warnings, fixed error handling on php 5.3 ++(2517) Fixed multiply strict warnings, fixed error handling on php 5.3 + config.default.php + reporting/includes/class.pdf.inc + reporting/includes/pdf_report.inc + reporting/includes/tcpdf.php + +2010-12-07 08:02 +0000 Janusz Dobrowolski - (2515) Fixed uploaded file name test ++(2516) Fixed uploaded file name test + admin/backups.php + +2010-12-07 08:01 +0000 Janusz Dobrowolski - (2514) Voided transactions should not be presented in GL inquiry. ++(2515) Voided transactions should not be presented in GL inquiry. + gl/includes/db/gl_db_trans.inc + +2010-12-07 08:00 +0000 Janusz Dobrowolski - (2513) Missing tags argument in display_type call ++(2514) Missing tags argument in display_type call + reporting/rep705.php + +2010-12-03 12:34 +0000 Janusz Dobrowolski - (2512) Fixed company prefs refresh after upgrade/restore, some smaller clenaups. ++(2513) Fixed company prefs refresh after upgrade/restore, some smaller clenaups. + CHANGELOG.txt + +2010-12-03 12:32 +0000 Janusz Dobrowolski - (2511) Clenaups. ++(2512) Clenaups. + includes/ui/ui_lists.inc + sales/includes/ui/sales_order_ui.inc + +2010-12-03 12:32 +0000 Janusz Dobrowolski - (2510) Added core translation support for modules. ++(2511) Added core translation support for modules. + includes/hooks.inc + includes/lang/gettext.php + +2010-12-03 12:28 +0000 Janusz Dobrowolski - (2509) Imporved readibility. ++(2510) Imporved readibility. + reporting/rep701.php + +2010-12-03 12:27 +0000 Janusz Dobrowolski - (2508) Fixed company prefs refresh after upgrade/restore. ++(2509) Fixed company prefs refresh after upgrade/restore. + admin/backups.php + admin/db/company_db.inc + admin/inst_upgrade.php + +2010-12-03 11:59 +0000 Joe Hunt - (2507) Fixing year closure for earlier fiscal years. en_US-demo.sql ++(2508) Fixing year closure for earlier fiscal years. en_US-demo.sql +Rerun of trial balance. + CHANGELOG.txt + gl/inquiry/gl_trial_balance.php + reporting/rep708.php + sql/en_US-demo.sql + +2010-12-03 10:25 +0000 Joe Hunt - (2506) Creating a warning when opening balance in trial balance is not in balance, ++(2507) Creating a warning when opening balance in trial balance is not in balance, + CHANGELOG.txt + gl/inquiry/gl_trial_balance.php + reporting/rep708.php + +2010-12-03 00:27 +0000 Joe Hunt - (2505) Changed so it is not possible to select a from date bigger than fiscal year end in trial balance. ++(2506) Changed so it is not possible to select a from date bigger than fiscal year end in trial balance. + CHANGELOG.txt + gl/inquiry/gl_trial_balance.php + +2010-12-02 14:24 +0000 Joe Hunt - (2504) When deleting a fiscal year, the open balances should share the same trans no. ++(2505) When deleting a fiscal year, the open balances should share the same trans no. + CHANGELOG.txt + admin/db/fiscalyears_db.inc + +2010-12-01 10:14 +0000 Joe Hunt - (2503) Better test for correct balance accounts when closing fiscal year. ++(2504) Better test for correct balance accounts when closing fiscal year. + CHANGELOG.txt + admin/db/fiscalyears_db.inc + +2010-11-29 09:04 +0000 Janusz Dobrowolski - (2502) Fixed display bug in view/print/void transaction, and problem with uploading sql files. ++(2503) Fixed display bug in view/print/void transaction, and problem with uploading sql files. + CHANGELOG.txt + +2010-11-29 09:03 +0000 Janusz Dobrowolski - (2501) [0000290] Can't upload files ++(2502) [0000290] Can't upload files + admin/backups.php + +2010-11-29 09:02 +0000 Janusz Dobrowolski - (2500) [0000289] Duplicate records in view/print/void transaction pager ++(2501) [0000289] Duplicate records in view/print/void transaction pager + admin/db/transactions_db.inc + +2010-11-28 20:17 +0000 Janusz Dobrowolski - (2499) Added Italian install wizard translation by Paolo Ardoino. ++(2500) Added Italian install wizard translation by Paolo Ardoino. + CHANGELOG.txt + install/isession.inc + install/lang/it_IT/LC_MESSAGES/it_IT.mo + install/lang/it_IT/LC_MESSAGES/it_IT.po + +2010-11-28 19:12 +0000 Janusz Dobrowolski - (2498) Transaction names shortcuts added. ++(2499) Transaction names shortcuts added. + CHANGELOG.txt + includes/sysnames.inc + reporting/includes/reports_classes.inc + +2010-11-28 13:06 +0000 Joe Hunt - (2497) Removed possibility to use bank account in Direct Invoice. This ++(2498) Removed possibility to use bank account in Direct Invoice. This +was an old method for handling Cash Payment. We now have better options. + CHANGELOG.txt + sales/includes/db/sales_invoice_db.inc + sales/manage/customer_branches.php + +2010-11-26 14:24 +0000 Janusz Dobrowolski - (2496) Improved reports menu display. ++(2497) Improved reports menu display. + CHANGELOG.txt + js/inserts.js + js/reports.js + js/utils.js + reporting/includes/reports_classes.inc + reporting/reports_main.php + +2010-11-26 10:10 +0000 Janusz Dobrowolski - (2495) Fixed ugreports 283,285 and two other small fixes. ++(2496) Fixed ugreports 283,285 and two other small fixes. + CHANGELOG.txt + +2010-11-26 10:09 +0000 Janusz Dobrowolski - (2494) Fixed vulnerability on id paramater ++(2495) Fixed vulnerability on id paramater + admin/db/security_db.inc + +2010-11-26 10:08 +0000 Janusz Dobrowolski - (2493) Fixed hotkeys support after validation changes ++(2494) Fixed hotkeys support after validation changes + js/inserts.js + +2010-11-26 10:07 +0000 Janusz Dobrowolski - (2492) Fixed errors/warning due to leaved obsolete code. ++(2493) Fixed errors/warning due to leaved obsolete code. + reporting/rep109.php + +2010-11-26 10:07 +0000 Janusz Dobrowolski - (2491) Fixed tabs switching ++(2492) Fixed tabs switching + sales/manage/customer_branches.php + +2010-11-24 18:02 +0000 Janusz Dobrowolski - (2490) A couple of additional smaller fixes. ++(2491) A couple of additional smaller fixes. + CHANGELOG.txt + +2010-11-24 18:01 +0000 Janusz Dobrowolski - (2489) [0000281] Filename saitization added ++(2490) [0000281] Filename saitization added + admin/attachments.php + admin/db/maintenance_db.inc + includes/main.inc + +2010-11-24 18:00 +0000 Janusz Dobrowolski - (2488) Fixed period type display. ++(2489) Fixed period type display. + gl/manage/gl_quick_entries.php + +2010-11-24 17:59 +0000 Janusz Dobrowolski - (2487) Fixed errors display in included files. ++(2488) Fixed errors display in included files. + includes/hooks.inc + +2010-11-24 17:58 +0000 Janusz Dobrowolski - (2486) Fixed backup view, sanitization. ++(2487) Fixed backup view, sanitization. + admin/backups.php + +2010-11-22 21:14 +0000 Janusz Dobrowolski - (2485) Extended and improved hooks system, multiply smaller fixes. ++(2486) Extended and improved hooks system, multiply smaller fixes. + CHANGELOG.txt + +2010-11-22 21:13 +0000 Janusz Dobrowolski - (2484) Rewritten third-party module installation according to extended hooks system. ++(2485) Rewritten third-party module installation according to extended hooks system. + admin/inst_module.php + +2010-11-22 21:12 +0000 Janusz Dobrowolski - (2483) Tabs/menu/roles extensions moved to module hooks file, added (un)install hooks. ++(2484) Tabs/menu/roles extensions moved to module hooks file, added (un)install hooks. + includes/access_levels.inc + includes/packages.inc + sql/alter2.3.php + +2010-11-22 21:10 +0000 Janusz Dobrowolski - (2482) check_table helper moved. ++(2483) check_table helper moved. + admin/db/maintenance_db.inc + admin/inst_upgrade.php + +2010-11-22 21:09 +0000 Janusz Dobrowolski - (2481) Integration of hooks provided by extensions. ++(2482) Integration of hooks provided by extensions. + includes/hooks.inc + includes/session.inc + +2010-11-22 21:09 +0000 Janusz Dobrowolski - (2480) Hooks for tabs/mneu added. ++(2481) Hooks for tabs/mneu added. + applications/application.php + frontaccounting.php + +2010-11-22 21:08 +0000 Janusz Dobrowolski - (2479) Cleanup ++(2480) Cleanup + includes/main.inc + +2010-11-22 21:08 +0000 Janusz Dobrowolski - (2478) Fixed long timeouts on localhost repo. ++(2479) Fixed long timeouts on localhost repo. + includes/remote_url.inc + +2010-11-22 21:07 +0000 Janusz Dobrowolski - (2477) Fixed input sanitization. ++(2478) Fixed input sanitization. + reporting/prn_redirect.php + +2010-11-22 21:06 +0000 Janusz Dobrowolski - (2476) Additional security related fixes. ++(2477) Additional security related fixes. + .htaccess + +2010-11-22 21:05 +0000 Janusz Dobrowolski - (2475) Fixed parameter sanitization in get_compan_extensions(). ++(2476) Fixed parameter sanitization in get_compan_extensions(). + admin/db/company_db.inc + +2010-11-22 21:04 +0000 Janusz Dobrowolski - (2474) Fixed db_close() helper. ++(2475) Fixed db_close() helper. + includes/db/connect_db.inc + +2010-11-22 21:04 +0000 Janusz Dobrowolski - (2473) Fixed bug in update_person_contact(). ++(2474) Fixed bug in update_person_contact(). + includes/db/crm_contacts_db.inc + +2010-11-22 21:03 +0000 Janusz Dobrowolski - (2472) Fixed bug in exrate return. ++(2473) Fixed bug in exrate return. + gl/includes/db/gl_db_rates.inc + +2010-11-22 21:02 +0000 Janusz Dobrowolski - (2471) Item type dispaincorrectd after change saving. ++(2472) Item type dispaincorrectd after change saving. + inventory/manage/items.php + +2010-11-18 22:08 +0000 Joe Hunt - (2470) Could not enter a year before other years (removed readonly begin) ++(2471) Could not enter a year before other years (removed readonly begin) +and better check for first end year. + CHANGELOG.txt + admin/db/fiscalyears_db.inc + admin/fiscalyears.php + +2010-11-18 10:36 +0000 Janusz Dobrowolski - (2469) Updated language template, added spanish install wizard translation. ++(2470) Updated language template, added spanish install wizard translation. + CHANGELOG.txt + +2010-11-18 10:31 +0000 Janusz Dobrowolski - (2468) Updated including exclusive theme messages. ++(2469) Updated including exclusive theme messages. + lang/new_language_template/LC_MESSAGES/empty.po + +2010-11-18 10:30 +0000 Janusz Dobrowolski - (2467) Added Spanish (Mexico) translation. ++(2468) Added Spanish (Mexico) translation. + install/isession.inc + install/lang/es_MX/LC_MESSAGES/es_MX.mo + install/lang/es_MX/LC_MESSAGES/es_MX.po + +2010-11-18 00:49 +0000 Joe Hunt - (2466) Scrambled graphic images to avoid unwanted downloads. ++(2467) Scrambled graphic images to avoid unwanted downloads. + CHANGELOG.txt + reporting/rep102.php + reporting/rep202.php + reporting/rep706.php + reporting/rep707.php + +2010-11-16 14:10 +0000 Joe Hunt - (2465) Added Work Order Entry menu link after Sales Order issue. ++(2466) Added Work Order Entry menu link after Sales Order issue. + CHANGELOG.txt + sales/sales_order_entry.php + +2010-11-16 13:52 +0000 Joe Hunt - (2464) Minor change in class.graphic.inc ++(2465) Minor change in class.graphic.inc + CHANGELOG.txt + reporting/includes/class.graphic.inc + +2010-11-15 15:25 +0000 Janusz Dobrowolski - (2463) Default font for graphics changed from Vera to LiberationSans-Regular. ++(2464) Default font for graphics changed from Vera to LiberationSans-Regular. + CHANGELOG.txt + reporting/fonts/LiberationSans-Regular.ttf + reporting/fonts/Vera.ttf + reporting/includes/class.graphic.inc + reporting/rep102.php + reporting/rep202.php + reporting/rep706.php + reporting/rep707.php + +2010-11-15 12:13 +0000 Janusz Dobrowolski - (2462) Fixed date legend in supplier documents, fixed text encoding in graphics. ++(2463) Fixed date legend in supplier documents, fixed text encoding in graphics. + CHANGELOG.txt + +2010-11-15 12:12 +0000 Janusz Dobrowolski - (2461) Fixed transaction date legend. ++(2462) Fixed transaction date legend. + purchasing/includes/ui/po_ui.inc + +2010-11-15 12:11 +0000 Janusz Dobrowolski - (2460) Fixed text encoding. ++(2461) Fixed text encoding. + reporting/includes/class.graphic.inc + +2010-11-13 10:14 +0000 Janusz Dobrowolski - (2459) Removed sparse postread hook. ++(2460) Removed sparse postread hook. + sales/includes/db/sales_order_db.inc + +2010-11-13 09:38 +0000 Janusz Dobrowolski - (2458) Established new hooks class convention. ++(2459) Established new hooks class convention. + CHANGELOG.txt + includes/hooks.inc + includes/session.inc + lang/new_language_template/locale.inc + +2010-11-13 09:19 +0000 Janusz Dobrowolski - (2457) Added db_write/db_void hooks. ++(2458) Added db_write/db_void hooks. + gl/includes/db/gl_db_banking.inc + inventory/includes/db/items_adjust_db.inc + inventory/includes/db/items_transfer_db.inc + manufacturing/includes/db/work_order_issues_db.inc + manufacturing/includes/db/work_order_produce_items_db.inc + manufacturing/includes/db/work_orders_db.inc + manufacturing/includes/db/work_orders_quick_db.inc + purchasing/includes/db/grn_db.inc + purchasing/includes/db/invoice_db.inc + purchasing/includes/db/po_db.inc + purchasing/includes/db/supp_payment_db.inc + purchasing/po_entry_items.php + sales/includes/db/payment_db.inc + sales/includes/db/sales_credit_db.inc + sales/includes/db/sales_delivery_db.inc + sales/includes/db/sales_invoice_db.inc + sales/includes/db/sales_order_db.inc + +2010-11-13 09:18 +0000 Janusz Dobrowolski - (2456) Old hooks superseded by new hooks API. ++(2457) Old hooks superseded by new hooks API. + gl/includes/db/gl_db_rates.inc + includes/ui/ui_view.inc + reporting/rep709.php + +2010-11-13 09:16 +0000 Janusz Dobrowolski - (2455) New hooks system added. ++(2456) New hooks system added. + includes/hooks.inc + includes/session.inc + +2010-11-12 12:17 +0000 Janusz Dobrowolski - (2454) Added db_close() for optional use. ++(2455) Added db_close() for optional use. + CHANGELOG.txt + includes/db/connect_db.inc + +2010-11-12 11:37 +0000 Janusz Dobrowolski - (2453) Added missing due date on direct purchase invoice, fixed QE edition ui, fixed Items name ++(2454) Added missing due date on direct purchase invoice, fixed QE edition ui, fixed Items name + entry field length. + CHANGELOG.txt + +2010-11-12 11:36 +0000 Janusz Dobrowolski - (2452) Added missing due date on direct invoice entry. ++(2453) Added missing due date on direct invoice entry. + purchasing/includes/db/invoice_db.inc + purchasing/includes/po_class.inc + purchasing/includes/supp_trans_class.inc + purchasing/includes/ui/invoice_ui.inc + purchasing/includes/ui/po_ui.inc + purchasing/po_entry_items.php + +2010-11-12 11:26 +0000 Janusz Dobrowolski - (2451) Fixed maximum nam length. ++(2452) Fixed maximum nam length. + inventory/manage/items.php + +2010-11-12 11:25 +0000 Janusz Dobrowolski - (2450) Fixed a couple of edition ui bugs. ++(2451) Fixed a couple of edition ui bugs. + gl/manage/gl_quick_entries.php + +2010-11-11 10:00 +0000 Janusz Dobrowolski - (2449) Fixed multiply where cluese in db_pager and two other implode vulnerabilities. ++(2450) Fixed multiply where cluese in db_pager and two other implode vulnerabilities. + CHANGELOG.txt + +2010-11-11 09:58 +0000 Janusz Dobrowolski - (2448) Fixed implode() injection vulnerabilities. ++(2449) Fixed implode() injection vulnerabilities. + includes/db/crm_contacts_db.inc + sales/includes/db/cust_trans_details_db.inc + +2010-11-11 09:58 +0000 Janusz Dobrowolski - (2447) Fixed sql_gen method for multiply extra where clauses. ++(2448) Fixed sql_gen method for multiply extra where clauses. + includes/db_pager.inc + +2010-11-10 13:27 +0000 Janusz Dobrowolski - (2446) Removed related report class when company does not use dimensions. ++(2447) Removed related report class when company does not use dimensions. + CHANGELOG.txt + reporting/includes/reports_classes.inc + +2010-11-10 11:42 +0000 Janusz Dobrowolski - (2445) Additional fix for setting local_path_to_root in find_custom_file() ++(2446) Additional fix for setting local_path_to_root in find_custom_file() + CHANGELOG.txt + includes/main.inc + +2010-11-09 16:47 +0000 Joe Hunt - (2444) [0000277] Changed so FA suggest the next begin day in new Fiscal Year (read only). ++(2445) [0000277] Changed so FA suggest the next begin day in new Fiscal Year (read only). +But only if there are any fiscal years before. Otherwise is is normal. + CHANGELOG.txt + admin/db/fiscalyears_db.inc + admin/fiscalyears.php + +2010-11-09 14:21 +0000 Janusz Dobrowolski - (2443) Fixed admin login/password update. ++(2444) Fixed admin login/password update. + CHANGELOG.txt + install/index.php + +2010-11-09 13:49 +0000 Janusz Dobrowolski - (2442) Session destroy on install finish added. ++(2443) Session destroy on install finish added. + CHANGELOG.txt + install/index.php + +2010-11-08 10:50 +0000 Janusz Dobrowolski - (2441) Fixed support for translations in extensions modules reports. ++(2442) Fixed support for translations in extensions modules reports. + CHANGELOG.txt + includes/main.inc + reporting/includes/class.pdf.inc + +2010-11-07 21:31 +0000 Janusz Dobrowolski - (2440) Added validation hook on buttons ++(2441) Added validation hook on buttons + CHANGELOG.txt + js/inserts.js + +2010-11-07 19:22 +0000 Janusz Dobrowolski - (2439) Enabled javascript updats on ajax _page_body refresh. ++(2440) Enabled javascript updats on ajax _page_body refresh. + CHANGELOG.txt + includes/ajax.inc + +2010-11-07 16:30 +0000 Janusz Dobrowolski - (2438) Small fixes to emailing documents and report cleanups. ++(2439) Small fixes to emailing documents and report cleanups. + CHANGELOG.txt + +2010-11-07 16:28 +0000 Janusz Dobrowolski - (2437) Cleanup. ++(2438) Cleanup. + reporting/includes/pdf_report.inc + reporting/rep107.php + reporting/rep109.php + reporting/rep110.php + reporting/rep111.php + reporting/rep209.php + reporting/rep210.php + reporting/rep409.php + +2010-11-07 16:28 +0000 Janusz Dobrowolski - (2436) Fixed multipart email structure. ++(2437) Fixed multipart email structure. + reporting/includes/class.mail.inc + +2010-11-07 16:26 +0000 Janusz Dobrowolski - (2435) Separate class for view and print links. ++(2436) Separate class for view and print links. + includes/ui/ui_controls.inc + +2010-11-06 19:29 +0000 Janusz Dobrowolski - (2434) Confirmation dialog added before transaction edition is abandoned, fixed contact edtion ++(2435) Confirmation dialog added before transaction edition is abandoned, fixed contact edtion +issues. + CHANGELOG.txt + +2010-11-06 19:28 +0000 Janusz Dobrowolski - (2433) Helpers for js confirmation dialog before data entry is abandoned. ++(2434) Helpers for js confirmation dialog before data entry is abandoned. + includes/ui/ui_controls.inc + js/inserts.js + themes/aqua/renderer.php + themes/cool/renderer.php + themes/default/renderer.php + +2010-11-06 19:27 +0000 Janusz Dobrowolski - (2432) Confirmaton dialog added before transaction edition is abandoned. ++(2433) Confirmaton dialog added before transaction edition is abandoned. + sales/includes/sales_ui.inc + sales/sales_order_entry.php + +2010-11-06 19:25 +0000 Janusz Dobrowolski - (2431) Rearanged contacts edition. ++(2432) Rearanged contacts edition. + includes/db/crm_contacts_db.inc + includes/ui/contacts_view.inc + sales/includes/db/branches_db.inc + +2010-11-06 19:23 +0000 Janusz Dobrowolski - (2430) [0000274] Contact edition failed after last security fixes. ++(2431) [0000274] Contact edition failed after last security fixes. + includes/session.inc + +2010-11-05 14:55 +0000 Janusz Dobrowolski - (2429) Two bugs in installer wizd fixed. ++(2430) Two bugs in installer wizd fixed. + CHANGELOG.txt + install/index.php + +2010-11-04 16:14 +0000 Janusz Dobrowolski - (2428) Cleanup ++(2429) Cleanup + reporting/includes/Workbook.php + +2010-11-04 15:21 +0000 Janusz Dobrowolski - (2427) Fixed broken excel reportsfor non-latin1 encoding. ++(2428) Fixed broken excel reportsfor non-latin1 encoding. + CHANGELOG.txt + reporting/includes/Workbook.php + +2010-11-03 07:06 +0000 Janusz Dobrowolski - (2426) Additional request input cleanup. ++(2427) Additional request input cleanup. + CHANGELOG.txt + includes/session.inc + +2010-11-02 11:12 +0000 Joe Hunt - (2425) Rerun. Bug in amount selection ++(2426) Rerun. Bug in amount selection + reporting/rep103.php + +2010-11-02 09:12 +0000 Joe Hunt - (2424) Report Customer Details didn't show up correctly in Excel ++(2425) Report Customer Details didn't show up correctly in Excel + CHANGELOG.txt + reporting/rep103.php + +2010-10-30 13:35 +0000 Janusz Dobrowolski - (2423) A couple of various small fixes. ++(2424) A couple of various small fixes. + CHANGELOG.txt + +2010-10-30 13:34 +0000 Janusz Dobrowolski - (2422) Added group code in account groups list selector. ++(2423) Added group code in account groups list selector. + includes/ui/ui_lists.inc + +2010-10-30 13:34 +0000 Janusz Dobrowolski - (2421) Normalized add_domain() params in native phpgettext classes ++(2422) Normalized add_domain() params in native phpgettext classes + includes/lang/gettext.php + +2010-10-30 13:33 +0000 Janusz Dobrowolski - (2420) submit_js_confirm() fixed to be used on button loadable via ajax. ++(2421) submit_js_confirm() fixed to be used on button loadable via ajax. + includes/ui/ui_input.inc + +2010-10-30 13:32 +0000 Janusz Dobrowolski - (2419) Validation code was skipped by esc/ctrlenter hotkeys. ++(2420) Validation code was skipped by esc/ctrlenter hotkeys. + js/inserts.js + +2010-10-30 13:32 +0000 Janusz Dobrowolski - (2418) Fixed reference display in credit note edition. ++(2419) Fixed reference display in credit note edition. + sales/includes/ui/sales_credit_ui.inc + +2010-10-29 16:16 +0000 Janusz Dobrowolski - (2417) Fixed input cleanup for arrays. ++(2418) Fixed input cleanup for arrays. + CHANGELOG.txt + includes/session.inc + +2010-10-28 16:26 +0000 Janusz Dobrowolski - (2416) Fixed warning on CN edition due to not existing ref POST. ++(2417) Fixed warning on CN edition due to not existing ref POST. + sales/credit_note_entry.php + +2010-10-28 16:13 +0000 Janusz Dobrowolski - (2415) Fixed db error on free hand credit invoice reedition. ++(2416) Fixed db error on free hand credit invoice reedition. + CHANGELOG.txt + sales/includes/cart_class.inc + +2010-10-28 09:36 +0000 Janusz Dobrowolski - (2414) MySQL related functions moved to connect_db.inc, fixed mailing under PHP with suhoshin ++(2415) MySQL related functions moved to connect_db.inc, fixed mailing under PHP with suhoshin +patch. + CHANGELOG.txt + +2010-10-28 09:30 +0000 Janusz Dobrowolski - (2413) All mysql specific calls moved to connect_db.inc ++(2414) All mysql specific calls moved to connect_db.inc + admin/db/maintenance_db.inc + admin/inst_theme.php + includes/current_user.inc + includes/db/connect_db.inc + includes/db_pager.inc + install/index.php + +2010-10-28 09:29 +0000 Janusz Dobrowolski - (2412) Fixed mailing problems under php with suhohin patch. ++(2413) Fixed mailing problems under php with suhohin patch. + reporting/includes/class.mail.inc + +2010-10-27 00:02 +0000 Joe Hunt - (2411) Rerun ++(2412) Rerun + includes/ui/view_package.php + +2010-10-26 23:52 +0000 Joe Hunt - (2410) Layout improvements ++(2411) Layout improvements + CHANGELOG.txt + includes/ui/view_package.php + +2010-10-26 16:29 +0000 Janusz Dobrowolski - (2409) Fixed installer (sys_prefs update error). ++(2410) Fixed installer (sys_prefs update error). + CHANGELOG.txt + install/index.php + +2010-10-26 11:35 +0000 Joe Hunt - (2408) 0000272: Manufacturing Bugs. Issue GL items moved to wo_work_order_issues.inc ++(2409) 0000272: Manufacturing Bugs. Issue GL items moved to wo_work_order_issues.inc +Layout improvements in work order inquiry and various work order forms + CHANGELOG.txt + manufacturing/includes/db/work_order_issues_db.inc + manufacturing/includes/db/work_order_produce_items_db.inc + manufacturing/includes/db/work_orders_quick_db.inc + manufacturing/search_work_orders.php + manufacturing/work_order_add_finished.php + manufacturing/work_order_costs.php + manufacturing/work_order_issue.php + manufacturing/work_order_release.php + +2010-10-25 16:38 +0000 Janusz Dobrowolski - (2407) Fixed tabbed_content behaviour. ++(2408) Fixed tabbed_content behaviour. + CHANGELOG.txt + includes/ui/ui_controls.inc + +2010-10-25 08:48 +0000 Janusz Dobrowolski - (2406) Version 2.3RC3 ++(2407) Version 2.3RC3 + CHANGELOG.txt + version.php + +2010-10-22 13:48 +0000 Janusz Dobrowolski - (2405) Fixed manuall package install and extension upgrade. ++(2406) Fixed manuall package install and extension upgrade. + CHANGELOG.txt + +2010-10-22 13:47 +0000 Janusz Dobrowolski - (2404) Old package version was not uninstalled on upgrade. ++(2405) Old package version was not uninstalled on upgrade. + includes/packages.inc + +2010-10-22 13:46 +0000 Janusz Dobrowolski - (2403) Fixed sql init for manually added modules. ++(2404) Fixed sql init for manually added modules. + admin/inst_module.php + +2010-10-22 13:43 +0000 Janusz Dobrowolski - (2402) New installer translation. ++(2403) New installer translation. + install/lang/el_GR/LC_MESSAGES/el_GR.mo + install/lang/el_GR/LC_MESSAGES/el_GR.po + +2010-10-22 13:42 +0000 Janusz Dobrowolski - (2401) Added greek translation. ++(2402) Added greek translation. + install/isession.inc + +2010-10-22 11:59 +0000 Janusz Dobrowolski - (2400) Added greek installer translation. ++(2401) Added greek installer translation. + CHANGELOG.txt + +2010-10-21 14:39 +0000 Janusz Dobrowolski - (2399) Improper amount sign in bank payment view fixed. ++(2400) Improper amount sign in bank payment view fixed. + CHANGELOG.txt + gl/view/gl_payment_view.php + +2010-10-21 14:38 +0000 Janusz Dobrowolski - (2398) Fixed cust_trans update on bank trans change. ++(2399) Fixed cust_trans update on bank trans change. + gl/gl_bank.php + gl/includes/db/gl_db_banking.inc + +2010-10-21 12:28 +0000 Janusz Dobrowolski - (2397) Fixed foreign currency bank deposit/payment reedition. ++(2398) Fixed foreign currency bank deposit/payment reedition. + gl/gl_bank.php + gl/includes/ui/gl_bank_ui.inc + +2010-10-21 10:39 +0000 Joe Hunt - (2396) Added credit info in supplier invoice and supplier credit note. ++(2397) Added credit info in supplier invoice and supplier credit note. + CHANGELOG.txt + purchasing/includes/db/invoice_db.inc + purchasing/includes/supp_trans_class.inc + purchasing/includes/ui/invoice_ui.inc + +2010-10-21 10:23 +0000 Janusz Dobrowolski - (2395) [0000270] fixed invalid next refference update, lots of cleanups and optimizations ++(2396) [0000270] fixed invalid next refference update, lots of cleanups and optimizations + CHANGELOG.txt + +2010-10-21 10:21 +0000 Janusz Dobrowolski - (2394) Various code cleanups ++(2395) Various code cleanups + gl/includes/db/gl_db_trans.inc + gl/inquiry/journal_inquiry.php + includes/date_functions.inc + includes/db/references_db.inc + includes/main.inc + includes/references.inc + +2010-10-21 10:18 +0000 Janusz Dobrowolski - (2393) Opitimized bank transaction edition code, [0000270] invalid next reference update. ++(2394) Opitimized bank transaction edition code, [0000270] invalid next reference update. + gl/gl_bank.php + gl/includes/db/gl_db_bank_trans.inc + gl/includes/db/gl_db_banking.inc + +2010-10-21 10:11 +0000 Janusz Dobrowolski - (2392) add_supp_trans and reinsert_supp_trans merged into write_supp_trans ++(2393) add_supp_trans and reinsert_supp_trans merged into write_supp_trans + purchasing/includes/db/invoice_db.inc + purchasing/includes/db/supp_payment_db.inc + purchasing/includes/db/supp_trans_db.inc + +2010-10-21 10:09 +0000 Janusz Dobrowolski - (2391) Additional sql parameters cleanup. ++(2392) Additional sql parameters cleanup. + purchasing/includes/db/suppalloc_db.inc + +2010-10-21 10:07 +0000 Janusz Dobrowolski - (2390) Additional sq parameters cleanup. ++(2391) Additional sq parameters cleanup. + sales/includes/db/cust_trans_db.inc + sales/includes/db/custalloc_db.inc + sales/includes/db/sales_order_db.inc + sales/includes/sales_db.inc + +2010-10-21 10:07 +0000 Janusz Dobrowolski - (2389) Code cleanup ++(2390) Code cleanup + sales/view/view_dispatch.php + sales/view/view_invoice.php + +2010-10-21 10:04 +0000 Janusz Dobrowolski - (2388) Added input cleanup ++(2389) Added input cleanup + includes/session.inc + +2010-10-19 08:01 +0000 Janusz Dobrowolski - (2387) New combo3 class searchable from start of the code (used in gl accounts list). ++(2388) New combo3 class searchable from start of the code (used in gl accounts list). + CHANGELOG.txt + includes/ui/ui_lists.inc + js/inserts.js + +2010-10-17 09:12 +0000 Joe Hunt - (2386) Changed Inventory Sales Report to use average cost by actual trans dates if non zero ++(2387) Changed Inventory Sales Report to use average cost by actual trans dates if non zero + CHANGELOG.txt + reporting/rep304.php + +2010-10-16 08:11 +0000 Joe Hunt - (2385) [0000266] Added dimension selections in Profit Loss and Balance drilldown and Trial Balance ++(2386) [0000266] Added dimension selections in Profit Loss and Balance drilldown and Trial Balance + CHANGELOG.txt + gl/inquiry/balance_sheet.php + gl/inquiry/gl_trial_balance.php + gl/inquiry/profit_loss.php + +2010-10-15 21:45 +0000 Joe Hunt - (2384) Rerun ++(2385) Rerun + reporting/rep702.php + +2010-10-15 15:30 +0000 Joe Hunt - (2383) [0000265] Changed Report List of Journal Entries to include balances. ++(2384) [0000265] Changed Report List of Journal Entries to include balances. + CHANGELOG.txt + reporting/rep702.php + +2010-10-15 07:38 +0000 Joe Hunt - (2382) Customer Credit Note didn't update units when shifting items. ++(2383) Customer Credit Note didn't update units when shifting items. + CHANGELOG.txt + sales/includes/ui/sales_credit_ui.inc + +2010-10-14 22:06 +0000 Janusz Dobrowolski - (2381) Fixed changelog ++(2382) Fixed changelog + CHANGELOG.txt + +2010-10-14 09:54 +0000 Joe Hunt - (2380) Check for empty class ID and better test for type/account id/name ++(2381) Check for empty class ID and better test for type/account id/name + CHANGELOG.txt + gl/manage/gl_account_classes.php + gl/manage/gl_account_types.php + gl/manage/gl_accounts.php + +2010-10-13 12:39 +0000 Janusz Dobrowolski - (2379) Added inline company switching with set_global_connection() ++(2380) Added inline company switching with set_global_connection() + admin/inst_upgrade.php + includes/current_user.inc + includes/db/connect_db.inc + includes/errors.inc + +2010-10-13 12:38 +0000 Janusz Dobrowolski - (2378) Warning instead of fatal error on invalid sales order document. ++(2379) Warning instead of fatal error on invalid sales order document. + sales/includes/db/sales_order_db.inc + +2010-10-13 12:37 +0000 Janusz Dobrowolski - (2377) Fixed document totals update. ++(2378) Fixed document totals update. + sql/alter2.3.php + +2010-10-13 12:36 +0000 Janusz Dobrowolski - (2376) Fixed cash only payment terms. ++(2377) Fixed cash only payment terms. + sql/en_US-demo.sql + sql/en_US-new.sql + +2010-10-12 06:26 +0000 Janusz Dobrowolski - (2375) Small strict mode script in upgrade sql file. ++(2376) Small strict mode script in upgrade sql file. + CHANGELOG.txt + sql/alter2.3.sql + +2010-10-11 07:49 +0000 Janusz Dobrowolski - (2374) Updated gettext template. ++(2375) Updated gettext template. + CHANGELOG.txt + +2010-10-11 07:47 +0000 Janusz Dobrowolski - (2373) Updated po template ++(2374) Updated po template + lang/new_language_template/LC_MESSAGES/empty.po + +2010-10-11 07:01 +0000 Janusz Dobrowolski - (2372) Allowed full edition of not used bank account. ++(2373) Allowed full edition of not used bank account. + CHANGELOG.txt + gl/manage/bank_accounts.php + +2010-10-11 06:42 +0000 Janusz Dobrowolski - (2371) Fixed payment terms selection and POS handling in sales module ++(2372) Fixed payment terms selection and POS handling in sales module + CHANGELOG.txt + +2010-10-11 06:41 +0000 Janusz Dobrowolski - (2370) Fixed point of sale handling and terms selection ++(2371) Fixed point of sale handling and terms selection + sales/includes/cart_class.inc + sales/includes/db/sales_invoice_db.inc + sales/includes/ui/sales_order_ui.inc + sales/sales_order_entry.php + +2010-10-11 06:40 +0000 Janusz Dobrowolski - (2369) Added payment terms in SO/SI view ++(2370) Added payment terms in SO/SI view + sales/view/view_invoice.php + sales/view/view_sales_order.php + +2010-10-11 06:40 +0000 Janusz Dobrowolski - (2368) Added payment category parameter in sale_payment_list ++(2369) Added payment category parameter in sale_payment_list + sales/customer_invoice.php + +2010-10-11 06:39 +0000 Janusz Dobrowolski - (2367) Added temrs category parameter in cale_payment_list ++(2368) Added temrs category parameter in cale_payment_list + includes/ui/ui_lists.inc + +2010-10-11 06:38 +0000 Janusz Dobrowolski - (2366) Added payment terms categories ++(2367) Added payment terms categories + includes/types.inc + +2010-10-10 16:14 +0000 Joe Hunt - (2365) Rerun ++(2366) Rerun + CHANGELOG.txt + +2010-10-10 16:05 +0000 Joe Hunt - (2364) Release 2.3RC2 ++(2365) Release 2.3RC2 + CHANGELOG.txt + update.html + version.php + +2010-10-10 15:39 +0000 Joe Hunt - (2363) Layout improvements. ++(2364) Layout improvements. + CHANGELOG.txt + purchasing/view/view_supp_credit.php + +2010-10-10 13:29 +0000 Joe Hunt - (2362) Fixing tax_included in gl_items. ++(2363) Fixing tax_included in gl_items. + CHANGELOG.txt + gl/includes/db/gl_db_trans.inc + purchasing/includes/db/invoice_db.inc + purchasing/includes/db/supp_trans_db.inc + purchasing/includes/supp_trans_class.inc + purchasing/includes/ui/invoice_ui.inc + +2010-10-10 09:32 +0000 Janusz Dobrowolski - (2361) Added transaction ref display in cust/supp payments. ++(2362) Added transaction ref display in cust/supp payments. + CHANGELOG.txt + includes/ui/allocation_cart.inc + +2010-10-09 23:21 +0000 Joe Hunt - (2360) Master bug in class supp_trans get_items_total. Minor bug in gl_db_trans.inc ++(2361) Master bug in class supp_trans get_items_total. Minor bug in gl_db_trans.inc +Wrong tax report and wrong supp trans/gl records with gl item lines. + CHANGELOG.txt + gl/includes/db/gl_db_trans.inc + purchasing/includes/supp_trans_class.inc + +2010-10-06 14:18 +0000 Janusz Dobrowolski - (2359) Smaller fixes in gettext domain switching. ++(2360) Smaller fixes in gettext domain switching. + CHANGELOG.txt + +2010-10-06 14:17 +0000 Janusz Dobrowolski - (2358) Gettext switching clenaup. ++(2359) Gettext switching clenaup. + applications/application.php + frontaccounting.php + +2010-10-06 14:16 +0000 Janusz Dobrowolski - (2357) Added helper for gettext domain switching. ++(2358) Added helper for gettext domain switching. + includes/lang/gettext.php + +2010-10-06 14:15 +0000 Janusz Dobrowolski - (2356) Fixed gettext for extension links. ++(2357) Fixed gettext for extension links. + reporting/includes/reports_classes.inc + +2010-10-06 13:34 +0000 Joe Hunt - (2355) [0000259] Item prices not transferring when using kit codes ++(2356) [0000259] Item prices not transferring when using kit codes + CHANGELOG.txt + sales/includes/sales_db.inc + +2010-10-06 10:44 +0000 Joe Hunt - (2354) Option for saving report selections ($save_report_selection > 0 in config.php means days to save) ++(2355) Option for saving report selections ($save_report_selection > 0 in config.php means days to save) +Excel reports were missing their headers (due to change in report system) + CHANGELOG.txt + config.default.php + reporting/includes/excel_report.inc + reporting/includes/reports_classes.inc + reporting/prn_redirect.php + +2010-10-05 19:09 +0000 Janusz Dobrowolski - (2353) [0000258] Broken src_id fields after sales document edition. ++(2354) [0000258] Broken src_id fields after sales document edition. + CHANGELOG.txt + sales/includes/cart_class.inc + sales/includes/sales_db.inc + +2010-10-05 13:18 +0000 Joe Hunt - (2352) [00000257] Bad Layout in sales order inquiry etc. (long item descriptions) ++(2353) [00000257] Bad Layout in sales order inquiry etc. (long item descriptions) +Other layout improvements. + CHANGELOG.txt + admin/fiscalyears.php + gl/inquiry/gl_account_inquiry.php + inventory/inquiry/stock_movements.php + purchasing/inquiry/po_search.php + purchasing/inquiry/po_search_completed.php + sales/inquiry/sales_deliveries_view.php + sales/inquiry/sales_orders_view.php + taxes/tax_groups.php + taxes/tax_types.php + +2010-10-05 09:42 +0000 Janusz Dobrowolski - (2351) Fixed 2 small language selection issues in reports. ++(2352) Fixed 2 small language selection issues in reports. + CHANGELOG.txt + +2010-10-05 09:41 +0000 Janusz Dobrowolski - (2350) Fixed language file selection. ++(2351) Fixed language file selection. + reporting/includes/class.pdf.inc + +2010-10-05 09:40 +0000 Janusz Dobrowolski - (2349) Fixed contact type for language selection. ++(2350) Fixed contact type for language selection. + reporting/rep107.php + +2010-10-04 10:28 +0000 Janusz Dobrowolski - (2348) [0000252] Error during credit invoice processing for already allocated sales invoice. ++(2349) [0000252] Error during credit invoice processing for already allocated sales invoice. + CHANGELOG.txt + sales/includes/db/custalloc_db.inc + +2010-10-04 08:03 +0000 Joe Hunt - (2347) Dimension Report doesn't show up with correct references ++(2348) Dimension Report doesn't show up with correct references + CHANGELOG.txt + reporting/rep501.php + +2010-10-01 13:16 +0000 Janusz Dobrowolski - (2346) Added chinese installer translation and updated empty.po. ++(2347) Added chinese installer translation and updated empty.po. + CHANGELOG.txt + +2010-10-01 13:14 +0000 Janusz Dobrowolski - (2345) Added missing GL/sql messages ++(2346) Added missing GL/sql messages + lang/new_language_template/LC_MESSAGES/empty.po + +2010-10-01 13:10 +0000 Janusz Dobrowolski - (2344) Added chinese simplified translation. ++(2345) Added chinese simplified translation. + install/isession.inc + install/lang/zh_CN/LC_MESSAGES/zh_CN.mo + install/lang/zh_CN/LC_MESSAGES/zh_CN.po + +2010-09-28 20:54 +0000 Janusz Dobrowolski - (2343) A couple of smaller fixes. ++(2344) A couple of smaller fixes. + CHANGELOG.txt + +2010-09-28 20:53 +0000 Janusz Dobrowolski - (2342) Missing gettext calls fixed. ++(2343) Missing gettext calls fixed. + gl/inquiry/gl_account_inquiry.php + purchasing/manage/suppliers.php + sales/manage/customer_branches.php + sales/manage/customers.php + +2010-09-28 20:52 +0000 Janusz Dobrowolski - (2341) Fixed warning on multiply extesnsion access file inclusion. ++(2342) Fixed warning on multiply extesnsion access file inclusion. + includes/access_levels.inc + +2010-09-28 20:51 +0000 Janusz Dobrowolski - (2340) Updated template. ++(2341) Updated template. + lang/new_language_template/LC_MESSAGES/empty.po + +2010-09-28 19:44 +0000 Joe Hunt - (2339) Division by zero error in graphics (Joe Hunt) ++(2340) Division by zero error in graphics (Joe Hunt) + CHANGELOG.txt + reporting/includes/class.graphic.inc + +2010-09-28 17:03 +0000 Janusz Dobrowolski - (2338) Fixed reference update on SO edition. ++(2339) Fixed reference update on SO edition. + CHANGELOG.txt + +2010-09-28 17:02 +0000 Janusz Dobrowolski - (2337) Reference update should not change next reference. ++(2338) Reference update should not change next reference. + includes/references.inc + +2010-09-28 17:02 +0000 Janusz Dobrowolski - (2336) Reference update after SO edition. ++(2337) Reference update after SO edition. + sales/includes/db/sales_order_db.inc + +2010-09-27 09:45 +0000 Janusz Dobrowolski - (2335) Two small extension related fixes. ++(2336) Two small extension related fixes. + CHANGELOG.txt + +2010-09-27 09:43 +0000 Janusz Dobrowolski - (2334) Allowed optional path usage in set_icon parameter ++(2335) Allowed optional path usage in set_icon parameter + includes/ui/ui_input.inc + +2010-09-27 09:41 +0000 Janusz Dobrowolski - (2333) pageNumber property of TCPDF class made public. ++(2334) pageNumber property of TCPDF class made public. + reporting/includes/fpdi/fpdi2tcpdf_bridge.php + +2010-09-23 16:22 +0000 Janusz Dobrowolski - (2332) Three smaller fixes. ++(2333) Three smaller fixes. + CHANGELOG.txt + +2010-09-23 16:22 +0000 Janusz Dobrowolski - (2331) Additonal error logging helper. ++(2332) Additonal error logging helper. + includes/ui/ui_view.inc + +2010-09-23 16:21 +0000 Janusz Dobrowolski - (2330) Fixed translation for extensions menu options. ++(2331) Fixed translation for extensions menu options. + applications/application.php + +2010-09-23 16:21 +0000 Janusz Dobrowolski - (2329) Fixed focus behaviour. ++(2330) Fixed focus behaviour. + includes/ajax.inc + +2010-09-23 08:08 +0000 Joe Hunt - (2328) Rerun ++(2329) Rerun + includes/lang/gettext.php + reporting/includes/header2.inc + +2010-09-22 16:06 +0000 Janusz Dobrowolski - (2327) Fixed delivery adress prinitng on sales documents. ++(2328) Fixed delivery adress prinitng on sales documents. + CHANGELOG.txt + reporting/includes/header2.inc + +2010-09-20 20:43 +0000 Janusz Dobrowolski - (2326) Fixed third party module installation. ++(2327) Fixed third party module installation. + CHANGELOG.txt + admin/inst_module.php + +2010-09-17 12:10 +0000 Janusz Dobrowolski - (2325) Fixed custom reports includes issue. ++(2326) Fixed custom reports includes issue. + includes/main.inc + reporting/prn_redirect.php + +2010-09-17 09:08 +0000 Janusz Dobrowolski - (2324) Failproof repository reading and exchange rate retrieval. ++(2325) Failproof repository reading and exchange rate retrieval. + CHANGELOG.txt + +2010-09-17 09:01 +0000 Janusz Dobrowolski - (2323) External url reading made independent of php configuration. ++(2324) External url reading made independent of php configuration. + gl/includes/db/gl_db_rates.inc + includes/packages.inc + includes/remote_url.inc + +2010-09-17 08:50 +0000 Janusz Dobrowolski - (2322) Warning fixed ++(2323) Warning fixed + includes/archive.inc + +2010-09-12 22:10 +0000 Joe Hunt - (2321) Improved information in Bank Transfers ++(2322) Improved information in Bank Transfers + CHANGELOG.txt + gl/includes/db/gl_db_banking.inc + +2010-09-11 07:01 +0000 Janusz Dobrowolski - (2320) Changed keys in debtors_master ++(2321) Changed keys in debtors_master + CHANGELOG.txt + sql/en_US-demo.sql + sql/en_US-new.sql + +2010-09-10 08:47 +0000 Joe Hunt - (2319) Layout improvements ++(2320) Layout improvements + CHANGELOG.txt + gl/inquiry/gl_account_inquiry.php + includes/ui/contacts_view.inc + includes/ui/ui_view.inc + manufacturing/manage/bom_edit.php + +2010-09-09 20:06 +0000 Janusz Dobrowolski - (2318) Two smaller fixes. ++(2319) Two smaller fixes. + CHANGELOG.txt + +2010-09-09 20:05 +0000 Janusz Dobrowolski - (2317) Missing focus on first page display. ++(2318) Missing focus on first page display. + sales/includes/ui/sales_order_ui.inc + +2010-09-09 20:04 +0000 Janusz Dobrowolski - (2316) Invalid users table ne. ++(2317) Invalid users table ne. + sql/alter2.3rc.sql + +2010-09-08 13:42 +0000 Joe Hunt - (2315) Layout improvements in accruals.php ++(2316) Layout improvements in accruals.php + CHANGELOG.txt + gl/accruals.php + +2010-09-08 11:14 +0000 Joe Hunt - (2314) Material cost updated when buying service items. Resulted in double COGS booking. ++(2315) Material cost updated when buying service items. Resulted in double COGS booking. + CHANGELOG.txt + purchasing/includes/db/grn_db.inc + purchasing/includes/db/invoice_db.inc + sales/includes/db/sales_delivery_db.inc + +2010-09-07 07:22 +0000 Joe Hunt - (2313) Release 2.3 RC1 ++(2314) Release 2.3 RC1 + CHANGELOG.txt + version.php + +2010-09-07 06:33 +0000 Janusz Dobrowolski - (2312) Ugly bug in javascript number entry formatting code. ++(2313) Ugly bug in javascript number entry formatting code. + CHANGELOG.txt + js/utils.js + +2010-09-06 22:23 +0000 Joe Hunt - (2311) Removed all decimal roundings in cost price calculations ++(2312) Removed all decimal roundings in cost price calculations + CHANGELOG.txt + manufacturing/includes/db/work_orders_db.inc + purchasing/includes/db/grn_db.inc + +2010-09-06 14:14 +0000 Janusz Dobrowolski - (2310) Fixed new contact addition. ++(2311) Fixed new contact addition. + CHANGELOG.txt + +2010-09-06 14:13 +0000 Janusz Dobrowolski - (2309) Fixed error on new contact add. ++(2310) Fixed error on new contact add. + includes/ui/contacts_view.inc + +2010-09-06 14:13 +0000 Janusz Dobrowolski - (2308) Fixed crud editor mode passing. ++(2309) Fixed crud editor mode passing. + includes/ui/simple_crud_class.inc + +2010-09-05 15:59 +0000 Joe Hunt - (2307) Rerun ++(2308) Rerun + CHANGELOG.txt + +2010-09-05 15:48 +0000 Joe Hunt - (2306) Changed layout of Direct GRN/Invoice form and check for supp ref in invoice ++(2307) Changed layout of Direct GRN/Invoice form and check for supp ref in invoice + CHANGELOG.txt + purchasing/po_entry_items.php + +2010-09-05 09:14 +0000 Joe Hunt - (2305) Wrong stock item code when processing supplier invoice ++(2306) Wrong stock item code when processing supplier invoice + CHANGELOG.txt + purchasing/includes/db/invoice_db.inc + +2010-09-05 07:15 +0000 Joe Hunt - (2304) Release 2.3RC ++(2305) Release 2.3RC + CHANGELOG.txt + version.php + +2010-09-04 19:37 +0000 Janusz Dobrowolski - (2303) Additonal fixes in install wizard. ++(2304) Additonal fixes in install wizard. + CHANGELOG.txt + +2010-09-04 19:31 +0000 Janusz Dobrowolski - (2302) Shorter line comments ++(2303) Shorter line comments + install/lang/new_language_template/LC_MESSAGES/empty.po + +2010-09-04 19:29 +0000 Janusz Dobrowolski - (2301) Fixed installed_languages.php creation. ++(2302) Fixed installed_languages.php creation. + install/index.php + +2010-09-04 19:28 +0000 Janusz Dobrowolski - (2300) Page blocked during FA upgrade ++(2301) Page blocked during FA upgrade + sales/sales_order_entry.php + +2010-09-04 19:25 +0000 Janusz Dobrowolski - (2299) Fixed languages upgrade. ++(2300) Fixed languages upgrade. + sql/alter2.3.php + +2010-09-03 13:57 +0000 Joe Hunt - (2298) Rerun ++(2299) Rerun + sales/customer_invoice.php + +2010-09-03 07:42 +0000 Joe Hunt - (2297) Added possibility to put dimensions on Delivery from sales order ++(2298) Added possibility to put dimensions on Delivery from sales order + CHANGELOG.txt + sales/customer_invoice.php + +2010-09-02 23:58 +0000 Joe Hunt - (2296) Added possibility to put dimensions on Delivery from sales order ++(2297) Added possibility to put dimensions on Delivery from sales order +Changed update.html to be more readable + CHANGELOG.txt + sales/customer_delivery.php + update.html + +2010-09-02 10:45 +0000 Janusz Dobrowolski - (2295) Report form template dir moved to /reporting ++(2296) Report form template dir moved to /reporting + CHANGELOG.txt + +2010-09-02 09:36 +0000 Janusz Dobrowolski - (2294) Forms dir moved to /reporting ++(2295) Forms dir moved to /reporting + reporting/forms/index.php + +2010-09-02 09:35 +0000 Janusz Dobrowolski - (2293) Forms dir moved to /reporting. ++(2294) Forms dir moved to /reporting. + reporting/includes/forms/index.php + +2010-08-30 16:13 +0000 Janusz Dobrowolski - (2292) Missing parameter in display_type call in rep707 ++(2293) Missing parameter in display_type call in rep707 + CHANGELOG.txt + reporting/rep707.php + +2010-08-30 12:29 +0000 Janusz Dobrowolski - (2291) Two small fixes. ++(2292) Two small fixes. + CHANGELOG.txt + +2010-08-30 12:28 +0000 Janusz Dobrowolski - (2290) Missing tags parameter in disply_type call ++(2291) Missing tags parameter in disply_type call + reporting/rep706.php + +2010-08-30 12:27 +0000 Janusz Dobrowolski - (2289) Fixed maxprec option in numer_format2 ++(2290) Fixed maxprec option in numer_format2 + includes/current_user.inc + +2010-08-25 12:28 +0000 Janusz Dobrowolski - (2288) Added taxes display for sales order/quotation. ++(2289) Added taxes display for sales order/quotation. + CHANGELOG.txt + reporting/rep109.php + sales/includes/cart_class.inc + sales/view/view_sales_order.php + +2010-08-24 13:39 +0000 Joe Hunt - (2287) Removed old headerfunc in rep111.php (Sales Quotation) ++(2288) Removed old headerfunc in rep111.php (Sales Quotation) + CHANGELOG.txt + reporting/rep111.php + +2010-08-23 15:23 +0000 Janusz Dobrowolski - (2286) Added german transaltion for install wizard. ++(2287) Added german transaltion for install wizard. + install/isession.inc + install/lang/de_DE/LC_MESSAGES/de_DE.mo + install/lang/de_DE/LC_MESSAGES/de_DE.po + +2010-08-23 15:20 +0000 Janusz Dobrowolski - (2285) Added german translation for install wizard. ++(2286) Added german translation for install wizard. + CHANGELOG.txt + lang/new_language_template/LC_MESSAGES/empty.po + +2010-08-23 09:22 +0000 Janusz Dobrowolski - (2284) A couple of bugfixes to last changes. ++(2285) A couple of bugfixes to last changes. + CHANGELOG.txt + +2010-08-23 09:22 +0000 Janusz Dobrowolski - (2283) Fixed maxprec formatting. ++(2284) Fixed maxprec formatting. + includes/current_user.inc + js/utils.js + +2010-08-23 09:21 +0000 Janusz Dobrowolski - (2282) Fixed cogs account selection. ++(2283) Fixed cogs account selection. + purchasing/includes/db/invoice_db.inc + +2010-08-23 09:21 +0000 Janusz Dobrowolski - (2281) Fixed itax_included option update. ++(2282) Fixed itax_included option update. + purchasing/manage/suppliers.php + +2010-08-23 09:20 +0000 Janusz Dobrowolski - (2280) Small fix in layout ++(2281) Small fix in layout + gl/manage/exchange_rates.php + +2010-08-23 08:54 +0000 Joe Hunt - (2279) Period bug caused warning on no fiscal year. Had to be reduces by one. ++(2280) Period bug caused warning on no fiscal year. Had to be reduces by one. + CHANGELOG.txt + gl/accruals.php + +2010-08-22 19:27 +0000 Janusz Dobrowolski - (2278) Compatibility bug in purchase posting and a couple of smaller fixes. ++(2279) Compatibility bug in purchase posting and a couple of smaller fixes. + CHANGELOG.txt + +2010-08-22 19:26 +0000 Janusz Dobrowolski - (2277) Extended number formatting to allow use maximum precision for 'max' specification. ++(2278) Extended number formatting to allow use maximum precision for 'max' specification. + includes/current_user.inc + js/utils.js + +2010-08-22 19:25 +0000 Janusz Dobrowolski - (2276) Added purchase account special option for useing item's GL account. ++(2277) Added purchase account special option for useing item's GL account. + purchasing/manage/suppliers.php + +2010-08-22 19:24 +0000 Janusz Dobrowolski - (2275) Excluded default C locale frm listing ++(2276) Excluded default C locale frm listing + admin/inst_lang.php + +2010-08-22 19:23 +0000 Janusz Dobrowolski - (2274) Fixed mysql php extension test. ++(2275) Fixed mysql php extension test. + includes/system_tests.inc + +2010-08-22 19:22 +0000 Janusz Dobrowolski - (2273) Fixed exrate reedition. ++(2274) Fixed exrate reedition. + gl/manage/exchange_rates.php + +2010-08-22 19:22 +0000 Janusz Dobrowolski - (2272) Maximum precision for factor entry ++(2273) Maximum precision for factor entry + inventory/purchasing_data.php + +2010-08-22 19:21 +0000 Janusz Dobrowolski - (2271) Fixed backward compatibility for cogs GL account setup ++(2272) Fixed backward compatibility for cogs GL account setup + purchasing/includes/db/invoice_db.inc + +2010-08-22 19:20 +0000 Janusz Dobrowolski - (2270) Fixed GL account selection on first display. ++(2271) Fixed GL account selection on first display. + purchasing/includes/ui/invoice_ui.inc + +2010-08-22 19:19 +0000 Janusz Dobrowolski - (2269) Fixed bug in lang update, changed purchase account for suppliers to default ++(2270) Fixed bug in lang update, changed purchase account for suppliers to default + sql/alter2.3rc.sql + sql/en_US-demo.sql + +2010-08-20 08:08 +0000 Joe Hunt - (2268) Improvements to bank inquiry credit/debit totals as well. ++(2269) Improvements to bank inquiry credit/debit totals as well. + CHANGELOG.txt + gl/inquiry/bank_inquiry.php + +2010-08-19 16:14 +0000 Joe Hunt - (2267) View of backup scripts and attachments didn't work ++(2268) View of backup scripts and attachments didn't work +Added more memo info in advanced manufacture / Chaitanya +Added total debit/credit in gl_trans_view.inc / Chaitanya + CHANGELOG.txt + admin/attachments.php + admin/backups.php + admin/db/attachments_db.inc + gl/view/gl_trans_view.php + manufacturing/includes/db/work_orders_quick_db.inc + +2010-08-13 16:24 +0000 Janusz Dobrowolski - (2266) Fixed 'Continue' button direction ++(2267) Fixed 'Continue' button direction + install/lang/ar_EG/LC_MESSAGES/ar_EG.mo + install/lang/ar_EG/LC_MESSAGES/ar_EG.po + +2010-08-13 07:27 +0000 Joe Hunt - (2265) Added arabic translation for install wizard (thanks to Hameed, infotechaccountants) ++(2266) Added arabic translation for install wizard (thanks to Hameed, infotechaccountants) + CHANGELOG.txt + install/isession.inc + install/lang/ar_EG/LC_MESSAGES/ar_EG.mo + install/lang/ar_EG/LC_MESSAGES/ar_EG.po + +2010-08-13 07:20 +0000 Janusz Dobrowolski - (2264) Updated pt_BR installer translation. ++(2265) Updated pt_BR installer translation. + CHANGELOG.txt + install/lang/pt_BR/LC_MESSAGES/pt_BR.mo + install/lang/pt_BR/LC_MESSAGES/pt_BR.po + +2010-08-12 08:24 +0000 Janusz Dobrowolski - (2263) [0000242] Databse error during credit note processing. ++(2264) [0000242] Databse error during credit note processing. + sales/includes/db/sales_credit_db.inc + +2010-08-11 20:20 +0000 Janusz Dobrowolski - (2262) Fixed portuguese language name. ++(2263) Fixed portuguese language name. + install/isession.inc + +2010-08-11 20:05 +0000 Janusz Dobrowolski - (2261) Added portuguese (Brasil) translation. ++(2262) Added portuguese (Brasil) translation. + CHANGELOG.txt + +2010-08-11 19:59 +0000 Janusz Dobrowolski - (2260) Added portuguese translation. ++(2261) Added portuguese translation. + install/isession.inc + install/lang/pt_BR/LC_MESSAGES/pt_BR.mo + install/lang/pt_BR/LC_MESSAGES/pt_BR.po + +2010-08-11 19:59 +0000 Janusz Dobrowolski - (2259) Fixed encoding in header. ++(2260) Fixed encoding in header. + install/lang/new_language_template/LC_MESSAGES/empty.po + +2010-08-11 19:17 +0000 Janusz Dobrowolski - (2258) Added dutch translation for install wizard, fixed two typos in gettextized messages. ++(2259) Added dutch translation for install wizard, fixed two typos in gettextized messages. + CHANGELOG.txt + +2010-08-11 19:16 +0000 Janusz Dobrowolski - (2257) Fixed two typos in translated messages. ++(2258) Fixed two typos in translated messages. + includes/system_tests.inc + install/lang/da_DK/LC_MESSAGES/da_DK.mo + install/lang/da_DK/LC_MESSAGES/da_DK.po + install/lang/fr_FR/LC_MESSAGES/fr_FR.mo + install/lang/fr_FR/LC_MESSAGES/fr_FR.po + install/lang/id_ID/LC_MESSAGES/id_ID.mo + install/lang/id_ID/LC_MESSAGES/id_ID.po + install/lang/new_language_template/LC_MESSAGES/empty.po + install/lang/pl_PL/LC_MESSAGES/pl_PL.mo + install/lang/pl_PL/LC_MESSAGES/pl_PL.po + install/lang/sv_SE/LC_MESSAGES/sv_SE.mo + install/lang/sv_SE/LC_MESSAGES/sv_SE.po + lang/new_language_template/LC_MESSAGES/empty.po + +2010-08-11 19:15 +0000 Janusz Dobrowolski - (2256) Added dutch translation for install wizard. ++(2257) Added dutch translation for install wizard. + install/isession.inc + install/lang/nl_BE/LC_MESSAGES/nl_BE.mo + install/lang/nl_BE/LC_MESSAGES/nl_BE.po + +2010-08-10 07:40 +0000 Janusz Dobrowolski - (2255) Warning cleanup. ++(2256) Warning cleanup. + includes/ajax.inc + includes/lang/language.php + +2010-08-10 07:39 +0000 Janusz Dobrowolski - (2254) Fixed tests for fresh new install. ++(2255) Fixed tests for fresh new install. + includes/system_tests.inc + +2010-08-09 14:16 +0000 Janusz Dobrowolski - (2253) Changed indonesian locale name to correct id_ID. ++(2254) Changed indonesian locale name to correct id_ID. + CHANGELOG.txt + install/isession.inc + install/lang/id_ID/LC_MESSAGES/id_ID.mo + install/lang/id_ID/LC_MESSAGES/id_ID.po + +2010-08-09 14:08 +0000 Janusz Dobrowolski - (2252) Added indonesian translation for install wizard. ++(2253) Added indonesian translation for install wizard. + CHANGELOG.txt + +2010-08-09 14:07 +0000 Janusz Dobrowolski - (2251) Fixed Back button translation. ++(2252) Fixed Back button translation. + install/lang/fr_FR/LC_MESSAGES/fr_FR.mo + install/lang/fr_FR/LC_MESSAGES/fr_FR.po + +2010-08-09 14:02 +0000 Janusz Dobrowolski - (2250) Added Indonesian translation for install wizard. ++(2251) Added Indonesian translation for install wizard. + install/lang/in_ID/LC_MESSAGES/in_ID.mo + install/lang/in_ID/LC_MESSAGES/in_ID.po + +2010-08-08 22:47 +0000 Janusz Dobrowolski - (2249) Added French translation and smaller fixes in installer. ++(2250) Added French translation and smaller fixes in installer. + CHANGELOG.txt + +2010-08-08 22:46 +0000 Janusz Dobrowolski - (2248) Added French transaltion from Gaston. ++(2249) Added French transaltion from Gaston. + install/isession.inc + install/lang/fr_FR/LC_MESSAGES/fr_FR.mo + install/lang/fr_FR/LC_MESSAGES/fr_FR.po + +2010-08-08 22:42 +0000 Janusz Dobrowolski - (2247) Waring in installer cleanup. ++(2248) Waring in installer cleanup. + install/index.php + +2010-08-08 21:03 +0000 Joe Hunt - (2246) Rerun ++(2247) Rerun + install/isession.inc + +2010-08-08 16:43 +0000 Janusz Dobrowolski - (2245) Activated danish and swedish languages ++(2246) Activated danish and swedish languages + install/isession.inc + +2010-08-08 15:22 +0000 Joe Hunt - (2244) Added Danish/Svedish installer translation (Joe Hunt) ++(2245) Added Danish/Svedish installer translation (Joe Hunt) + CHANGELOG.txt + install/lang/da_DK/LC_MESSAGES/da_DK.mo + install/lang/da_DK/LC_MESSAGES/da_DK.po + install/lang/sv_SE/LC_MESSAGES/sv_SE.mo + install/lang/sv_SE/LC_MESSAGES/sv_SE.po + +2010-08-08 11:23 +0000 Janusz Dobrowolski - (2243) Added multilanguage installer support, polish installer translation added. ++(2244) Added multilanguage installer support, polish installer translation added. + CHANGELOG.txt + +2010-08-08 11:22 +0000 Janusz Dobrowolski - (2242) Updated gettext template. ++(2243) Updated gettext template. + lang/new_language_template/LC_MESSAGES/empty.po + +2010-08-08 11:21 +0000 Janusz Dobrowolski - (2241) Added multilanguage support. ++(2242) Added multilanguage support. + install/index.php + install/isession.inc + +2010-08-08 11:15 +0000 Janusz Dobrowolski - (2240) Installer polish translation - initial version. ++(2241) Installer polish translation - initial version. + install/lang/pl_PL/LC_MESSAGES/pl_PL.mo + install/lang/pl_PL/LC_MESSAGES/pl_PL.po + +2010-08-08 11:14 +0000 Janusz Dobrowolski - (2239) Gettext installer template. ++(2240) Gettext installer template. + install/lang/new_language_template/LC_MESSAGES/empty.po + +2010-08-07 10:04 +0000 Janusz Dobrowolski - (2238) Added languages selection in installer, changed default language to 'C', other fixes. ++(2239) Added languages selection in installer, changed default language to 'C', other fixes. + CHANGELOG.txt + +2010-08-07 10:02 +0000 Janusz Dobrowolski - (2237) Default language code changed from 'en_GB' to 'C'. ++(2238) Default language code changed from 'en_GB' to 'C'. + admin/inst_lang.php + includes/lang/gettext.php + includes/lang/language.php + includes/system_tests.inc + sql/alter2.3.php + sql/alter2.3rc.sql + sql/en_US-demo.sql + +2010-08-07 10:00 +0000 Janusz Dobrowolski - (2236) Side bug fixed. ++(2237) Side bug fixed. + applications/setup.php + +2010-08-07 10:00 +0000 Janusz Dobrowolski - (2235) Testing config_db.php on start. ++(2236) Testing config_db.php on start. + index.php + +2010-08-07 10:00 +0000 Janusz Dobrowolski - (2234) Added languages selection. ++(2235) Added languages selection. + install/index.php + +2010-08-07 09:59 +0000 Janusz Dobrowolski - (2233) Clanup. ++(2234) Clanup. + includes/archive.inc + +2010-08-07 09:59 +0000 Janusz Dobrowolski - (2232) Additional error messages. ++(2233) Additional error messages. + includes/packages.inc + +2010-08-07 09:58 +0000 Janusz Dobrowolski - (2231) Added descriptions for all existing hooks. ++(2232) Added descriptions for all existing hooks. + lang/new_language_template/locale.inc + +2010-08-07 09:57 +0000 Janusz Dobrowolski - (2230) Changed hook function name from TaxFunction to tax_report_done. ++(2231) Changed hook function name from TaxFunction to tax_report_done. + reporting/rep709.php + +2010-08-07 09:44 +0000 Joe Hunt - (2229) Bug in inst_lang.php ++(2230) Bug in inst_lang.php + CHANGELOG.txt + admin/inst_lang.php + +2010-08-07 09:27 +0000 Joe Hunt - (2228) Stamping the installed_languags.inc file with 'rtl' = false, causes 'rtl'. ++(2229) Stamping the installed_languags.inc file with 'rtl' = false, causes 'rtl'. +The value: 'rtl' = false will make the variable as isset. + CHANGELOG.txt + includes/lang/language.php + includes/session.inc + +2010-08-06 16:16 +0000 Janusz Dobrowolski - (2227) Fixed multiline package property value display. ++(2228) Fixed multiline package property value display. + CHANGELOG.txt + includes/ui/view_package.php + +2010-08-06 14:51 +0000 Janusz Dobrowolski - (2226) Added COA packages installation. ++(2227) Added COA packages installation. + CHANGELOG.txt + +2010-08-06 14:50 +0000 Janusz Dobrowolski - (2225) Added chart packages installation. ++(2226) Added chart packages installation. + admin/inst_chart.php + applications/setup.php + +2010-08-06 14:49 +0000 Janusz Dobrowolski - (2224) Fixed third-party extension installation. ++(2225) Fixed third-party extension installation. + admin/inst_module.php + +2010-08-06 14:49 +0000 Janusz Dobrowolski - (2223) Fixed description popup. ++(2224) Fixed description popup. + admin/inst_theme.php + +2010-08-06 14:48 +0000 Janusz Dobrowolski - (2222) Optional type parameter in get_extensions_list(). ++(2223) Optional type parameter in get_extensions_list(). + includes/packages.inc + +2010-08-06 14:47 +0000 Janusz Dobrowolski - (2221) Added COA encoding display. ++(2222) Added COA encoding display. + install/index.php + +2010-08-06 12:29 +0000 Janusz Dobrowolski - (2220) Other 2 small fixes ++(2221) Other 2 small fixes + CHANGELOG.txt + +2010-08-06 12:28 +0000 Janusz Dobrowolski - (2219) Improved chart list selection. ++(2220) Improved chart list selection. + includes/ui/ui_lists.inc + +2010-08-06 12:27 +0000 Janusz Dobrowolski - (2218) Cleanup. ++(2219) Cleanup. + install/index.php + +2010-08-06 07:57 +0000 Janusz Dobrowolski - (2217) Two small bugs fixed in bank payment edition. ++(2218) Two small bugs fixed in bank payment edition. + CHANGELOG.txt + +2010-08-06 07:56 +0000 Janusz Dobrowolski - (2216) Fixed memo duplication after bank payment edition. ++(2217) Fixed memo duplication after bank payment edition. + gl/includes/db/gl_db_bank_trans.inc + +2010-08-06 07:55 +0000 Janusz Dobrowolski - (2215) Fixed page title. ++(2216) Fixed page title. + gl/gl_bank.php + +2010-08-06 07:22 +0000 Joe Hunt - (2214) Bank Payment on customer statements shows in credit column, should be debit. Balance ok. ++(2215) Bank Payment on customer statements shows in credit column, should be debit. Balance ok. + CHANGELOG.txt + reporting/rep108.php + +2010-08-05 11:58 +0000 Janusz Dobrowolski - (2213) Cleanup. ++(2214) Cleanup. + install/index.php + +2010-08-05 10:11 +0000 Janusz Dobrowolski - (2212) Rewriten installation wizard, chart packages support added, other smaller fixes. ++(2213) Rewriten installation wizard, chart packages support added, other smaller fixes. + CHANGELOG.txt + +2010-08-05 10:09 +0000 Janusz Dobrowolski - (2211) Install wizard rewritten, added uploading COAs during install. ++(2212) Install wizard rewritten, added uploading COAs during install. + install/index.php + install/isession.inc + install/save.php + install/stylesheet.css + +2010-08-05 10:05 +0000 Janusz Dobrowolski - (2210) COA selected form preiously uploaded charts. ++(2211) COA selected form preiously uploaded charts. + admin/create_coy.php + +2010-08-05 10:04 +0000 Janusz Dobrowolski - (2209) Diagnostic tests movedto separate file to be reused in install wizard. ++(2210) Diagnostic tests movedto separate file to be reused in install wizard. + admin/system_diagnostics.php + includes/system_tests.inc + +2010-08-05 10:03 +0000 Janusz Dobrowolski - (2208) user_theme() fixed to be used also before login, warning suppressed in array_search_value ++(2209) user_theme() fixed to be used also before login, warning suppressed in array_search_value + includes/current_user.inc + +2010-08-05 10:01 +0000 Janusz Dobrowolski - (2207) Fixed bug in check_write, css parameter in page() ++(2208) Fixed bug in check_write, css parameter in page() + includes/main.inc + +2010-08-05 10:00 +0000 Janusz Dobrowolski - (2206) Update to 2.3RC1 ++(2207) Update to 2.3RC1 + sql/alter2.3rc.sql + +2010-08-05 09:59 +0000 Janusz Dobrowolski - (2205) Changed core_version to db_version for better readibility. ++(2206) Changed core_version to db_version for better readibility. + admin/db/company_db.inc + +2010-08-05 09:59 +0000 Janusz Dobrowolski - (2204) Chart packages support added. ++(2205) Chart packages support added. + includes/packages.inc + includes/ui/ui_lists.inc + +2010-08-05 09:57 +0000 Janusz Dobrowolski - (2203) Update from beta to RC1 ++(2204) Update from beta to RC1 + sql/alter2.3.php + sql/en_US-demo.sql + sql/en_US-new.sql + +2010-08-05 09:57 +0000 Janusz Dobrowolski - (2202) Fixed exit on error in check_db_error ++(2203) Fixed exit on error in check_db_error + includes/errors.inc + +2010-08-05 09:56 +0000 Janusz Dobrowolski - (2201) Added css parameter in page() ++(2202) Added css parameter in page() + includes/page/header.inc + +2010-08-05 09:56 +0000 Janusz Dobrowolski - (2200) Changed repo_auth format. ++(2201) Changed repo_auth format. + version.php + +2010-08-05 09:55 +0000 Janusz Dobrowolski - (2199) Cleanup. ++(2200) Cleanup. + admin/inst_lang.php + +2010-08-04 10:59 +0000 Joe Hunt - (2198) Added an extra parameter to db_export in maintenance_db.inc for new COAs ++(2199) Added an extra parameter to db_export in maintenance_db.inc for new COAs +Link error in items.php for Pictures + CHANGELOG.txt + admin/db/maintenance_db.inc + inventory/manage/items.php + version.php + +2010-08-01 07:35 +0000 Joe Hunt - (2197) Added Email link when updating documents. ++(2198) Added Email link when updating documents. + CHANGELOG.txt + sales/credit_note_entry.php + sales/customer_credit_invoice.php + sales/customer_invoice.php + +2010-07-30 08:43 +0000 Janusz Dobrowolski - (2196) Fixed bug in parent lines retrieval during sales doc edition and a couple of smaller ++(2197) Fixed bug in parent lines retrieval during sales doc edition and a couple of smaller +cleanups. + CHANGELOG.txt + +2010-07-30 08:42 +0000 Janusz Dobrowolski - (2195) Skipping hidden iles in sql directory during upgrade. ++(2196) Skipping hidden iles in sql directory during upgrade. + admin/inst_upgrade.php + +2010-07-30 08:41 +0000 Janusz Dobrowolski - (2194) Warning ceanup. ++(2195) Warning ceanup. + includes/lang/language.php + +2010-07-30 08:40 +0000 Janusz Dobrowolski - (2193) Fixed bug in parent lines retrieveal during document edition. ++(2194) Fixed bug in parent lines retrieveal during document edition. + sales/includes/cart_class.inc + +2010-07-30 08:39 +0000 Janusz Dobrowolski - (2192) Fixing extension configurion file moved to installed() method. ++(2193) Fixing extension configurion file moved to installed() method. + sql/alter2.3.php + +2010-07-26 07:45 +0000 Janusz Dobrowolski - (2191) Fixed language update function. ++(2192) Fixed language update function. + sql/alter2.3.php + +2010-07-26 07:37 +0000 Janusz Dobrowolski - (2190) Fatal typo in upgrade function fixed. ++(2191) Fatal typo in upgrade function fixed. + CHANGELOG.txt + sql/alter2.3.php + +2010-07-25 15:29 +0000 Janusz Dobrowolski - (2189) Warning on non existing language version fixed. ++(2190) Warning on non existing language version fixed. + includes/lang/language.php + +2010-07-25 12:24 +0000 Janusz Dobrowolski - (2188) Fixed multilangauge tests and cleanups. ++(2189) Fixed multilangauge tests and cleanups. + CHANGELOG.txt + +2010-07-25 12:24 +0000 Janusz Dobrowolski - (2187) Fixed multilanguage tests. ++(2188) Fixed multilanguage tests. + admin/system_diagnostics.php + includes/lang/gettext.php + +2010-07-25 12:23 +0000 Janusz Dobrowolski - (2186) Cleanup. ++(2187) Cleanup. + includes/packages.inc + +2010-07-25 12:22 +0000 Janusz Dobrowolski - (2185) Added language config upgrade. ++(2186) Added language config upgrade. + sql/alter2.3.php + +2010-07-25 12:22 +0000 Janusz Dobrowolski - (2184) Fixed config file comments. ++(2185) Fixed config file comments. + admin/db/maintenance_db.inc + +2010-07-25 09:23 +0000 Janusz Dobrowolski - (2183) Fixed langiage version swicting, added preprinted forms folder. ++(2184) Fixed langiage version swicting, added preprinted forms folder. + CHANGELOG.txt + +2010-07-25 09:22 +0000 Janusz Dobrowolski - (2182) Fixed language file switching on package version change. ++(2183) Fixed language file switching on package version change. + admin/db/company_db.inc + includes/current_user.inc + includes/lang/language.php + includes/session.inc + +2010-07-25 09:21 +0000 Janusz Dobrowolski - (2181) flush_dir() and company_path() moved to current_uer.php file. ++(2182) flush_dir() and company_path() moved to current_uer.php file. + includes/main.inc + +2010-07-25 09:21 +0000 Janusz Dobrowolski - (2180) New. ++(2181) New. + reporting/includes/forms/index.php + +2010-07-24 22:01 +0000 Janusz Dobrowolski - (2179) Extension system upgrade routine and cleanups. ++(2180) Extension system upgrade routine and cleanups. + CHANGELOG.txt + +2010-07-24 22:00 +0000 Janusz Dobrowolski - (2178) Cleanups ++(2179) Cleanups + admin/inst_module.php + includes/current_user.inc + includes/packages.inc + +2010-07-24 22:00 +0000 Janusz Dobrowolski - (2177) Upgrade routines for extensions configuration. ++(2178) Upgrade routines for extensions configuration. + sql/alter2.3.php + +2010-07-24 15:32 +0000 Joe Hunt - (2176) Fixed Customer Details Report and Pricelist (UOM) and Supp.aged Report ++(2177) Fixed Customer Details Report and Pricelist (UOM) and Supp.aged Report + CHANGELOG.txt + reporting/rep103.php + reporting/rep104.php + reporting/rep202.php + +2010-07-24 10:07 +0000 Joe Hunt - (2175) Changed so Purchase Order also print taxes. ++(2176) Changed so Purchase Order also print taxes. + CHANGELOG.txt + reporting/includes/doctext.inc + reporting/rep209.php + +2010-07-23 13:13 +0000 Janusz Dobrowolski - (2174) Added support for tax included prices in pucrhase module, a couple of other smaller fixes. ++(2175) Added support for tax included prices in pucrhase module, a couple of other smaller fixes. + CHANGELOG.txt + +2010-07-23 13:12 +0000 Janusz Dobrowolski - (2173) Added support for tax included prices in transactions. ++(2174) Added support for tax included prices in transactions. + purchasing/includes/db/grn_db.inc + purchasing/includes/db/invoice_db.inc + purchasing/includes/db/po_db.inc + purchasing/includes/db/supp_trans_db.inc + purchasing/includes/po_class.inc + purchasing/includes/supp_trans_class.inc + purchasing/includes/ui/invoice_ui.inc + purchasing/includes/ui/po_ui.inc + purchasing/po_entry_items.php + purchasing/po_receive_items.php + +2010-07-23 13:11 +0000 Janusz Dobrowolski - (2172) Fixed line items section button position. ++(2173) Fixed line items section button position. + sales/includes/ui/sales_order_ui.inc + +2010-07-23 13:09 +0000 Janusz Dobrowolski - (2171) Tax included option added. ++(2172) Tax included option added. + purchasing/includes/db/suppliers_db.inc + +2010-07-23 13:09 +0000 Janusz Dobrowolski - (2170) Tax included ption added. ++(2171) Tax included ption added. + purchasing/manage/suppliers.php + +2010-07-23 13:08 +0000 Janusz Dobrowolski - (2169) Added tax information ++(2170) Added tax information + purchasing/view/view_grn.php + purchasing/view/view_po.php + +2010-07-23 13:07 +0000 Janusz Dobrowolski - (2168) Added GRNs to inquire result. ++(2169) Added GRNs to inquire result. + purchasing/inquiry/supplier_inquiry.php + +2010-07-23 13:07 +0000 Janusz Dobrowolski - (2167) Added upgrade from 2.3beta to 2.3RC. ++(2168) Added upgrade from 2.3beta to 2.3RC. + sql/alter2.3.php + sql/alter2.3.sql + sql/en_US-demo.sql + sql/en_US-new.sql + +2010-07-23 13:06 +0000 Janusz Dobrowolski - (2166) Versions information moved to separate file. ++(2167) Versions information moved to separate file. + config.default.php + includes/session.inc + version.php + +2010-07-23 13:04 +0000 Janusz Dobrowolski - (2165) Fixed credit credit links color. ++(2166) Fixed credit credit links color. + themes/aqua/default.css + themes/cool/default.css + themes/default/default.css + +2010-07-23 13:03 +0000 Janusz Dobrowolski - (2164) SysPrefs restoration after upgrade. ++(2165) SysPrefs restoration after upgrade. + admin/inst_upgrade.php + +2010-07-23 13:03 +0000 Janusz Dobrowolski - (2163) Warning cleanup. ++(2164) Warning cleanup. + includes/packages.inc + +2010-07-23 13:02 +0000 Janusz Dobrowolski - (2162) Supplier transactions list added. ++(2163) Supplier transactions list added. + includes/ui/ui_lists.inc + +2010-07-23 13:02 +0000 Janusz Dobrowolski - (2161) Fixed tax footer descriptions. ++(2162) Fixed tax footer descriptions. + includes/ui/ui_view.inc + +2010-07-21 14:24 +0000 Joe Hunt - (2160) Changed Report Statements to accept selector Outstanding Only ++(2161) Changed Report Statements to accept selector Outstanding Only + CHANGELOG.txt + reporting/rep108.php + reporting/reports_main.php + +2010-07-19 22:43 +0000 Joe Hunt - (2159) Changed Std. Cost to show all decimals, and added UOM ++(2160) Changed Std. Cost to show all decimals, and added UOM + CHANGELOG.txt + applications/inventory.php + reporting/rep301.php + reporting/rep303.php + +2010-07-19 00:16 +0000 Joe Hunt - (2158) Added Revenue / Cost Accruals to be included in core FA ++(2159) Added Revenue / Cost Accruals to be included in core FA + CHANGELOG.txt + applications/generalledger.php + gl/accruals.php + gl/view/accrual_trans.php + includes/access_levels.inc + +2010-07-18 16:39 +0000 Janusz Dobrowolski - (2157) Released constraint on currency edition for new customer/supplier. ++(2158) Released constraint on currency edition for new customer/supplier. + CHANGELOG.txt + +2010-07-18 16:39 +0000 Janusz Dobrowolski - (2156) New customer/supplier currency can be changed as long as no transaction is entered. ++(2157) New customer/supplier currency can be changed as long as no transaction is entered. + purchasing/includes/db/suppliers_db.inc + purchasing/manage/suppliers.php + sales/includes/db/customers_db.inc + sales/manage/customers.php + +2010-07-18 16:38 +0000 Janusz Dobrowolski - (2155) Improved key_in_foreign table function to check in multiply tables. ++(2156) Improved key_in_foreign table function to check in multiply tables. + admin/db/company_db.inc + +2010-07-17 17:01 +0000 Janusz Dobrowolski - (2154) New file. ++(2155) New file. + admin/inst_theme.php + +2010-07-17 16:35 +0000 Janusz Dobrowolski - (2153) New extensions system, a couple of other smaller fixes. ++(2154) New extensions system, a couple of other smaller fixes. + CHANGELOG.txt + +2010-07-17 16:33 +0000 Janusz Dobrowolski - (2152) Added repo address. ++(2153) Added repo address. + config.default.php + +2010-07-17 16:31 +0000 Janusz Dobrowolski - (2151) Support for new packaged extensions system. ++(2152) Support for new packaged extensions system. + FA.pem + admin/db/maintenance_db.inc + admin/inst_lang.php + admin/inst_module.php + config.default.php + frontaccounting.php + includes/access_levels.inc + includes/archive.inc + includes/packages.inc + includes/ui/ui_controls.inc + includes/ui/ui_view.inc + includes/ui/view_package.php + modules/_cache/index.php + +2010-07-17 16:19 +0000 Janusz Dobrowolski - (2150) Changedlang file convention to avoid need for server restart after *.po file change. ++(2151) Changedlang file convention to avoid need for server restart after *.po file change. + includes/lang/gettext.php + includes/lang/language.php + +2010-07-17 16:18 +0000 Janusz Dobrowolski - (2149) Small cleanup ++(2150) Small cleanup + includes/page/header.inc + +2010-07-17 16:18 +0000 Janusz Dobrowolski - (2148) Fixed memo string in adjust_deliveries. ++(2149) Fixed memo string in adjust_deliveries. + includes/db/inventory_db.inc + +2010-07-17 16:17 +0000 Janusz Dobrowolski - (2147) Fixed callparams check message display ++(2148) Fixed callparams check message display + gl/view/gl_trans_view.php + +2010-07-17 16:16 +0000 Janusz Dobrowolski - (2146) Updated mysql,php,debugging and extension system checks. ++(2147) Updated mysql,php,debugging and extension system checks. + admin/system_diagnostics.php + +2010-07-17 16:15 +0000 Janusz Dobrowolski - (2145) Fixed gettext msg typo ++(2146) Fixed gettext msg typo + purchasing/supplier_invoice.php + +2010-07-17 16:14 +0000 Janusz Dobrowolski - (2144) Fixed curr_defualt check ++(2145) Fixed curr_defualt check + gl/manage/currencies.php + +2010-07-17 16:13 +0000 Janusz Dobrowolski - (2143) Message typos ++(2144) Message typos + admin/create_coy.php + admin/inst_upgrade.php + +2010-07-17 16:13 +0000 Janusz Dobrowolski - (2142) Fixed a couple of typos. ++(2143) Fixed a couple of typos. + lang/new_language_template/LC_MESSAGES/empty.po + +2010-07-16 09:38 +0000 Joe Hunt - (2141) Changed calculating of cost update (average material price) for better sync. ++(2142) Changed calculating of cost update (average material price) for better sync. + CHANGELOG.txt + includes/db/inventory_db.inc + +2010-07-15 14:16 +0000 Joe Hunt - (2140) Changed calculating of cost update (average material price) for better sync. ++(2141) Changed calculating of cost update (average material price) for better sync. + CHANGELOG.txt + manufacturing/includes/db/work_orders_db.inc + purchasing/includes/db/grn_db.inc + purchasing/includes/db/invoice_db.inc + +2010-06-28 12:22 +0000 Joe Hunt +(2138) Rerun + update.html + +2010-06-28 12:04 +0000 Joe Hunt +(2137) Release 2.3 Beta + CHANGELOG.txt + config.default.php + +2010-06-28 10:57 +0000 Janusz Dobrowolski +(2136) Marged fixes from ain trunk up to 2.2.11 + CHANGELOG.txt + admin/payment_terms.php + config.default.php + includes/db/manufacturing_db.inc + reporting/rep101.php + reporting/rep102.php + reporting/rep201.php + reporting/rep202.php + reporting/rep203.php + reporting/rep303.php + reporting/reports_main.php + sales/create_recurrent_invoices.php + sales/customer_credit_invoice.php + sales/includes/db/custalloc_db.inc + +2010-06-27 17:47 +0000 Janusz Dobrowolski +(2133) Updated version for 2.3beta + lang/new_language_template/LC_MESSAGES/empty.po + +2010-06-27 14:38 +0000 Janusz Dobrowolski +(2132) Changed Price column name to reflect current pricelist type on SO/Direct document +entry. + CHANGELOG.txt + +2010-06-27 14:36 +0000 Janusz Dobrowolski +(2131) Changed Price column name to reflect type of pricelist. + sales/includes/ui/sales_order_ui.inc + +2010-06-27 14:10 +0000 Janusz Dobrowolski +(2130) Fixed debtor_trans insert. + sql/en_US-demo.sql + +2010-06-27 13:37 +0000 Janusz Dobrowolski +(2129) Added tax_included firld in suppliers table. + sql/alter2.3.sql + sql/en_US-demo.sql + sql/en_US-new.sql + +2010-06-27 13:09 +0000 Janusz Dobrowolski +(2128) Updated upgrade routines for changed in sales module, a couple of side +bugfixes/improvements. + CHANGELOG.txt + +2010-06-27 13:08 +0000 Janusz Dobrowolski +(2127) Cleanup. + purchasing/includes/db/po_db.inc + +2010-06-27 13:07 +0000 Janusz Dobrowolski +(2126) Removed bank payment print links (not implemented yet). + sales/inquiry/customer_inquiry.php + +2010-06-27 13:07 +0000 Janusz Dobrowolski +(2125) Fixed child/parent lines retrieval sql query. + sales/includes/sales_db.inc + +2010-06-27 13:06 +0000 Janusz Dobrowolski +(2124) Removed obsolete emial field from sql query. + reporting/rep112.php + +2010-06-27 13:05 +0000 Janusz Dobrowolski +(2123) Added company db upgrade boundary markers in error log. + admin/inst_upgrade.php + +2010-06-27 13:04 +0000 Janusz Dobrowolski +(2122) Added debtor_trans_details.src_id update + sql/alter2.3.php + sql/alter2.3.sql + +2010-06-27 13:03 +0000 Janusz Dobrowolski +(2121) Added key for debtor_trans_details.src_id + sql/en_US-demo.sql + sql/en_US-new.sql + +2010-06-26 16:28 +0000 Joe Hunt +(2120) Improvements to Sales Groups. Presenting the Id too. + CHANGELOG.txt + sales/manage/sales_groups.php + +2010-06-26 08:04 +0000 Joe Hunt +(2119) Option to suppress tax rates on documents. To be used for tax on tax +The tax % should be included in the tax name and the calculated +rate be set as the rate. $suppress_tax_rates in config.php set to 1. +Preparing for 2.3. Beta + CHANGELOG.txt + config.default.php + includes/ui/ui_view.inc + reporting/rep107.php + reporting/rep110.php + update.html + +2010-06-26 07:54 +0000 Janusz Dobrowolski +(2118) Fixed sql for child transaction lines retrieval + CHANGELOG.txt + sales/includes/sales_db.inc + +2010-06-26 06:57 +0000 Janusz Dobrowolski +(2117) Added debtor_trans_details.src_id field + sql/en_US-demo.sql + sql/en_US-new.sql + +2010-06-25 22:15 +0000 Janusz Dobrowolski +(2116) Changed sales document relations scheme, voided documents references reuse allowed. + CHANGELOG.txt + +2010-06-25 22:13 +0000 Janusz Dobrowolski +(2115) Fixed sales database design to ensure document relations consistency on line level. + admin/db/fiscalyears_db.inc + admin/db/voiding_db.inc + reporting/includes/header2.inc + sales/customer_invoice.php + sales/includes/cart_class.inc + sales/includes/db/cust_trans_db.inc + sales/includes/db/cust_trans_details_db.inc + sales/includes/db/payment_db.inc + sales/includes/db/sales_credit_db.inc + sales/includes/db/sales_delivery_db.inc + sales/includes/db/sales_invoice_db.inc + sales/includes/sales_db.inc + sales/view/view_invoice.php + sales/view/view_sales_order.php + +2010-06-25 22:12 +0000 Janusz Dobrowolski +(2114) Allow reuse of references previously used on voided documents. + includes/references.inc + +2010-06-24 11:18 +0000 Joe Hunt +(2113) Rewritten function gl_account_in_company_defaults in gl_db_accounts.inc +More test on tags due to db error in reports with tags. + CHANGELOG.txt + gl/includes/db/gl_db_accounts.inc + reporting/rep705.php + reporting/rep706.php + reporting/rep707.php + +2010-06-23 07:56 +0000 Joe Hunt +(2112) Changed memo message in supp invoice price variance +Changed Ourstanding GRN Report to use Actual Price instead of Std Cost. + CHANGELOG.txt + purchasing/includes/db/invoice_db.inc + reporting/rep204.php + +2010-06-23 06:28 +0000 Janusz Dobrowolski +(2111) Restored customer payment display in cutomer transactions inquire. + CHANGELOG.txt + sales/includes/db/cust_trans_db.inc + +2010-06-22 09:54 +0000 Janusz Dobrowolski +(2110) Fixed POS parameters retrieval in cart_class + CHANGELOG.txt + sales/includes/cart_class.inc + +2010-06-21 17:21 +0000 Janusz Dobrowolski +(2108) Current credit splay in sales & purchase, crediting allocated invoices allowed, sql +debugging supoport improved and a couple of other fixes. + CHANGELOG.txt + +2010-06-21 17:19 +0000 Janusz Dobrowolski +(2107) Current credit display implemented. + includes/sysnames.inc + includes/ui/ui_input.inc + purchasing/includes/db/po_db.inc + purchasing/includes/db/suppliers_db.inc + purchasing/includes/ui/po_ui.inc + purchasing/po_entry_items.php + sales/customer_delivery.php + sales/includes/cart_class.inc + sales/includes/db/customers_db.inc + sales/includes/db/sales_order_db.inc + sales/includes/ui/sales_order_ui.inc + +2010-06-21 17:17 +0000 Janusz Dobrowolski +(2106) Support for debugging sql queries in page footer. + admin/system_diagnostics.php + config.default.php + includes/db/connect_db.inc + includes/errors.inc + includes/page/footer.inc + +2010-06-21 17:15 +0000 Janusz Dobrowolski +(2105) Not fully credited invoice still can be credited (with invoice reallocation). + sales/includes/db/cust_trans_db.inc + sales/includes/db/sales_credit_db.inc + +2010-06-21 17:13 +0000 Janusz Dobrowolski +(2104) Added Payment term types. + includes/types.inc + +2010-06-21 17:13 +0000 Janusz Dobrowolski +(2103) Added popup mode + purchasing/inquiry/supplier_inquiry.php + +2010-06-21 17:10 +0000 Janusz Dobrowolski +(2102) Added popup mode. + sales/inquiry/customer_inquiry.php + +2010-06-21 17:10 +0000 Janusz Dobrowolski +(2101) Reorganized using payment term type selector. + admin/payment_terms.php + +2010-06-21 17:09 +0000 Janusz Dobrowolski +(2100) Payment terms types list added + includes/ui/ui_lists.inc + +2010-06-21 17:08 +0000 Janusz Dobrowolski +(2099) Comments added + includes/ui/allocation_cart.inc + +2010-06-21 17:08 +0000 Janusz Dobrowolski +(2098) Cleanup + reporting/rep101.php + +2010-06-21 17:07 +0000 Janusz Dobrowolski +(2097) Fixed fatal typo + sales/customer_credit_invoice.php + +2010-06-21 17:07 +0000 Janusz Dobrowolski +(2096) Fixed final page message text. + sales/customer_invoice.php + +2010-06-21 17:06 +0000 Janusz Dobrowolski +(2095) Invoice reallocation routine added, removed sparse order allocation code + sales/includes/db/custalloc_db.inc + +2010-06-21 17:05 +0000 Janusz Dobrowolski +(2094) Fixed branch creation for new company. + sales/manage/customer_branches.php + +2010-06-21 17:03 +0000 Janusz Dobrowolski +(2093) Changed line_items class name to po_line_items,support for current credit display + purchasing/includes/po_class.inc + +2010-06-21 17:01 +0000 Janusz Dobrowolski +(2092) Added sales/purchase order totals + sql/alter2.3.php + sql/alter2.3.sql + sql/en_US-demo.sql + sql/en_US-new.sql + +2010-06-14 13:26 +0000 Janusz Dobrowolski +(2087) Additional fixes to yesterday commit. + CHANGELOG.txt + +2010-06-14 13:25 +0000 Janusz Dobrowolski +(2086) Fixed credit note list display. + sales/view/view_sales_order.php + +2010-06-14 12:59 +0000 Janusz Dobrowolski +(2084) Additional fix to last rewrite + sales/includes/cart_class.inc + sales/includes/db/cust_trans_db.inc + sales/includes/db/custalloc_db.inc + +2010-06-13 19:05 +0000 Janusz Dobrowolski +(2083) Removed obsolete complete parameter. + purchasing/supplier_credit.php + +2010-06-13 18:48 +0000 Janusz Dobrowolski +(2082) Multiply technical changes, cleanups and improvements. + CHANGELOG.txt + +2010-06-13 18:47 +0000 Janusz Dobrowolski +(2081) Smaller technical fixes. + purchasing/includes/db/grn_db.inc + purchasing/includes/db/po_db.inc + purchasing/po_entry_items.php + purchasing/po_receive_items.php + purchasing/supplier_credit.php + purchasing/supplier_invoice.php + sales/includes/db/sales_credit_db.inc + sales/includes/sales_db.inc + +2010-06-13 18:40 +0000 Janusz Dobrowolski +(2080) is_invoice => trans_type + purchasing/includes/db/invoice_db.inc + purchasing/includes/supp_trans_class.inc + purchasing/includes/ui/invoice_ui.inc + purchasing/view/view_supp_credit.php + purchasing/view/view_supp_invoice.php + +2010-06-13 18:37 +0000 Janusz Dobrowolski +(2079) Documents inheritance added. + includes/types.inc + +2010-06-13 18:36 +0000 Janusz Dobrowolski +(2078) clenaups and comments. + purchasing/includes/po_class.inc + +2010-06-13 18:36 +0000 Janusz Dobrowolski +(2077) Cleanups and comments + sales/includes/cart_class.inc + +2010-06-13 18:34 +0000 Janusz Dobrowolski +(2076) Changed method name convention + includes/ui/contacts_view.inc + +2010-06-13 18:33 +0000 Janusz Dobrowolski +(2075) Post formatting and a couple of other improvements + includes/ui/simple_crud_class.inc + +2010-06-13 18:32 +0000 Janusz Dobrowolski +(2074) Allowed space and square brackets in button names + includes/ui/ui_input.inc + +2010-06-13 18:31 +0000 Janusz Dobrowolski +(2073) Fixed small layout bug in tabs widget. + includes/ui/ui_controls.inc + +2010-06-13 16:33 +0000 Janusz Dobrowolski +(2072) Merged changes from main CVS (up to 2.2.10) + CHANGELOG.txt + admin/payment_terms.php + config.default.php + gl/includes/ui/gl_bank_ui.inc + gl/includes/ui/gl_journal_ui.inc + includes/current_user.inc + includes/ui/allocation_cart.inc + includes/ui/ui_input.inc + js/behaviour.js + js/inserts.js + reporting/includes/excel_report.inc + reporting/includes/reports_classes.inc + reporting/rep704.php + sales/customer_credit_invoice.php + sales/includes/db/cust_trans_db.inc + sales/view/view_sales_order.php + sql/en_US-demo.sql + sql/en_US-new.sql + update.html + +2010-06-06 15:25 +0000 Joe Hunt +(2060) Allowing SA_MULTIFISCALYEAR access to enter transactions on open fiscal years + CHANGELOG.txt + includes/access_levels.inc + includes/date_functions.inc + +2010-06-05 09:01 +0000 Joe Hunt +(2059) Rerun + includes/date_functions.inc + +2010-06-04 22:55 +0000 Joe Hunt +(2058) Rerun + +2010-06-04 22:32 +0000 Joe Hunt +(2057) Allowing SA_FISCALYEAR access to enter transactions on open fiscal years + CHANGELOG.txt + admin/db/fiscalyears_db.inc + includes/date_functions.inc + +2010-05-30 23:37 +0000 Joe Hunt +(2053) Allowing modifying of Bank Payments/Deposits + CHANGELOG.txt + gl/gl_bank.php + gl/includes/db/gl_db_bank_trans.inc + gl/includes/db/gl_db_banking.inc + gl/includes/db/gl_db_trans.inc + gl/inquiry/journal_inquiry.php + purchasing/includes/db/supp_trans_db.inc + sales/includes/db/cust_trans_db.inc + +2010-05-27 06:57 +0000 Janusz Dobrowolski +(2050) Merged changes form main trunk (2.2.8, 2.2.9) + CHANGELOG.txt + admin/create_coy.php + admin/db/maintenance_db.inc + admin/display_prefs.php + admin/system_diagnostics.php + config.default.php + gl/inquiry/balance_sheet.php + gl/inquiry/profit_loss.php + includes/current_user.inc + includes/session.inc + includes/ui/allocation_cart.inc + includes/ui/ui_input.inc + includes/ui/ui_lists.inc + js/allocate.js + js/payalloc.js + lang/new_language_template/LC_MESSAGES/empty.po + purchasing/includes/db/suppalloc_db.inc + purchasing/includes/ui/invoice_ui.inc + purchasing/po_entry_items.php + purchasing/supplier_invoice.php + purchasing/supplier_payment.php + reporting/includes/doctext.inc + reporting/includes/excel_report.inc + reporting/includes/header2.inc + reporting/includes/pdf_report.inc + reporting/rep104.php + reporting/rep105.php + reporting/rep108.php + reporting/rep203.php + reporting/rep209.php + reporting/rep301.php + reporting/rep302.php + reporting/rep303.php + reporting/rep304.php + reporting/rep305.php + reporting/rep709.php + reporting/reports_main.php + sales/customer_invoice.php + sales/customer_payments.php + sales/includes/db/sales_order_db.inc + sales/inquiry/sales_orders_view.php + sales/sales_order_entry.php + taxes/tax_groups.php + update.html + +2010-05-15 20:37 +0000 Joe Hunt +(2044) Layout - added class label for branch link + CHANGELOG.txt + sales/manage/customers.php + +2010-05-11 21:51 +0000 Janusz Dobrowolski +(2035) Fixed bugs in company deletion and soft upgrade, updated en_US-*.sql scripts. + CHANGELOG.txt + +2010-05-11 21:50 +0000 Janusz Dobrowolski +(2034) Updated to current dev state. + sql/en_US-demo.sql + sql/en_US-new.sql + +2010-05-11 21:49 +0000 Janusz Dobrowolski +(2033) Fixed upgrae routine + sql/alter2.3.php + +2010-05-11 21:48 +0000 Janusz Dobrowolski +(2032) Fixed bug in company upgrade. + admin/create_coy.php + admin/db/company_db.inc + +2010-05-11 15:21 +0000 Janusz Dobrowolski +(2031) Removed obsolete email field from SO. + sales/includes/db/sales_order_db.inc + +2010-05-11 12:28 +0000 Janusz Dobrowolski +(2030) Contact CRUD class. + includes/ui/contacts_view.inc + +2010-05-11 12:27 +0000 Janusz Dobrowolski +(2029) Initialversion of contacts db support. + includes/db/crm_contacts_db.inc + +2010-05-11 12:26 +0000 Janusz Dobrowolski +(2028) Added support for multiply contacts for supplier/customer. + CHANGELOG.txt + +2010-05-11 11:55 +0000 Janusz Dobrowolski +(2027) Fixes for tabbed content. + themes/aqua/default.css + themes/cool/default.css + themes/default/default.css + +2010-05-11 11:55 +0000 Janusz Dobrowolski +(2026) Contact categories support added. + includes/access_levels.inc + includes/sysnames.inc + +2010-05-11 11:50 +0000 Janusz Dobrowolski +(2025) Multiply contacts spport added. + manufacturing/includes/db/work_orders_db.inc + purchasing/includes/db/suppliers_db.inc + purchasing/manage/suppliers.php + reporting/rep107.php + reporting/rep108.php + reporting/rep109.php + reporting/rep110.php + reporting/rep111.php + reporting/rep112.php + reporting/rep209.php + reporting/rep210.php + reporting/rep409.php + sales/includes/db/branches_db.inc + sales/includes/db/cust_trans_db.inc + sales/includes/db/customers_db.inc + sales/includes/db/sales_order_db.inc + sales/includes/ui/sales_order_ui.inc + sales/manage/customer_branches.php + sales/manage/customers.php + sql/alter2.3.php + sql/alter2.3.sql + sql/en_US-demo.sql + sql/en_US-new.sql + +2010-05-11 11:48 +0000 Janusz Dobrowolski +(2024) Cleanup. + includes/ui/simple_crud_class.inc + +2010-05-11 11:45 +0000 Janusz Dobrowolski +(2023) Simple abstract CRUD class + includes/ui/simple_crud_class.inc + +2010-05-11 11:42 +0000 Janusz Dobrowolski +(2022) Added tabs control widget + includes/ui/ui_controls.inc + +2010-05-11 11:40 +0000 Janusz Dobrowolski +(2021) Added contact categories option. + applications/setup.php + +2010-05-11 11:39 +0000 Janusz Dobrowolski +(2020) Contact categories - initial version + admin/crm_categories.php + +2010-05-11 11:34 +0000 Janusz Dobrowolski +(2019) Changes in hotkeys system for tas support. + js/inserts.js + +2010-05-11 11:33 +0000 Janusz Dobrowolski +(2018) Emailed reports can be send to multiply destinations, fixed email charset selection. + reporting/includes/pdf_report.inc + +2010-05-11 11:32 +0000 Janusz Dobrowolski +(2017) Added charset selection for email content. + reporting/includes/class.mail.inc + +2010-05-11 11:30 +0000 Janusz Dobrowolski +(2016) Smallfield naming bug. + reporting/reports_main.php + +2010-05-11 11:30 +0000 Janusz Dobrowolski +(2015) Fixed typo and small bug. + reporting/includes/doctext.inc + +2010-05-11 11:29 +0000 Janusz Dobrowolski +(2014) Fixed problem with multiselection in array_combo, added crm related list helpers. + includes/ui/ui_lists.inc + +2010-05-11 11:28 +0000 Janusz Dobrowolski +(2013) Fixed function name convention. + sales/includes/db/sales_credit_db.inc + +2010-05-11 11:27 +0000 Janusz Dobrowolski +(2012) Fixed email sending links to use ajax. + sales/credit_note_entry.php + sales/customer_delivery.php + sales/customer_invoice.php + +2010-05-11 11:26 +0000 Janusz Dobrowolski +(2011) Fix in array_search_keys + includes/current_user.inc + +2010-05-07 16:31 +0000 Joe Hunt +(2009) Added Account tags selection in Annual Expense Breakdown, Balanse Sheet +and Profit and Loss Sheet + CHANGELOG.txt + admin/db/tags_db.inc + reporting/includes/reports_classes.inc + reporting/rep705.php + reporting/rep706.php + reporting/rep707.php + reporting/reports_main.php + +2010-05-07 13:37 +0000 Janusz Dobrowolski +(2008) Fixed bug in array_selector + CHANGELOG.txt + includes/ui/ui_lists.inc + +2010-04-30 13:10 +0000 Janusz Dobrowolski +(2002) Recovering next reference after voiding last enterd transaction, improvements in voiding. + CHANGELOG.txt + +2010-04-30 13:08 +0000 Janusz Dobrowolski +(2001) Reference recover afer voiding of last transaction in sequence. + admin/db/voiding_db.inc + includes/db/references_db.inc + includes/references.inc + +2010-04-30 13:06 +0000 Janusz Dobrowolski +(2000) Search only for not voided transactions. + admin/db/transactions_db.inc + +2010-04-30 13:05 +0000 Janusz Dobrowolski +(1999) Reference column visible also for journal entries. + admin/void_transaction.php + +2010-04-26 15:11 +0000 Joe Hunt +(1998) Changed voiding of Direct Invoice to automatically void 'auto' delivery and set SO quantity and qty_sent to 0. +And a few small bug fixes. + CHANGELOG.txt + admin/db/voiding_db.inc + sales/includes/db/sales_credit_db.inc + sales/includes/db/sales_delivery_db.inc + sales/includes/db/sales_invoice_db.inc + sales/includes/sales_db.inc + +2010-04-20 22:24 +0000 Joe Hunt +(1994) Didn't show 'View Attachments' for Journal Entries + CHANGELOG.txt + includes/ui/ui_controls.inc + +2010-04-20 22:06 +0000 Joe Hunt +(1993) Bug in systypes selector (no type update) +and better layout in company preferences + CHANGELOG.txt + admin/attachments.php + admin/company_preferences.php + +2010-04-20 12:52 +0000 Joe Hunt +(1992) Added option for Manual Revaluation of Currency Accounts + CHANGELOG.txt + admin/company_preferences.php + applications/generalledger.php + gl/includes/db/gl_db_banking.inc + gl/manage/revaluate_currencies.php + includes/prefs/sysprefs.inc + sql/alter2.3.sql + sql/en_US-demo.sql + sql/en_US-new.sql + +2010-04-16 14:18 +0000 Joe Hunt +(1987) Layout improvement in hyperlink_back function + CHANGELOG.txt + includes/ui/ui_controls.inc + +2010-04-16 09:42 +0000 Joe Hunt +(1986) Minor fixes in voiding transactions + CHANGELOG.txt + admin/void_transaction.php + +2010-04-15 11:12 +0000 Joe Hunt +(1985) Added an alternative way of presenting tax included on invoices. +This is done by setting a global variabel $alternative_tax_include_on_docs = 1. + CHANGELOG.txt + config.default.php + includes/ui/ui_view.inc + reporting/rep107.php + reporting/rep110.php + +2010-04-15 08:50 +0000 Joe Hunt +(1984) Added a date column and combined the # and View column in 'View / Print Transactions. +Changed Voiding Transaction to also include a pager. + CHANGELOG.txt + admin/db/transactions_db.inc + admin/view_print_transaction.php + admin/void_transaction.php + includes/systypes.inc + manufacturing/view/wo_production_view.php + reporting/includes/reporting.inc + +2010-04-14 21:01 +0000 Joe Hunt +(1983) Replaced the global variables for table styles to defined CSS classes. + CHANGELOG.txt + access/login.php + admin/attachments.php + admin/backups.php + admin/change_current_user_password.php + admin/company_preferences.php + admin/create_coy.php + admin/display_prefs.php + admin/fiscalyears.php + admin/forms_setup.php + admin/gl_setup.php + admin/inst_lang.php + admin/inst_module.php + admin/inst_upgrade.php + admin/payment_terms.php + admin/print_profiles.php + admin/printers.php + admin/security_roles.php + admin/shipping_companies.php + admin/system_diagnostics.php + admin/tags.php + admin/users.php + admin/view_print_transaction.php + admin/void_transaction.php + dimensions/dimension_entry.php + dimensions/includes/dimensions_ui.inc + dimensions/inquiry/search_dimensions.php + dimensions/view/view_dimension.php + gl/bank_account_reconcile.php + gl/bank_transfer.php + gl/gl_bank.php + gl/gl_budget.php + gl/gl_journal.php + gl/includes/ui/gl_bank_ui.inc + gl/includes/ui/gl_journal_ui.inc + gl/inquiry/balance_sheet.php + gl/inquiry/bank_inquiry.php + gl/inquiry/gl_account_inquiry.php + gl/inquiry/gl_trial_balance.php + gl/inquiry/journal_inquiry.php + gl/inquiry/profit_loss.php + gl/inquiry/tax_inquiry.php + gl/manage/bank_accounts.php + gl/manage/currencies.php + gl/manage/exchange_rates.php + gl/manage/gl_account_classes.php + gl/manage/gl_account_types.php + gl/manage/gl_accounts.php + gl/manage/gl_quick_entries.php + gl/view/bank_transfer_view.php + gl/view/gl_deposit_view.php + gl/view/gl_payment_view.php + gl/view/gl_trans_view.php + includes/db_pager.inc + includes/types.inc + includes/ui/allocation_cart.inc + includes/ui/db_pager_view.inc + includes/ui/ui_controls.inc + includes/ui/ui_view.inc + inventory/adjustments.php + inventory/cost_update.php + inventory/includes/item_adjustments_ui.inc + inventory/includes/stock_transfers_ui.inc + inventory/inquiry/stock_movements.php + inventory/inquiry/stock_status.php + inventory/manage/item_categories.php + inventory/manage/item_codes.php + inventory/manage/item_units.php + inventory/manage/items.php + inventory/manage/locations.php + inventory/manage/movement_types.php + inventory/manage/sales_kits.php + inventory/prices.php + inventory/purchasing_data.php + inventory/reorder_level.php + inventory/transfers.php + inventory/view/view_adjustment.php + inventory/view/view_transfer.php + manufacturing/includes/manufacturing_ui.inc + manufacturing/includes/work_order_issue_ui.inc + manufacturing/inquiry/bom_cost_inquiry.php + manufacturing/manage/bom_edit.php + manufacturing/manage/work_centres.php + manufacturing/search_work_orders.php + manufacturing/view/wo_issue_view.php + manufacturing/view/wo_production_view.php + manufacturing/work_order_add_finished.php + manufacturing/work_order_costs.php + manufacturing/work_order_entry.php + manufacturing/work_order_issue.php + manufacturing/work_order_release.php + purchasing/includes/ui/grn_ui.inc + purchasing/includes/ui/invoice_ui.inc + purchasing/includes/ui/po_ui.inc + purchasing/inquiry/po_search.php + purchasing/inquiry/po_search_completed.php + purchasing/inquiry/supplier_allocation_inquiry.php + purchasing/inquiry/supplier_inquiry.php + purchasing/manage/suppliers.php + purchasing/po_entry_items.php + purchasing/po_receive_items.php + purchasing/supplier_payment.php + purchasing/view/view_grn.php + purchasing/view/view_po.php + purchasing/view/view_supp_credit.php + purchasing/view/view_supp_invoice.php + purchasing/view/view_supp_payment.php + reporting/includes/reports_classes.inc + sales/create_recurrent_invoices.php + sales/credit_note_entry.php + sales/customer_credit_invoice.php + sales/customer_delivery.php + sales/customer_invoice.php + sales/customer_payments.php + sales/includes/ui/sales_credit_ui.inc + sales/includes/ui/sales_order_ui.inc + sales/inquiry/customer_allocation_inquiry.php + sales/inquiry/customer_inquiry.php + sales/inquiry/sales_deliveries_view.php + sales/inquiry/sales_orders_view.php + sales/manage/credit_status.php + sales/manage/customer_branches.php + sales/manage/customers.php + sales/manage/recurrent_invoices.php + sales/manage/sales_areas.php + sales/manage/sales_groups.php + sales/manage/sales_people.php + sales/manage/sales_points.php + sales/manage/sales_types.php + sales/sales_order_entry.php + sales/view/view_credit.php + sales/view/view_dispatch.php + sales/view/view_invoice.php + sales/view/view_receipt.php + sales/view/view_sales_order.php + taxes/item_tax_types.php + taxes/tax_groups.php + taxes/tax_types.php + themes/aqua/renderer.php + themes/cool/renderer.php + themes/default/renderer.php + +2010-04-13 23:00 +0000 Joe Hunt +(1982) Added 'View Attachments' if any in all popup view windows + CHANGELOG.txt + admin/db/attachments_db.inc + dimensions/view/view_dimension.php + gl/view/bank_transfer_view.php + gl/view/gl_deposit_view.php + gl/view/gl_payment_view.php + gl/view/gl_trans_view.php + includes/main.inc + includes/ui/ui_controls.inc + inventory/view/view_adjustment.php + inventory/view/view_transfer.php + manufacturing/view/wo_issue_view.php + manufacturing/view/wo_production_view.php + manufacturing/view/work_order_view.php + purchasing/view/view_grn.php + purchasing/view/view_po.php + purchasing/view/view_supp_credit.php + purchasing/view/view_supp_invoice.php + purchasing/view/view_supp_payment.php + sales/view/view_credit.php + sales/view/view_dispatch.php + sales/view/view_invoice.php + sales/view/view_receipt.php + sales/view/view_sales_order.php + +2010-04-04 12:22 +0000 Janusz Dobrowolski +(1978) Customer/supplier/branch document language selection, changes for better support for +reports provided by extension modules. + CHANGELOG.txt + +2010-04-04 12:20 +0000 Janusz Dobrowolski +(1977) Document language for new supplier set to system default. + purchasing/manage/suppliers.php + +2010-04-04 12:17 +0000 Janusz Dobrowolski +(1976) Added per customer document language. + sales/includes/db/branches_db.inc + sales/includes/db/cust_trans_db.inc + sales/includes/db/customers_db.inc + sales/includes/db/sales_order_db.inc + +2010-04-04 12:16 +0000 Janusz Dobrowolski +(1975) Added report langauge selector + sales/manage/customer_branches.php + sales/manage/customers.php + +2010-04-04 12:14 +0000 Janusz Dobrowolski +(1974) Added per supplier/customer document language selection. + purchasing/includes/db/suppliers_db.inc + purchasing/manage/suppliers.php + reporting/includes/class.pdf.inc + reporting/includes/doctext2.inc + reporting/includes/pdf_report.inc + reporting/rep107.php + reporting/rep108.php + reporting/rep109.php + reporting/rep110.php + reporting/rep111.php + reporting/rep112.php + reporting/rep209.php + reporting/rep210.php + sql/alter2.3.sql + sql/en_US-demo.sql + sql/en_US-new.sql + +2010-04-04 12:11 +0000 Janusz Dobrowolski +(1973) company_path() helper used. + admin/attachments.php + admin/company_preferences.php + admin/create_coy.php + admin/db/fiscalyears_db.inc + admin/display_prefs.php + admin/print_profiles.php + admin/system_diagnostics.php + includes/lang/language.php + includes/page/header.inc + includes/ui/ui_view.inc + inventory/manage/items.php + reporting/includes/excel_report.inc + reporting/includes/header2.inc + reporting/rep102.php + reporting/rep104.php + reporting/rep202.php + reporting/rep303.php + reporting/rep706.php + reporting/rep707.php + +2010-04-04 12:09 +0000 Janusz Dobrowolski +(1972) Added company_path() helper. + includes/main.inc + +2010-04-04 12:04 +0000 Janusz Dobrowolski +(1971) Added all_option parameter to language selectors. + includes/ui/ui_lists.inc + +2010-04-04 12:03 +0000 Janusz Dobrowolski +(1970) System names extracted to new separated file to enable re-read after language change. + includes/sysnames.inc + includes/types.inc + +2010-04-04 12:02 +0000 Janusz Dobrowolski +(1969) Fixed for better extension modules support. + reporting/includes/tcpdf.php + reporting/prn_redirect.php + +2010-04-04 12:01 +0000 Janusz Dobrowolski +(1968) Changed addReport method (better support for extension modules). + reporting/includes/reports_classes.inc + reporting/reports_main.php + +2010-04-04 11:58 +0000 Janusz Dobrowolski +(1967) Code cleanup + gl/inquiry/balance_sheet.php + gl/inquiry/profit_loss.php + +2010-03-26 16:30 +0000 Joe Hunt +(1965) Another problem with 'parent != false'. should be 'parent !== false'. + CHANGELOG.txt + gl/includes/db/gl_db_account_types.inc + +2010-03-26 15:16 +0000 Joe Hunt +(1964) Fixed a sorting problem in gl_account_types_list + CHANGELOG.txt + includes/ui/ui_lists.inc + +2010-03-24 09:33 +0000 Joe Hunt +(1963) Parse error in ui_list.inc. Fix in other files + CHANGELOG.txt + gl/includes/db/gl_db_account_types.inc + gl/manage/gl_account_types.php + includes/ui/ui_lists.inc + +2010-03-24 08:28 +0000 Janusz Dobrowolski +(1962) Same for array_selector. + includes/ui/ui_lists.inc + +2010-03-24 08:25 +0000 Janusz Dobrowolski +(1961) Fixed problem with multiply zero values in selector options. + CHANGELOG.txt + includes/ui/ui_lists.inc + +2010-03-23 15:17 +0000 Joe Hunt +(1960) problem with "00" == "0" in php. + CHANGELOG.txt + gl/manage/gl_account_types.php + +2010-03-23 09:12 +0000 Joe Hunt +(1959) Update of old 0 and -1 parents in chart_types to an empty string + CHANGELOG.txt + sql/alter2.3.sql + +2010-03-22 16:28 +0000 Joe Hunt +(1958) Error editing (updating) Account Groups + gl/includes/db/gl_db_account_types.inc + gl/manage/gl_account_classes.php + gl/manage/gl_account_types.php + includes/ui/ui_lists.inc + +2010-03-12 21:29 +0000 Janusz Dobrowolski +(1950) Small cleanups in reports 301,304,601. + CHANGELOG.txt + +2010-03-12 21:27 +0000 Janusz Dobrowolski +(1949) Small cleanups. + reporting/rep301.php + reporting/rep304.php + reporting/rep601.php + +2010-03-05 13:08 +0000 Janusz Dobrowolski +(1943) Merged changes from main trunk up to 2.2.7 + CHANGELOG.txt + admin/backups.php + admin/create_coy.php + config.default.php + gl/gl_journal.php + gl/includes/db/gl_db_accounts.inc + gl/includes/db/gl_db_banking.inc + gl/manage/exchange_rates.php + includes/access_levels.inc + includes/session.inc + includes/ui/ui_lists.inc + js/inserts.js + lang/new_language_template/LC_MESSAGES/empty.po + manufacturing/includes/db/work_order_produce_items_db.inc + manufacturing/includes/db/work_order_requirements_db.inc + manufacturing/includes/db/work_orders_db.inc + manufacturing/includes/db/work_orders_quick_db.inc + manufacturing/work_order_add_finished.php + purchasing/includes/db/grn_db.inc + purchasing/includes/ui/po_ui.inc + reporting/includes/class.graphic.inc + reporting/includes/doctext.inc + reporting/includes/doctext2.inc + reporting/includes/pdf_report.inc + reporting/includes/reports_classes.inc + reporting/rep107.php + reporting/rep110.php + sales/customer_delivery.php + sales/manage/customer_branches.php + taxes/tax_calc.inc + update.html + +2010-03-01 10:00 +0000 Janusz Dobrowolski +(1937) Reritten FrontReport API to accept header layouts externally defined in pdf and php files. + CHANGELOG.txt + +2010-03-01 09:58 +0000 Janusz Dobrowolski +(1936) Rewrte of FrontReport header API to accept external layouts in pdf and php files. + reporting/includes/class.pdf.inc + reporting/includes/excel_report.inc + reporting/includes/header2.inc + reporting/includes/pdf_report.inc + +2010-03-01 09:56 +0000 Janusz Dobrowolski +(1935) Integration of fpdi class. + reporting/includes/fpdi/decoders/ASCII85Decode.php + reporting/includes/fpdi/decoders/LZWDecode.php + reporting/includes/fpdi/fpdf_tpl.php + reporting/includes/fpdi/fpdi.php + reporting/includes/fpdi/fpdi2tcpdf_bridge.php + reporting/includes/fpdi/fpdi_pdf_parser.php + reporting/includes/fpdi/pdf_context.php + reporting/includes/fpdi/pdf_parser.php + reporting/includes/fpdi/wrapper_functions.php + +2010-03-01 09:54 +0000 Janusz Dobrowolski +(1934) Report fixed according to changed headers API in FrontReport class. + reporting/rep101.php + reporting/rep102.php + reporting/rep103.php + reporting/rep104.php + reporting/rep105.php + reporting/rep106.php + reporting/rep107.php + reporting/rep108.php + reporting/rep109.php + reporting/rep110.php + reporting/rep111.php + reporting/rep112.php + reporting/rep201.php + reporting/rep202.php + reporting/rep203.php + reporting/rep204.php + reporting/rep209.php + reporting/rep210.php + reporting/rep301.php + reporting/rep302.php + reporting/rep303.php + reporting/rep304.php + reporting/rep305.php + reporting/rep401.php + reporting/rep409.php + reporting/rep501.php + reporting/rep601.php + reporting/rep701.php + reporting/rep702.php + reporting/rep704.php + reporting/rep705.php + reporting/rep706.php + reporting/rep707.php + reporting/rep708.php + reporting/rep709.php + reporting/rep710.php + +2010-03-01 09:53 +0000 Janusz Dobrowolski +(1933) find_report_file() heler moved to main.inc and renamed to find_custom_file() + includes/main.inc + reporting/prn_redirect.php + +2010-02-25 21:18 +0000 Janusz Dobrowolski +(1925) A couple of smaller various fixes and improvements. + CHANGELOG.txt + +2010-02-25 21:17 +0000 Janusz Dobrowolski +(1924) Cleanup (missing $row declaration). + reporting/includes/pdf_report.inc + +2010-02-25 21:16 +0000 Janusz Dobrowolski +(1923) Error message displayed when no report file is found. + reporting/prn_redirect.php + +2010-02-25 21:15 +0000 Janusz Dobrowolski +(1922) Small layout fix on final screen. + purchasing/po_entry_items.php + +2010-02-25 21:14 +0000 Janusz Dobrowolski +(1921) Changed _vd() debug function to display notification instead of error. + includes/ui/ui_view.inc + +2010-02-25 21:13 +0000 Janusz Dobrowolski +(1920) Lists reset after page reload, nonformatted descriptions for edition, html cleanup. + includes/ui/ui_lists.inc + +2010-02-25 21:12 +0000 Janusz Dobrowolski +(1919) Added radio buttons helper + includes/ui/ui_input.inc + +2010-02-25 21:11 +0000 Janusz Dobrowolski +(1918) Cleanup + includes/db/sql_functions.inc + +2010-02-25 21:11 +0000 Janusz Dobrowolski +(1917) Files manipulation helpers added. + includes/main.inc + +2010-02-20 08:19 +0000 Joe Hunt +(1905) Wrong class parameter in Generqal Ledger Reports + CHANGELOG.txt + applications/generalledger.php + +2010-02-16 20:09 +0000 Janusz Dobrowolski +(1902) Merging changes form main trunk 2.2.5-2.2.6 + CHANGELOG.txt + access/login.php + admin/attachments.php + admin/backups.php + admin/change_current_user_password.php + admin/company_preferences.php + admin/create_coy.php + admin/display_prefs.php + admin/gl_setup.php + admin/inst_lang.php + admin/inst_module.php + admin/users.php + applications/generalledger.php + config.default.php + gl/gl_bank.php + gl/includes/db/gl_db_account_types.inc + gl/includes/db/gl_db_accounts.inc + gl/includes/db/gl_db_trans.inc + gl/inquiry/balance_sheet.php + gl/inquiry/journal_inquiry.php + gl/inquiry/profit_loss.php + includes/banking.inc + includes/db/inventory_db.inc + includes/db/manufacturing_db.inc + includes/main.inc + includes/page/footer.inc + includes/session.inc + includes/ui/ui_controls.inc + includes/ui/ui_input.inc + includes/ui/ui_lists.inc + inventory/manage/items.php + js/inserts.js + lang/new_language_template/LC_MESSAGES/empty.po + manufacturing/includes/db/work_orders_db.inc + purchasing/includes/db/grn_db.inc + purchasing/includes/db/invoice_db.inc + purchasing/includes/ui/invoice_ui.inc + purchasing/includes/ui/po_ui.inc + purchasing/supplier_credit.php + purchasing/supplier_invoice.php + reporting/includes/reports_classes.inc + reporting/rep107.php + reporting/rep110.php + reporting/rep305.php + reporting/rep701.php + reporting/rep705.php + reporting/rep706.php + reporting/rep707.php + reporting/reports_main.php + sales/includes/db/sales_delivery_db.inc + sales/includes/db/sales_invoice_db.inc + sales/includes/db/sales_order_db.inc + sales/includes/ui/sales_order_ui.inc + sales/view/view_sales_order.php + themes/aqua/default.css + themes/cool/default.css + themes/default/default.css + update.html + +2010-02-09 13:13 +0000 Janusz Dobrowolski +(1889) Direct Purchase Invoice/GRN, improved db transaction support, other optimizations. + CHANGELOG.txt + +2010-02-09 13:12 +0000 Janusz Dobrowolski +(1888) Added Direct GRN and Direct invice in Purchases module. + includes/current_user.inc + includes/ui/ui_lists.inc + purchasing/includes/db/grn_db.inc + purchasing/includes/db/invoice_db.inc + purchasing/includes/db/po_db.inc + purchasing/includes/po_class.inc + purchasing/includes/ui/grn_ui.inc + purchasing/includes/ui/po_ui.inc + purchasing/po_entry_items.php + purchasing/po_receive_items.php + +2010-02-09 13:10 +0000 Janusz Dobrowolski +(1887) Improved transactions support (multilevel). + includes/db/connect_db.inc + includes/db/sql_functions.inc + includes/errors.inc + sales/includes/cart_class.inc + +2010-02-09 13:07 +0000 Janusz Dobrowolski +(1886) Added invoice preselection option. + purchasing/supplier_payment.php + +2010-02-09 13:06 +0000 Janusz Dobrowolski +(1885) Optimized extensions related code. + applications/application.php + applications/customers.php + applications/dimensions.php + applications/generalledger.php + applications/inventory.php + applications/manufacturing.php + applications/setup.php + applications/suppliers.php + +2010-02-09 13:05 +0000 Janusz Dobrowolski +(1884) Cleanup. + purchasing/supplier_invoice.php + sales/includes/ui/sales_order_ui.inc + +2010-02-09 13:03 +0000 Janusz Dobrowolski +(1883) Typo fixed. + sales/sales_order_entry.php + +2010-02-06 21:55 +0000 Janusz Dobrowolski +(1881) Multiply lines with same stock_id supported in purchase documents. + CHANGELOG.txt + +2010-02-06 21:54 +0000 Janusz Dobrowolski +(1880) Multiply order items with same stock_id (with warning), code cleanups. + purchasing/includes/db/po_db.inc + purchasing/includes/po_class.inc + purchasing/includes/supp_trans_class.inc + purchasing/includes/ui/po_ui.inc + purchasing/po_entry_items.php + +2010-02-06 21:53 +0000 Janusz Dobrowolski +(1879) Type bugs. + purchasing/includes/db/grn_db.inc + purchasing/includes/db/invoice_db.inc + +2010-02-04 14:48 +0000 Joe Hunt +(1864) Better sorting in new gl types and gl accounts + CHANGELOG.txt + includes/ui/ui_lists.inc + +2010-02-04 11:41 +0000 Joe Hunt +(1863) Rerun. Stuff forgotten. + CHANGELOG.txt + gl/includes/db/gl_db_account_types.inc + gl/manage/gl_account_classes.php + gl/manage/gl_account_types.php + gl/manage/gl_accounts.php + +2010-02-04 11:18 +0000 Joe Hunt +(1862) Extended account id's to 15 chars. Changed account type to varchar(10) +and class id varchar(3). Ability to change account groups online. + CHANGELOG.txt + gl/includes/db/gl_db_account_types.inc + gl/manage/gl_account_classes.php + gl/manage/gl_account_types.php + sql/alter2.3.php + sql/alter2.3.sql + sql/en_US-demo.sql + sql/en_US-new.sql + +2010-02-03 18:05 +0000 Janusz Dobrowolski +(1861) Fixed edtable item selector in prices.php + CHANGELOG.txt + inventory/prices.php + +2010-02-03 16:32 +0000 Janusz Dobrowolski +(1860) Payment terms were not retrieved on invoice edit start. + CHANGELOG.txt + sales/customer_invoice.php + +2010-02-02 12:01 +0000 Janusz Dobrowolski +(1854) Small fixes in sys_prefs update/retrieval. + CHANGELOG.txt + admin/db/company_db.inc + +2010-02-02 10:51 +0000 Janusz Dobrowolski +(1853) Missing closing bracket in 2.3 installer class + CHANGELOG.txt + +2010-02-02 10:02 +0000 Janusz Dobrowolski +(1852) Merged changes from main trunk up to 2.2.5 + CHANGELOG.txt + admin/gl_setup.php + applications/generalledger.php + config.default.php + gl/bank_transfer.php + gl/includes/db/gl_db_trans.inc + gl/inquiry/balance_sheet.php + gl/inquiry/gl_account_inquiry.php + gl/manage/exchange_rates.php + includes/db/manufacturing_db.inc + includes/errors.inc + includes/types.inc + includes/ui/ui_view.inc + js/inserts.js + js/utils.js + purchasing/supplier_payment.php + reporting/includes/doctext.inc + reporting/includes/doctext2.inc + reporting/includes/header2.inc + reporting/includes/reporting.inc + reporting/includes/reports_classes.inc + reporting/rep107.php + reporting/rep108.php + reporting/rep109.php + reporting/rep110.php + reporting/rep111.php + reporting/rep112.php + reporting/rep209.php + reporting/rep210.php + reporting/rep601.php + reporting/rep704.php + reporting/rep705.php + reporting/rep706.php + reporting/rep707.php + reporting/rep709.php + reporting/reports_main.php + sales/customer_payments.php + sales/includes/db/sales_order_db.inc + sales/includes/sales_db.inc + sales/inquiry/customer_inquiry.php + sales/sales_order_entry.php + sql/en_US-demo.sql + sql/en_US-new.sql + taxes/tax_types.php + update.html + +2010-01-31 22:14 +0000 Janusz Dobrowolski +(1843) Editable sales terms in sales orders and invoices. + CHANGELOG.txt + sales/create_recurrent_invoices.php + sales/customer_delivery.php + sales/customer_invoice.php + sales/includes/cart_class.inc + sales/includes/db/cust_trans_db.inc + sales/includes/db/sales_credit_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/manage/sales_points.php + sales/sales_order_entry.php + sql/alter2.3.php + sql/alter2.3.sql + sql/en_US-demo.sql + sql/en_US-new.sql + +2010-01-31 22:12 +0000 Janusz Dobrowolski +(1842) payment_tems retrieved from debtor_trans + reporting/rep102.php + reporting/rep108.php + +2010-01-31 22:11 +0000 Janusz Dobrowolski +(1841) Added sale_payment_list + includes/ui/ui_lists.inc + +2010-01-31 22:09 +0000 Janusz Dobrowolski +(1840) Added cash_sale return form get_payment_term + admin/db/company_db.inc + +2010-01-26 17:40 +0000 Janusz Dobrowolski +(1834) Additional fixes for editable item descriptions. + CHANGELOG.txt + sales/customer_delivery.php + +2010-01-26 17:36 +0000 Janusz Dobrowolski +(1833) Additional fixed in combo_input related to editable lists + includes/ui/ui_lists.inc + +2010-01-26 14:21 +0000 Janusz Dobrowolski +(1832) Full suport for editable items descriptions in sales documents, warning fix in deliveries +inquiry. + CHANGELOG.txt + +2010-01-26 14:19 +0000 Janusz Dobrowolski +(1831) Added full support for editable item descriptions in sales + includes/ui/ui_lists.inc + inventory/includes/db/items_db.inc + inventory/manage/items.php + inventory/prices.php + js/inserts.js + sales/includes/cart_class.inc + sales/includes/ui/sales_order_ui.inc + sales/sales_order_entry.php + +2010-01-26 14:16 +0000 Janusz Dobrowolski +(1830) Added 'editable' field in stock_master + sql/alter2.3.sql + sql/en_US-demo.sql + sql/en_US-new.sql + +2010-01-26 14:15 +0000 Janusz Dobrowolski +(1829) Fixed warning in debug mode + sales/includes/db/cust_trans_db.inc + +2010-01-26 14:14 +0000 Janusz Dobrowolski +(1828) Fixed warning in debug mode. + sales/inquiry/sales_deliveries_view.php + +2010-01-23 18:46 +0000 Janusz Dobrowolski +(1820) Changed company name storage. + install/save.php + +2010-01-23 18:45 +0000 Janusz Dobrowolski +(1819) Added save.php to last changes. + CHANGELOG.txt + +2010-01-23 18:41 +0000 Janusz Dobrowolski +(1818) Cahnged get_base_sales_type() + admin/db/company_db.inc + +2010-01-23 18:33 +0000 Janusz Dobrowolski +(1817) System preferences moved to new sys_prefs table, a couple of smaller fixes and improvements. + CHANGELOG.txt + +2010-01-23 18:32 +0000 Janusz Dobrowolski +(1816) System preferences moved form company to new sys_prefs table + admin/company_preferences.php + admin/db/company_db.inc + admin/db/users_db.inc + admin/display_prefs.php + admin/gl_setup.php + admin/users.php + includes/current_user.inc + includes/prefs/sysprefs.inc + includes/prefs/userprefs.inc + includes/session.inc + sql/alter2.1.php + sql/alter2.3.php + sql/alter2.3.sql + sql/en_US-demo.sql + sql/en_US-new.sql + +2010-01-23 18:30 +0000 Janusz Dobrowolski +(1815) Updated locales and data/src compatibility checks. + admin/system_diagnostics.php + +2010-01-23 18:27 +0000 Janusz Dobrowolski +(1814) Improved locales checking. + includes/lang/gettext.php + includes/lang/language.php + +2010-01-23 18:26 +0000 Janusz Dobrowolski +(1813) Defaults for get_post also for array submits, added confirm dialog helper. + includes/ui/ui_controls.inc + +2010-01-23 18:25 +0000 Janusz Dobrowolski +(1812) Added info label in error_log for warnings during upgrade process. + includes/errors.inc + +2010-01-23 18:22 +0000 Janusz Dobrowolski +(1811) Added core version for checks against database version_id + config.default.php + +2010-01-23 18:21 +0000 Janusz Dobrowolski +(1810) System setup re-read after upgrade. + admin/inst_upgrade.php + +2010-01-23 18:21 +0000 Janusz Dobrowolski +(1809) Cached company currency retrieval. + includes/banking.inc + +2010-01-23 18:20 +0000 Janusz Dobrowolski +(1808) Removed sysprefs.inc include + includes/main.inc + +2010-01-23 18:20 +0000 Janusz Dobrowolski +(1807) Removed archaic erro handling. + includes/date_functions.inc + +2010-01-23 18:18 +0000 Janusz Dobrowolski +(1806) Missing path_to_root declaration in handle_submit() + admin/create_coy.php + +2010-01-23 18:18 +0000 Janusz Dobrowolski +(1805) Message box cleanup before ajax call. + js/utils.js + +2010-01-20 11:23 +0000 Janusz Dobrowolski +(1800) Merged changes form main trunk up to 2.2.4 + CHANGELOG.txt + admin/create_coy.php + config.default.php + gl/manage/gl_account_types.php + includes/data_checks.inc + includes/errors.inc + includes/main.inc + includes/page/footer.inc + includes/ui/ui_input.inc + includes/ui/ui_view.inc + inventory/cost_update.php + inventory/includes/item_adjustments_ui.inc + inventory/manage/sales_kits.php + inventory/view/view_adjustment.php + manufacturing/includes/db/work_orders_db.inc + purchasing/includes/db/grn_db.inc + purchasing/includes/db/invoice_db.inc + sales/includes/sales_db.inc + sales/manage/sales_points.php + sql/en_US-new.sql + taxes/item_tax_types.php + update.html + +2010-01-12 15:14 +0000 Janusz Dobrowolski +(1777) Two smaller fixes. + CHANGELOG.txt + +2010-01-12 15:13 +0000 Janusz Dobrowolski +(1776) Fixed misnamed function parameter. + sales/inquiry/sales_deliveries_view.php + +2010-01-12 15:12 +0000 Janusz Dobrowolski +(1775) Added sorting branches by branch_ref. + sales/includes/db/branches_db.inc + sales/includes/db/cust_trans_db.inc + +2010-01-12 14:04 +0000 Janusz Dobrowolski +(1774) Merged changes from main trunk up to 2.2.3 + CHANGELOG.txt + admin/db/fiscalyears_db.inc + admin/fiscalyears.php + config.default.php + gl/includes/db/gl_db_accounts.inc + gl/includes/db/gl_db_banking.inc + includes/current_user.inc + includes/data_checks.inc + includes/date_functions.inc + includes/references.inc + includes/session.inc + includes/ui/db_pager_view.inc + inventory/manage/item_codes.php + inventory/reorder_level.php + js/inserts.js + purchasing/inquiry/supplier_inquiry.php + purchasing/supplier_payment.php + reporting/includes/class.pdf.inc + reporting/includes/doctext.inc + reporting/includes/doctext2.inc + reporting/includes/header2.inc + reporting/includes/pdf_report.inc + reporting/includes/reporting.inc + reporting/includes/reports_classes.inc + reporting/prn_redirect.php + reporting/rep108.php + reporting/rep109.php + reporting/rep110.php + reporting/rep111.php + reporting/rep209.php + reporting/rep210.php + reporting/rep701.php + reporting/reports_main.php + sales/allocations/customer_allocate.php + sales/create_recurrent_invoices.php + taxes/db/tax_groups_db.inc + taxes/tax_calc.inc + update.html + +2010-01-11 11:55 +0000 Janusz Dobrowolski +(1771) Optimized database indexes. + CHANGELOG.txt + sql/alter2.3.sql + sql/en_US-demo.sql + sql/en_US-new.sql + +2009-12-24 13:17 +0000 Joe Hunt +(1743) Restore of old sql (didn't get updated correctly) + gl/includes/db/gl_db_trans.inc + +2009-12-24 11:29 +0000 Janusz Dobrowolski +(1742) Merged changes from main trunk 2.2.1-2.2.2 + CHANGELOG.txt + admin/create_coy.php + admin/db/maintenance_db.inc + admin/system_diagnostics.php + applications/setup.php + config.default.php + gl/gl_bank.php + gl/includes/db/gl_db_rates.inc + gl/inquiry/journal_inquiry.php + includes/current_user.inc + includes/date_functions.inc + includes/db_pager.inc + includes/lang/language.php + includes/page/header.inc + includes/session.inc + includes/ui/allocation_cart.inc + includes/ui/ui_lists.inc + install/save.php + inventory/adjustments.php + inventory/transfers.php + purchasing/allocations/supplier_allocate.php + purchasing/includes/db/supp_trans_db.inc + purchasing/includes/ui/po_ui.inc + purchasing/po_entry_items.php + purchasing/supplier_invoice.php + reporting/fonts/courier.php + reporting/fonts/symbol.php + reporting/fonts/times.php + reporting/fonts/timesb.php + reporting/fonts/timesbi.php + reporting/fonts/timesi.php + reporting/fonts/zapfdingbats.php + reporting/includes/Workbook.php + reporting/includes/class.graphic.inc + reporting/includes/class.pdf.inc + reporting/includes/doctext.inc + reporting/includes/doctext2.inc + reporting/includes/excel_report.inc + reporting/includes/pdf_report.inc + reporting/includes/tcpdf.php + reporting/rep108.php + reporting/rep109.php + reporting/rep111.php + sales/allocations/customer_allocate.php + sales/customer_delivery.php + sales/includes/cart_class.inc + sales/includes/sales_db.inc + update.html + +2009-12-10 09:46 +0000 Joe Hunt +(1729) Enhanced Quick Entries to also support Balance Based source amount. Monthly or Yearly (all) +Only works with type Journal Entry. + CHANGELOG.txt + gl/includes/db/gl_db_bank_accounts.inc + gl/includes/ui/gl_journal_ui.inc + gl/manage/gl_quick_entries.php + includes/ui/ui_view.inc + sql/alter2.3.sql + sql/en_US-demo.sql + sql/en_US-new.sql + +2009-12-05 09:27 +0000 Joe Hunt +(1724) Moved all SQL statements from PHP files into relevant *_db.inc files. +All folders done, except reporting/repXXX.php and reporting/includes/reports_classes.inc +Awaiting change in report mechanism + CHANGELOG.txt + includes/ui/allocation_cart.inc + reporting/includes/header2.inc + reporting/includes/reports_classes.inc + sales/create_recurrent_invoices.php + sales/customer_payments.php + sales/includes/db/branches_db.inc + sales/includes/db/cust_trans_db.inc + sales/includes/db/custalloc_db.inc + sales/includes/db/customers_db.inc + sales/includes/db/recurrent_invoices_db.inc + sales/includes/db/sales_groups_db.inc + sales/includes/db/sales_order_db.inc + sales/includes/sales_db.inc + sales/inquiry/customer_allocation_inquiry.php + sales/inquiry/customer_inquiry.php + sales/inquiry/sales_deliveries_view.php + sales/inquiry/sales_orders_view.php + sales/manage/credit_status.php + sales/manage/customer_branches.php + sales/manage/customers.php + sales/manage/recurrent_invoices.php + sales/manage/sales_areas.php + sales/manage/sales_groups.php + sales/manage/sales_people.php + sales/manage/sales_points.php + sales/manage/sales_types.php + sales/view/view_sales_order.php + taxes/db/tax_types_db.inc + taxes/item_tax_types.php + taxes/tax_calc.inc + taxes/tax_groups.php + taxes/tax_types.php + +2009-12-04 23:31 +0000 Janusz Dobrowolski +(1723) Upgrade to 2.3 skeleton files added, added key on comments table. + CHANGELOG.txt + +2009-12-04 23:31 +0000 Janusz Dobrowolski +(1722) Added key on comments table for better performance. + sql/en_US-demo.sql + sql/en_US-new.sql + +2009-12-04 23:30 +0000 Janusz Dobrowolski +(1721) Upgrade skeleton files for 2.3 release. + sql/alter2.3.php + sql/alter2.3.sql + +2009-12-04 00:39 +0000 Joe Hunt +(1716) Moved all SQL statements from PHP files into relevant *_db.inc files. +Included purchasing folder + CHANGELOG.txt + includes/db/manufacturing_db.inc + manufacturing/includes/db/work_orders_db.inc + manufacturing/inquiry/where_used_inquiry.php + manufacturing/manage/bom_edit.php + manufacturing/manage/work_centres.php + manufacturing/search_work_orders.php + manufacturing/work_order_costs.php + purchasing/includes/db/invoice_db.inc + purchasing/includes/db/po_db.inc + purchasing/includes/db/supp_trans_db.inc + purchasing/includes/db/suppalloc_db.inc + purchasing/includes/db/suppliers_db.inc + purchasing/inquiry/po_search.php + purchasing/inquiry/po_search_completed.php + purchasing/inquiry/supplier_allocation_inquiry.php + purchasing/inquiry/supplier_inquiry.php + purchasing/manage/suppliers.php + purchasing/po_entry_items.php + purchasing/po_receive_items.php + purchasing/supplier_credit.php + purchasing/supplier_invoice.php + +2009-12-03 23:20 +0000 Joe Hunt +(1715) New file + inventory/includes/db/items_purchases_db.inc + +2009-12-02 23:46 +0000 Joe Hunt +(1713) Moved all SQL statements from PHP files into relevant *_db.inc files. +Included inventory folder + CHANGELOG.txt + admin/db/company_db.inc + admin/db/printers_db.inc + admin/db/shipping_db.inc + admin/payment_terms.php + admin/print_profiles.php + admin/printers.php + admin/shipping_companies.php + dimensions/includes/dimensions_db.inc + gl/includes/db/gl_db_account_types.inc + gl/includes/db/gl_db_accounts.inc + gl/includes/db/gl_db_bank_accounts.inc + gl/includes/db/gl_db_currencies.inc + gl/manage/bank_accounts.php + gl/manage/currencies.php + gl/manage/gl_account_classes.php + gl/manage/gl_account_types.php + gl/manage/gl_accounts.php + inventory/includes/db/items_category_db.inc + inventory/includes/db/items_db.inc + inventory/includes/db/items_locations_db.inc + inventory/includes/db/movement_types_db.inc + inventory/includes/inventory_db.inc + inventory/inquiry/stock_movements.php + inventory/manage/item_categories.php + inventory/manage/items.php + inventory/manage/locations.php + inventory/manage/movement_types.php + inventory/purchasing_data.php + +2009-12-02 20:16 +0000 Janusz Dobrowolski +(1712) Merged changes from main branch up to release 2.2.1 + CHANGELOG.txt + admin/backups.php + admin/company_preferences.php + admin/db/maintenance_db.inc + admin/display_prefs.php + config.default.php + gl/gl_bank.php + includes/current_user.inc + includes/errors.inc + includes/lang/language.php + includes/main.inc includes/session.inc - install/isession.inc - reporting/includes/class.pdf.inc + includes/systypes.inc + includes/ui/allocation_cart.inc + install/save.php + lang/en_US/LC_MESSAGES/en_US.mo + lang/new_language_template/LC_MESSAGES/empty.po + purchasing/includes/db/supp_trans_db.inc + purchasing/includes/ui/po_ui.inc + reporting/includes/header2.inc + sql/en_US-demo.sql + +2009-12-01 16:55 +0000 Joe Hunt +(1702) Moved all SQL statements from PHP files into relevant *_db.inc files. + included gl folder + CHANGELOG.txt + dimensions/includes/dimensions_db.inc + dimensions/includes/dimensions_ui.inc + dimensions/inquiry/search_dimensions.php + gl/bank_account_reconcile.php + gl/gl_budget.php + gl/includes/db/gl_db_account_types.inc + gl/includes/db/gl_db_accounts.inc + gl/includes/db/gl_db_bank_accounts.inc + gl/includes/db/gl_db_bank_trans.inc + gl/includes/db/gl_db_currencies.inc + gl/includes/db/gl_db_rates.inc + gl/includes/db/gl_db_trans.inc + gl/inquiry/bank_inquiry.php + gl/inquiry/journal_inquiry.php + gl/manage/bank_accounts.php + gl/manage/currencies.php + gl/manage/exchange_rates.php + gl/manage/gl_account_classes.php + gl/manage/gl_account_types.php + gl/manage/gl_accounts.php + gl/view/gl_trans_view.php + +2009-11-30 09:02 +0000 Joe Hunt +(1694) Moved all SQL statements from PHP files into relevant *_db.inc files. + admin/attachments.php + admin/create_coy.php + admin/db/attachments_db.inc + admin/db/company_db.inc + admin/db/fiscalyears_db.inc + admin/db/maintenance_db.inc + admin/db/printers_db.inc + admin/db/shipping_db.inc + admin/db/transactions_db.inc + admin/fiscalyears.php + admin/gl_setup.php + admin/payment_terms.php + admin/printers.php + admin/shipping_companies.php + admin/view_print_transaction.php + includes/date_functions.inc + lang/en_US/LC_MESSAGES/en_US.mo + reporting/includes/excel_report.inc + reporting/includes/pdf_report.inc + +2009-11-18 13:08 +0000 Janusz Dobrowolski +(1679) Fixed side bug after last sql update. + CHANGELOG.txt + gl/bank_account_reconcile.php + +2009-11-18 09:54 +0000 Joe Hunt +(1678) Allow null references in trans to show up in gl_trans_view + CHANGELOG.txt + gl/view/gl_trans_view.php + +2009-11-18 07:53 +0000 Joe Hunt +(1677) Release 2.2 + CHANGELOG.txt + config.default.php + +2009-11-17 22:34 +0000 Joe Hunt +(1676) Changed rep705 to show fiscal year instead of year + CHANGELOG.txt + lang/new_language_template/LC_MESSAGES/empty.po + reporting/includes/reports_classes.inc + reporting/rep705.php + update.html + +2009-11-17 21:09 +0000 Joe Hunt +(1675) Moved payment terms in documents for better view. Increased space for legal text. +Changed sorting in get_gl_transactions to sort by tran_date, counter +Changed period in Journal Entries to one month instead of one year. + CHANGELOG.txt + gl/includes/db/gl_db_trans.inc + gl/inquiry/journal_inquiry.php + reporting/includes/header2.inc + reporting/includes/pdf_report.inc + +2009-11-15 22:07 +0000 Janusz Dobrowolski +(1674) Variable ctrl_handlers moved to BoxReports. + reporting/includes/reports_classes.inc + +2009-11-15 21:00 +0000 Janusz Dobrowolski +(1673) Added integrtion ofcustom and extended reports to reporting menu; ui_list cleanup. + CHANGELOG.txt + +2009-11-15 20:58 +0000 Janusz Dobrowolski +(1672) All *_list() functions now does not display html directly - added echo when needed. + admin/backups.php + admin/inst_module.php + admin/print_profiles.php + gl/includes/ui/gl_bank_ui.inc + gl/includes/ui/gl_journal_ui.inc + gl/manage/exchange_rates.php + includes/ui/ui_input.inc + inventory/cost_update.php + inventory/inquiry/stock_status.php + inventory/manage/item_codes.php + inventory/manage/items.php + inventory/manage/sales_kits.php + inventory/prices.php + inventory/purchasing_data.php + inventory/reorder_level.php + manufacturing/inquiry/where_used_inquiry.php + manufacturing/manage/bom_edit.php + purchasing/allocations/supplier_allocation_main.php + purchasing/includes/ui/invoice_ui.inc + purchasing/includes/ui/po_ui.inc + sales/allocations/customer_allocation_main.php + sales/manage/customer_branches.php + +2009-11-15 20:55 +0000 Janusz Dobrowolski +(1671) Adde integration of custom/extended reports; optimizations. + reporting/includes/reports_classes.inc + reporting/prn_redirect.php + reporting/reports_main.php + +2009-11-15 20:53 +0000 Janusz Dobrowolski +(1670) All *_list() functions now return html code instead direct display, *_list_cells() and +*_list_row() work as before. + includes/ui/ui_lists.inc + +2009-11-13 15:50 +0000 Joe Hunt +(1669) Allow editing account when editing a row in GL Bank and GL Journal Entry +Transaction bug in void_journal_trans() + CHANGELOG.txt + gl/gl_bank.php + gl/gl_journal.php + gl/includes/db/gl_db_trans.inc + gl/includes/ui/gl_bank_ui.inc + gl/includes/ui/gl_journal_ui.inc + includes/ui/items_cart.inc + +2009-11-13 13:45 +0000 Joe Hunt +(1668) Cleaning CHANGELOG.txt and small fix in references.inc + CHANGELOG.txt + includes/references.inc + +2009-11-12 21:11 +0000 Joe Hunt +(1667) Changed to allow change of reference in GL modifying +Added reference in gl_trans_view.php + CHANGELOG.txt + gl/gl_journal.php + gl/includes/db/gl_db_trans.inc + gl/includes/ui/gl_journal_ui.inc + gl/view/gl_trans_view.php + includes/db/references_db.inc + includes/references.inc + +2009-11-12 20:33 +0000 Janusz Dobrowolski +(1666) Fixed maksimum length of memo for gl postings in entry forms. + CHANGELOG.txt + gl/includes/ui/gl_bank_ui.inc + gl/includes/ui/gl_journal_ui.inc + +2009-11-12 10:36 +0000 Janusz Dobrowolski +(1665) Added amount range in gl inquires. + CHANGELOG.txt + gl/includes/db/gl_db_trans.inc + gl/inquiry/gl_account_inquiry.php + +2009-11-12 10:35 +0000 Janusz Dobrowolski +(1664) Fixed typo + doc/access_levels.txt + +2009-11-12 10:35 +0000 Janusz Dobrowolski +(1663) Changed menu option text for GL inquiry. + applications/generalledger.php + +2009-11-12 10:29 +0000 Joe Hunt +(1662) Changed Journal Inquiries so it shows the Bank Deposit/Payment amount instead of sum of positive transaction. + CHANGELOG.txt + gl/inquiry/journal_inquiry.php + +2009-11-10 22:58 +0000 Joe Hunt +(1661) type warning in dimension tags + CHANGELOG.txt + admin/tags.php + +2009-11-10 22:02 +0000 Janusz Dobrowolski +(1660) Fixed value for SA_SUPPBULKREP access area. + CHANGELOG.txt + includes/access_levels.inc + sql/en_US-demo.sql + sql/en_US-new.sql + +2009-11-10 00:23 +0000 Joe Hunt +(1659) disallow bank accounts in accounts list in Bank Deposits/Payments. +It produces double records in bank inquiry otherwise. + CHANGELOG.txt + gl/includes/ui/gl_bank_ui.inc + gl/manage/gl_quick_entries.php + +2009-11-09 11:00 +0000 Janusz Dobrowolski +(1658) Fixed help link generation to clean page context string. + CHANGELOG.txt + includes/page/header.inc + +2009-11-08 14:29 +0000 Joe Hunt +(1657) Changed the Running Balance column in Customer Transaction to only show when the type is selected. The order is not good before sorting in date order + CHANGELOG.txt + sales/inquiry/customer_inquiry.php + +2009-11-08 10:54 +0000 Joe Hunt +(1656) Bug in adding freight cost to sales order/quotation +Additional improvements on layout display + CHANGELOG.txt + purchasing/includes/ui/invoice_ui.inc + purchasing/view/view_po.php + sales/inquiry/sales_orders_view.php + sales/view/view_sales_order.php + +2009-11-07 15:35 +0000 Janusz Dobrowolski +(1655) Added mising help context in sales inquires. + CHANGELOG.txt + +2009-11-07 15:34 +0000 Janusz Dobrowolski +(1654) Added missing help_context + sales/inquiry/sales_orders_view.php + +2009-11-07 10:45 +0000 Joe Hunt +(1653) More improvements on layout display. + CHANGELOG.txt + inventory/includes/item_adjustments_ui.inc + purchasing/includes/ui/po_ui.inc -2012-01-27 09:39 +0100 Joe Hunt -(2960) Switching to cash sales in documents didn't preserve the delivery date. +2009-11-06 11:01 +0000 Joe Hunt +(1652) Improved layout in the new tax info display. Also old ones. + CHANGELOG.txt + sales/customer_credit_invoice.php + sales/customer_delivery.php + sales/customer_invoice.php + sales/includes/ui/sales_credit_ui.inc sales/includes/ui/sales_order_ui.inc -2012-01-26 23:22 +0100 Joe Hunt -(2959) Fixed a session_regenerate_id error leaving session files in /tmp folder. - includes/lang/gettext.php - includes/lang/language.php - includes/session.inc +2009-11-06 09:27 +0000 Janusz Dobrowolski +(1651) Fixed include file sequence. + admin/tags.php -2012-01-25 13:00 +0100 Joe Hunt -(2958) Fixed a translation bug in gettext php, that could create huge session files left. - includes/lang/gettext.php +2009-11-05 09:57 +0000 Joe Hunt +(1650) Bug on line 215 in /sales/customer_delivery.php + CHANGELOG.txt + sales/customer_delivery.php -2012-01-22 23:23 +0100 Joe Hunt -(2957) 0001309: Insufficient Quantities "Red Marker" doesn't take into account dispatched quantity +2009-11-05 09:32 +0000 Joe Hunt +(1649) Rerun. Modifying need an extra column. sales/includes/ui/sales_order_ui.inc -2012-01-22 09:23 +0100 Joe Hunt -(2956) 0001307: Insufficent quantities "marker" use wrong date in Sales Order +2009-11-05 09:20 +0000 Joe Hunt +(1648) Rerun. Update button for change of shipping + CHANGELOG.txt sales/includes/ui/sales_order_ui.inc + sales/sales_order_entry.php -2012-01-20 09:47 +0100 Joe Hunt -(2955) Rerun of void_transaction.php - admin/void_transaction.php +2009-11-05 00:40 +0000 Joe Hunt +(1647) Include freight_cost in Sales Quotations, Orders in inquiries. + CHANGELOG.txt + sales/inquiry/sales_orders_view.php -2012-01-20 09:33 +0100 Joe Hunt -(2954) Implemented error/warning for customer on hold in bank payment/deposit. - gl/includes/ui/gl_bank_ui.inc +2009-11-05 00:12 +0000 Joe Hunt +(1646) Display tax info in Sales Quotation, Order, Direct Delivery and Invoice. + CHANGELOG.txt + sales/includes/ui/sales_order_ui.inc -2012-01-19 16:16 +0100 Joe Hunt -(2953) Customer Payment from customers on hold now only throws a warning. You can still pay. - sales/customer_payments.php +2009-11-04 23:02 +0000 Joe Hunt +(1645) Included dimension(s) in Bank Deposit/Payment View and correct signs. + CHANGELOG.txt + gl/view/gl_deposit_view.php + gl/view/gl_payment_view.php -2012-01-17 10:13 +0100 Joe Hunt -(2952) Do not print zero lines amount of 0.00 in Sales Documents if service item, $no_zero_lines_amount. 1 = do not - config.default.php - reporting/rep107.php - reporting/rep109.php - reporting/rep110.php - reporting/rep111.php - sales/includes/db/cust_trans_details_db.inc - sales/includes/db/sales_order_db.inc +2009-11-04 14:28 +0000 Janusz Dobrowolski +(1644) Fixed bug in printer selection introduced during security update and +merged from main trunk. + CHANGELOG.txt + admin/db/printers_db.inc -2012-01-17 00:59 +0100 Joe Hunt -(2951) 0001285: Restrict the voiding transaction of closed fiscal year - admin/void_transaction.php +2009-11-03 16:29 +0000 Joe Hunt +(1643) Changed so reference no in QUOTE/SO/INV/CRE/PO is printed instead of trans_no +if global variable in config.php, $print_invoice_no = 0 (default). + CHANGELOG.txt + reporting/includes/header2.inc + reporting/includes/reports_classes.inc -2012-01-08 23:29 +0100 Joe Hunt -(2950) Option in config.php for using an icon for editkey after combobox. - config.default.php - includes/ui/ui_lists.inc +2009-11-03 15:34 +0000 Janusz Dobrowolski +(1642) Fixed js bug on logout screen, optional transactions support in +add_bank_transaction + CHANGELOG.txt -2012-01-08 16:16 +0100 Janusz Dobrowolski -(2949) Several imporvements in ui helpers (nonajax button for long processes, fixed radio button etc). - includes/ui/ui_input.inc - js/inserts.js - js/utils.js +2009-11-03 15:32 +0000 Janusz Dobrowolski +(1641) Added optional parameter in add_bank_transaction + gl/includes/db/gl_db_banking.inc -2012-01-03 16:12 +0100 Janusz Dobrowolski -(2948) Gettext domain was not properly restored after invoking hook provided by extension. - includes/hooks.inc - includes/lang/gettext.php +2009-11-03 15:32 +0000 Janusz Dobrowolski +(1640) Fixed missing defualt for price_dec setting. + includes/prefs/userprefs.inc -2012-01-03 16:06 +0100 Janusz Dobrowolski -(2947) Back link on final edition page now properly redirects user to previous menu tab, improved sales document edition control. - includes/main.inc - includes/page/footer.inc - includes/ui/ui_controls.inc - js/utils.js - sales/includes/sales_ui.inc +2009-11-03 10:37 +0000 Joe Hunt +(1639) Wrong presentation on reference and order in Customer Allocation Inquiry + CHANGELOG.txt + sales/inquiry/customer_allocation_inquiry.php + +2009-11-03 00:43 +0000 Joe Hunt +(1638) Bad debit account when debiting service items. +Removed unneeded reference to $result in db_num_rows. Gave warnings +Better formatting of update.html + CHANGELOG.txt + includes/db/connect_db.inc + purchasing/includes/db/invoice_db.inc + update.html + +2009-11-02 16:06 +0000 Janusz Dobrowolski +(1637) Bad value for COGS acount retrieved from category for new service type +item entry. + CHANGELOG.txt + inventory/manage/items.php + +2009-11-01 22:42 +0000 Janusz Dobrowolski +(1636) Added default date format used before login. + CHANGELOG.txt + config.default.php + includes/prefs/userprefs.inc -2012-01-06 15:51 +0100 Joe Hunt -(2946) Improved float compare for AR/AP ledgers. - includes/current_user.inc - purchasing/includes/db/supp_trans_db.inc - purchasing/includes/db/suppliers_db.inc - reporting/rep102.php - reporting/rep202.php - sales/includes/db/customers_db.inc +2009-11-01 10:50 +0000 Joe Hunt +(1635) Bugs in function show_users_online in users_db.inc +Small sideeffect in date_functions after correction of $date_system + CHANGELOG.txt + admin/db/users_db.inc + includes/date_functions.inc -2012-01-06 12:55 +0100 Joe Hunt -(2945) Optimized editkey graphics by using JS callEditor instead. - includes/ui/ui_lists.inc - js/inserts.js +2009-11-01 08:22 +0000 Joe Hunt +(1634) Changed $date_system value of 3 to be traditional, but non-workday is Friday and start of week is Saturday. For DatePicker. + CHANGELOG.txt + config.default.php + includes/ui/ui_view.inc -2012-01-06 10:12 +0100 Joe Hunt -(2944) 0001266: Delivery Location wrong when different from PO - purchasing/includes/ui/grn_ui.inc +2009-10-30 13:23 +0000 Janusz Dobrowolski +(1633) Fixed non-default company selection bug on login. + CHANGELOG.txt + includes/session.inc -2012-01-05 11:38 +0100 Joe Hunt -(2943) Fixed a small bug in graphics editkeys (when search lists are enabled) - includes/ui/ui_lists.inc +2009-10-30 13:22 +0000 Janusz Dobrowolski +(1632) Code cleanup. + includes/db/connect_db.inc -2012-01-05 00:33 +0100 Joe Hunt -(2942) Do not allow editing of allocated sales invoices in Journal Inquiry. - gl/inquiry/journal_inquiry.php +2009-10-30 08:28 +0000 Joe Hunt +(1631) Changed name on folder for global help url to fawiki. + CHANGELOG.txt + config.default.php -2012-01-04 14:25 +0100 Joe Hunt -(2941) Improved float compare in certain files (AR/AP ledger) - includes/current_user.inc - reporting/rep101.php - reporting/rep102.php - reporting/rep201.php - reporting/rep202.php - sales/inquiry/customer_inquiry.php +2009-10-29 22:11 +0000 Janusz Dobrowolski +(1630) Changed context help system organization to enable use of central multilanguage wiki. + CHANGELOG.txt + config.default.php -2012-01-04 11:19 +0100 Joe Hunt -(2940) Added graphic edit/add icons in lists with $editkey. - includes/session.inc - includes/ui/ui_lists.inc +2009-10-29 22:05 +0000 Janusz Dobrowolski +(1629) Changed context help organization to enable use of central, multilanguage wiki. + admin/attachments.php + admin/backups.php + admin/change_current_user_password.php + admin/company_preferences.php + admin/create_coy.php + admin/display_prefs.php + admin/fiscalyears.php + admin/forms_setup.php + admin/gl_setup.php + admin/inst_lang.php + admin/inst_module.php + admin/inst_upgrade.php + admin/payment_terms.php + admin/print_profiles.php + admin/printers.php + admin/security_roles.php + admin/shipping_companies.php + admin/tags.php + admin/users.php + admin/view_print_transaction.php + admin/void_transaction.php + applications/application.php + applications/customers.php + applications/dimensions.php + applications/generalledger.php + applications/inventory.php + applications/manufacturing.php + applications/setup.php + applications/suppliers.php + dimensions/dimension_entry.php + dimensions/inquiry/search_dimensions.php + dimensions/view/view_dimension.php + gl/bank_account_reconcile.php + gl/bank_transfer.php + gl/gl_bank.php + gl/gl_budget.php + gl/gl_journal.php + gl/inquiry/bank_inquiry.php + gl/inquiry/gl_account_inquiry.php + gl/inquiry/gl_trial_balance.php + gl/inquiry/journal_inquiry.php + gl/inquiry/tax_inquiry.php + gl/manage/bank_accounts.php + gl/manage/currencies.php + gl/manage/exchange_rates.php + gl/manage/gl_account_classes.php + gl/manage/gl_account_types.php + gl/manage/gl_accounts.php + gl/manage/gl_quick_entries.php + gl/view/bank_transfer_view.php + gl/view/gl_deposit_view.php + gl/view/gl_payment_view.php + gl/view/gl_trans_view.php + includes/page/header.inc + inventory/adjustments.php + inventory/cost_update.php + inventory/inquiry/stock_movements.php + inventory/inquiry/stock_status.php + inventory/manage/item_categories.php + inventory/manage/item_codes.php + inventory/manage/item_units.php inventory/manage/items.php + inventory/manage/locations.php + inventory/manage/movement_types.php + inventory/manage/sales_kits.php + inventory/prices.php + inventory/purchasing_data.php + inventory/reorder_level.php + inventory/transfers.php + inventory/view/view_adjustment.php + inventory/view/view_transfer.php + manufacturing/inquiry/bom_cost_inquiry.php + manufacturing/inquiry/where_used_inquiry.php + manufacturing/manage/bom_edit.php + manufacturing/manage/work_centres.php + manufacturing/search_work_orders.php + manufacturing/view/wo_issue_view.php + manufacturing/view/wo_production_view.php + manufacturing/view/work_order_view.php + manufacturing/work_order_add_finished.php + manufacturing/work_order_costs.php + manufacturing/work_order_entry.php + manufacturing/work_order_issue.php + manufacturing/work_order_release.php + purchasing/allocations/supplier_allocate.php + purchasing/allocations/supplier_allocation_main.php + purchasing/inquiry/po_search.php + purchasing/inquiry/po_search_completed.php + purchasing/inquiry/supplier_allocation_inquiry.php + purchasing/inquiry/supplier_inquiry.php purchasing/manage/suppliers.php + purchasing/po_entry_items.php + purchasing/po_receive_items.php + purchasing/supplier_credit.php + purchasing/supplier_invoice.php + purchasing/supplier_payment.php + purchasing/view/view_grn.php + purchasing/view/view_po.php + purchasing/view/view_supp_credit.php + purchasing/view/view_supp_invoice.php + purchasing/view/view_supp_payment.php + reporting/reports_main.php + sales/allocations/customer_allocate.php + sales/allocations/customer_allocation_main.php + sales/create_recurrent_invoices.php + sales/credit_note_entry.php + sales/customer_credit_invoice.php + sales/customer_delivery.php + sales/customer_invoice.php + sales/customer_payments.php + sales/inquiry/customer_allocation_inquiry.php + sales/inquiry/customer_inquiry.php + sales/inquiry/sales_deliveries_view.php + sales/manage/credit_status.php sales/manage/customer_branches.php sales/manage/customers.php + sales/manage/recurrent_invoices.php + sales/manage/sales_areas.php + sales/manage/sales_groups.php + sales/manage/sales_people.php + sales/manage/sales_points.php + sales/manage/sales_types.php + sales/sales_order_entry.php + sales/view/view_credit.php + sales/view/view_dispatch.php + sales/view/view_invoice.php + sales/view/view_receipt.php + sales/view/view_sales_order.php + taxes/item_tax_types.php + taxes/tax_groups.php + taxes/tax_types.php + themes/aqua/renderer.php + themes/cool/renderer.php + themes/default/renderer.php -2011-12-26 10:16 +0100 Joe Hunt -(2939) Multiple email accounts on contacts didn't work in sales documents - reporting/includes/pdf_report.inc - reporting/rep107.php - reporting/rep109.php - reporting/rep110.php - reporting/rep111.php - reporting/rep113.php +2009-10-28 11:11 +0000 Joe Hunt +(1628) Changed report Annual Expense Breakdown to follow the fiscal year instead of +calendar year. The year selector selects the start of the fiscal year. +Only the last 12 months are shown. + CHANGELOG.txt + reporting/rep705.php -2011-12-16 21:05 +0100 Janusz Dobrowolski -(2938) [0001088] Database export optimization (minimized restore time). - admin/db/maintenance_db.inc +2009-10-27 13:53 +0000 Joe Hunt +(1627) Database error when updating item. + CHANGELOG.txt + inventory/includes/db/items_db.inc + +2009-10-27 13:44 +0000 Joe Hunt +(1626) Removed unneeded double forms in scripts with db_pager. Missing $_POST variables. + CHANGELOG.txt + dimensions/inquiry/search_dimensions.php + manufacturing/search_work_orders.php + purchasing/allocations/supplier_allocation_main.php + 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 -2011-12-16 10:21 +0100 Joe Hunt -(2937) Added memo/comments print in remittance and receipt. Optimized memo/prints in other docs. - reporting/rep107.php - reporting/rep110.php - reporting/rep112.php - reporting/rep113.php - reporting/rep210.php - reporting/rep409.php +2009-10-26 16:54 +0000 Janusz Dobrowolski +(1625) Fixed error during gl class update [0000177] + CHANGELOG.txt + gl/includes/db/gl_db_account_types.inc -2011-12-08 00:46 +0100 Joe Hunt -(2936) When sending documents by email, the email address follows the status message. - reporting/includes/pdf_report.inc +2009-10-26 15:43 +0000 Joe Hunt +(1624) Fixed another compatibility issue with MySQL 3.xx (DATE) +Late language changes + CHANGELOG.txt + lang/en_US/LC_MESSAGES/en_US.mo + lang/new_language_template/LC_MESSAGES/empty.po + reporting/rep710.php -2011-12-08 00:30 +0100 Joe Hunt -(2935) Put correct bank account on receipt. - reporting/rep112.php +2009-10-25 12:27 +0000 Janusz Dobrowolski +(1623) Fixed compatibility issue with MySQL 3.xx + CHANGELOG.txt + admin/db/tags_db.inc -2011-12-07 16:16 +0100 Joe Hunt -(2934) Put correct bank account on remittance. - reporting/rep210.php +2009-10-24 20:01 +0000 Janusz Dobrowolski +(1622) Fixed ajax support for multiply selects, obsoleted #tags array some other small fixes + CHANGELOG.txt -2011-11-26 22:57 +0100 Joe Hunt -(2933) Salesman listing not adding over page break in report. - reporting/rep105.php - reporting/rep106.php +2009-10-24 19:59 +0000 Janusz Dobrowolski +(1621) Removed obsolete $tabs global array, tab ids retrieved from $_SESSION['App'] + admin/inst_module.php + includes/page/header.inc + includes/types.inc + includes/ui/ui_lists.inc -2011-11-25 13:48 +0100 Joe Hunt -(2932) Small change in voiding stock move. - includes/db/inventory_db.inc +2009-10-24 19:58 +0000 Janusz Dobrowolski +(1620) Defualt add/update button, ajax page update. + dimensions/dimension_entry.php + gl/manage/gl_accounts.php -2011-11-25 08:49 +0100 Joe Hunt -(2931) Correction related to tax Included GRN Voiding - purchasing/includes/db/invoice_db.inc +2009-10-24 19:57 +0000 Janusz Dobrowolski +(1619) Fixed ajax support for multiply selects. + js/utils.js -2011-11-24 09:54 +0100 Joe Hunt -(2930) Release 2.3.9 and rerun of some files +2009-10-24 19:56 +0000 Janusz Dobrowolski +(1618) Fixed buggy php behaviour when foreach is used on global array. + frontaccounting.php + +2009-10-24 13:22 +0000 Janusz Dobrowolski +(1617) Cleanup of not important error log messages. CHANGELOG.txt - access/logout.php - includes/ui/ui_controls.inc - version.php -2011-11-23 23:56 +0100 Joe Hunt -(2929) Changed TYPE= to ENGINE= ins core COA scripts. TYPE= was deprecated since 4.1. - sql/en_US-demo.sql - sql/en_US-new.sql +2009-10-24 13:21 +0000 Janusz Dobrowolski +(1616) Fixed error log warning (missing installed_extensions.inc) during upgrade to 2.2. + includes/session.inc -2011-11-23 20:12 +0100 Janusz Dobrowolski -(2928) Fixed problem with output buffering (blank page on some configurations). - includes/errors.inc +2009-10-24 13:20 +0000 Janusz Dobrowolski +(1615) CVS folders excluded from flush_dir to avoid unwanted messages in error log on devel boxes. + includes/main.inc -2011-11-23 09:37 +0100 Joe Hunt -(2927) 0001183: Can't close the popup dimension # view window - includes/ui/ui_controls.inc - js/utils.js +2009-10-24 09:05 +0000 Joe Hunt +(1614) *** empty log message *** + lang/new_language_template/LC_MESSAGES/empty.po -2011-11-23 01:40 +0100 Joe Hunt -(2926) Fixed double calculation of tax free price for an item. - purchasing/includes/db/grn_db.inc +2009-10-24 09:04 +0000 Janusz Dobrowolski +(1613) Fixed table selection query in sanitize_database(). + sql/alter2.2.php -2011-11-17 09:19 +0100 Joe Hunt -(2925) 1177: Print single receipt fails - reporting/rep112.php +2009-10-23 23:31 +0000 Joe Hunt +(1612) Better format. + update.html -2011-11-15 09:11 +0100 Joe Hunt -(2924) 0001173: Incompatible static implementation of Session Manager in /includes/session.inc - includes/session.inc +2009-10-23 22:46 +0000 Janusz Dobrowolski +(1611) Added text fields sanitization on upgrdae to 2.2. + CHANGELOG.txt + sql/alter2.2.php -2011-11-13 13:23 +0100 Joe Hunt -(2923) Fixed a selection bug in Report Credit Notes. Caused all CN to print. - reporting/rep113.php +2009-10-23 22:41 +0000 Joe Hunt +(1610) Changed so -1 as parameters to dimensions in get_transactions db routines only fetches NO dimensions. + CHANGELOG.txt + gl/includes/db/gl_db_trans.inc + reporting/includes/reports_classes.inc + reporting/rep705.php -2011-11-12 09:52 +0100 Joe Hunt -(2922) Couldn't use the date picker in the new transaction tabs in customer/supplier/items. - inventory/manage/items.php - purchasing/manage/suppliers.php - sales/manage/customers.php +2009-10-23 20:32 +0000 Janusz Dobrowolski +(1609) Fixed extension module update and deletion. + CHANGELOG.txt + admin/inst_module.php -2011-11-10 11:15 +0100 Janusz Dobrowolski -(2921) Langauge template update. - lang/new_language_template/LC_MESSAGES/empty.po +2009-10-23 14:22 +0000 Janusz Dobrowolski +(1608) Fixed check_table to avoid errors in log file. + admin/inst_upgrade.php -2011-11-10 08:45 +0100 Joe Hunt -(2920) New CHANGELOG.txt - CHANGELOG.txt +2009-10-23 13:46 +0000 Joe Hunt +(1607) Additional update instructions + update.html -2011-11-10 08:37 +0100 Joe Hunt -(2919) Release 2.3.8 - version.php +2009-10-23 09:50 +0000 Janusz Dobrowolski +(1606) Fixed pre_check. + sql/alter2.2.php -2011-11-07 11:58 +0100 Joe Hunt -(2918) Fixed small bug in sales orders inquiry, page title. - sales/inquiry/sales_orders_view.php +2009-10-22 17:14 +0000 Janusz Dobrowolski +(1605) More sql security fixes, two issues in upgrade fixed. + CHANGELOG.txt -2011-11-02 14:52 +0100 Joe Hunt -(2917) Removed SERVER REQUEST_METHOD setting - inventory/manage/items.php +2009-10-22 17:13 +0000 Janusz Dobrowolski +(1604) Initial value for next_extension_id added. + admin/db/maintenance_db.inc -2011-11-02 12:04 +0100 Joe Hunt -(2916) Fixed Next bug for pagers in customers and suppliers transactions. - purchasing/includes/db/po_db.inc - purchasing/manage/suppliers.php - sales/inquiry/customer_inquiry.php - sales/manage/customers.php +2009-10-22 17:11 +0000 Janusz Dobrowolski +(1603) Additional security fixes in sql statements. + gl/manage/bank_accounts.php + gl/manage/currencies.php + gl/manage/exchange_rates.php + gl/manage/gl_account_types.php + gl/manage/gl_accounts.php + includes/db/audit_trail_db.inc + includes/db/comments_db.inc + includes/db/inventory_db.inc + includes/db/references_db.inc -2011-11-01 10:58 +0100 Joe Hunt -(2915) Rerun. Layout miss. - inventory/inquiry/stock_status.php +2009-10-22 17:10 +0000 Janusz Dobrowolski +(1602) Added fixing special chars in refs table during upgrade. + sql/alter2.2.php -2011-11-01 10:33 +0100 Joe Hunt -(2914) Cleanup. Optimized hotkeys in tabs. - inventory/manage/items.php - purchasing/manage/suppliers.php - sales/manage/customers.php +2009-10-22 17:08 +0000 Janusz Dobrowolski +(1601) Added initial value for $next_extension_id + includes/db/manufacturing_db.inc -2011-11-01 10:07 +0100 Joe Hunt -(2913) Cleanup Items.php. Bugfix in extra tabs. - inventory/manage/items.php +2009-10-22 12:01 +0000 Janusz Dobrowolski +(1600) Fixed error on add/update with no tags selected. + dimensions/dimension_entry.php + gl/manage/gl_accounts.php -2011-11-01 02:36 +0100 Joe Hunt -(2912) Rerun (no template selection allowed) - sales/inquiry/sales_orders_view.php +2009-10-22 11:47 +0000 Janusz Dobrowolski +(1599) *** empty log message *** + dimensions/includes/dimensions_db.inc -2011-11-01 02:28 +0100 Joe Hunt -(2911) Added sales orders and purchase orders in customer/supplier tabs inquiry. - purchasing/inquiry/po_search_completed.php - purchasing/manage/suppliers.php - sales/inquiry/sales_orders_view.php - sales/manage/customers.php +2009-10-22 11:32 +0000 Janusz Dobrowolski +(1598) Fixed double db_escape in add/update. + dimensions/includes/dimensions_db.inc -2011-11-01 01:39 +0100 Joe Hunt -(2910) Changed popup to tabs in customers, suppliers, items for transactions. - inventory/inquiry/stock_movements.php - inventory/inquiry/stock_status.php - inventory/manage/items.php - purchasing/inquiry/supplier_inquiry.php - purchasing/manage/suppliers.php - sales/inquiry/customer_inquiry.php - sales/manage/customers.php +2009-10-22 11:29 +0000 Janusz Dobrowolski +(1597) Fixed default value for systypes slector. + includes/ui/ui_lists.inc -2011-10-29 22:37 +0200 Janusz Dobrowolski -(2909) Fixed bank transaction dition problem (bank transaction balance check should be performed on daily basis) - gl/includes/db/gl_db_bank_trans.inc - gl/includes/db/gl_db_banking.inc +2009-10-22 11:26 +0000 Janusz Dobrowolski +(1596) Fixed double escaping on dimensions. + dimensions/includes/dimensions_db.inc -2011-10-29 22:34 +0200 Janusz Dobrowolski -(2908) Fixed problem in package repository communication. - includes/packages.inc +2009-10-22 11:25 +0000 Janusz Dobrowolski +(1595) Fixed include order. + admin/tags.php -2011-10-29 08:58 +0200 Joe Hunt -(2907) 0001149: Undefined variable trying to delete a currency - gl/manage/currencies.php +2009-10-22 11:24 +0000 Janusz Dobrowolski +(1594) Removed debug code. + admin/db/tags_db.inc -2011-10-27 08:42 +0200 Joe Hunt -(2906) Cleanup. Don't show edit/credit links in popup transactions/inquiry. - purchasing/inquiry/supplier_inquiry.php - sales/inquiry/customer_inquiry.php +2009-10-22 10:35 +0000 Janusz Dobrowolski +(1593) Added tags support, fixed bug in array_selector. + CHANGELOG.txt -2011-10-27 01:16 +0200 Joe Hunt -(2905) Links from Items to Inventory Item Movement and Inventory Item Status. - inventory/inquiry/stock_movements.php - inventory/inquiry/stock_status.php - inventory/manage/items.php +2009-10-22 10:34 +0000 Janusz Dobrowolski +(1592) Added generic tags support; tags for dimensions/gl accounts. + admin/db/tags_db.inc + admin/tags.php + applications/dimensions.php + applications/generalledger.php + dimensions/dimension_entry.php + gl/manage/gl_accounts.php + includes/data_checks.inc -2011-10-27 00:36 +0200 Joe Hunt -(2904) Supplier Inquiry link in Supplier form. - purchasing/inquiry/supplier_inquiry.php - purchasing/manage/suppliers.php +2009-10-22 10:32 +0000 Janusz Dobrowolski +(1591) Fixed bug in default selection in array selector, added tags lists. + includes/ui/ui_lists.inc -2011-10-26 23:58 +0200 Joe Hunt -(2903) Cleanup in customers.php and customer_inquiry.php - sales/inquiry/customer_inquiry.php - sales/manage/customers.php +2009-10-21 16:28 +0000 Janusz Dobrowolski +(1590) Fixed help link generation and upgrade of refs table. + CHANGELOG.txt -2011-10-26 15:20 +0200 Joe Hunt -(2902) Rerun, forgot global variable. - sales/manage/customers.php +2009-10-21 16:27 +0000 Janusz Dobrowolski +(1589) Fixed refs table upgrade to avoid duplicate record errors. + sql/alter2.2.php -2011-10-26 15:13 +0200 Joe Hunt -(2901) Option for auto create branch when creating new customer. Link to Customer Transactions. - config.default.php - sales/inquiry/customer_inquiry.php - sales/manage/customers.php +2009-10-21 16:26 +0000 Janusz Dobrowolski +(1588) Fixed help link generation. + includes/page/header.inc -2011-10-23 23:53 +0200 Joe Hunt -(2900) Option to use iso-8859-13 (The Baltic Countries) in pdf reports. - reporting/includes/class.pdf.inc +2009-10-21 14:06 +0000 Joe Hunt +(1587) A couple of new strings from upgrade... + lang/new_language_template/LC_MESSAGES/empty.po -2011-10-19 09:25 +0200 Joe Hunt -(2899) FA tried to print logo for new clients even if it doesn't exist. - reporting/includes/header2.inc +2009-10-21 13:49 +0000 Joe Hunt +(1586) Enabled a global flag in config.default.php (config.php), $show_users_online = 0. +If this flag is set to 1 FA will show discretely the users online in the footer. + CHANGELOG.txt + admin/db/users_db.inc + config.default.php -2011-10-15 12:04 +0200 Joe Hunt -(2898) Allowing edit of Customer Payments. (Chaitanya and Joe) - sales/customer_payments.php - sales/includes/db/cust_trans_db.inc - sales/includes/db/payment_db.inc - sales/inquiry/customer_inquiry.php +2009-10-21 12:20 +0000 Janusz Dobrowolski +(1585) Missing argument in pre_check call. + admin/inst_upgrade.php -2011-10-14 15:37 +0200 Joe Hunt -(2897) A default branch is created when creating a new customer. - sales/manage/customers.php +2009-10-21 11:44 +0000 Janusz Dobrowolski +(1584) Additional fixes to upgrade scripts. + CHANGELOG.txt + admin/inst_upgrade.php + sql/alter2.1.php + sql/alter2.2.php + sql/alter2.2rc.sql -2011-10-12 13:40 +0200 Joe Hunt -(2896) Removed redundant file /themes/default/login.css - themes/default/login.css +2009-10-21 11:07 +0000 Janusz Dobrowolski +(1583) Upgrade scripts modified to be used with FA 2.1 and 2.2beta + CHANGELOG.txt + sql/alter2.1.php + sql/alter2.2.php -2011-10-11 08:27 +0200 Joe Hunt -(2895) Fixed a IE9 compatible session regenerate id. - includes/session.inc +2009-10-21 11:06 +0000 Janusz Dobrowolski +(1582) Upgrade script from 2.2beta to 2.2RC/final. + sql/alter2.2rc.sql -2011-10-10 08:50 +0200 Joe Hunt -(2894) Small changes in costing by Chaitanya. - includes/db/inventory_db.inc - purchasing/includes/db/grn_db.inc +2009-10-21 07:54 +0000 Joe Hunt +(1581) Changed install.html, update.html and empty.po files + CHANGELOG.txt + install.html + lang/new_language_template/LC_MESSAGES/empty.po + update.html -2011-10-06 22:29 +0200 Janusz Dobrowolski -(2893) Old session files are now deleted on session id change. - includes/session.inc +2009-10-20 21:51 +0000 Janusz Dobrowolski +(1580) Small error message fix in dimension db. + CHANGELOG.txt + dimensions/includes/dimensions_db.inc -2011-10-06 21:38 +0200 Janusz Dobrowolski -(2892) Fixed hangouts on php installations with zlib extension installed, fixed warnings logged during install. +2009-10-20 21:47 +0000 Janusz Dobrowolski +(1579) Conditional config files generation - prevents overwrite during upgrade. + CHANGELOG.txt admin/db/maintenance_db.inc - includes/errors.inc + admin/inst_lang.php + company/0/installed_extensions.php + config.default.php + config.php + config_db.php + includes/session.inc install/index.php - install/isession.inc + install/save.php + installed_extensions.php + lang/installed_languages.inc -2011-09-29 12:29 +0200 Janusz Dobrowolski -(2891) Fixed install css stylesheet (removed nonexistent background img) - install/stylesheet.css +2009-10-20 21:45 +0000 Janusz Dobrowolski +(1578) Moving control to install wizard when config file does not exists. + index.php -2011-09-28 21:19 +0200 Janusz Dobrowolski -(2890) Fixed range selection for bulk document printing to avoid unexpected blank page when from/to selectors are mistakenly swapped. - reporting/rep107.php - reporting/rep110.php - reporting/rep112.php - reporting/rep113.php - reporting/rep210.php - reporting/rep409.php +2009-10-18 19:01 +0000 Janusz Dobrowolski +(1575) Fixed duplicate db_escape() im add_gl_account and update_gl_account + gl/includes/db/gl_db_accounts.inc -2011-09-22 10:52 +0200 Janusz Dobrowolski -(2889) Cleanup on key_in_foreign_table calls, removed obsolete $escaped argument. +2009-10-18 18:43 +0000 Janusz Dobrowolski +(1574) Security update merged from 2.1. + CHANGELOG.txt + admin/attachments.php admin/db/company_db.inc - gl/manage/bank_accounts.php - gl/manage/currencies.php - gl/manage/gl_account_types.php - gl/manage/gl_accounts.php - -2011-10-01 00:38 +0200 Joe Hunt -(2888) Bank payment/deposit edit. Attachment will follow the new edit number. - gl/gl_bank.php + admin/db/printers_db.inc + admin/db/voiding_db.inc + admin/payment_terms.php + admin/print_profiles.php + admin/printers.php + admin/shipping_companies.php + admin/view_print_transaction.php + dimensions/includes/dimensions_db.inc + dimensions/inquiry/search_dimensions.php + gl/bank_account_reconcile.php + gl/gl_budget.php + gl/includes/db/gl_db_account_types.inc + gl/includes/db/gl_db_accounts.inc + gl/includes/db/gl_db_bank_accounts.inc + gl/includes/db/gl_db_bank_trans.inc gl/includes/db/gl_db_banking.inc - -2011-09-30 15:33 +0200 Joe Hunt -(2887) Option for changing dimensions when editing Sales Invoice. - sales/customer_invoice.php - -2011-09-30 10:03 +0200 Joe Hunt -(2886) 0001091: Stock Check Sheets and Inventory Planning Report slow with lots of category and items - reporting/rep302.php - reporting/rep303.php - -2011-09-29 15:14 +0200 Joe Hunt -(2885) Fixed typos in ui_view.inc _number_to_words() - includes/ui/ui_view.inc - -2011-09-27 09:39 +0200 Joe Hunt -(2884) 0001085: When doing multiple deliveries for an order should account for shipping costs already consumed - sales/customer_delivery.php - sales/includes/db/sales_delivery_db.inc - -2011-09-20 10:57 +0200 Janusz Dobrowolski -(2883) Added links to payments for invoices in customer/supplier allocation inquiry + gl/includes/db/gl_db_currencies.inc + gl/includes/db/gl_db_rates.inc + gl/includes/db/gl_db_trans.inc + gl/inquiry/bank_inquiry.php + gl/manage/gl_account_types.php + gl/view/bank_transfer_view.php + gl/view/gl_trans_view.php + includes/db/connect_db.inc + inventory/cost_update.php + inventory/includes/db/items_category_db.inc + inventory/includes/db/items_codes_db.inc + inventory/includes/db/items_db.inc + inventory/includes/db/items_locations_db.inc + inventory/includes/db/items_prices_db.inc + inventory/includes/db/items_trans_db.inc + inventory/includes/db/items_units_db.inc + inventory/includes/db/movement_types_db.inc + inventory/inquiry/stock_movements.php + inventory/manage/item_categories.php + inventory/manage/item_units.php + inventory/manage/items.php + inventory/manage/locations.php + inventory/manage/movement_types.php + inventory/purchasing_data.php + manufacturing/includes/db/work_centres_db.inc + manufacturing/includes/db/work_order_issues_db.inc + manufacturing/includes/db/work_order_produce_items_db.inc + manufacturing/includes/db/work_order_requirements_db.inc + manufacturing/includes/db/work_orders_db.inc + manufacturing/includes/db/work_orders_quick_db.inc + manufacturing/inquiry/where_used_inquiry.php + manufacturing/manage/bom_edit.php + manufacturing/manage/work_centres.php + manufacturing/search_work_orders.php + purchasing/includes/db/grn_db.inc purchasing/includes/db/invoice_db.inc + purchasing/includes/db/invoice_items_db.inc + purchasing/includes/db/po_db.inc + purchasing/includes/db/supp_trans_db.inc purchasing/includes/db/suppalloc_db.inc + purchasing/includes/db/suppliers_db.inc + purchasing/includes/purchasing_db.inc + purchasing/inquiry/po_search.php + purchasing/inquiry/po_search_completed.php purchasing/inquiry/supplier_allocation_inquiry.php - purchasing/supplier_payment.php + purchasing/inquiry/supplier_inquiry.php + purchasing/manage/suppliers.php + purchasing/po_entry_items.php + purchasing/po_receive_items.php + purchasing/supplier_credit.php + purchasing/supplier_invoice.php + reporting/rep101.php + reporting/rep102.php + reporting/rep103.php + reporting/rep104.php + reporting/rep105.php + reporting/rep108.php + reporting/rep201.php + reporting/rep202.php + reporting/rep203.php + reporting/rep204.php + reporting/rep209.php + reporting/rep301.php + reporting/rep302.php + reporting/rep303.php + reporting/rep304.php + reporting/rep401.php + reporting/rep501.php + reporting/rep705.php + sales/create_recurrent_invoices.php sales/customer_payments.php + sales/includes/db/branches_db.inc + sales/includes/db/credit_status_db.inc + sales/includes/db/cust_trans_db.inc + sales/includes/db/cust_trans_details_db.inc sales/includes/db/custalloc_db.inc + sales/includes/db/customers_db.inc + sales/includes/db/sales_order_db.inc + sales/includes/db/sales_points_db.inc + sales/includes/db/sales_types_db.inc + sales/includes/sales_db.inc sales/inquiry/customer_allocation_inquiry.php + sales/inquiry/customer_inquiry.php + sales/inquiry/sales_deliveries_view.php + sales/inquiry/sales_orders_view.php + sales/manage/credit_status.php + sales/manage/customer_branches.php sales/manage/customers.php + sales/manage/recurrent_invoices.php + sales/manage/sales_areas.php + sales/manage/sales_groups.php + sales/manage/sales_people.php + sales/manage/sales_types.php + sales/view/view_sales_order.php + taxes/db/item_tax_types_db.inc + taxes/db/tax_groups_db.inc + taxes/db/tax_types_db.inc + taxes/item_tax_types.php + taxes/tax_calc.inc + taxes/tax_groups.php + taxes/tax_types.php -2011-09-07 21:14 +0200 Janusz Dobrowolski -(2882) Removed obsolete set_global_connection() call in get_user_auth(). - admin/db/users_db.inc - -2011-09-06 12:09 +0200 Janusz Dobrowolski -(2881) Fixed supplier order reference uniquty, fixed company logo file deletion. - admin/company_preferences.php - purchasing/includes/db/invoice_db.inc - purchasing/po_entry_items.php - -2011-09-02 12:00 +0200 Janusz Dobrowolski -(2877) Added tag version_2_3_7 for changeset bbd75fe337d1 - .hgtags +2009-10-16 14:35 +0000 Janusz Dobrowolski +(1573) Access control system description. + CHANGELOG.txt + doc/access_levels.txt -2011-09-01 09:01 +0200 Joe Hunt -(2876) Release 2.3.7. +2009-10-14 18:39 +0000 Janusz Dobrowolski +(1564) [0000173] Missing systypes_array global declaration. CHANGELOG.txt - version.php + purchasing/allocations/supplier_allocate.php -2011-09-01 08:34 +0200 Janusz Dobrowolski -(2875) Gettext template update. - lang/new_language_template/LC_MESSAGES/empty.po +2009-10-14 14:36 +0000 Joe Hunt +(1563) [0000172] Difference between Customer Balances and Print Statements + CHANGELOG.txt + reporting/rep108.php -2011-08-30 08:26 +0200 Joe Hunt -(2873) Show discount in view supp payment, if any. - purchasing/view/view_supp_payment.php +2009-10-13 22:16 +0000 Joe Hunt +(1562) Rerun with better algorithm. + admin/db/users_db.inc -2011-08-29 16:42 +0200 Joe Hunt -(2872) Display payments on view invoice like display allocation on view payments. Chaitanya. +2009-10-13 21:49 +0000 Joe Hunt +(1561) Code cleanup (old code removed) + CHANGELOG.txt includes/ui/ui_view.inc - purchasing/includes/db/suppalloc_db.inc - purchasing/view/view_supp_invoice.php - sales/includes/db/custalloc_db.inc - sales/view/view_invoice.php - -2011-08-28 22:28 +0200 Janusz Dobrowolski -(2871) Rounding errors in tax calculations for tax_included sales fixed again. - taxes/tax_calc.inc - -2011-08-28 09:50 +0200 Janusz Dobrowolski -(2870) Cleanup in add_supplier(). - purchasing/includes/db/suppliers_db.inc - -2011-08-28 00:47 +0200 Joe Hunt -(2869) Fixed severe error in tax calculation 8 days ago! - taxes/tax_calc.inc - -2011-08-19 10:22 +0200 Janusz Dobrowolski -(2867) Fixed additional rounding errors posting when tax included invoice is saved. - taxes/tax_calc.inc - -2011-08-19 10:06 +0200 Janusz Dobrowolski -(2866) Fixed improper checks on GL account deletion. - gl/includes/db/gl_db_accounts.inc - gl/manage/bank_accounts.php - gl/manage/gl_accounts.php - -2011-08-19 09:58 +0200 Janusz Dobrowolski -(2865) Fixed log error during rate retrieval when open_basedir restriction is set. - gl/includes/db/gl_db_rates.inc - -2011-08-16 01:11 +0200 Joe Hunt -(2864) 0000991: Default to premier bank account - gl/includes/ui/gl_bank_ui.inc - -2011-08-15 00:23 +0200 Joe Hunt -(2863) 0000987: In Supplier Payments allocation list should display Supplier Reference if possible - purchasing/includes/db/suppalloc_db.inc - -2011-08-12 22:55 +0200 Joe Hunt -(2862) 0000984: SO doesn't print the reference when the $print_invoice_no is set to 0. - reporting/includes/doctext.inc - -2011-08-07 23:05 +0200 Joe Hunt -(2861) Cleanup in Inventory Sales Report. Removed a _vd(). - reporting/rep304.php - -2011-08-07 16:44 +0200 Joe Hunt -(2860) 0000978 : PDF report don't run in newer verions of PHP (case sensitive member functions). - reporting/includes/pdf_report.inc -2011-08-07 09:22 +0200 Joe Hunt -(2859) Inventory Valuation Report has now got End Date selection. - reporting/rep301.php - reporting/reports_main.php +2009-10-13 16:06 +0000 Joe Hunt +(1560) Added discrete users online in footer (from Wish List Forum) (New rerun) + CHANGELOG.txt + admin/db/users_db.inc + sql/alter2.2.sql + sql/en_US-demo.sql + sql/en_US-new.sql -2011-08-04 00:00 +0200 Joe Hunt -(2858) Added support for png and gif item images. Rerun. - company/0/images/102.jpg - inventory/manage/items.php +2009-10-13 14:11 +0000 Joe Hunt +(1559) Changed Tag types in reports_classes to be the same as defined in types.inc. Suitable height=5 + CHANGELOG.txt + reporting/includes/reports_classes.inc -2011-08-03 13:22 +0200 Janusz Dobrowolski -(2857) Added support for png and gif item images. - company/0/images/102.jpg - inventory/manage/items.php +2009-10-13 09:53 +0000 Janusz Dobrowolski +(1558) Fixed page usage type check. + sales/inquiry/sales_orders_view.php -2011-08-03 13:11 +0200 Janusz Dobrowolski -(2856) Fixed key_in_foreign_table helper (problems with non-numeric keys). - admin/db/company_db.inc +2009-10-13 09:47 +0000 Janusz Dobrowolski +(1557) Fixed default access for sales order inquiry. + CHANGELOG.txt + sales/inquiry/sales_orders_view.php -2011-08-03 13:09 +0200 Janusz Dobrowolski -(2855) Fixed problem with unscrollable content in larger popup windows. - js/inserts.js +2009-10-12 23:29 +0000 Joe Hunt +(1556) 2 more files + CHANGELOG.txt + sql/en_US-demo.sql + sql/en_US-new.sql -2011-07-25 19:58 +0200 Janusz Dobrowolski -(2854) Added missing aux info on sales order/quotation reports. - reporting/includes/doctext.inc - sales/includes/db/sales_order_db.inc +2009-10-12 23:24 +0000 Joe Hunt +(1555) Added discrete users online in footer (from Wish List Forum) + CHANGELOG.txt + admin/db/users_db.inc + sql/alter2.2.sql + themes/aqua/renderer.php + themes/cool/renderer.php + themes/default/renderer.php -2011-07-21 16:55 +0200 Janusz Dobrowolski -(2853) Language template update. - lang/new_language_template/LC_MESSAGES/empty.po +2009-10-12 22:12 +0000 Janusz Dobrowolski +(1554) Broken gl_acount_classes/type editor layout fixed, fixed side error in allocations + CHANGELOG.txt -2011-07-31 00:37 +0200 Joe Hunt -(2852) 0000960: When printing PO's the PO# is the Trans_id not the Forms Reference number. - reporting/includes/doctext.inc +2009-10-12 22:09 +0000 Janusz Dobrowolski +(1553) q + purchasing/allocations/supplier_allocation_main.php + sales/allocations/customer_allocation_main.php -2011-07-22 23:24 +0200 Joe Hunt -(2851) Saved Report parameters didn't work any more. - reporting/prn_redirect.php +2009-10-12 22:08 +0000 Janusz Dobrowolski +(1552) Fixed broken table editor page layout on duplicate record error. + gl/includes/db/gl_db_account_types.inc + gl/includes/db/gl_db_accounts.inc + gl/manage/gl_account_classes.php + gl/manage/gl_account_types.php + gl/manage/gl_accounts.php -2011-07-22 08:49 +0200 Joe Hunt -(2850) New ChANGELOG.txt +2009-10-12 10:34 +0000 Janusz Dobrowolski +(1550) SQL injection fix CHANGELOG.txt -2011-07-22 08:47 +0200 Joe Hunt -(2849) Release 2.3.6 - version.php +2009-10-12 10:31 +0000 Janusz Dobrowolski +(1549) Fixed SQL injection vulnerability on some mysql/php configurations. + admin/db/users_db.inc -2011-07-20 16:28 +0200 Janusz Dobrowolski -(2848) [0000947] Fixed unneeded input fields reset after input error in Customers. - sales/manage/customers.php +2009-10-11 21:51 +0000 Joe Hunt +(1548) [0000168] Undefined variable: paylink in file rep110.php + CHANGELOG.txt + reporting/includes/pdf_report.inc + reporting/rep110.php -2011-07-20 16:19 +0200 Janusz Dobrowolski -(2847) [0000946] Added filename selection checks. - admin/backups.php +2009-10-11 09:34 +0000 Janusz Dobrowolski +(1547) Added security area for sales quotes and some smaller fixes to access control. + CHANGELOG.txt -2011-07-20 16:09 +0200 Janusz Dobrowolski -(2846) [0000936] Fixed invalid sales order update on voiding delivery note after SO line is removed. - sales/includes/db/sales_delivery_db.inc +2009-10-11 09:33 +0000 Janusz Dobrowolski +(1546) Added security area for sales quotes entry. + applications/customers.php + includes/access_levels.inc + sql/alter2.2.php + sql/en_US-demo.sql + sql/en_US-new.sql -2011-07-20 13:53 +0200 Janusz Dobrowolski -(2845) Fixed empty inventory sales report for all customers. - reporting/rep304.php +2009-10-11 09:31 +0000 Janusz Dobrowolski +(1545) Standard SA_DENIED access level added. + includes/current_user.inc -2011-07-08 11:13 +0200 Janusz Dobrowolski -(2844) Added checks on bank account creation to avoid selection of already used GL account. - gl/includes/db/gl_db_accounts.inc - gl/manage/bank_accounts.php +2009-10-11 09:29 +0000 Janusz Dobrowolski +(1544) Added helper function for setting page_security for multiusage pages. + includes/session.inc -2011-07-18 22:58 +0200 Joe Hunt -(2843) 0000948: Cost Update form uses cached old cost - inventory/cost_update.php +2009-10-11 09:27 +0000 Janusz Dobrowolski +(1543) Fixed security areas sort order. + admin/security_roles.php -2011-07-14 17:38 +0200 Joe Hunt -(2836) Removed condition in calculation of COGS in sales_delivery_db.inc. Chaitanya. - sales/includes/db/sales_delivery_db.inc +2009-10-11 09:27 +0000 Janusz Dobrowolski +(1542) Fixed page_security for various page usages. + sales/inquiry/sales_orders_view.php + sales/sales_order_entry.php -2011-07-11 11:37 +0200 Joe Hunt -(2835) Negative Stock Handling should be prior to add_stock_move - manufacturing/includes/db/work_orders_quick_db.inc +2009-10-10 16:34 +0000 Janusz Dobrowolski +(1541) Fixed page_security for sales_deliveries_view.php file. + CHANGELOG.txt -2011-07-11 09:28 +0200 Joe Hunt -(2834) Creation of audit trail and reference in GL was missing when deleting fiscal year. - admin/db/fiscalyears_db.inc +2009-10-10 16:33 +0000 Janusz Dobrowolski +(1540) Updated security areas for all menu options. + applications/customers.php + applications/dimensions.php + applications/generalledger.php + applications/inventory.php + applications/manufacturing.php + applications/setup.php + applications/suppliers.php -2011-07-01 23:25 +0200 Joe Hunt -(2832) 0000918: GL Inquiry, trial balance for a non-balance account for non-current year shows 0 - admin/db/fiscalyears_db.inc - gl/inquiry/gl_account_inquiry.php - gl/inquiry/gl_trial_balance.php - reporting/rep704.php - reporting/rep708.php +2009-10-10 16:31 +0000 Janusz Dobrowolski +(1539) Changed page_security to SA_SALESINVOICE. + sales/inquiry/sales_deliveries_view.php -2011-06-30 13:13 +0200 Janusz Dobrowolski -(2831) Fixed regression in cash invoice entry (location change ignored) - sales/includes/ui/sales_order_ui.inc - sales/sales_order_entry.php +2009-10-10 14:45 +0000 Janusz Dobrowolski +(1538) Fixed bug during edition of old delivery notes. + CHANGELOG.txt -2011-06-29 10:49 +0200 Janusz Dobrowolski -(2830) Fixed access control on redirected reports. - reporting/prn_redirect.php +2009-10-10 14:43 +0000 Janusz Dobrowolski +(1537) Fixed side bug on transaction numbers rewrite (edition of old delivery notes) + sales/includes/cart_class.inc -2011-06-24 12:49 +0200 Joe Hunt -(2829) 0000910: Report Aged Customer Analysis Total doesn't match the record totals. - reporting/rep102.php +2009-10-10 12:31 +0000 Janusz Dobrowolski +(1536) Changes in access control support for modules/plugins, a couple of other bugfixes. + CHANGELOG.txt -2011-06-21 15:37 +0200 Janusz Dobrowolski -(2828) Added GRN voiding. - admin/db/voiding_db.inc - admin/void_transaction.php - purchasing/includes/db/supp_trans_db.inc +2009-10-10 12:30 +0000 Janusz Dobrowolski +(1535) Enabled error handling for extensions. + frontaccounting.php -2011-06-21 15:36 +0200 Janusz Dobrowolski -(2827) Added supplier reference uniqueness check in Direct Supplier Invoice. - purchasing/po_entry_items.php +2009-10-10 12:29 +0000 Janusz Dobrowolski +(1534) Changed access control extensions support for modules/plugins to use unique extension ids. + admin/db/maintenance_db.inc + admin/security_roles.php + includes/access_levels.inc + includes/current_user.inc + index.php + installed_extensions.php -2011-06-21 15:24 +0200 Janusz Dobrowolski -(2826) Cleanup (fixed installed_extensions indlusion). - includes/session.inc - purchasing/includes/ui/invoice_ui.inc +2009-10-10 12:26 +0000 Janusz Dobrowolski +(1533) Page code rewrite, unique extension ids for modules/plugins. + admin/inst_module.php -2011-06-20 15:06 +0200 Joe Hunt -(2825) 0000900: Supplier Payment in another currency the bank charge is wrongly calculated. - purchasing/includes/db/supp_payment_db.inc +2009-10-10 12:25 +0000 Janusz Dobrowolski +(1532) Fixed missing paraeters in update_user_display_prefs() call. + admin/users.php -2011-06-18 15:27 +0200 Joe Hunt -(2824) Cleanup in document footer text. - reporting/includes/doctext.inc +2009-10-10 12:25 +0000 Janusz Dobrowolski +(1531) Fixed php 5.3 function name conflict. + includes/main.inc + sales/inquiry/sales_orders_view.php -2011-06-18 15:06 +0200 Janusz Dobrowolski -(2823) A couple of additional fixes to changed document reports. - reporting/includes/doctext.inc - reporting/includes/excel_report.inc - reporting/includes/pdf_report.inc - reporting/rep107.php - reporting/rep108.php - reporting/rep109.php - reporting/rep110.php - reporting/rep111.php - reporting/rep113.php - reporting/rep209.php - reporting/rep210.php - reporting/rep409.php +2009-10-10 12:23 +0000 Janusz Dobrowolski +(1530) Fixed error handling for duplicate records. + includes/errors.inc -2011-06-17 14:16 +0200 Janusz Dobrowolski -(2822) Warning in header2.inc fixed - reporting/includes/header2.inc +2009-10-10 12:23 +0000 Janusz Dobrowolski +(1529) Nonaccesable extension menu options dsplayed as text instead of link + applications/customers.php + applications/dimensions.php + applications/generalledger.php + applications/inventory.php + applications/manufacturing.php + applications/setup.php + applications/suppliers.php -2011-06-17 13:45 +0200 Janusz Dobrowolski -(2821) Rewitten document reports layout for easier modifications, support for multiply payment services. - includes/ui/ui_lists.inc - includes/ui/ui_view.inc - purchasing/includes/ui/invoice_ui.inc +2009-10-09 16:21 +0000 Joe Hunt +(1528) Added option to print delivery notes as packing slip in reports and links. + CHANGELOG.txt + includes/ui/ui_controls.inc reporting/includes/doctext.inc + reporting/includes/doctext2.inc reporting/includes/header2.inc reporting/includes/pdf_report.inc - reporting/includes/reports_classes.inc - reporting/rep107.php - reporting/rep108.php - reporting/rep109.php + reporting/includes/reporting.inc reporting/rep110.php - reporting/rep111.php - reporting/rep112.php - reporting/rep113.php - reporting/rep209.php - reporting/rep210.php + reporting/reports_main.php + sales/customer_delivery.php + sales/sales_order_entry.php -2011-06-16 23:41 +0200 Joe Hunt -(2820) 0000877: Bug updating a GL account that is also a bank account. - gl/manage/gl_accounts.php +2009-10-08 22:08 +0000 Joe Hunt +(1527) Minor adjustments + reporting/includes/class.graphic.inc + reporting/includes/reports_classes.inc -2011-06-14 11:09 +0200 Janusz Dobrowolski -(2819) Added hook for authentication from external sources like LDAP. - admin/db/users_db.inc - includes/current_user.inc - includes/hooks.inc - includes/session.inc +2009-10-08 10:25 +0000 Joe Hunt +(1526) Minor bug in currency + reporting/includes/reports_classes.inc -2011-06-14 00:39 +0200 Janusz Dobrowolski -(2818) Price_in_words and retrieve_ex_rate commented out in base hook class (required because of hook_invoke_last usage) - includes/hooks.inc +2009-10-08 09:36 +0000 Joe Hunt +(1525) Prepared the Report Engine for Tags handling. +Changed report::getDisplay() to use combo_input from ui_lists.inc insted of local function dup_simple_codeandname_list(). +Changed a parameter in report 301.php to be Summary Only instead of Detailed report. + CHANGELOG.txt + reporting/includes/reports_classes.inc + reporting/rep301.php + reporting/reports_main.php -2011-06-09 16:07 +0200 Joe Hunt -(2817) Changelog +2009-10-06 22:02 +0000 Joe Hunt +(1524) Show Journal Entries from 2.1 as closed in Journal Inquiries. CHANGELOG.txt + gl/inquiry/journal_inquiry.php -2011-06-09 16:03 +0200 Joe Hunt -(2816) Release 2.3.5 +2009-10-06 11:47 +0000 Joe Hunt +(1523) moved commit_transaction and added a default use_transaction param in write_journal_entries CHANGELOG.txt - update.html - version.php + gl/includes/db/gl_db_trans.inc -2011-06-09 15:27 +0200 Janusz Dobrowolski -(2815) Updated gettext template. +2009-10-03 15:17 +0000 Joe Hunt +(1522) Bad conversion of timestamp value in report audit trail + CHANGELOG.txt + lang/en_US/LC_MESSAGES/en_US.mo lang/new_language_template/LC_MESSAGES/empty.po + reporting/rep710.php -2011-06-08 12:07 +0200 Janusz Dobrowolski -(2814) Cleanup in supplier_invoice.php (obsolete add_grn_to_trans parameter) - purchasing/supplier_invoice.php - -2011-06-08 15:38 +0200 Joe Hunt -(2813) Cleanup setting of customers/suppliers bank account in forms - gl/includes/db/gl_db_bank_accounts.inc - gl/includes/ui/gl_bank_ui.inc - purchasing/supplier_payment.php - sales/customer_payments.php - -2011-06-07 22:54 +0200 Joe Hunt -(2812) Improved setting of default customer / supplier bank account - gl/includes/db/gl_db_bank_accounts.inc - gl/includes/ui/gl_bank_ui.inc +2009-10-03 08:37 +0000 Janusz Dobrowolski +(1521) Changed structure of tag_association table + sql/alter2.2.sql + sql/en_US-demo.sql + sql/en_US-new.sql -2011-06-07 14:58 +0200 Joe Hunt -(2811) Setting customer/supplier currency bank account in payment / deposit forms. - gl/includes/db/gl_db_bank_accounts.inc - gl/includes/ui/gl_bank_ui.inc - purchasing/supplier_payment.php - sales/customer_payments.php +2009-10-03 08:33 +0000 Janusz Dobrowolski +(1520) Fixed false upgrade error displayed in some situations. + access/logout.php -2011-06-07 10:55 +0200 Janusz Dobrowolski -(2810) Fixed javascript bug in price_format for max decimals. - js/utils.js +2009-10-03 08:32 +0000 Janusz Dobrowolski +(1519) Missing old_db declaration + includes/current_user.inc -2011-06-06 12:20 +0200 Janusz Dobrowolski -(2809) Fixed item settings display after data update in Items. - inventory/manage/items.php +2009-10-03 08:31 +0000 Janusz Dobrowolski +(1518) Fixed combo_input and array_selector to to accept array of selected options from POST. + includes/ui/ui_lists.inc -2011-06-06 12:19 +0200 Janusz Dobrowolski -(2808) Timeout on long processing like backup/restore emlarged to 10min - js/inserts.js - js/utils.js +2009-10-01 20:19 +0000 Janusz Dobrowolski +(1517) Added multiply selection support in array_selector. + includes/ui/ui_lists.inc -2011-06-04 17:15 +0200 Joe Hunt -(2807) Improved Creation and ability to edit Last Sent date in Recurrent Invoice - sales/create_recurrent_invoices.php - sales/manage/recurrent_invoices.php +2009-10-01 20:11 +0000 Janusz Dobrowolski +(1516) Added support for multiselect lists, bugfix for modules/plugins access extensions + CHANGELOG.txt -2011-06-03 14:31 +0200 Joe Hunt -(2806) Missing Print/Email links after creating recurrent invoices. - sales/create_recurrent_invoices.php +2009-10-01 20:09 +0000 Janusz Dobrowolski +(1515) Removed sparse add_access_extensions call. + includes/session.inc -2011-05-30 19:47 +0200 Janusz Dobrowolski -(2805) [0000753] Bank deposit/payment edition fixed (rewritten database rewrite scheme to void+add) - gl/gl_bank.php - gl/includes/db/gl_db_banking.inc - gl/includes/db/gl_db_trans.inc +2009-10-01 20:08 +0000 Janusz Dobrowolski +(1514) Added comment on add_access_extensions usage + includes/access_levels.inc -2011-05-30 18:05 +0200 Janusz Dobrowolski -(2804) Customer/branch list was searched on name and not reference. +2009-10-01 20:07 +0000 Janusz Dobrowolski +(1513) Added support for multily selection in combo_input lists. includes/ui/ui_lists.inc -2011-05-30 18:04 +0200 Janusz Dobrowolski -(2803) Fixed Chrome issue with blocked cursor focus when enter is received on empty selectors. - js/inserts.js - -2011-05-30 18:01 +0200 Janusz Dobrowolski -(2802) [0000828] sql rail swiched off during databse restore. - admin/db/maintenance_db.inc - -2011-05-26 10:06 +0200 Joe Hunt -(2801) Added attachment link after most popular entry forms. - gl/gl_bank.php - gl/gl_journal.php - inventory/adjustments.php - manufacturing/work_order_entry.php - sales/credit_note_entry.php - sales/customer_credit_invoice.php - sales/customer_invoice.php - sales/sales_order_entry.php +2009-10-01 20:07 +0000 Janusz Dobrowolski +(1512) Unaccesable menu options are now displayed in grey. + themes/aqua/default.css + themes/aqua/renderer.php + themes/cool/default.css + themes/cool/renderer.php + themes/default/default.css + themes/default/renderer.php -2011-05-25 10:52 +0200 Janusz Dobrowolski -(2800) CSRF checks added in users editor. - admin/users.php +2009-09-30 22:21 +0000 Janusz Dobrowolski +(1511) Fixes to page access checking. + CHANGELOG.txt -2011-05-25 10:16 +0200 Janusz Dobrowolski -(2799) Added CSRF attack prevention on password change. - admin/change_current_user_password.php - includes/ui/ui_controls.inc +2009-09-30 22:20 +0000 Janusz Dobrowolski +(1510) Fixed access to payment when deposits are disabled. + gl/gl_bank.php -2011-05-25 10:16 +0200 Janusz Dobrowolski -(2798) Result return added in add_user/update_user/update_user_password. - admin/db/users_db.inc +2009-09-30 22:19 +0000 Janusz Dobrowolski +(1509) Access level checking moved to page() function to make session start and access checking independent + includes/main.inc + includes/session.inc -2011-05-25 10:15 +0200 Janusz Dobrowolski -(2797) Check added for directory existence in flush_dir() helper +2009-09-30 22:17 +0000 Janusz Dobrowolski +(1508) Back link on upgrade help page. includes/current_user.inc -2011-05-15 20:34 +0200 Janusz Dobrowolski -(2796) [0000806] Branches were repeated in Customer Branches table when more than one general contact defined. - sales/includes/db/branches_db.inc +2009-09-30 17:02 +0000 Joe Hunt +(1507) Renaming sales_quotations.txt + doc/sales_quotations.txt + doc/sales_quotatoins.txt -2011-05-22 16:15 +0200 Joe Hunt -(2795) Wrong Balance in Search Dimension and changing dates in view_dimension didn't work. - dimensions/includes/dimensions_db.inc - dimensions/view/view_dimension.php +2009-09-30 16:38 +0000 Janusz Dobrowolski +(1506) Fixed false error on entry of payment without allocation. + CHANGELOG.txt + purchasing/supplier_payment.php + sales/customer_payments.php -2011-05-22 10:39 +0200 Joe Hunt -(2794) 0000800: Cannot seem to update contact categories as inactive - admin/crm_categories.php +2009-09-30 16:03 +0000 Joe Hunt +(1505) Parse error in view_supp_payment.php + CHANGELOG.txt + purchasing/view/view_supp_payment.php -2011-05-21 11:25 +0200 Joe Hunt -(2793) 0000824: Quick Entries. Problems with latest MySql release. - gl/manage/gl_quick_entries.php +2009-09-30 15:01 +0000 Joe Hunt +(1504) Last minute update of update.html + CHANGELOG.txt + update.html -2011-05-18 09:15 +0200 Joe Hunt -(2792) Changed Print Statements to follow aged customer/supplier list in presentation - reporting/rep108.php - reporting/reports_main.php +2009-09-30 14:36 +0000 Janusz Dobrowolski +(1503) Three smaller fixes + CHANGELOG.txt -2011-05-17 23:22 +0200 Joe Hunt -(2791) Correction in inventory_?db.inc. Chaitanya. - includes/db/inventory_db.inc +2009-09-30 14:35 +0000 Janusz Dobrowolski +(1502) Message typo fixed + sql/alter2.2.php -2011-05-14 09:48 +0200 Janusz Dobrowolski -(2790) [0000802] Fixed selection by date in supplier transactions inquiry. +2009-09-30 14:35 +0000 Janusz Dobrowolski +(1501) Changed tag types array name. + includes/types.inc -2011-05-14 10:09 +0200 Janusz Dobrowolski -(2789) Added helper for catching tabbed content widget change. - includes/ui/ui_controls.inc +2009-09-30 14:34 +0000 Janusz Dobrowolski +(1500) Added missing dimension configuration section + includes/access_levels.inc -2011-05-14 09:45 +0200 Janusz Dobrowolski -(2788) Fixed subheaders gettext in Tial Balance inquiry. - gl/inquiry/gl_trial_balance.php +2009-09-30 13:27 +0000 Joe Hunt +(1499) Trivial errors in not set bank charge account, retained earnings or profit/loss year account + CHANGELOG.txt + admin/fiscalyears.php + purchasing/supplier_payment.php + sales/customer_payments.php -2011-05-14 09:44 +0200 Janusz Dobrowolski -(2787) Fixed problem with GRN clearing account initialization in GL setup. - admin/gl_setup.php +2009-09-30 13:19 +0000 Janusz Dobrowolski +(1498) Single quotes encoded before database data insert. + CHANGELOG.txt + admin/db/maintenance_db.inc + includes/db/connect_db.inc + reporting/includes/tcpdf.php + sales/includes/cart_class.inc -2011-05-14 09:43 +0200 Janusz Dobrowolski -(2786) Fixed wrong date displayed in View/Print transaction for edited journal entries. - admin/db/transactions_db.inc +2009-09-30 10:35 +0000 Joe Hunt +(1497) Updated update.html + includes/prefs/userprefs.inc + sql/alter2.2.php + update.html -2011-05-11 15:03 +0200 Janusz Dobrowolski -(2785) Added strict warnings display as errors in debug mode. - includes/errors.inc +2009-09-30 10:11 +0000 Joe Hunt +(1496) Release 2.2 Beta +Errors in the 2 last user variables in userprefs and parse error in alter2.2.php + CHANGELOG.txt + config.php + doc/2.2_Beta.txt -2011-05-14 09:32 +0200 Joe Hunt -(2784) 0000802: Supplier Inquiry Summary Balance till a date - purchasing/inquiry/supplier_inquiry.php +2009-09-29 21:11 +0000 Janusz Dobrowolski +(1495) Fixed error on inserting refs with single quotes. + sql/alter2.2.php -2011-05-14 09:14 +0200 Joe Hunt -(2783) Fixed a minor bug in balance sheet drill down on screen. Chaitanya. - gl/inquiry/balance_sheet.php +2009-09-29 19:36 +0000 Janusz Dobrowolski +(1494) Changes in tags table structure, tags related security areas added. + CHANGELOG.txt + includes/access_levels.inc + includes/types.inc + sql/alter2.2.php + sql/alter2.2.sql + sql/en_US-demo.sql + sql/en_US-new.sql -2011-05-13 09:29 +0200 Joe Hunt -(2782) 0000799: function void_work_order misses void_bank_trans - manufacturing/includes/db/work_orders_db.inc +2009-09-29 09:12 +0000 Janusz Dobrowolski +(1490) Fixed sql error during sales order line update with line cancelation +(ported). + CHANGELOG.txt + sales/includes/db/sales_order_db.inc -2011-05-12 08:22 +0200 Joe Hunt -(2781) Optimized gl_db_banking.inc, revaluation of AR/AP currencies - gl/includes/db/gl_db_banking.inc +2009-09-29 07:11 +0000 Joe Hunt +(1489) Improved layout on documents etc and new empty language file. + CHANGELOG.txt + doc/2.1_Beta.txt + doc/2.2_Beta.txt + doc/attachments.txt + doc/calculate_price.txt + doc/dim_on_invoice.txt + doc/extensions.txt + doc/quick_entries.txt + doc/recurrent_invoice.txt + doc/sales_quotatoins.txt + lang/new_language_template/LC_MESSAGES/empty.po + update.html -2011-05-10 15:05 +0200 Joe Hunt -(2780) Cleanup inventory_db.inc, work_orders_db.inc and grn_db.inc by Chaitanya - includes/db/inventory_db.inc - manufacturing/includes/db/work_orders_db.inc - purchasing/includes/db/grn_db.inc +2009-09-28 20:37 +0000 Janusz Dobrowolski +(1488) Removed duplicated natsort function in inst_lang.php + CHANGELOG.txt + admin/inst_lang.php -2011-05-10 11:46 +0200 Janusz Dobrowolski -(2779) Fixed backup/restore screen layout displayed in Chrome. - admin/backups.php +2009-09-28 20:29 +0000 Janusz Dobrowolski +(1487) Fixed modules/plugins security extensions inclusion. + includes/access_levels.inc + includes/session.inc -2011-05-10 11:30 +0200 Janusz Dobrowolski -(2778) Current fiscal year in en_US-*.sql set to 2011. - sql/en_US-demo.sql - sql/en_US-new.sql +2009-09-28 15:43 +0000 Janusz Dobrowolski +(1486) initial per company extensions file + company/0/installed_extensions.php -2011-05-10 10:09 +0200 Joe Hunt -(2777) Improved notification in revaluation of currencies and fixed a summation bug. - gl/includes/db/gl_db_banking.inc - gl/manage/revaluate_currencies.php +2009-09-28 15:35 +0000 Janusz Dobrowolski +(1485) Plugins are now registered in installed_extensions.php + modules/installed_modules.php -2011-05-09 20:53 +0200 Joe Hunt -(2776) Using $_POST instead of $_GET when creating Recurrent Invoices. - sales/create_recurrent_invoices.php +2009-09-28 14:52 +0000 Janusz Dobrowolski +(1484) Access level extension inclusions only for active extensions. + includes/access_levels.inc -2011-05-09 16:41 +0200 Janusz Dobrowolski -(2775) Cleanups in ui_msgs.inc and inventory_db.inc - includes/db/inventory_db.inc - includes/ui/ui_msgs.inc +2009-09-28 14:51 +0000 Janusz Dobrowolski +(1483) get_company_extensions() moved. + admin/db/company_db.inc + admin/inst_module.php -2011-05-09 16:40 +0200 Janusz Dobrowolski -(2774) Voided bank transactions removed from bank inquiry. - gl/includes/db/gl_db_bank_trans.inc +2009-09-28 13:53 +0000 Janusz Dobrowolski +(1482) Additional extension system related fixes. + CHANGELOG.txt + admin/db/maintenance_db.inc + admin/inst_module.php -2011-05-09 16:33 +0200 Janusz Dobrowolski -(2773) Fixed recurrent invoices messages, new recurrent invoices now show no last date. - sales/create_recurrent_invoices.php - sales/includes/db/recurrent_invoices_db.inc - sales/manage/recurrent_invoices.php +2009-09-28 13:18 +0000 Janusz Dobrowolski +(1481) Rewritten extensions system, lock up prevention in security roles +editor. + CHANGELOG.txt -2011-05-04 16:55 +0200 Janusz Dobrowolski -(2772) Fixed message on po line removal in purchase invoice. - purchasing/includes/ui/invoice_ui.inc +2009-09-28 13:17 +0000 Janusz Dobrowolski +(1480) Rewritten extensions system to enable per company module/plugin +activation. + admin/create_coy.php + admin/db/maintenance_db.inc + admin/inst_module.php + applications/customers.php + applications/dimensions.php + applications/generalledger.php + applications/inventory.php + applications/manufacturing.php + applications/setup.php + applications/suppliers.php + frontaccounting.php + includes/access_levels.inc + includes/current_user.inc + includes/main.inc + includes/session.inc + includes/ui/ui_lists.inc + installed_extensions.php + sql/alter2.2.php -2011-05-04 16:54 +0200 Janusz Dobrowolski -(2771) Parse error after last changes in bank_transfer.php - gl/bank_transfer.php +2009-09-28 13:15 +0000 Janusz Dobrowolski +(1479) Prevented switching off access to security roles editor for current +user role. + admin/security_roles.php -2011-04-29 13:52 +0200 Janusz Dobrowolski -(2770) Additional checks on bank transaction entry/delete to avoid overdraft in following transactions. - admin/db/voiding_db.inc - gl/bank_transfer.php - gl/gl_bank.php - gl/includes/db/gl_db_bank_trans.inc +2009-09-25 08:54 +0000 Joe Hunt +(1478) Improved login screen. + CHANGELOG.txt + access/login.php + themes/default/login.css -2011-04-29 13:25 +0200 Janusz Dobrowolski -(2769) Fixed amount display at bank deposit view. - gl/view/gl_deposit_view.php +2009-09-24 23:43 +0000 Joe Hunt +(1477) Wrong presentation of qty decimals when trans_no != 0 (delivered) + CHANGELOG.txt + sales/includes/ui/sales_order_ui.inc -2011-05-09 15:30 +0200 Joe Hunt -(2768) Including AR/AP accounts when doing manuelly Revaluation of Currency Accounts - gl/includes/db/gl_db_banking.inc +2009-09-24 19:00 +0000 Janusz Dobrowolski +(1476) Additional secondary phone and/or general notes fields in customers, branches, suppliers, +locations and shippers tables. + CHANGELOG.txt + admin/shipping_companies.php + inventory/includes/db/items_locations_db.inc + inventory/manage/locations.php + purchasing/manage/suppliers.php + sales/manage/customer_branches.php + sales/manage/customers.php + sql/alter2.2.sql + sql/en_US-demo.sql + sql/en_US-new.sql -2011-05-05 23:15 +0200 Joe Hunt -(2765) Allow editing of sales orders in Delivery Against Sales Orders - sales/inquiry/sales_orders_view.php +2009-09-24 08:49 +0000 Joe Hunt +(1475) Parse error + CHANGELOG.txt + sales/inquiry/customer_inquiry.php -2011-05-05 09:41 +0200 Joe Hunt -(2764) Also display company name in warning when pressing delete company. - admin/create_coy.php +2009-09-24 00:08 +0000 Joe Hunt +(1474) Changed login to be dependent only by login.css + CHANGELOG.txt + access/login.php + themes/default/login.css -2011-04-29 13:47 +0200 Joe Hunt -(2763) Fixed summation error in Aged customer/supplier Lists - purchasing/includes/db/suppliers_db.inc - reporting/rep102.php - reporting/rep202.php - sales/includes/db/customers_db.inc +2009-09-23 21:20 +0000 Janusz Dobrowolski +(1473) Bug in report 702 + CHANGELOG.txt -2011-04-28 21:52 +0200 Joe Hunt -(2762) Rerun of Aged Supplier List. - purchasing/includes/db/suppliers_db.inc - reporting/rep202.php +2009-09-23 21:20 +0000 Janusz Dobrowolski +(1472) Fixed blank page when all transaction types were selected. + reporting/rep702.php -2011-04-28 14:29 +0200 Joe Hunt -(2761) Option for Show Also Allocated in Aged Customer/Supplier List. - purchasing/includes/db/suppliers_db.inc - reporting/rep102.php - reporting/rep202.php - reporting/reports_main.php - sales/includes/db/customers_db.inc +2009-09-23 13:07 +0000 Joe Hunt +(1471) missing unset of post variable (DayNumber) + CHANGELOG.txt + admin/payment_terms.php -2011-04-28 14:52 +0200 Janusz Dobrowolski -(2760) Added tax summary to Sales Quotation report. - reporting/rep111.php +2009-09-23 09:30 +0000 Joe Hunt +(1470) Cleaning from javascript errors. + CHANGELOG.txt + access/login.php + admin/fiscalyears.php -2011-04-28 10:59 +0200 Joe Hunt -(2759) Customer Credit Notes should not be included in Print Receipts. - reporting/includes/reports_classes.inc - reporting/rep112.php +2009-09-23 08:59 +0000 Joe Hunt +(1469) Slightly better layout + access/login.php -2011-04-28 01:00 +0200 Janusz Dobrowolski -(2758) Direct sales invoice due date was not stored in database. - sales/includes/cart_class.inc +2009-09-23 00:24 +0000 Joe Hunt +(1468) Changed login.php and logout.php to be neutral and tried to use our own api. +Parse error in login_fail + CHANGELOG.txt + access/login.php + access/logout.php + includes/session.inc -2011-04-27 16:35 +0200 Janusz Dobrowolski -(2756) Added tag version_2_3_4 for changeset b5cb2a38213b - .hgtags +2009-09-22 09:10 +0000 Joe Hunt +(1467) 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. + CHANGELOG.txt + doc/2.2_Beta.txt + doc/sales_quotatoins.txt + install.html + install/index.php + install/save.php + +2009-09-21 19:59 +0000 Janusz Dobrowolski +(1466) Tags related db changes and small changes in 2.2 info file. + CHANGELOG.txt -2011-04-27 15:26 +0200 Joe Hunt -(2755) Rerun of old CHANGELOG.old.txt - doc/CHANGELOG.old.txt +2009-09-21 19:58 +0000 Janusz Dobrowolski +(1465) Added default bank_accounts and imeout info. + doc/2.2_Beta.txt + +2009-09-21 19:58 +0000 Janusz Dobrowolski +(1464) Tags support related changes. + sql/alter2.2.php + sql/alter2.2.sql + sql/en_US-demo.sql + sql/en_US-new.sql -2011-04-27 14:55 +0200 Joe Hunt -(2754) Rerun CHANGELOG.txt +2009-09-20 17:21 +0000 Janusz Dobrowolski +(1463) Fixed debtors_master name size. CHANGELOG.txt + sql/en_US-demo.sql + sql/en_US-new.sql -2011-04-27 14:44 +0200 Joe Hunt -(2753) New ChaNGELOG.txt and empty.po - doc/CHANGELOG.old.txt - lang/new_language_template/LC_MESSAGES/empty.po +2009-09-20 16:36 +0000 Janusz Dobrowolski +(1462) Finished security roles for modules/extensions, a couple of smaller fixes. + CHANGELOG.txt -2011-04-27 10:58 +0200 Joe Hunt -(2752) Release 2.3.4 - version.php +2009-09-20 16:34 +0000 Janusz Dobrowolski +(1461) Optional additional security roles inscludable from modules/extensions. + admin/inst_module.php + admin/security_roles.php + includes/access_levels.inc + installed_extensions.php -2011-04-27 10:45 +0200 Janusz Dobrowolski -(2751) Removed sparse grn item id from purchase invoice entry form. - purchasing/includes/ui/invoice_ui.inc +2009-09-20 16:32 +0000 Janusz Dobrowolski +(1460) Fixed 'bad password' info screen to be usable also in non-js mode. + includes/session.inc -2011-04-26 11:34 +0200 Janusz Dobrowolski -(2750) Fixed bug in create_coy, resulting in database reset on company seting change. - admin/create_coy.php +2009-09-20 16:31 +0000 Janusz Dobrowolski +(1459) Bug in rates display fixed in single form layout. + taxes/tax_groups.php -2011-04-21 18:37 +0200 Janusz Dobrowolski -(2749) [0000619] Fixed javascript related timeout issues. +2009-09-20 16:29 +0000 Janusz Dobrowolski +(1458) Fixed previous interface mode after timeout. access/login.php - access/logout.php - includes/ui/ui_view.inc - js/login.js - -2011-04-21 15:42 +0200 Janusz Dobrowolski -(2748) Cleanups. - includes/db/inventory_db.inc - includes/ui/items_cart.inc -2011-04-21 15:41 +0200 Janusz Dobrowolski -(2747) Added check for duplicate account group code. - gl/manage/gl_account_types.php +2009-09-20 10:15 +0000 Joe Hunt +(1457) Removed editable rate field in tax_group_items. +A start_form and end_form was missing +Design improvement in rep704 + CHANGELOG.txt + reporting/rep704.php + taxes/tax_groups.php -2011-04-21 15:40 +0200 Janusz Dobrowolski -(2746) Fixed php4 compatibility. - admin/db/maintenance_db.inc +2009-09-20 08:33 +0000 Janusz Dobrowolski +(1456) Optional demo data checkbox on install page. + CHANGELOG.txt + install/index.php + install/save.php -2011-04-21 15:39 +0200 Janusz Dobrowolski -(2745) Optional printing item codes on purchase order report with config.php $show_po_item_codes - config.default.php - reporting/rep209.php +2009-09-19 20:25 +0000 Janusz Dobrowolski +(1455) Improved db_pager class, improved customer branches layout, additional fixes. + CHANGELOG.txt -2011-04-21 15:33 +0200 Janusz Dobrowolski -(2744) Entry into Upgrade Software option triggered automatic config.php changes even without starting upgrade. - sql/alter2.3.php +2009-09-19 20:24 +0000 Janusz Dobrowolski +(1454) Code cleanup after db_pager optimization. + admin/view_print_transaction.php + dimensions/inquiry/search_dimensions.php + gl/bank_account_reconcile.php + gl/inquiry/journal_inquiry.php + gl/manage/exchange_rates.php + manufacturing/inquiry/where_used_inquiry.php + manufacturing/search_work_orders.php + purchasing/allocations/supplier_allocation_main.php + purchasing/inquiry/po_search.php + purchasing/inquiry/po_search_completed.php + purchasing/inquiry/supplier_allocation_inquiry.php + purchasing/inquiry/supplier_inquiry.php + sales/allocations/customer_allocation_main.php + sales/inquiry/customer_allocation_inquiry.php + sales/inquiry/customer_inquiry.php + sales/inquiry/sales_deliveries_view.php + sales/inquiry/sales_orders_view.php -2011-04-15 12:59 +0200 Janusz Dobrowolski -(2743) Removed sparse in_ID lang folder. - install/lang/in_ID/LC_MESSAGES/in_ID.mo - install/lang/in_ID/LC_MESSAGES/in_ID.po +2009-09-19 20:21 +0000 Janusz Dobrowolski +(1453) db_pager used instaed of simple table. + sales/manage/customer_branches.php -2011-04-14 01:19 +0200 Joe Hunt -(2742) [0000714] Bug creating GL trans on inventory items in supplier invoice when tax included. - purchasing/includes/db/grn_db.inc - purchasing/includes/db/invoice_db.inc +2009-09-19 20:20 +0000 Janusz Dobrowolski +(1452) Support for inactive record control added, optimizations. + includes/db_pager.inc + includes/ui/db_pager_view.inc -2011-04-13 14:50 +0200 Joe Hunt -(2741) Minor bug in on screen Trial Balance (wrong Dimension warning) - gl/inquiry/gl_trial_balance.php +2009-09-19 20:18 +0000 Janusz Dobrowolski +(1451) Additional fix after removal of bank account report parameter + reporting/rep107.php + sales/create_recurrent_invoices.php -2011-04-13 14:15 +0200 Janusz Dobrowolski -(2740) Restored Sales Quotation option in Customer and Sales Reports - reporting/reports_main.php +2009-09-19 10:22 +0000 Joe Hunt +(1450) Removed auto increment on order_no in sales_orders table + sql/en_US-demo.sql + sql/en_US-new.sql -2011-04-13 11:40 +0200 Janusz Dobrowolski -(2739) Rerun - taxes/tax_calc.inc +2009-09-19 09:11 +0000 Joe Hunt +(1449) Error msg in Bank Transfer if no Bank Charge Account set. + CHANGELOG.txt + gl/bank_transfer.php -2011-04-13 11:10 +0200 Janusz Dobrowolski -(2738) Fixed shipping tax calculation for tax exempt customer. - taxes/tax_calc.inc +2009-09-19 08:55 +0000 Joe Hunt +(1448) Eliminate PT_WORKORDER from payment_person_types_list + CHANGELOG.txt + includes/ui/ui_lists.inc -2011-04-13 09:48 +0200 Joe Hunt -(2737) Suppress zero tax on printed documents. +2009-09-18 22:15 +0000 Janusz Dobrowolski +(1447) Added currency defualt bank accounts used in reporting instead of manually selected account. + CHANGELOG.txt + gl/includes/db/gl_db_bank_accounts.inc + gl/manage/bank_accounts.php + reporting/includes/reporting.inc reporting/rep107.php + reporting/rep108.php reporting/rep109.php - reporting/rep110.php - reporting/rep113.php + reporting/rep111.php reporting/rep209.php + reporting/reports_main.php + sql/alter2.2.sql + sql/en_US-demo.sql + sql/en_US-new.sql -2011-04-13 00:47 +0200 Janusz Dobrowolski -(2736) Additional fixes in tax display/reporting - includes/ui/ui_view.inc - sales/includes/cart_class.inc - sales/sales_order_entry.php - taxes/tax_calc.inc +2009-09-17 15:08 +0000 Joe Hunt +(1446) Added release note file for 2.2 + CHANGELOG.txt + doc/2.2_Beta.txt -2011-04-12 15:40 +0200 Joe Hunt -(2735) [0000712] Work Order issue with 0 qty is accepted - manufacturing/work_order_issue.php +2009-09-16 22:30 +0000 Joe Hunt +(1445) Removing php5 date warnings + CHANGELOG.txt + includes/date_functions.inc -2011-04-12 10:15 +0200 Joe Hunt -(2734) Improved search filter in Void Transactions (like View Print Transactions) - admin/void_transaction.php +2009-09-16 21:48 +0000 Joe Hunt +(1444) Session bordercolor and clean up. + CHANGELOG.txt + admin/display_prefs.php + config.php + update.html -2011-04-11 15:40 +0200 Joe Hunt -(2733) Cleanup Sales Summary Report (again) - reporting/rep114.php +2009-09-16 11:30 +0000 Joe Hunt +(1443) Clean ups in default themes. + CHANGELOG.txt + config.php + reporting/rep101.php + themes/aqua/default.css + themes/cool/default.css + themes/default/default.css -2011-04-11 13:34 +0200 Janusz Dobrowolski -(2732) Fixed shipment tax calculation regresion. - taxes/tax_calc.inc +2009-09-15 17:32 +0000 Janusz Dobrowolski +(1441) Fixed GET continuation after timeot and logout page access without authorization. + CHANGELOG.txt + access/login.php + includes/prefs/userprefs.inc + includes/session.inc -2011-04-10 21:04 +0200 Janusz Dobrowolski -(2731) [0000692] Tab characters should be forbidden in item code. - inventory/manage/items.php +2009-09-15 10:06 +0000 Joe Hunt +(1440) Changed security roles in default COAs + CHANGELOG.txt + sql/en_US-demo.sql + sql/en_US-new.sql -2011-04-10 18:07 +0200 Janusz Dobrowolski -(2730) Fixed excel report redirection (regresion after customer selector in reports improvement). - reporting/includes/excel_report.inc +2009-09-15 09:21 +0000 Joe Hunt +(1439) Restore of the 4 include files in types.inc + CHANGELOG.txt + includes/types.inc -2011-04-10 13:10 +0200 Janusz Dobrowolski -(2729) Not used tax rates removed from edition form display. - includes/ui/ui_view.inc +2009-09-15 07:56 +0000 Joe Hunt +(1438) A couple of minor bugs + CHANGELOG.txt + includes/ui/ui_lists.inc + reporting/includes/reports_classes.inc -2011-04-10 11:41 +0200 Joe Hunt -(2728) Cleanup of on screen Trial Balance - gl/inquiry/gl_trial_balance.php +2009-09-15 07:23 +0000 Janusz Dobrowolski +(1437) Fixed journal entry type and system type lists, code cleanup. + CHANGELOG.txt + includes/types.inc + includes/ui/ui_lists.inc -2011-04-10 11:02 +0200 Janusz Dobrowolski -(2727) [0000707] Fixed sales transaction edition (invalid max quantities for second and next lines) +2009-09-14 21:46 +0000 Joe Hunt +(1436) *** empty log message *** sales/includes/cart_class.inc -2011-04-10 10:43 +0200 Janusz Dobrowolski -(2726) Fixed taxes display for multiply tax types included in price. - taxes/tax_calc.inc - -2011-04-10 10:41 +0200 Janusz Dobrowolski -(2725) Fixed trial balance layout. - gl/inquiry/gl_trial_balance.php - -2011-04-09 13:47 +0200 Janusz Dobrowolski -(2724) db_insert_id() returned wrong id when $sql_trail=1. Nasty bug resulting in unexpected problems in various places. - includes/db/connect_db.inc - -2011-04-09 12:15 +0200 Janusz Dobrowolski -(2723) EOL formatting cleanup. - gl/inquiry/gl_trial_balance.php - reporting/rep114.php - reporting/rep701.php - reporting/rep708.php - reporting/rep709.php - sales/includes/db/sales_order_db.inc - -2011-04-09 11:59 +0200 Janusz Dobrowolski -(2722) Changed tax grup retrieval functions to return all tax types (with filtered tax rates), rewritten tax group editor. +2009-09-14 21:34 +0000 Joe Hunt +(1435) Changed all numeric constants to the new defined constants. A huge task. + CHANGELOG.txt + admin/db/voiding_db.inc + admin/fiscalyears.php + admin/forms_setup.php + admin/view_print_transaction.php + admin/void_transaction.php + gl/includes/db/gl_db_banking.inc gl/includes/db/gl_db_trans.inc + gl/inquiry/journal_inquiry.php + includes/systypes.inc + includes/ui/allocation_cart.inc includes/ui/ui_view.inc - taxes/db/tax_groups_db.inc - taxes/tax_groups.php - -2011-04-07 01:02 +0200 Joe Hunt -(2721) Rerun of Sales Summary Report - reporting/rep114.php - -2011-04-06 23:57 +0200 Joe Hunt -(2720) Cleanup Sales Summary Report - reporting/rep114.php - reporting/reports_main.php - -2011-04-06 15:41 +0200 Joe Hunt -(2719) New report, Sales Summary Report, added under Sales Reports. - reporting/rep114.php - reporting/reports_main.php + inventory/inquiry/stock_movements.php + manufacturing/includes/db/work_order_issues_db.inc + manufacturing/includes/db/work_order_produce_items_db.inc + manufacturing/view/wo_production_view.php + purchasing/allocations/supplier_allocation_main.php + purchasing/includes/db/grn_db.inc + purchasing/includes/db/invoice_db.inc + purchasing/includes/db/supp_payment_db.inc + purchasing/includes/db/supp_trans_db.inc + purchasing/includes/db/suppalloc_db.inc + purchasing/includes/db/suppliers_db.inc + purchasing/includes/ui/grn_ui.inc + purchasing/includes/ui/invoice_ui.inc + purchasing/inquiry/supplier_allocation_inquiry.php + purchasing/inquiry/supplier_inquiry.php + purchasing/po_receive_items.php + purchasing/supplier_credit.php + purchasing/supplier_invoice.php + purchasing/supplier_payment.php + purchasing/view/view_grn.php + purchasing/view/view_po.php + purchasing/view/view_supp_credit.php + purchasing/view/view_supp_invoice.php + purchasing/view/view_supp_payment.php + reporting/includes/reporting.inc + reporting/includes/reports_classes.inc + reporting/rep101.php + reporting/rep102.php + reporting/rep103.php + reporting/rep105.php + reporting/rep106.php + reporting/rep107.php + reporting/rep108.php + reporting/rep109.php + reporting/rep110.php + reporting/rep111.php + reporting/rep201.php + reporting/rep202.php + reporting/rep203.php + reporting/rep304.php + reporting/rep409.php + reporting/rep709.php + sales/create_recurrent_invoices.php + sales/credit_note_entry.php + sales/customer_credit_invoice.php + sales/customer_delivery.php + sales/customer_invoice.php + sales/customer_payments.php + sales/includes/cart_class.inc + sales/includes/db/cust_trans_db.inc + sales/includes/db/custalloc_db.inc + sales/includes/db/payment_db.inc + sales/includes/db/sales_credit_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/customer_inquiry.php + sales/inquiry/sales_deliveries_view.php + sales/inquiry/sales_orders_view.php + sales/manage/recurrent_invoices.php + sales/sales_order_entry.php + sales/view/view_credit.php + sales/view/view_dispatch.php + sales/view/view_invoice.php + sales/view/view_sales_order.php -2011-04-05 14:03 +0200 Joe Hunt -(2718) Cleanup Trial Report - reporting/rep708.php +2009-09-14 06:15 +0000 Janusz Dobrowolski +(1433) Fixed syntax typo. + gl/view/gl_trans_view.php -2011-04-05 00:16 +0200 Joe Hunt -(2717) Improved reports, COA, Trial Balance and Tax Report by Chaitanya. - reporting/rep701.php - reporting/rep708.php - reporting/rep709.php +2009-09-13 21:33 +0000 Janusz Dobrowolski +(1432) *** empty log message *** + CHANGELOG.txt -2011-04-04 15:57 +0200 Joe Hunt -(2716) Fixed logout error when setting show users online. - admin/db/users_db.inc +2009-09-13 21:21 +0000 Janusz Dobrowolski +(1431) Big rewrite to eleminate sparse warnings in error log. + CHANGELOG.txt -2011-04-04 14:06 +0200 Janusz Dobrowolski -(2715) Fixed error handling in trace debug mode (go_debug=2) +2009-09-13 21:17 +0000 Janusz Dobrowolski +(1430) Eliminated non-static method calls and some more fixes to avoid log warnings on php4&5 + includes/JsHttpRequest.php + includes/banking.inc includes/errors.inc - includes/ui/ui_msgs.inc + includes/lang/gettext.php + includes/lang/language.php + includes/main.inc + includes/page/footer.inc + includes/prefs/sysprefs.inc + includes/prefs/userprefs.inc + includes/references.inc + includes/reserved.inc + includes/session.inc + includes/types.inc + includes/ui/allocation_cart.inc + includes/ui/items_cart.inc + includes/ui/ui_globals.inc + includes/ui/ui_lists.inc includes/ui/ui_view.inc -2011-04-03 23:58 +0200 Joe Hunt -(2714) Display bank balance in payment forms. +2009-09-13 21:14 +0000 Janusz Dobrowolski +(1429) Eliminated non-static method calls and other bulk fixes to fix php5 warnings + admin/db/voiding_db.inc + admin/display_prefs.php + admin/fiscalyears.php + admin/forms_setup.php + admin/view_print_transaction.php + admin/void_transaction.php + dimensions/dimension_entry.php + dimensions/includes/dimensions_db.inc + dimensions/inquiry/search_dimensions.php + dimensions/view/view_dimension.php + frontaccounting.php + gl/bank_account_reconcile.php gl/bank_transfer.php + gl/gl_bank.php + gl/gl_journal.php + gl/includes/db/gl_db_banking.inc + gl/includes/db/gl_db_trans.inc gl/includes/ui/gl_bank_ui.inc gl/inquiry/bank_inquiry.php - includes/ui/ui_input.inc - purchasing/supplier_payment.php - -2011-04-02 10:51 +0200 Janusz Dobrowolski -(2713) Added tag version_2_3_3 for changeset 074d18d3b920 - .hgtags - -2011-04-01 13:36 +0200 Janusz Dobrowolski -(2710) Fixed upgrade routines from 2.1.x versions. - admin/db/company_db.inc - sql/alter2.2.php - -2011-04-01 12:54 +0200 Janusz Dobrowolski -(2709) Debugging cod in maintenance_db.inc commented out - admin/db/maintenance_db.inc - -2011-03-31 22:54 +0200 Joe Hunt -(2708) Version 2.3.3. All install language templates updated. - install/lang/ar_EG/LC_MESSAGES/ar_EG.mo - install/lang/ar_EG/LC_MESSAGES/ar_EG.po - install/lang/da_DK/LC_MESSAGES/da_DK.mo - install/lang/da_DK/LC_MESSAGES/da_DK.po - install/lang/de_DE/LC_MESSAGES/de_DE.mo - install/lang/de_DE/LC_MESSAGES/de_DE.po - install/lang/el_GR/LC_MESSAGES/el_GR.mo - install/lang/el_GR/LC_MESSAGES/el_GR.po - install/lang/es_MX/LC_MESSAGES/es_MX.mo - install/lang/es_MX/LC_MESSAGES/es_MX.po - install/lang/fr_FR/LC_MESSAGES/fr_FR.mo - install/lang/fr_FR/LC_MESSAGES/fr_FR.po - install/lang/id_ID/LC_MESSAGES/id_ID.mo - install/lang/id_ID/LC_MESSAGES/id_ID.po - install/lang/in_ID/LC_MESSAGES/in_ID.mo - install/lang/in_ID/LC_MESSAGES/in_ID.po - install/lang/it_IT/LC_MESSAGES/it_IT.mo - install/lang/it_IT/LC_MESSAGES/it_IT.po - install/lang/ka_GE/LC_MESSAGES/ka_GE.mo - install/lang/ka_GE/LC_MESSAGES/ka_GE.po - install/lang/new_language_template/LC_MESSAGES/empty.po - install/lang/nl_BE/LC_MESSAGES/nl_BE.mo - install/lang/nl_BE/LC_MESSAGES/nl_BE.po - install/lang/pl_PL/LC_MESSAGES/pl_PL.mo - install/lang/pl_PL/LC_MESSAGES/pl_PL.po - install/lang/pt_BR/LC_MESSAGES/pt_BR.mo - install/lang/pt_BR/LC_MESSAGES/pt_BR.po - install/lang/sv_SE/LC_MESSAGES/sv_SE.mo - install/lang/sv_SE/LC_MESSAGES/sv_SE.po - install/lang/zh_CN/LC_MESSAGES/zh_CN.mo - install/lang/zh_CN/LC_MESSAGES/zh_CN.po - version.php - -2011-03-31 22:51 +0200 Joe Hunt -(2707) New style CHANGELOG.txt (Automatic). Old CHANGELOG saved in new file in doc folder. - CHANGELOG.txt - doc/CHANGELOG.old.txt - -2011-03-31 11:09 +0200 Janusz Dobrowolski -(2706) Updated main and installer language templates. - install/lang/new_language_template/LC_MESSAGES/empty.po - install/lang/pl_PL/LC_MESSAGES/pl_PL.mo - install/lang/pl_PL/LC_MESSAGES/pl_PL.po - lang/new_language_template/LC_MESSAGES/empty.po - -2011-03-31 10:36 +0200 Janusz Dobrowolski -(2705) [0000695] Problem with cash balance constraint during payment edition fixed. - gl/gl_bank.php - includes/ui/items_cart.inc - -2011-03-30 09:45 +0200 Joe Hunt -(2704) Missing restriction on fiscal year in direct GRN and direct Supp Invoice - purchasing/po_entry_items.php - purchasing/po_receive_items.php - -2011-03-28 09:25 +0200 Joe Hunt -(2703) [0000691] Error updating BOM - includes/db/manufacturing_db.inc - -2011-03-27 00:55 +0100 Joe Hunt -(2702) Warning if line price is below standard cost in sales documents. - sales/sales_order_entry.php - -2011-03-26 15:30 +0100 Joe Hunt -(2701) Added customer filter in sales order inquiries. - sales/includes/db/sales_order_db.inc - sales/inquiry/sales_orders_view.php - -2011-03-26 12:18 +0100 Janusz Dobrowolski -(2700) Cleanup in add_months() - includes/date_functions.inc - -2011-03-26 11:54 +0100 Janusz Dobrowolski -(2699) EOL cleanup. + gl/inquiry/gl_account_inquiry.php + gl/inquiry/journal_inquiry.php + gl/manage/bank_accounts.php + gl/manage/gl_account_types.php + gl/view/bank_transfer_view.php + gl/view/gl_deposit_view.php + gl/view/gl_payment_view.php + gl/view/gl_trans_view.php + inventory/adjustments.php inventory/cost_update.php inventory/includes/db/items_adjust_db.inc inventory/includes/db/items_trans_db.inc diff --cc config.default.php index 5cd7fe20,ae6668ef..a932d258 --- a/config.default.php +++ b/config.default.php @@@ -222,26 -219,44 +222,45 @@@ if(isset($_SESSION["wa_current_user"]) if (!defined('ICON_EDIT')) { - define("ICON_EDIT", "edit.gif"); - define("ICON_DELETE", "delete.gif"); - define("ICON_ADD", "ok.gif"); - define("ICON_UPDATE", "ok.gif"); - define("ICON_OK", "ok.gif"); - define("ICON_CANCEL", "cancel.png"); - define("ICON_GL", "gl.png"); - define("ICON_PRINT", "print.png"); - define("ICON_PDF", "pdf.gif"); - define("ICON_DOC", "invoice.gif"); - define("ICON_CREDIT", "credit.gif"); - define("ICON_RECEIVE", "receive.gif"); - define("ICON_DOWN", "download.gif"); - define("ICON_MONEY", "money.png"); - define("ICON_REMOVE", "remove.png"); - define("ICON_REPORT", "report.png"); - define("ICON_VIEW", "view.gif"); + define("ICON_EDIT", "edit.gif"); + define("ICON_DELETE", "delete.gif"); + define("ICON_ADD", "ok.gif"); + define("ICON_UPDATE", "ok.gif"); + define("ICON_OK", "ok.gif"); + define("ICON_CANCEL", "cancel.png"); + define("ICON_GL", "gl.png"); + define("ICON_PRINT", "print.png"); + define("ICON_PDF", "pdf.gif"); + define("ICON_DOC", "invoice.gif"); + define("ICON_CREDIT", "credit.gif"); + define("ICON_RECEIVE", "receive.gif"); + define("ICON_DOWN", "download.gif"); + define("ICON_MONEY", "money.png"); + define("ICON_REMOVE", "remove.png"); + define("ICON_REPORT", "report.png"); + define("ICON_VIEW", "view.gif"); define("ICON_SUBMIT", "ok.gif"); - define("ICON_ESCAPE", "escape.png"); + define("ICON_ESCAPE", "escape.png"); + define("ICON_CLOSED", "closed.png"); } - ?> + /* + Display a dropdown select box for choosing Company to login if false. + Show a blank editbox only if true where the Company NickName + will have to be manually entered. This is when privacy is needed. + */ + $text_company_selection = false; + + /* Should FA hide menu items (Applications, Modules, and Actions) from the user if they don't have access to them? + 0 for no 1 for yes + */ + + $hide_inaccessible_menu_items = 0; + + /* + Brute force prevention. + $login_delay seconds delay is required between login attempts after $login_max_attemps failed logins. + Set $login_delay to 0 to disable the feature (not recommended) + */ + $login_delay = 30; + $login_max_attempts = 10; diff --cc gl/includes/db/gl_db_trans.inc index ea4b38e2,0134776b..310194e3 --- a/gl/includes/db/gl_db_trans.inc +++ b/gl/includes/db/gl_db_trans.inc @@@ -661,11 -634,7 +661,10 @@@ function get_sql_for_journal_inquiry($f if (!$alsoclosed) { $sql .= " AND gl_seq=0"; } + else + $sql .= " AND NOT ISNULL(a.gl_seq)"; + - $sql .= " GROUP BY tran_date, gl_seq, gl.type, gl.type_no"; - + $sql .= " GROUP BY gl.tran_date, a.gl_seq, gl.type, gl.type_no"; return $sql; } ?> diff --cc includes/db/connect_db.inc index ecd84249,b0c33f64..ec9e3816 --- a/includes/db/connect_db.inc +++ b/includes/db/connect_db.inc @@@ -295,8 -174,7 +295,8 @@@ function db_create_db($connection $connection["dbuser"], $connection["dbpassword"]); if (!mysql_select_db($connection["dbname"], $db)) { - $sql = "CREATE DATABASE " . $connection["dbname"] . " COLLATE ".get_mysql_collation(); - $sql = "CREATE DATABASE IF NOT EXISTS " . $connection["dbname"] . ""; ++ $sql = "CREATE DATABASE IF NOT EXISTS " . $connection["dbname"] . " COLLATE ".get_mysql_collation(); + if (!mysql_query($sql) || !mysql_select_db($connection["dbname"], $db)) return 0; } diff --cc includes/db_pager.inc index f06d6501,36afb923..b099e3dd --- a/includes/db_pager.inc +++ b/includes/db_pager.inc @@@ -258,8 -281,14 +258,13 @@@ class db_pager } } } - if (count($ord)) { - $sql .= " ORDER BY " . implode($ord, ','); + $ord = array_map(function_exists('mysql_real_escape_string') ? + 'mysql_real_escape_string': 'mysql_escape_string', $ord); + $sql .= " ORDER BY " . implode(',', $ord); + } else { + if($order) + $sql .= " ORDER BY $order"; // original base query order } $page_len = $this->page_len; diff --cc install/lang/new_language_template/LC_MESSAGES/empty.po index 804d5ae2,0ab8bff5..4c2227d7 --- a/install/lang/new_language_template/LC_MESSAGES/empty.po +++ b/install/lang/new_language_template/LC_MESSAGES/empty.po @@@ -8,7 -8,7 +8,7 @@@ msgid " msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2012-02-29 09:49+0100\n" -"POT-Creation-Date: 2012-03-07 20:46+0100\n" ++"POT-Creation-Date: 2012-09-18 14:11+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@@ -17,486 -17,486 +17,508 @@@ "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" --#: install/index.php:20 install/index.php:41 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:20 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:41 msgid "FrontAccouting ERP Installation Wizard" msgstr "" --#: install/index.php:42 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:42 #, php-format msgid "Step %d: %s" msgstr "" --#: install/index.php:49 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:49 msgid "Chart of accounts" msgstr "" --#: install/index.php:49 install/index.php:76 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:49 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:76 msgid "Encoding" msgstr "" --#: install/index.php:49 install/index.php:76 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:49 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:76 msgid "Description" msgstr "" --#: install/index.php:49 install/index.php:76 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:49 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:76 msgid "Install" msgstr "" --#: install/index.php:66 install/index.php:94 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:66 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:94 msgid "Installed" msgstr "" --#: install/index.php:76 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:76 msgid "Language" msgstr "" --#: install/index.php:124 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:124 msgid "" "Cannot connect to database. User or password is invalid or you have no " "permittions to create database." msgstr "" --#: install/index.php:160 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:160 msgid "Cannot save system configuration file 'config.php'." msgstr "" --#: install/index.php:167 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:167 msgid "Cannot open 'config_db.php' configuration file." msgstr "" --#: install/index.php:170 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:170 msgid "Cannot write to the 'config_db.php' configuration file." msgstr "" --#: install/index.php:173 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:173 msgid "" "Configuration file 'config_db.php' is not writable. Change its permissions " "so it is, then re-run installation step." msgstr "" --#: install/index.php:211 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:211 msgid "Host name cannot be empty." msgstr "" --#: install/index.php:215 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:215 msgid "Database user name cannot be empty." msgstr "" --#: install/index.php:219 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:219 msgid "Database name cannot be empty." msgstr "" --#: install/index.php:272 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:272 msgid "Company name cannot be empty." msgstr "" --#: install/index.php:276 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:276 msgid "Company admin name cannot be empty." msgstr "" --#: install/index.php:280 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:280 msgid "Company admin password cannot be empty." msgstr "" --#: install/index.php:284 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:284 msgid "Company admin passwords differ." msgstr "" --#: install/index.php:316 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:316 msgid "System Diagnostics" msgstr "" --#: install/index.php:318 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:318 msgid "Select install wizard language:" msgstr "" --#: install/index.php:324 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:324 msgid "" "All application preliminary requirements seems to be correct. Please press " "Continue button below." msgstr "" --#: install/index.php:325 install/index.php:351 install/index.php:358 --#: install/index.php:365 install/index.php:389 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:325 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:351 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:358 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:365 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:389 msgid "Continue >>" msgstr "" --#: install/index.php:327 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:327 msgid "" "Application cannot be installed. Please fix problems listed below in red, " "and press Refresh button." msgstr "" --#: install/index.php:328 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:328 msgid "Refresh" msgstr "" --#: install/index.php:338 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:338 msgid "Database Server Settings" msgstr "" --#: install/index.php:340 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:340 msgid "Server Host:" msgstr "" --#: install/index.php:341 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:341 msgid "Database User:" msgstr "" --#: install/index.php:342 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:342 msgid "Database Password:" msgstr "" --#: install/index.php:343 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:343 msgid "Database Name:" msgstr "" --#: install/index.php:344 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:344 msgid "Use '0_' Table Prefix:" msgstr "" --#: install/index.php:344 includes/system_tests.inc:38 --#: includes/system_tests.inc:113 includes/system_tests.inc:126 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:344 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:38 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:113 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:126 msgid "Yes" msgstr "" --#: install/index.php:344 includes/system_tests.inc:38 --#: includes/system_tests.inc:113 includes/system_tests.inc:126 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:344 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:38 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:113 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:126 msgid "No" msgstr "" --#: install/index.php:345 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:345 msgid "Install Additional Language Packs from FA Repository:" msgstr "" --#: install/index.php:346 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:346 msgid "Install Additional COAs from FA Repository:" msgstr "" --#: install/index.php:348 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:348 msgid "" "Use table prefix if you share selected database for more than one FA company." msgstr "" --#: install/index.php:349 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:349 msgid "" "Do not select additional langs nor COAs if you have no working internet " "connection right now. You can install them later." msgstr "" --#: install/index.php:350 install/index.php:357 install/index.php:364 --#: install/index.php:388 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:350 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:357 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:364 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:388 msgid "<< Back" msgstr "" --#: install/index.php:355 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:355 msgid "User Interface Languages Selection" msgstr "" --#: install/index.php:362 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:362 msgid "Charts of Accounts Selection" msgstr "" --#: install/index.php:379 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:379 msgid "Company Settings" msgstr "" --#: install/index.php:381 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:381 msgid "Company Name:" msgstr "" --#: install/index.php:382 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:382 msgid "Admin Login:" msgstr "" --#: install/index.php:383 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:383 msgid "Admin Password:" msgstr "" --#: install/index.php:384 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:384 msgid "Reenter Password:" msgstr "" --#: install/index.php:385 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:385 msgid "Select Chart of Accounts:" msgstr "" --#: install/index.php:386 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:386 msgid "Select Default Language:" msgstr "" --#: install/index.php:393 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:393 msgid "FrontAccounting ERP has been installed successsfully." msgstr "" --#: install/index.php:394 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:394 msgid "Please do not forget to remove install wizard folder." msgstr "" --#: install/index.php:397 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:397 msgid "Click here to start." msgstr "" --#: includes/system_tests.inc:15 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:15 msgid "Info" msgstr "" --#: includes/system_tests.inc:16 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:16 msgid "Optional" msgstr "" --#: includes/system_tests.inc:17 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:17 msgid "Recommended" msgstr "" --#: includes/system_tests.inc:18 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:18 msgid "Required " msgstr "" --#: includes/system_tests.inc:24 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:24 msgid "MySQL version" msgstr "" --#: includes/system_tests.inc:28 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:28 msgid "Upgrade MySQL server to version at least 4.1" msgstr "" --#: includes/system_tests.inc:35 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:35 msgid "PHP MySQL extension" msgstr "" --#: includes/system_tests.inc:40 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:40 msgid "Your PHP has to have MySQL extension enabled." msgstr "" --#: includes/system_tests.inc:46 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:46 msgid "PHP version" msgstr "" --#: includes/system_tests.inc:50 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:50 msgid "Upgrade PHP to version at least 4.3.3" msgstr "" --#: includes/system_tests.inc:57 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:57 msgid "Server system" msgstr "" --#: includes/system_tests.inc:67 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:67 msgid "Session save path" msgstr "" --#: includes/system_tests.inc:79 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:79 msgid "Removed install wizard folder" msgstr "" --#: includes/system_tests.inc:82 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:82 msgid "Not removed" msgstr "" --#: includes/system_tests.inc:83 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:83 msgid "Remove or rename install wizard folder for security reasons." msgstr "" --#: includes/system_tests.inc:90 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:90 msgid "Browser type" msgstr "" --#: includes/system_tests.inc:94 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:94 msgid "Any browser is supported" msgstr "" --#: includes/system_tests.inc:101 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:101 msgid "Http server type" msgstr "" --#: includes/system_tests.inc:105 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:105 msgid "Any server is supported" msgstr "" --#: includes/system_tests.inc:112 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:112 msgid "Native gettext" msgstr "" --#: includes/system_tests.inc:116 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:116 msgid "In case of no gettext support, php emulation is used" msgstr "" --#: includes/system_tests.inc:124 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:124 msgid "Debugging mode" msgstr "" --#: includes/system_tests.inc:128 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:128 msgid "To switch debugging on set $go_debug>0 in config.php file" msgstr "" --#: includes/system_tests.inc:137 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:137 msgid "Error logging" msgstr "" --#: includes/system_tests.inc:145 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:145 msgid "Disabled" msgstr "" --#: includes/system_tests.inc:148 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:148 msgid "To switch error logging set $error_logging in config.php file" msgstr "" --#: includes/system_tests.inc:151 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:151 msgid "Log file is not writeable" msgstr "" --#: includes/system_tests.inc:161 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:161 msgid "Current database version" msgstr "" --#: includes/system_tests.inc:165 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:165 msgid "Database structure seems to be not upgraded to current version" msgstr "" --#: includes/system_tests.inc:180 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:180 msgid "Company subdirectories consistency" msgstr "" --#: includes/system_tests.inc:193 includes/system_tests.inc:200 --#: includes/system_tests.inc:208 includes/system_tests.inc:225 --#: includes/system_tests.inc:340 includes/system_tests.inc:349 --#: includes/system_tests.inc:358 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:193 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:200 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:208 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:225 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:340 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:349 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:358 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:366 #, php-format msgid "'%s' is not writeable" msgstr "" --#: includes/system_tests.inc:221 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:221 msgid "Temporary directory" msgstr "" --#: includes/system_tests.inc:233 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:233 msgid "Language configuration consistency" msgstr "" --#: includes/system_tests.inc:242 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:242 msgid "Languages folder should be writeable." msgstr "" --#: includes/system_tests.inc:251 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:251 msgid "Languages configuration file should be writeable." msgstr "" --#: includes/system_tests.inc:270 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:270 #, php-format msgid "Missing %s translation file." msgstr "" --#: includes/system_tests.inc:275 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:275 #, php-format msgid "Missing system locale: %s" msgstr "" --#: includes/system_tests.inc:288 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:288 msgid "Main config file" msgstr "" --#: includes/system_tests.inc:295 includes/system_tests.inc:317 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:295 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:317 #, php-format msgid "Can't write '%s' file. Check FA directory write permissions." msgstr "" --#: includes/system_tests.inc:296 includes/system_tests.inc:318 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:296 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:318 #, php-format msgid "'%s' file exists." msgstr "" --#: includes/system_tests.inc:300 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:300 #, php-format msgid "'%s' file should be read-only" msgstr "" --#: includes/system_tests.inc:309 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:309 msgid "Database auth file" msgstr "" --#: includes/system_tests.inc:322 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:322 #, php-format msgid "" "'%s' file should be read-only if you do not plan to add or change companies" msgstr "" --#: includes/system_tests.inc:333 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:333 msgid "Extensions system" msgstr "" --#: includes/system_tests.inc:363 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:371 msgid "Extensions configuration files and directories should be writeable" msgstr "" --#: includes/system_tests.inc:375 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:384 #, php-format msgid "Non-standard theme directory '%s' is not writable" msgstr "" --#: includes/system_tests.inc:385 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:394 msgid "" "OpenSSL PHP extension have to be enabled to use extension repository system." msgstr "" --#: includes/system_tests.inc:388 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:397 msgid "" "OpenSSL have to be available on your server to use extension repository " "system." msgstr "" --#: includes/system_tests.inc:411 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:420 msgid "Test" msgstr "" --#: includes/system_tests.inc:411 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:420 msgid "Test type" msgstr "" --#: includes/system_tests.inc:411 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:420 msgid "Value" msgstr "" --#: includes/system_tests.inc:411 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:420 msgid "Comments" msgstr "" --#: includes/system_tests.inc:435 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:444 msgid "Ok" msgstr "" --#: includes/packages.inc:190 ++#: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:190 #, php-format msgid "No key field '%s' in file '%s'" msgstr "" --#: includes/packages.inc:295 includes/packages.inc:329 ++#: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:295 ++#: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:329 #, php-format msgid "Cannot delete outdated '%s' file." msgstr "" --#: includes/packages.inc:299 ++#: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:299 msgid "Release file in repository is invalid, or public key is outdated." msgstr "" --#: includes/packages.inc:316 ++#: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:316 msgid "Repository version does not match application version." msgstr "" --#: includes/packages.inc:333 ++#: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:333 #, php-format msgid "" "Security alert: broken index file in repository '%s'. Please inform " "repository administrator about this issue." msgstr "" --#: includes/packages.inc:366 ++#: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:366 #, php-format msgid "" "Security alert: broken package '%s' in repository. Please inform repository " "administrator about this issue." msgstr "" --#: includes/packages.inc:621 includes/packages.inc:672 ++#: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:621 ++#: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:672 #, php-format msgid "Package '%s' not found." msgstr "" diff --cc install/lang/pl_PL/LC_MESSAGES/pl_PL.mo index 702f65af,702f65af..2bc5ea9b Binary files differ diff --cc install/lang/pl_PL/LC_MESSAGES/pl_PL.po index 210033b0,3ad76a1b..5fc3546d --- a/install/lang/pl_PL/LC_MESSAGES/pl_PL.po +++ b/install/lang/pl_PL/LC_MESSAGES/pl_PL.po @@@ -7,481 -7,492 +7,535 @@@ msgid " msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2010-08-08 12:50+0200\n" -"POT-Creation-Date: 2011-03-31 10:54+0200\n" ++"POT-Creation-Date: 2012-09-18 14:11+0200\n" "PO-Revision-Date: \n" -"Last-Translator: Translation Team \n" +"Last-Translator: Janusz Dobrowolski \n" "Language-Team: \n" + "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" - #: /var/www/fa2.3/devel/../install/index.php:20 - #: /var/www/fa2.3/devel/../install/index.php:40 -#: install/index.php:20 -#: install/index.php:40 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:20 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:41 msgid "FrontAccouting ERP Installation Wizard" msgstr "Instalator FrontAccounting ERP" - #: /var/www/fa2.3/devel/../install/index.php:41 -#: install/index.php:41 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:42 #, php-format msgid "Step %d: %s" msgstr "Krok %d: %s" - #: /var/www/fa2.3/devel/../install/index.php:48 -#: install/index.php:48 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:49 msgid "Chart of accounts" msgstr "Plan kont" - #: /var/www/fa2.3/devel/../install/index.php:48 - #: /var/www/fa2.3/devel/../install/index.php:75 -#: install/index.php:48 -#: install/index.php:75 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:49 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:76 msgid "Encoding" msgstr "Kodowanie" - #: /var/www/fa2.3/devel/../install/index.php:48 - #: /var/www/fa2.3/devel/../install/index.php:75 -#: install/index.php:48 -#: install/index.php:75 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:49 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:76 msgid "Description" msgstr "Opis" - #: /var/www/fa2.3/devel/../install/index.php:48 - #: /var/www/fa2.3/devel/../install/index.php:75 -#: install/index.php:48 -#: install/index.php:75 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:49 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:76 msgid "Install" msgstr "Zainstaluj" - #: /var/www/fa2.3/devel/../install/index.php:65 - #: /var/www/fa2.3/devel/../install/index.php:93 -#: install/index.php:65 -#: install/index.php:93 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:66 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:94 msgid "Installed" msgstr "Zainstalowany" - #: /var/www/fa2.3/devel/../install/index.php:75 -#: install/index.php:75 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:76 msgid "Language" msgstr "Jêzyk" - #: /var/www/fa2.3/devel/../install/index.php:156 -#: install/index.php:123 -msgid "Cannot connect to database. User or password is invalid or you have no permittions to create database." -msgstr "Nie mo¿na po³aæzyæ siê z baz± danych. Login lub has³o jest niepoprawne, lub brak uprawnieñ do tworzenia bazy danych." ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:124 ++msgid "" ++"Cannot connect to database. User or password is invalid or you have no " ++"permittions to create database." ++msgstr "" + -#: install/index.php:159 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:160 msgid "Cannot save system configuration file 'config.php'." msgstr "Nie mo¿na zapisaæ pliku konfiguracyjnego 'config.php'." - #: /var/www/fa2.3/devel/../install/index.php:173 -#: install/index.php:166 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:167 msgid "Cannot open 'config_db.php' configuration file." msgstr "Nie mo¿na utworzyæ pliku konfiguracji 'config_db.php'." - #: /var/www/fa2.3/devel/../install/index.php:176 -#: install/index.php:169 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:170 msgid "Cannot write to the 'config_db.php' configuration file." msgstr "Nie mo¿na zapisaæ pliku konfiguracji 'config_db.php'." - #: /var/www/fa2.3/devel/../install/index.php:179 -#: install/index.php:172 -msgid "Configuration file 'config_db.php' is not writable. Change its permissions so it is, then re-run installation step." -msgstr "Plik konfiguracji 'config_db.php' jest zabezpieczony przed zapisem. Zmieñ prawa dostêpu i powtórz krok instalacji." ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:173 +msgid "" +"Configuration file 'config_db.php' is not writable. Change its permissions " +"so it is, then re-run installation step." +msgstr "" +"Plik konfiguracji 'config_db.php' jest zabezpieczony przed zapisem. Zmieñ " +"prawa dostêpu i powtórz krok instalacji." - #: /var/www/fa2.3/devel/../install/index.php:217 -#: install/index.php:211 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:211 msgid "Host name cannot be empty." msgstr "Adres serwera nie mo¿e byæ pusty." - #: /var/www/fa2.3/devel/../install/index.php:221 -#: install/index.php:215 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:215 msgid "Database user name cannot be empty." msgstr "Nazwa u¿ytkownika nie mo¿e by pusta." - #: /var/www/fa2.3/devel/../install/index.php:225 -#: install/index.php:219 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:219 msgid "Database name cannot be empty." msgstr "Nazwa bazy danych nie mo¿e byæ pusta." - #: /var/www/fa2.3/devel/../install/index.php:277 -#: install/index.php:272 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:272 msgid "Company name cannot be empty." msgstr "Nazwa firmy nie mo¿e by pusta." - #: /var/www/fa2.3/devel/../install/index.php:281 -#: install/index.php:276 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:276 msgid "Company admin name cannot be empty." msgstr "Nazwa administratora nie mo¿e byæ pusta." - #: /var/www/fa2.3/devel/../install/index.php:285 -#: install/index.php:280 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:280 msgid "Company admin password cannot be empty." msgstr "Has³o administratora nie mo¿e by puste." - #: /var/www/fa2.3/devel/../install/index.php:289 -#: install/index.php:284 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:284 msgid "Company admin passwords differ." msgstr "Wprowadzone has³a ró¿ni± siê." - #: /var/www/fa2.3/devel/../install/index.php:320 -#: install/index.php:316 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:316 msgid "System Diagnostics" msgstr "Diagnostyka Systemu" - #: /var/www/fa2.3/devel/../install/index.php:323 -#: install/index.php:318 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:318 msgid "Select install wizard language:" msgstr "Wybierz jêzyk u¿ywany przy instalacji:" - #: /var/www/fa2.3/devel/../install/index.php:329 -#: install/index.php:324 -msgid "All application preliminary requirements seems to be correct. Please press Continue button below." -msgstr "Wszystkie wymagania systemu wydaj± siê byæ spe³nione. Kliknij klawisz poni¿ej aby rozpocz±æ instalacjê." - -#: install/index.php:325 -#: install/index.php:351 -#: install/index.php:358 -#: install/index.php:365 -#: install/index.php:384 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:324 +msgid "" +"All application preliminary requirements seems to be correct. Please press " +"Continue button below." +msgstr "" +"Wszystkie wymagania systemu wydaj± siê byæ spe³nione. Kliknij klawisz " +"poni¿ej aby rozpocz±æ instalacjê." + - #: /var/www/fa2.3/devel/../install/index.php:330 - #: /var/www/fa2.3/devel/../install/index.php:356 - #: /var/www/fa2.3/devel/../install/index.php:363 - #: /var/www/fa2.3/devel/../install/index.php:370 - #: /var/www/fa2.3/devel/../install/index.php:389 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:325 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:351 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:358 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:365 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:389 msgid "Continue >>" msgstr "Kontynuuj >>" - #: /var/www/fa2.3/devel/../install/index.php:332 -#: install/index.php:327 -msgid "Application cannot be installed. Please fix problems listed below in red, and press Refresh button." -msgstr "Aplikacja nie mo¿e byæ zainstalowana. Usuñ wskazane problemy i kliknij klawisz 'Od¶wie¿'." ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:327 +msgid "" +"Application cannot be installed. Please fix problems listed below in red, " +"and press Refresh button." +msgstr "" +"Aplikacja nie mo¿e byæ zainstalowana. Usuñ wskazane problemy i kliknij " +"klawisz 'Od¶wie¿'." - #: /var/www/fa2.3/devel/../install/index.php:333 -#: install/index.php:328 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:328 msgid "Refresh" msgstr "Od¶wierz" - #: /var/www/fa2.3/devel/../install/index.php:343 -#: install/index.php:338 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:338 msgid "Database Server Settings" msgstr "Ustawienia Serwera Bazy Danych" - #: /var/www/fa2.3/devel/../install/index.php:345 -#: install/index.php:340 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:340 msgid "Server Host:" msgstr "Adres Serwera:" - #: /var/www/fa2.3/devel/../install/index.php:346 -#: install/index.php:341 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:341 msgid "Database User:" msgstr "Nazwa U¿ytkownika:" - #: /var/www/fa2.3/devel/../install/index.php:347 -#: install/index.php:342 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:342 msgid "Database Password:" msgstr "Has³o:" - #: /var/www/fa2.3/devel/../install/index.php:348 -#: install/index.php:343 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:343 msgid "Database Name:" msgstr "Nazwa Bazy Danych:" - #: /var/www/fa2.3/devel/../install/index.php:349 -#: install/index.php:344 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:344 msgid "Use '0_' Table Prefix:" msgstr "Prefiks '0_' dla Nazw Tablic:" - #: /var/www/fa2.3/devel/../install/index.php:349 - #: /var/www/fa2.3/devel/../includes/system_tests.inc:38 - #: /var/www/fa2.3/devel/../includes/system_tests.inc:113 - #: /var/www/fa2.3/devel/../includes/system_tests.inc:126 -#: install/index.php:344 -#: includes/system_tests.inc:38 -#: includes/system_tests.inc:113 -#: includes/system_tests.inc:126 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:344 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:38 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:113 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:126 msgid "Yes" msgstr "Tak" - #: /var/www/fa2.3/devel/../install/index.php:349 - #: /var/www/fa2.3/devel/../includes/system_tests.inc:38 - #: /var/www/fa2.3/devel/../includes/system_tests.inc:113 - #: /var/www/fa2.3/devel/../includes/system_tests.inc:126 -#: install/index.php:344 -#: includes/system_tests.inc:38 -#: includes/system_tests.inc:113 -#: includes/system_tests.inc:126 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:344 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:38 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:113 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:126 msgid "No" msgstr "Nie" - #: /var/www/fa2.3/devel/../install/index.php:350 -#: install/index.php:345 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:345 msgid "Install Additional Language Packs from FA Repository:" msgstr "Instalacja Dodatkowych Jêzyków z Repozytorium FA:" - #: /var/www/fa2.3/devel/../install/index.php:351 -#: install/index.php:346 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:346 msgid "Install Additional COAs from FA Repository:" msgstr "Instalacja Dodatkowych Planów Kont z Repozytorium FA:" - #: /var/www/fa2.3/devel/../install/index.php:353 -#: install/index.php:348 -msgid "Use table prefix if you share selected database for more than one FA company." ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:348 +msgid "" +"Use table prefix if you share selected database for more than one FA company." msgstr "U¿yj prefiksu je¶li ta sama baza danych bêdzie u¿ywana dla kilku firm." - #: /var/www/fa2.3/devel/../install/index.php:354 -#: install/index.php:349 -msgid "Do not select additional langs nor COAs if you have no working internet connection right now. You can install them later." -msgstr "Nie zaznaczaj wyboru dodatkowych jêzyków ani planów kont je¶li w tej chwili nie masz dostêpu do internetu. Bêdziesz je móg³ zainstalowaæ równie¿ pó¼niej." ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:349 +msgid "" +"Do not select additional langs nor COAs if you have no working internet " +"connection right now. You can install them later." +msgstr "" +"Nie zaznaczaj wyboru dodatkowych jêzyków ani planów kont je¶li w tej chwili " +"nie masz dostêpu do internetu. Bêdziesz je móg³ zainstalowaæ równie¿ pó¼niej." - #: /var/www/fa2.3/devel/../install/index.php:355 - #: /var/www/fa2.3/devel/../install/index.php:362 - #: /var/www/fa2.3/devel/../install/index.php:369 - #: /var/www/fa2.3/devel/../install/index.php:388 -#: install/index.php:350 -#: install/index.php:357 -#: install/index.php:364 -#: install/index.php:383 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:350 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:357 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:364 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:388 msgid "<< Back" msgstr "<< Wróæ" - #: /var/www/fa2.3/devel/../install/index.php:360 -#: install/index.php:355 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:355 msgid "User Interface Languages Selection" msgstr "Wybór Jêzyków Interfejsu U¿ytkownika" - #: /var/www/fa2.3/devel/../install/index.php:367 -#: install/index.php:362 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:362 msgid "Charts of Accounts Selection" msgstr "Wybór Planów Kont" - #: /var/www/fa2.3/devel/../install/index.php:379 -#: install/index.php:374 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:379 msgid "Company Settings" msgstr "Ustawienia Firmy" - #: /var/www/fa2.3/devel/../install/index.php:381 -#: install/index.php:376 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:381 msgid "Company Name:" msgstr "Nazwa Firmy:" - #: /var/www/fa2.3/devel/../install/index.php:382 -#: install/index.php:377 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:382 msgid "Admin Login:" msgstr "Login Administratora:" - #: /var/www/fa2.3/devel/../install/index.php:383 -#: install/index.php:378 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:383 msgid "Admin Password:" msgstr "Has³o Administratora:" - #: /var/www/fa2.3/devel/../install/index.php:384 -#: install/index.php:379 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:384 msgid "Reenter Password:" msgstr "Powtórz Has³o:" - #: /var/www/fa2.3/devel/../install/index.php:385 -#: install/index.php:380 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:385 msgid "Select Chart of Accounts:" msgstr "Wybierz Planów Kont:" - #: /var/www/fa2.3/devel/../install/index.php:386 -#: install/index.php:381 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:386 msgid "Select Default Language:" msgstr "Wybierz Jêzyk Domy¶lny:" - #: /var/www/fa2.3/devel/../install/index.php:393 -#: install/index.php:388 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:393 msgid "FrontAccounting ERP has been installed successsfully." msgstr "Aplikacja FrontAccounting ERP zosta³a zainstalowana pomy¶lnie." - #: /var/www/fa2.3/devel/../install/index.php:394 -#: install/index.php:389 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:394 msgid "Please do not forget to remove install wizard folder." msgstr "Nie zapomnij usun±æ folderu instalatora." - #: /var/www/fa2.3/devel/../install/index.php:396 -#: install/index.php:392 ++#: /tmp/fa_unstable.sav3/devel/../install/index.php:397 msgid "Click here to start." msgstr "Kliknij tutaj, aby rozpocz±æ pracê." - #: /var/www/fa2.3/devel/../includes/system_tests.inc:15 -#: includes/system_tests.inc:15 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:15 msgid "Info" msgstr "Informacja" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:16 -#: includes/system_tests.inc:16 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:16 msgid "Optional" msgstr "Opcjonalne" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:17 -#: includes/system_tests.inc:17 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:17 msgid "Recommended" msgstr "Zalecane" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:18 -#: includes/system_tests.inc:18 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:18 msgid "Required " msgstr "Wymagane" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:24 -#: includes/system_tests.inc:24 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:24 msgid "MySQL version" msgstr "Wersja MySQL" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:28 -#: includes/system_tests.inc:28 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:28 msgid "Upgrade MySQL server to version at least 4.1" msgstr "U¿yj wersji serwera MySQL minimum 4.1" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:35 -#: includes/system_tests.inc:35 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:35 msgid "PHP MySQL extension" msgstr "Rozszerzenie PHP MySQL" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:40 -#: includes/system_tests.inc:40 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:40 msgid "Your PHP has to have MySQL extension enabled." msgstr "PHP musi mieæ w³±czone rozszerzenie MySQL." - #: /var/www/fa2.3/devel/../includes/system_tests.inc:46 -#: includes/system_tests.inc:46 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:46 msgid "PHP version" msgstr "Wersja PHP" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:50 -#: includes/system_tests.inc:50 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:50 msgid "Upgrade PHP to version at least 4.3.3" msgstr "Zainstaluj PHP w wersji co najmniej 4.3.3" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:57 -#: includes/system_tests.inc:57 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:57 msgid "Server system" msgstr "System serwera" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:67 -#: includes/system_tests.inc:67 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:67 msgid "Session save path" msgstr "Katalog zapisu pliku sesji" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:79 -#: includes/system_tests.inc:79 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:79 msgid "Removed install wizard folder" msgstr "Folder instalatora usuniêty" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:82 -#: includes/system_tests.inc:82 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:82 msgid "Not removed" msgstr "Nie usuniêty" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:83 -#: includes/system_tests.inc:83 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:83 msgid "Remove or rename install wizard folder for security reasons." msgstr "Ze wzglêdów bezpieczeñstwa usuñ lub zmieñ nazwê folderu instalatora." - #: /var/www/fa2.3/devel/../includes/system_tests.inc:90 -#: includes/system_tests.inc:90 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:90 msgid "Browser type" msgstr "Typ przegl±darki" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:94 -#: includes/system_tests.inc:94 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:94 msgid "Any browser is supported" msgstr "Mo¿e byæ u¿yty dowolny typ przegl±darki" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:101 -#: includes/system_tests.inc:101 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:101 msgid "Http server type" msgstr "Serwer http" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:105 -#: includes/system_tests.inc:105 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:105 msgid "Any server is supported" msgstr "Dowolny" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:112 -#: includes/system_tests.inc:112 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:112 msgid "Native gettext" msgstr "Biblioteka Gettext " - #: /var/www/fa2.3/devel/../includes/system_tests.inc:116 -#: includes/system_tests.inc:116 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:116 msgid "In case of no gettext support, php emulation is used" msgstr "W przypadku braku wsparcia systemu, gettext jest emulowany." - #: /var/www/fa2.3/devel/../includes/system_tests.inc:124 -#: includes/system_tests.inc:124 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:124 msgid "Debugging mode" msgstr "Tryb debug" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:128 -#: includes/system_tests.inc:128 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:128 msgid "To switch debugging on set $go_debug>0 in config.php file" msgstr "Aby w³±czyæ tryb debug ustaw $go_debug>0 in config.php file" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:137 -#: includes/system_tests.inc:137 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:137 msgid "Error logging" msgstr "Logowanie b³êdów" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:145 -#: includes/system_tests.inc:145 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:145 msgid "Disabled" msgstr "Wy³±czony" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:148 -#: includes/system_tests.inc:148 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:148 msgid "To switch error logging set $error_logging in config.php file" -msgstr "Aby w³±czyæ logowanie b³êdów ustaw zmienn± $error_logging w pliku config.php" +msgstr "" +"Aby w³±czyæ logowanie b³êdów ustaw zmienn± $error_logging w pliku config.php" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:151 -#: includes/system_tests.inc:151 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:151 msgid "Log file is not writeable" msgstr "Logfile jest niezapisywalny" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:161 -#: includes/system_tests.inc:161 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:161 msgid "Current database version" msgstr "Aktualna wersja bazy danych" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:165 -#: includes/system_tests.inc:165 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:165 msgid "Database structure seems to be not upgraded to current version" msgstr "Struktura bazy danych nie jest zaktualizowana do bie¿±cej wersji" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:180 -#: includes/system_tests.inc:180 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:180 msgid "Company subdirectories consistency" msgstr "Prawid³owa struktura folderów firmowych" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:193 - #: /var/www/fa2.3/devel/../includes/system_tests.inc:200 - #: /var/www/fa2.3/devel/../includes/system_tests.inc:208 - #: /var/www/fa2.3/devel/../includes/system_tests.inc:225 - #: /var/www/fa2.3/devel/../includes/system_tests.inc:345 -#: includes/system_tests.inc:193 -#: includes/system_tests.inc:200 -#: includes/system_tests.inc:208 -#: includes/system_tests.inc:225 -#: includes/system_tests.inc:340 -#: includes/system_tests.inc:349 -#: includes/system_tests.inc:358 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:193 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:200 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:208 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:225 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:340 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:349 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:358 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:366 #, php-format msgid "'%s' is not writeable" msgstr "'%s' jest niezapisywalny" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:221 -#: includes/system_tests.inc:221 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:221 msgid "Temporary directory" msgstr "Katalog plików tymczasowych" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:233 -#: includes/system_tests.inc:233 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:233 msgid "Language configuration consistency" msgstr "Konfiguracja jêzykowa" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:242 -#: includes/system_tests.inc:242 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:242 msgid "Languages folder should be writeable." msgstr "Folder jêzyków musi byæ zapisywalny" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:250 -#: includes/system_tests.inc:251 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:251 msgid "Languages configuration file should be writeable." msgstr "Pliki konfiguracyjny jêzyków musi byæ zapisywalny." - #: /var/www/fa2.3/devel/../includes/system_tests.inc:268 -#: includes/system_tests.inc:270 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:270 #, php-format msgid "Missing %s translation file." msgstr "Brak pliku t³umaczeñ %s" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:273 -#: includes/system_tests.inc:275 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:275 #, php-format msgid "Missing system locale: %s" msgstr "Lokalizacja '%s' nie jest zainstalowana w systemie" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:286 -#: includes/system_tests.inc:288 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:288 msgid "Main config file" msgstr "G³ówny plik konfiguracyjny " - #: /var/www/fa2.3/devel/../includes/system_tests.inc:293 - #: /var/www/fa2.3/devel/../includes/system_tests.inc:315 -#: includes/system_tests.inc:295 -#: includes/system_tests.inc:317 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:295 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:317 #, php-format msgid "Can't write '%s' file. Check FA directory write permissions." msgstr "Nie mo¿na zapisaæ pliku '%s'. Sprawd¼ prawa zapisu do foderu FA." - #: /var/www/fa2.3/devel/../includes/system_tests.inc:294 - #: /var/www/fa2.3/devel/../includes/system_tests.inc:316 -#: includes/system_tests.inc:296 -#: includes/system_tests.inc:318 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:296 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:318 #, php-format msgid "'%s' file exists." msgstr "Plik '%s' istnieje." - #: /var/www/fa2.3/devel/../includes/system_tests.inc:298 -#: includes/system_tests.inc:300 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:300 #, php-format msgid "'%s' file should be read-only" msgstr "Plik '%s powinien byæ zabezpieczony przed zapisem" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:307 -#: includes/system_tests.inc:309 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:309 msgid "Database auth file" msgstr "Pik configuracyjny bazy danych" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:320 -#: includes/system_tests.inc:322 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:322 #, php-format -msgid "'%s' file should be read-only if you do not plan to add or change companies" -msgstr "Plik '%s' powinien byæ zabezpieczony przed zapisem je¶li nie planujesz dodawania ani zmiany firm" +msgid "" +"'%s' file should be read-only if you do not plan to add or change companies" +msgstr "" +"Plik '%s' powinien byæ zabezpieczony przed zapisem je¶li nie planujesz " +"dodawania ani zmiany firm" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:331 -#: includes/system_tests.inc:333 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:333 msgid "Extensions system" msgstr "System rozszerzeñ" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:366 -#: includes/system_tests.inc:363 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:371 msgid "Extensions configuration files and directories should be writeable" msgstr "Pliki konfiguracyjne i foldery rozszerzeñ powinny byæ zapisywalne" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:378 -#: includes/system_tests.inc:375 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:384 #, php-format msgid "Non-standard theme directory '%s' is not writable" msgstr "Niestandardowy folder tematu '%s' jest zazpieczony przed zapisem" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:388 -#: includes/system_tests.inc:385 -msgid "OpenSSL PHP extension have to be enabled to use extension repository system." ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:394 +msgid "" +"OpenSSL PHP extension have to be enabled to use extension repository system." msgstr "System pakietów wymaga zaisnatlowanego rozszerzenia PHP OpenSSL." - #: /var/www/fa2.3/devel/../includes/system_tests.inc:391 -#: includes/system_tests.inc:388 -msgid "OpenSSL have to be available on your server to use extension repository system." -msgstr "Serwer musi mieæ zainstalowane OpenSSL ¿eby mo¿na by³o korzystaæ z repozytorium pakietów rozszerzeñ FA." ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:397 +msgid "" +"OpenSSL have to be available on your server to use extension repository " +"system." +msgstr "" +"Serwer musi mieæ zainstalowane OpenSSL ¿eby mo¿na by³o korzystaæ z " +"repozytorium pakietów rozszerzeñ FA." - #: /var/www/fa2.3/devel/../includes/system_tests.inc:414 -#: includes/system_tests.inc:411 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:420 msgid "Test" msgstr "Test" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:414 -#: includes/system_tests.inc:411 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:420 msgid "Test type" msgstr "Typ testu" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:414 -#: includes/system_tests.inc:411 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:420 msgid "Value" msgstr "Warto¶æ" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:414 -#: includes/system_tests.inc:411 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:420 msgid "Comments" msgstr "Komentarz" - #: /var/www/fa2.3/devel/../includes/system_tests.inc:438 -#: includes/system_tests.inc:435 ++#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:444 msgid "Ok" msgstr "Ok" + -#: includes/packages.inc:190 ++#: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:190 + #, php-format + msgid "No key field '%s' in file '%s'" -msgstr "Brak pola '%s' w pliku '%s'" ++msgstr "" ++ ++#: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:295 ++#: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:329 ++#, fuzzy, php-format ++msgid "Cannot delete outdated '%s' file." ++msgstr "Nie mo¿na usun±æ pliku." + -#: includes/packages.inc:295 ++#: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:299 + msgid "Release file in repository is invalid, or public key is outdated." -msgstr "Plik kontrolny wydania jest uszkodzony, lub klucz publiczny jest nieaktualny." ++msgstr "" ++"Plik kontrolny wydania jest uszkodzony, lub klucz publiczny jest nieaktualny." + -#: includes/packages.inc:311 ++#: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:316 + msgid "Repository version does not match application version." + msgstr "Wersja repozytorium nie zgadza siê z wersj± aplikacji." + -#: includes/packages.inc:325 ++#: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:333 + #, php-format -msgid "Security alert: broken index file in repository '%s'. Please inform repository administrator about this issue." -msgstr "Alarm bezpieczeñstwa: uszkodzony plik indeksu repozytorium '%s'. Poinformuj administratora repozytorium o tym problemie." ++msgid "" ++"Security alert: broken index file in repository '%s'. Please inform " ++"repository administrator about this issue." ++msgstr "" ++"Alarm bezpieczeñstwa: uszkodzony plik indeksu repozytorium '%s'. Poinformuj " ++"administratora repozytorium o tym problemie." + -#: includes/packages.inc:358 ++#: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:366 + #, php-format -msgid "Security alert: broken package '%s' in repository. Please inform repository administrator about this issue." -msgstr "Alarm bezpieczeñstwa: uszkodzony plik '%s' w repozytorium. Poinformuj administratora repozytorium o tym problemie." ++msgid "" ++"Security alert: broken package '%s' in repository. Please inform repository " ++"administrator about this issue." ++msgstr "" ++"Alarm bezpieczeñstwa: uszkodzony plik '%s' w repozytorium. Poinformuj " ++"administratora repozytorium o tym problemie." + -#: includes/packages.inc:613 -#: includes/packages.inc:664 ++#: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:621 ++#: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:672 + #, php-format + msgid "Package '%s' not found." + msgstr "Pakiet '%s' nie zosta³ znaleziony." - diff --cc lang/new_language_template/LC_MESSAGES/empty.po index d81832e4,8cd9e5d1..39e655ec --- a/lang/new_language_template/LC_MESSAGES/empty.po +++ b/lang/new_language_template/LC_MESSAGES/empty.po @@@ -8,7 -8,7 +8,7 @@@ msgid " msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2012-06-16 10:52+0200\n" -"POT-Creation-Date: 2012-09-15 09:38+0200\n" ++"POT-Creation-Date: 2012-09-18 14:10+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@@ -22,10 -21,9 +22,10 @@@ msgid "Main Menu" msgstr "" -#: frontaccounting.php:75 access/logout.php:18 themes/default/renderer.php:52 -#: themes/default/renderer.php:78 themes/default/renderer.php:53 -#: themes/default/renderer.php:82 +#: ../frontaccounting.php:75 +#: ../access/logout.php:18 - #: ../themes/default/renderer.php:52 - #: ../themes/default/renderer.php:78 ++#: ../themes/default/renderer.php:53 ++#: ../themes/default/renderer.php:82 msgid "Logout" msgstr "" @@@ -41,45 -39,43 +41,50 @@@ msgstr " msgid "Please login here" msgstr "" - #: ../access/login.php:39 - #: ../access/login.php:69 -#: access/login.php:39 access/login.php:69 admin/db/login.php:40 -#: admin/db/login.php:70 access/login.php:49 access/login.php:79 ++#: ../access/login.php:36 ++msgid "Too many failed login attempts.
Please wait a while or try later." ++msgstr "" ++ ++#: ../access/login.php:49 ++#: ../access/login.php:79 msgid "Authorization timeout" msgstr "" - #: ../access/login.php:39 - #: ../access/login.php:76 -#: access/login.php:39 access/login.php:76 admin/db/login.php:40 -#: admin/db/login.php:77 access/login.php:49 access/login.php:86 ++#: ../access/login.php:49 ++#: ../access/login.php:86 msgid "Login" msgstr "" - #: ../access/login.php:76 - #: ../admin/inst_upgrade.php:137 -#: access/login.php:76 admin/inst_upgrade.php:137 admin/db/login.php:77 -#: access/login.php:86 ++#: ../access/login.php:86 ++#: ../admin/inst_upgrade.php:141 msgid "Version" msgstr "" - #: ../access/login.php:79 -#: access/login.php:79 admin/db/login.php:80 access/login.php:89 ++#: ../access/login.php:89 msgid "User name" msgstr "" - #: ../access/login.php:83 -#: access/login.php:83 admin/change_current_user_password.php:78 -#: admin/users.php:191 admin/db/login.php:84 access/login.php:93 ++#: ../access/login.php:93 +#: ../admin/change_current_user_password.php:78 +#: ../admin/users.php:191 msgid "Password:" msgstr "" - #: ../access/login.php:92 - #: ../admin/create_coy.php:249 - #: ../admin/create_coy.php:331 -#: access/login.php:92 admin/create_coy.php:249 admin/create_coy.php:331 -#: admin/db/login.php:93 access/login.php:103 access/login.php:110 -#: admin/create_coy.php:253 admin/create_coy.php:336 ++#: ../access/login.php:103 ++#: ../access/login.php:110 ++#: ../admin/create_coy.php:253 ++#: ../admin/create_coy.php:336 +#: ../includes/sysnames.inc:194 msgid "Company" msgstr "" - #: ../access/login.php:101 -#: access/login.php:101 admin/db/login.php:102 access/login.php:117 ++#: ../access/login.php:117 msgid "Login -->" msgstr "" - #: ../access/login.php:132 -#: access/login.php:132 admin/display_prefs.php:111 admin/db/login.php:133 -#: themes/default/renderer.php:123 access/login.php:148 -#: themes/default/renderer.php:127 ++#: ../access/login.php:148 +#: ../admin/display_prefs.php:111 - #: ../themes/default/renderer.php:123 ++#: ../themes/default/renderer.php:127 msgid "Theme:" msgstr "" @@@ -95,294 -91,203 +100,295 @@@ msgstr " msgid "Attach Documents" msgstr "" - #: ../admin/attachments.php:123 -#: admin/attachments.php:123 admin/attachments.php:121 ++#: ../admin/attachments.php:84 ++msgid "No transaction has been selected." ++msgstr "" ++ ++#: ../admin/attachments.php:86 ++msgid "Select attachment file." ++msgstr "" ++ ++#: ../admin/attachments.php:121 msgid "Attachment has been inserted." msgstr "" - #: ../admin/attachments.php:129 -#: admin/attachments.php:129 admin/attachments.php:127 ++#: ../admin/attachments.php:127 msgid "Attachment has been updated." msgstr "" - #: ../admin/attachments.php:141 -#: admin/attachments.php:141 admin/attachments.php:140 ++#: ../admin/attachments.php:140 msgid "Attachment has been deleted." msgstr "" - #: ../admin/attachments.php:159 -#: admin/attachments.php:159 admin/view_print_transaction.php:72 -#: admin/void_transaction.php:157 gl/inquiry/journal_inquiry.php:47 -#: inventory/includes/item_adjustments_ui.inc:47 -#: manufacturing/work_order_add_finished.php:203 -#: manufacturing/work_order_costs.php:150 -#: manufacturing/work_order_entry.php:379 -#: manufacturing/work_order_entry.php:387 -#: manufacturing/includes/work_order_issue_ui.inc:161 -#: sales/inquiry/customer_allocation_inquiry.php:47 admin/attachments.php:158 ++#: ../admin/attachments.php:158 +#: ../admin/view_print_transaction.php:72 +#: ../gl/inquiry/journal_inquiry.php:47 +#: ../inventory/includes/item_adjustments_ui.inc:47 +#: ../manufacturing/work_order_add_finished.php:203 +#: ../manufacturing/work_order_costs.php:136 +#: ../manufacturing/work_order_entry.php:379 +#: ../manufacturing/work_order_entry.php:387 +#: ../manufacturing/includes/work_order_issue_ui.inc:161 +#: ../sales/inquiry/customer_allocation_inquiry.php:47 - #: ../sales/inquiry/customer_allocation_inquiry.php.orig:47 msgid "Type:" msgstr "" - #: ../admin/attachments.php:171 -#: admin/attachments.php:171 admin/view_print_transaction.php:126 -#: admin/void_transaction.php:181 dimensions/inquiry/search_dimensions.php:127 -#: dimensions/view/view_dimension.php:54 gl/bank_account_reconcile.php:234 -#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126 -#: gl/inquiry/journal_inquiry.php:127 gl/inquiry/journal_inquiry.php:140 -#: includes/ui/allocation_cart.inc:263 -#: inventory/inquiry/stock_movements.php:81 -#: manufacturing/search_work_orders.php:159 -#: manufacturing/includes/manufacturing_ui.inc:157 -#: manufacturing/includes/manufacturing_ui.inc:200 -#: manufacturing/includes/manufacturing_ui.inc:236 -#: manufacturing/includes/manufacturing_ui.inc:276 -#: manufacturing/includes/manufacturing_ui.inc:280 -#: manufacturing/includes/manufacturing_ui.inc:331 -#: purchasing/view/view_po.php:115 purchasing/view/view_po.php:140 -#: purchasing/inquiry/po_search_completed.php:121 -#: purchasing/inquiry/po_search.php:130 -#: purchasing/inquiry/supplier_allocation_inquiry.php:127 -#: purchasing/inquiry/supplier_inquiry.php:169 -#: purchasing/inquiry/supplier_inquiry.php.orig:163 -#: purchasing/allocations/supplier_allocation_main.php:95 -#: reporting/rep101.php:130 reporting/rep201.php:118 reporting/rep203.php:91 -#: reporting/rep601.php:76 reporting/rep704.php:79 reporting/rep704.php:82 -#: reporting/rep704.php:85 reporting/rep710.php:76 -#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186 -#: reporting/includes/doctext.inc:224 -#: sales/allocations/customer_allocation_main.php:94 -#: sales/view/view_sales_order.php:96 sales/view/view_sales_order.php:129 -#: sales/view/view_sales_order.php:161 -#: sales/inquiry/customer_allocation_inquiry.php:145 -#: sales/inquiry/customer_inquiry.php:225 -#: sales/inquiry/customer_inquiry.php.orig:225 admin/attachments.php:170 ++#: ../admin/attachments.php:170 +#: ../admin/view_print_transaction.php:126 +#: ../admin/void_transaction.php:181 +#: ../dimensions/inquiry/search_dimensions.php:127 +#: ../dimensions/view/view_dimension.php:54 +#: ../gl/bank_account_reconcile.php:232 +#: ../gl/inquiry/bank_inquiry.php:70 +#: ../gl/inquiry/gl_account_inquiry.php:126 +#: ../gl/inquiry/journal_inquiry.php:127 +#: ../gl/inquiry/journal_inquiry.php:140 +#: ../includes/ui/allocation_cart.inc:264 +#: ../inventory/inquiry/stock_movements.php:77 +#: ../inventory/inquiry/stock_movements.php.orig:79 +#: ../manufacturing/search_work_orders.php:159 +#: ../manufacturing/includes/manufacturing_ui.inc:157 +#: ../manufacturing/includes/manufacturing_ui.inc:200 +#: ../manufacturing/includes/manufacturing_ui.inc:236 +#: ../manufacturing/includes/manufacturing_ui.inc:276 +#: ../manufacturing/includes/manufacturing_ui.inc:280 +#: ../manufacturing/includes/manufacturing_ui.inc:331 +#: ../purchasing/view/view_po.php:115 +#: ../purchasing/view/view_po.php:140 +#: ../purchasing/inquiry/po_search_completed.php:120 +#: ../purchasing/inquiry/po_search_completed.php.orig:119 +#: ../purchasing/inquiry/po_search.php:130 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:126 +#: ../purchasing/inquiry/supplier_inquiry.php:174 +#: ../purchasing/inquiry/supplier_inquiry.php.orig:171 +#: ../purchasing/allocations/supplier_allocation_main.php:95 +#: ../reporting/rep101.php:130 +#: ../reporting/rep201.php:118 +#: ../reporting/rep203.php:91 +#: ../reporting/rep601.php:76 +#: ../reporting/rep602.php:80 +#: ../reporting/rep704.php:79 +#: ../reporting/rep704.php:82 +#: ../reporting/rep704.php:85 +#: ../reporting/rep710.php:76 +#: ../reporting/includes/doctext.inc:167 +#: ../reporting/includes/doctext.inc:208 +#: ../reporting/includes/doctext.inc:246 +#: ../sales/allocations/customer_allocation_main.php:94 +#: ../sales/view/view_sales_order.php:109 +#: ../sales/view/view_sales_order.php:142 +#: ../sales/view/view_sales_order.php:179 +#: ../sales/view/view_sales_order.php.orig:96 +#: ../sales/view/view_sales_order.php.orig:129 +#: ../sales/view/view_sales_order.php.orig:161 +#: ../sales/inquiry/customer_allocation_inquiry.php:145 - #: ../sales/inquiry/customer_allocation_inquiry.php.orig:145 +#: ../sales/inquiry/customer_inquiry.php:201 - #: ../sales/inquiry/customer_inquiry.php.orig:225 msgid "#" msgstr "" - #: ../admin/attachments.php:171 - #: ../admin/attachments.php:221 -#: admin/attachments.php:171 admin/attachments.php:221 -#: admin/crm_categories.php:88 admin/inst_upgrade.php:137 -#: admin/payment_terms.php:127 admin/printers.php:84 -#: admin/print_profiles.php:148 gl/inquiry/tax_inquiry.php:82 -#: gl/manage/gl_quick_entries.php:186 gl/manage/gl_quick_entries.php:224 -#: includes/ui/view_package.php:22 inventory/manage/item_codes.php:125 -#: inventory/manage/item_units.php:94 inventory/manage/movement_types.php:95 -#: inventory/manage/sales_kits.php:40 inventory/view/view_adjustment.php:56 -#: inventory/view/view_transfer.php:56 manufacturing/manage/bom_edit.php:70 -#: manufacturing/includes/manufacturing_ui.inc:28 -#: purchasing/includes/ui/invoice_ui.inc:471 -#: purchasing/includes/ui/invoice_ui.inc:483 -#: purchasing/po_receive_items.php:62 reporting/rep104.php:109 -#: reporting/rep105.php:112 reporting/rep204.php:82 reporting/rep303.php:109 -#: reporting/rep303.php:115 reporting/rep304.php:112 reporting/rep305.php:95 -#: reporting/rep401.php:69 sales/create_recurrent_invoices.php:115 -#: sales/manage/credit_status.php:97 sales/manage/recurrent_invoices.php:102 -#: sales/inquiry/sales_orders_view.php:295 -#: sales/inquiry/sales_orders_view.php:299 -#: sales/inquiry/sales_orders_view.php.orig:293 -#: sales/inquiry/sales_orders_view.php.orig:297 taxes/tax_groups.php:124 -#: taxes/tax_types.php:115 admin/attachments.php:170 admin/attachments.php:220 -#: reporting/rep305.php:98 sales/create_recurrent_invoices.php:132 ++#: ../admin/attachments.php:170 ++#: ../admin/attachments.php:220 +#: ../admin/crm_categories.php:88 - #: ../admin/inst_upgrade.php:137 ++#: ../admin/inst_upgrade.php:141 +#: ../admin/payment_terms.php:127 +#: ../admin/printers.php:84 +#: ../admin/print_profiles.php:148 +#: ../gl/inquiry/tax_inquiry.php:82 +#: ../gl/manage/gl_quick_entries.php:186 +#: ../gl/manage/gl_quick_entries.php:224 +#: ../includes/ui/view_package.php:22 +#: ../inventory/manage/item_codes.php:125 +#: ../inventory/manage/item_units.php:94 +#: ../inventory/manage/movement_types.php:95 +#: ../inventory/manage/sales_kits.php:40 +#: ../inventory/view/view_adjustment.php:56 +#: ../inventory/view/view_transfer.php:56 +#: ../manufacturing/manage/bom_edit.php:70 +#: ../manufacturing/includes/manufacturing_ui.inc:28 +#: ../purchasing/includes/ui/invoice_ui.inc:492 +#: ../purchasing/includes/ui/invoice_ui.inc:504 +#: ../purchasing/po_receive_items.php:62 +#: ../reporting/rep104.php:109 +#: ../reporting/rep105.php:112 +#: ../reporting/rep204.php:82 +#: ../reporting/rep303.php:109 +#: ../reporting/rep303.php:115 +#: ../reporting/rep304.php:112 - #: ../reporting/rep305.php:95 ++#: ../reporting/rep305.php:98 +#: ../reporting/rep401.php:69 - #: ../sales/create_recurrent_invoices.php:115 ++#: ../sales/create_recurrent_invoices.php:132 +#: ../sales/manage/credit_status.php:97 +#: ../sales/manage/recurrent_invoices.php:102 +#: ../sales/inquiry/sales_orders_view.php:317 +#: ../sales/inquiry/sales_orders_view.php:321 - #: ../sales/inquiry/sales_orders_view.php.orig:294 - #: ../sales/inquiry/sales_orders_view.php.orig:298 +#: ../taxes/tax_groups.php:123 +#: ../taxes/tax_groups.php.orig:125 +#: ../taxes/tax_groups.php.sav:125 +#: ../taxes/tax_types.php:115 msgid "Description" msgstr "" - #: ../admin/attachments.php:171 -#: admin/attachments.php:171 admin/backups.php:63 admin/backups.php:149 -#: admin/attachments.php:170 ++#: ../admin/attachments.php:170 +#: ../admin/backups.php:63 +#: ../admin/backups.php:149 msgid "Filename" msgstr "" - #: ../admin/attachments.php:171 -#: admin/attachments.php:171 admin/attachments.php:170 ++#: ../admin/attachments.php:170 msgid "Size" msgstr "" - #: ../admin/attachments.php:171 -#: admin/attachments.php:171 admin/attachments.php:170 ++#: ../admin/attachments.php:170 msgid "Filetype" msgstr "" - #: ../admin/attachments.php:171 -#: admin/attachments.php:171 admin/attachments.php:170 ++#: ../admin/attachments.php:170 msgid "Date Uploaded" msgstr "" - #: ../admin/attachments.php:186 - #: ../admin/create_coy.php:273 -#: admin/attachments.php:186 admin/create_coy.php:273 -#: admin/crm_categories.php:106 admin/fiscalyears.php:164 -#: admin/inst_lang.php:100 admin/inst_lang.php.orig:100 -#: admin/payment_terms.php:142 admin/printers.php:96 -#: admin/shipping_companies.php:106 admin/tags.php:140 admin/users.php:144 -#: dimensions/inquiry/search_dimensions.php:120 -#: gl/inquiry/journal_inquiry.php:118 gl/manage/bank_accounts.php:130 -#: gl/manage/bank_accounts.php.orig:130 gl/manage/currencies.php:164 -#: gl/manage/exchange_rates.php:94 gl/manage/gl_account_classes.php:132 -#: gl/manage/gl_account_types.php:154 gl/manage/gl_quick_entries.php:196 -#: gl/manage/gl_quick_entries.php:295 gl/includes/ui/gl_bank_ui.inc:184 -#: gl/includes/ui/gl_bank_ui.inc.orig:166 gl/includes/ui/gl_journal_ui.inc:122 -#: includes/ui/contacts_view.inc:64 includes/ui/simple_crud_class.inc:52 -#: inventory/prices.php:145 inventory/purchasing_data.php:146 -#: inventory/includes/item_adjustments_ui.inc:87 -#: inventory/includes/stock_transfers_ui.inc:79 -#: inventory/manage/item_categories.php:121 -#: inventory/manage/item_codes.php:140 inventory/manage/item_units.php:110 -#: inventory/manage/locations.php:161 inventory/manage/movement_types.php:106 -#: inventory/manage/sales_kits.php:55 manufacturing/search_work_orders.php:109 -#: manufacturing/manage/bom_edit.php:86 -#: manufacturing/manage/work_centres.php:114 -#: manufacturing/includes/work_order_issue_ui.inc:58 -#: purchasing/includes/ui/invoice_ui.inc:520 -#: purchasing/includes/ui/po_ui.inc:266 -#: purchasing/inquiry/po_search_completed.php:106 -#: purchasing/inquiry/po_search.php:87 sales/manage/credit_status.php:119 -#: sales/manage/customer_branches.php:159 -#: sales/manage/recurrent_invoices.php:130 sales/manage/sales_areas.php:103 -#: sales/manage/sales_groups.php:99 sales/manage/sales_people.php:119 -#: sales/manage/sales_points.php:99 sales/manage/sales_types.php:121 -#: sales/inquiry/customer_inquiry.php:198 -#: sales/inquiry/customer_inquiry.php.orig:198 -#: sales/inquiry/sales_deliveries_view.php:154 -#: sales/inquiry/sales_orders_view.php:128 -#: sales/inquiry/sales_orders_view.php.orig:126 -#: sales/includes/ui/sales_credit_ui.inc:197 -#: sales/includes/ui/sales_order_ui.inc:202 taxes/item_tax_types.php:139 -#: taxes/tax_groups.php:142 taxes/tax_types.php:132 admin/attachments.php:185 -#: sales/includes/ui/sales_order_ui.inc:206 admin/create_coy.php:277 ++#: ../admin/attachments.php:185 ++#: ../admin/create_coy.php:277 +#: ../admin/crm_categories.php:106 +#: ../admin/fiscalyears.php:164 +#: ../admin/inst_lang.php:100 +#: ../admin/payment_terms.php:142 +#: ../admin/printers.php:96 +#: ../admin/shipping_companies.php:106 +#: ../admin/tags.php:140 +#: ../admin/users.php:144 +#: ../dimensions/inquiry/search_dimensions.php:120 +#: ../gl/inquiry/journal_inquiry.php:118 +#: ../gl/manage/bank_accounts.php:133 +#: ../gl/manage/currencies.php:164 +#: ../gl/manage/exchange_rates.php:94 +#: ../gl/manage/gl_account_classes.php:132 +#: ../gl/manage/gl_account_types.php:154 +#: ../gl/manage/gl_quick_entries.php:196 +#: ../gl/manage/gl_quick_entries.php:295 +#: ../gl/includes/ui/gl_bank_ui.inc:184 +#: ../gl/includes/ui/gl_bank_ui.inc.orig:158 +#: ../gl/includes/ui/gl_journal_ui.inc:134 +#: ../includes/ui/contacts_view.inc:64 +#: ../includes/ui/simple_crud_class.inc:52 - #: ../includes/ui/ui_input.inc:956 ++#: ../includes/ui/ui_input.inc:960 +#: ../inventory/prices.php:145 +#: ../inventory/purchasing_data.php:146 +#: ../inventory/purchasing_data.php.orig:75 +#: ../inventory/includes/item_adjustments_ui.inc:87 +#: ../inventory/includes/stock_transfers_ui.inc:79 +#: ../inventory/manage/item_categories.php:121 +#: ../inventory/manage/item_codes.php:140 +#: ../inventory/manage/item_units.php:110 +#: ../inventory/manage/locations.php:161 +#: ../inventory/manage/movement_types.php:106 +#: ../inventory/manage/sales_kits.php:55 +#: ../manufacturing/search_work_orders.php:109 +#: ../manufacturing/manage/bom_edit.php:86 +#: ../manufacturing/manage/work_centres.php:114 +#: ../manufacturing/includes/work_order_issue_ui.inc:58 +#: ../purchasing/includes/ui/invoice_ui.inc:542 +#: ../purchasing/includes/ui/po_ui.inc:273 ++#: ../purchasing/includes/ui/po_ui.inc.orig:273 +#: ../purchasing/inquiry/po_search_completed.php:105 +#: ../purchasing/inquiry/po_search_completed.php.orig:104 +#: ../purchasing/inquiry/po_search.php:87 +#: ../sales/manage/credit_status.php:119 +#: ../sales/manage/customer_branches.php:159 +#: ../sales/manage/recurrent_invoices.php:130 +#: ../sales/manage/sales_areas.php:103 +#: ../sales/manage/sales_groups.php:99 +#: ../sales/manage/sales_people.php:119 +#: ../sales/manage/sales_points.php:99 +#: ../sales/manage/sales_types.php:121 +#: ../sales/inquiry/sales_deliveries_view.php:154 - #: ../sales/inquiry/sales_deliveries_view.php.orig:154 +#: ../sales/inquiry/sales_orders_view.php:136 - #: ../sales/inquiry/sales_orders_view.php.orig:127 +#: ../sales/includes/ui/sales_credit_ui.inc:197 - #: ../sales/includes/ui/sales_order_ui.inc:202 +#: ../sales/includes/ui/sales_order_ui.inc.orig:202 +#: ../taxes/item_tax_types.php:139 +#: ../taxes/tax_groups.php:137 +#: ../taxes/tax_groups.php.orig:139 +#: ../taxes/tax_groups.php.sav:139 +#: ../taxes/tax_types.php:132 msgid "Edit" msgstr "" - #: ../admin/attachments.php:187 -#: admin/attachments.php:187 gl/inquiry/journal_inquiry.php:135 -#: admin/attachments.php:186 ++#: ../admin/attachments.php:186 +#: ../gl/inquiry/journal_inquiry.php:135 msgid "View" msgstr "" - #: ../admin/attachments.php:188 -#: admin/attachments.php:188 admin/attachments.php:187 ++#: ../admin/attachments.php:187 msgid "Download" msgstr "" - #: ../admin/attachments.php:189 - #: ../admin/create_coy.php:274 -#: admin/attachments.php:189 admin/create_coy.php:274 -#: admin/crm_categories.php:110 admin/fiscalyears.php:166 -#: admin/inst_chart.php:80 admin/inst_lang.php:109 -#: admin/inst_lang.php.orig:109 admin/inst_module.php:144 -#: admin/inst_theme.php:102 admin/payment_terms.php:143 admin/printers.php:97 -#: admin/shipping_companies.php:107 admin/tags.php:141 admin/users.php:146 -#: gl/gl_budget.php:137 gl/manage/bank_accounts.php:131 -#: gl/manage/bank_accounts.php.orig:131 gl/manage/currencies.php:166 -#: gl/manage/exchange_rates.php:99 gl/manage/gl_account_classes.php:133 -#: gl/manage/gl_account_types.php:155 gl/manage/gl_quick_entries.php:197 -#: gl/manage/gl_quick_entries.php:296 gl/includes/ui/gl_bank_ui.inc:186 -#: gl/includes/ui/gl_bank_ui.inc.orig:168 gl/includes/ui/gl_journal_ui.inc:124 -#: includes/ui/contacts_view.inc:67 includes/ui/radio.ui_input.inc:284 -#: includes/ui/simple_crud_class.inc:54 includes/ui/ui_input.inc:284 -#: inventory/prices.php:146 inventory/purchasing_data.php:147 -#: inventory/includes/item_adjustments_ui.inc:89 -#: inventory/includes/stock_transfers_ui.inc:81 -#: inventory/manage/item_categories.php:122 -#: inventory/manage/item_codes.php:141 inventory/manage/item_units.php:111 -#: inventory/manage/locations.php:162 inventory/manage/movement_types.php:107 -#: inventory/manage/sales_kits.php:56 manufacturing/manage/bom_edit.php:87 -#: manufacturing/manage/work_centres.php:115 -#: manufacturing/includes/work_order_issue_ui.inc:60 -#: purchasing/includes/ui/invoice_ui.inc:284 -#: purchasing/includes/ui/po_ui.inc:268 sales/manage/credit_status.php:120 -#: sales/manage/customer_branches.php:163 -#: sales/manage/recurrent_invoices.php:131 sales/manage/sales_areas.php:104 -#: sales/manage/sales_groups.php:100 sales/manage/sales_people.php:120 -#: sales/manage/sales_points.php:100 sales/manage/sales_types.php:122 -#: sales/includes/ui/sales_credit_ui.inc:199 -#: sales/includes/ui/sales_order_ui.inc:204 taxes/item_tax_types.php:140 -#: taxes/tax_groups.php:143 taxes/tax_types.php:133 admin/attachments.php:188 -#: sales/includes/ui/sales_order_ui.inc:208 admin/create_coy.php:278 -#: includes/ui/ui_input.inc:285 ++#: ../admin/attachments.php:188 ++#: ../admin/create_coy.php:278 +#: ../admin/crm_categories.php:110 +#: ../admin/fiscalyears.php:166 +#: ../admin/inst_chart.php:80 +#: ../admin/inst_lang.php:109 +#: ../admin/inst_module.php:144 +#: ../admin/inst_theme.php:102 +#: ../admin/payment_terms.php:143 +#: ../admin/printers.php:97 +#: ../admin/shipping_companies.php:107 +#: ../admin/tags.php:141 +#: ../admin/users.php:146 +#: ../gl/gl_budget.php:137 +#: ../gl/manage/bank_accounts.php:134 +#: ../gl/manage/currencies.php:166 +#: ../gl/manage/exchange_rates.php:99 +#: ../gl/manage/gl_account_classes.php:133 +#: ../gl/manage/gl_account_types.php:155 +#: ../gl/manage/gl_quick_entries.php:197 +#: ../gl/manage/gl_quick_entries.php:296 +#: ../gl/includes/ui/gl_bank_ui.inc:186 +#: ../gl/includes/ui/gl_bank_ui.inc.orig:160 +#: ../gl/includes/ui/gl_journal_ui.inc:136 +#: ../includes/ui/contacts_view.inc:67 +#: ../includes/ui/simple_crud_class.inc:54 - #: ../includes/ui/ui_input.inc:285 ++#: ../includes/ui/ui_input.inc:286 +#: ../inventory/prices.php:146 +#: ../inventory/purchasing_data.php:147 +#: ../inventory/purchasing_data.php.orig:80 +#: ../inventory/includes/item_adjustments_ui.inc:89 +#: ../inventory/includes/stock_transfers_ui.inc:81 +#: ../inventory/manage/item_categories.php:122 +#: ../inventory/manage/item_codes.php:141 +#: ../inventory/manage/item_units.php:111 +#: ../inventory/manage/locations.php:162 +#: ../inventory/manage/movement_types.php:107 +#: ../inventory/manage/sales_kits.php:56 +#: ../manufacturing/manage/bom_edit.php:87 +#: ../manufacturing/manage/work_centres.php:115 +#: ../manufacturing/includes/work_order_issue_ui.inc:60 +#: ../purchasing/includes/ui/invoice_ui.inc:304 +#: ../purchasing/includes/ui/po_ui.inc:275 ++#: ../purchasing/includes/ui/po_ui.inc.orig:275 +#: ../sales/manage/credit_status.php:120 +#: ../sales/manage/customer_branches.php:163 +#: ../sales/manage/recurrent_invoices.php:131 +#: ../sales/manage/sales_areas.php:104 +#: ../sales/manage/sales_groups.php:100 +#: ../sales/manage/sales_people.php:120 +#: ../sales/manage/sales_points.php:100 +#: ../sales/manage/sales_types.php:122 +#: ../sales/includes/ui/sales_credit_ui.inc:199 - #: ../sales/includes/ui/sales_order_ui.inc:204 +#: ../sales/includes/ui/sales_order_ui.inc.orig:204 +#: ../taxes/item_tax_types.php:140 +#: ../taxes/tax_groups.php:138 +#: ../taxes/tax_groups.php.orig:140 +#: ../taxes/tax_groups.php.sav:140 +#: ../taxes/tax_types.php:133 msgid "Delete" msgstr "" - #: ../admin/attachments.php:215 - #: ../admin/attachments.php:220 -#: admin/attachments.php:215 admin/attachments.php:220 -#: admin/attachments.php:214 admin/attachments.php:219 ++#: ../admin/attachments.php:214 ++#: ../admin/attachments.php:219 msgid "Transaction #" msgstr "" - #: ../admin/attachments.php:222 -#: admin/attachments.php:222 admin/attachments.php:221 ++#: ../admin/attachments.php:221 msgid "Attached File" msgstr "" @@@ -419,40 -320,23 +425,39 @@@ msgstr " msgid "Database backup failed." msgstr "" -#: admin/backups.php:98 admin/create_coy.php:261 admin/fiscalyears.php:155 -#: admin/inst_lang.php:85 admin/inst_lang.php:97 admin/inst_lang.php.orig:85 -#: admin/inst_lang.php.orig:97 admin/void_transaction.php:125 -#: dimensions/inquiry/search_dimensions.php:107 -#: gl/manage/bank_accounts.php:127 gl/manage/bank_accounts.php.orig:127 -#: gl/manage/currencies.php:162 gl/manage/gl_account_classes.php:127 -#: gl/manage/gl_quick_entries.php:230 includes/system_tests.inc:38 -#: includes/system_tests.inc:113 includes/system_tests.inc:126 -#: includes/ui/sav.ui_lists.inc:1649 includes/ui/ui_lists.inc:1670 -#: purchasing/manage/suppliers.php:120 reporting/rep101.php:126 -#: reporting/rep102.php:112 reporting/rep102.php:114 reporting/rep104.php:103 -#: reporting/rep106.php:73 reporting/rep114.php:73 reporting/rep201.php:114 -#: reporting/rep202.php:116 reporting/rep202.php:118 reporting/rep203.php:87 -#: reporting/rep303.php:101 reporting/rep303.php:105 reporting/rep501.php:109 -#: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95 -#: sales/manage/sales_types.php:119 taxes/item_tax_types.php:129 -#: taxes/tax_groups.php:139 admin/create_coy.php:265 +#: ../admin/backups.php:98 - #: ../admin/create_coy.php:261 ++#: ../admin/create_coy.php:265 +#: ../admin/fiscalyears.php:155 +#: ../admin/inst_lang.php:85 +#: ../admin/inst_lang.php:97 +#: ../dimensions/inquiry/search_dimensions.php:107 +#: ../gl/manage/bank_accounts.php:130 +#: ../gl/manage/currencies.php:162 +#: ../gl/manage/gl_account_classes.php:127 +#: ../gl/manage/gl_quick_entries.php:230 +#: ../includes/system_tests.inc:38 +#: ../includes/system_tests.inc:113 +#: ../includes/system_tests.inc:126 +#: ../includes/ui/ui_lists.inc:1674 - #: ../includes/ui/ui_lists.inc.orig:1672 +#: ../purchasing/manage/suppliers.php:122 +#: ../purchasing/manage/suppliers.php.orig:132 +#: ../reporting/rep101.php:126 +#: ../reporting/rep102.php:112 +#: ../reporting/rep102.php:114 +#: ../reporting/rep104.php:103 +#: ../reporting/rep106.php:73 +#: ../reporting/rep114.php:73 +#: ../reporting/rep201.php:114 +#: ../reporting/rep202.php:116 +#: ../reporting/rep202.php:118 +#: ../reporting/rep203.php:87 +#: ../reporting/rep303.php:101 +#: ../reporting/rep303.php:105 +#: ../reporting/rep501.php:109 +#: ../sales/manage/sales_points.php:94 +#: ../sales/manage/sales_points.php:95 +#: ../sales/manage/sales_types.php:119 +#: ../taxes/item_tax_types.php:129 msgid "No" msgstr "" @@@ -480,11 -364,10 +485,9 @@@ msgstr " msgid "Create backup" msgstr "" -#: admin/backups.php:181 sales/includes/ui/sales_order_ui.inc:589 -#: sales/includes/ui/sales_order_ui.inc:637 -#: sales/includes/ui/sales_order_ui.inc:593 -#: sales/includes/ui/sales_order_ui.inc:641 +#: ../admin/backups.php:181 - #: ../sales/includes/ui/sales_order_ui.inc:589 - #: ../sales/includes/ui/sales_order_ui.inc:645 +#: ../sales/includes/ui/sales_order_ui.inc.orig:589 - #: ../sales/includes/ui/sales_order_ui.inc.orig:637 ++#: ../sales/includes/ui/sales_order_ui.inc.orig:645 msgid "Comments:" msgstr "" @@@ -533,9 -416,9 +536,9 @@@ msgstr " msgid "Upload file" msgstr "" -#: admin/change_current_user_password.php:16 -#: admin/change_current_user_password.php:85 themes/default/renderer.php:72 -#: themes/default/renderer.php:76 +#: ../admin/change_current_user_password.php:16 +#: ../admin/change_current_user_password.php:85 - #: ../themes/default/renderer.php:72 ++#: ../themes/default/renderer.php:76 msgid "Change password" msgstr "" @@@ -626,14 -499,11 +629,13 @@@ msgstr " msgid "Name (to appear on reports):" msgstr "" -#: admin/company_preferences.php:160 admin/shipping_companies.php:142 -#: includes/ui/contacts_view.inc:109 inventory/manage/locations.php:202 -#: sales/manage/customers.php:231 sales/manage/customers.php.orig:228 -#: sales/includes/ui/sales_order_ui.inc:628 -#: sales/includes/ui/sales_order_ui.inc:632 +#: ../admin/company_preferences.php:160 +#: ../admin/shipping_companies.php:142 +#: ../includes/ui/contacts_view.inc:109 +#: ../inventory/manage/locations.php:202 +#: ../sales/manage/customers.php:231 +#: ../sales/manage/sav.customers.php:231 - #: ../sales/includes/ui/sales_order_ui.inc:636 - #: ../sales/includes/ui/sales_order_ui.inc.orig:628 ++#: ../sales/includes/ui/sales_order_ui.inc.orig:636 msgid "Address:" msgstr "" @@@ -765,52 -623,35 +767,49 @@@ msgstr " msgid "Version Id" msgstr "" -#: admin/company_preferences.php:201 admin/display_prefs.php:142 -#: admin/forms_setup.php:61 admin/gl_setup.php:221 admin/inst_chart.php:74 -#: admin/inst_lang.php:103 admin/inst_lang.php.orig:103 -#: admin/inst_module.php:138 admin/inst_module.php:156 -#: admin/inst_module.php:199 admin/inst_theme.php:96 -#: dimensions/dimension_entry.php:293 gl/gl_bank.php:401 gl/gl_budget.php:135 -#: gl/manage/gl_quick_entries.php:60 gl/includes/ui/gl_bank_ui.inc:275 -#: gl/includes/ui/gl_bank_ui.inc.orig:257 gl/includes/ui/gl_journal_ui.inc:221 -#: includes/ui/db_pager_view.inc:174 includes/ui/radio.ui_input.inc:206 -#: includes/ui/radio.ui_input.inc:901 includes/ui/simple_crud_class.inc:56 -#: includes/ui/simple_crud_class.inc:227 includes/ui/ui_input.inc:206 -#: includes/ui/ui_input.inc:900 inventory/adjustments.php:235 -#: inventory/cost_update.php:116 inventory/reorder_level.php:97 -#: inventory/transfers.php:236 inventory/includes/item_adjustments_ui.inc:157 -#: inventory/includes/stock_transfers_ui.inc:137 -#: inventory/manage/sales_kits.php:208 manufacturing/work_order_entry.php:459 -#: manufacturing/includes/work_order_issue_ui.inc:131 -#: purchasing/includes/ui/po_ui.inc:299 purchasing/includes/ui/po_ui.inc:442 -#: purchasing/po_receive_items.php:333 sales/credit_note_entry.php:282 -#: sales/customer_credit_invoice.php:382 sales/customer_delivery.php:523 -#: sales/customer_invoice.php:580 sales/inquiry/sales_orders_view.php:323 -#: sales/inquiry/sales_orders_view.php.orig:321 -#: sales/includes/ui/sales_credit_ui.inc:293 -#: sales/includes/ui/sales_order_ui.inc:237 -#: sales/includes/ui/sales_order_ui.inc:555 sales/credit_note_entry.php:284 -#: sales/customer_credit_invoice.php:380 sales/customer_invoice.php:582 -#: sales/includes/ui/sales_order_ui.inc:241 -#: sales/includes/ui/sales_order_ui.inc:559 gl/gl_bank.php:403 -#: includes/ui/ui_input.inc:207 includes/ui/ui_input.inc:904 +#: ../admin/company_preferences.php:201 +#: ../admin/display_prefs.php:144 +#: ../admin/forms_setup.php:61 - #: ../admin/gl_setup.php:235 - #: ../admin/gl_setup.php.orig:231 ++#: ../admin/gl_setup.php.orig:235 +#: ../admin/inst_chart.php:74 +#: ../admin/inst_lang.php:103 +#: ../admin/inst_module.php:138 +#: ../admin/inst_module.php:156 +#: ../admin/inst_module.php:199 +#: ../admin/inst_theme.php:96 +#: ../dimensions/dimension_entry.php:293 - #: ../gl/gl_bank.php:403 ++#: ../gl/gl_bank.php:406 +#: ../gl/gl_budget.php:135 +#: ../gl/manage/gl_quick_entries.php:60 +#: ../gl/includes/ui/gl_bank_ui.inc:275 +#: ../gl/includes/ui/gl_bank_ui.inc.orig:249 +#: ../gl/includes/ui/gl_journal_ui.inc:257 +#: ../includes/ui/db_pager_view.inc:174 +#: ../includes/ui/simple_crud_class.inc:56 +#: ../includes/ui/simple_crud_class.inc:227 - #: ../includes/ui/ui_input.inc:207 - #: ../includes/ui/ui_input.inc:901 ++#: ../includes/ui/ui_input.inc:208 ++#: ../includes/ui/ui_input.inc:905 +#: ../inventory/adjustments.php:235 +#: ../inventory/cost_update.php:116 +#: ../inventory/reorder_level.php:97 +#: ../inventory/transfers.php:236 +#: ../inventory/includes/item_adjustments_ui.inc:157 +#: ../inventory/includes/stock_transfers_ui.inc:137 +#: ../inventory/manage/sales_kits.php:208 +#: ../manufacturing/work_order_entry.php:459 +#: ../manufacturing/includes/work_order_issue_ui.inc:131 +#: ../purchasing/includes/ui/po_ui.inc:306 - #: ../purchasing/includes/ui/po_ui.inc:457 ++#: ../purchasing/includes/ui/po_ui.inc.orig:306 ++#: ../purchasing/includes/ui/po_ui.inc.orig:457 +#: ../purchasing/po_receive_items.php:331 - #: ../sales/credit_note_entry.php:282 - #: ../sales/customer_credit_invoice.php:382 - #: ../sales/customer_delivery.php:531 - #: ../sales/customer_invoice.php:682 ++#: ../sales/credit_note_entry.php:284 ++#: ../sales/customer_credit_invoice.php:380 ++#: ../sales/customer_delivery.php.orig:536 ++#: ../sales/customer_invoice.php:684 +#: ../sales/inquiry/sales_orders_view.php:349 - #: ../sales/inquiry/sales_orders_view.php.orig:322 +#: ../sales/includes/ui/sales_credit_ui.inc:293 - #: ../sales/includes/ui/sales_order_ui.inc:237 - #: ../sales/includes/ui/sales_order_ui.inc:555 +#: ../sales/includes/ui/sales_order_ui.inc.orig:237 +#: ../sales/includes/ui/sales_order_ui.inc.orig:555 msgid "Update" msgstr "" @@@ -845,180 -685,149 +844,184 @@@ msgstr " msgid "Cannot create new company due to bugs in sql file." msgstr "" - #: ../admin/create_coy.php:145 - #: ../admin/create_coy.php:212 -#: admin/create_coy.php:145 admin/create_coy.php:212 admin/create_coy.php:149 -#: admin/create_coy.php:216 ++#: ../admin/create_coy.php:149 ++#: ../admin/create_coy.php:216 msgid "Cannot open the configuration file - " msgstr "" - #: ../admin/create_coy.php:147 - #: ../admin/create_coy.php:214 -#: admin/create_coy.php:147 admin/create_coy.php:214 admin/create_coy.php:151 -#: admin/create_coy.php:218 ++#: ../admin/create_coy.php:151 ++#: ../admin/create_coy.php:218 msgid "Cannot write to the configuration file - " msgstr "" - #: ../admin/create_coy.php:149 - #: ../admin/create_coy.php:185 - #: ../admin/create_coy.php:216 -#: admin/create_coy.php:149 admin/create_coy.php:185 admin/create_coy.php:216 -#: admin/create_coy.php:153 admin/create_coy.php:189 admin/create_coy.php:220 ++#: ../admin/create_coy.php:153 ++#: ../admin/create_coy.php:189 ++#: ../admin/create_coy.php:220 msgid "The configuration file " msgstr "" - #: ../admin/create_coy.php:149 - #: ../admin/create_coy.php:185 - #: ../admin/create_coy.php:216 -#: admin/create_coy.php:149 admin/create_coy.php:185 admin/create_coy.php:216 -#: admin/db/maintenance_db.inc:250 admin/db/maintenance_db.inc.orig:248 -#: admin/create_coy.php:153 admin/create_coy.php:189 admin/create_coy.php:220 ++#: ../admin/create_coy.php:153 ++#: ../admin/create_coy.php:189 ++#: ../admin/create_coy.php:220 +#: ../admin/db/maintenance_db.inc:250 - #: ../admin/db/maintenance_db.inc.orig:248 msgid "" " is not writable. Change its permissions so it is, then re-run the operation." msgstr "" - #: ../admin/create_coy.php:161 -#: admin/create_coy.php:161 admin/create_coy.php:165 ++#: ../admin/create_coy.php:165 msgid "New company has been created." msgstr "" - #: ../admin/create_coy.php:161 -#: admin/create_coy.php:161 admin/create_coy.php:165 ++#: ../admin/create_coy.php:165 msgid "Company has been updated." msgstr "" - #: ../admin/create_coy.php:178 -#: admin/create_coy.php:178 admin/create_coy.php:182 ++#: ../admin/create_coy.php:182 msgid "" "Broken company subdirectories system. You have to remove this company " "manually." msgstr "" - #: ../admin/create_coy.php:194 -#: admin/create_coy.php:194 admin/create_coy.php:198 ++#: ../admin/create_coy.php:198 msgid "Cannot rename subdirectory to temporary name." msgstr "" - #: ../admin/create_coy.php:200 -#: admin/create_coy.php:200 admin/create_coy.php:204 ++#: ../admin/create_coy.php:204 msgid "Cannot rename company subdirectory" msgstr "" - #: ../admin/create_coy.php:206 -#: admin/create_coy.php:206 admin/create_coy.php:210 ++#: ../admin/create_coy.php:210 msgid "Error removing Database: " msgstr "" - #: ../admin/create_coy.php:206 -#: admin/create_coy.php:206 admin/create_coy.php:210 ++#: ../admin/create_coy.php:210 msgid ", please remove it manually" msgstr "" - #: ../admin/create_coy.php:225 -#: admin/create_coy.php:225 admin/create_coy.php:229 ++#: ../admin/create_coy.php:229 msgid "Cannot remove temporary renamed company data directory " msgstr "" - #: ../admin/create_coy.php:228 -#: admin/create_coy.php:228 admin/create_coy.php:232 ++#: ../admin/create_coy.php:232 msgid "Selected company has been deleted" msgstr "" - #: ../admin/create_coy.php:242 -#: admin/create_coy.php:242 admin/create_coy.php:246 ++#: ../admin/create_coy.php:246 msgid "Are you sure you want to delete company no. " msgstr "" - #: ../admin/create_coy.php:249 -#: admin/create_coy.php:249 admin/create_coy.php:253 ++#: ../admin/create_coy.php:253 msgid "Database Host" msgstr "" - #: ../admin/create_coy.php:249 - #: ../admin/create_coy.php:336 - #: ../admin/create_coy.php:342 -#: admin/create_coy.php:249 admin/create_coy.php:336 admin/create_coy.php:342 -#: admin/create_coy.php:253 admin/create_coy.php:341 admin/create_coy.php:347 ++#: ../admin/create_coy.php:253 ++#: ../admin/create_coy.php:341 ++#: ../admin/create_coy.php:347 msgid "Database User" msgstr "" - #: ../admin/create_coy.php:250 - #: ../admin/create_coy.php:338 -#: admin/create_coy.php:250 admin/create_coy.php:338 admin/create_coy.php:343 -#: admin/create_coy.php:254 admin/create_coy.php:348 ++#: ../admin/create_coy.php:254 +#: ../admin/create_coy.php:343 ++#: ../admin/create_coy.php:348 msgid "Database Name" msgstr "" - #: ../admin/create_coy.php:250 - #: ../admin/create_coy.php:339 -#: admin/create_coy.php:250 admin/create_coy.php:339 admin/create_coy.php:344 -#: admin/create_coy.php:254 admin/create_coy.php:349 ++#: ../admin/create_coy.php:254 +#: ../admin/create_coy.php:344 ++#: ../admin/create_coy.php:349 msgid "Table Pref" msgstr "" - #: ../admin/create_coy.php:250 - #: ../admin/create_coy.php:346 -#: admin/create_coy.php:250 admin/create_coy.php:346 admin/inst_lang.php:36 -#: admin/inst_lang.php.orig:36 admin/print_profiles.php:162 -#: admin/create_coy.php:254 admin/create_coy.php:351 ++#: ../admin/create_coy.php:254 ++#: ../admin/create_coy.php:351 +#: ../admin/inst_lang.php:36 +#: ../admin/print_profiles.php:162 msgid "Default" msgstr "" - #: ../admin/create_coy.php:259 -#: admin/create_coy.php:259 admin/fiscalyears.php:159 admin/inst_lang.php:85 -#: admin/inst_lang.php:97 admin/inst_lang.php.orig:85 -#: admin/inst_lang.php.orig:97 dimensions/inquiry/search_dimensions.php:107 -#: gl/manage/bank_accounts.php:125 gl/manage/bank_accounts.php.orig:125 -#: gl/manage/currencies.php:162 gl/manage/gl_account_classes.php:127 -#: gl/manage/gl_quick_entries.php:230 includes/system_tests.inc:38 -#: includes/system_tests.inc:113 includes/system_tests.inc:126 -#: includes/ui/sav.ui_lists.inc:1650 includes/ui/ui_lists.inc:1671 -#: purchasing/manage/suppliers.php:120 reporting/rep101.php:125 -#: reporting/rep102.php:111 reporting/rep102.php:113 reporting/rep104.php:105 -#: reporting/rep106.php:75 reporting/rep114.php:75 reporting/rep201.php:113 -#: reporting/rep202.php:115 reporting/rep202.php:117 reporting/rep203.php:86 -#: reporting/rep303.php:96 reporting/rep303.php:104 reporting/rep501.php:107 -#: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95 -#: sales/manage/sales_types.php:119 taxes/item_tax_types.php:133 -#: taxes/tax_groups.php:137 admin/create_coy.php:263 ++#: ../admin/create_coy.php:263 +#: ../admin/fiscalyears.php:159 +#: ../admin/inst_lang.php:85 +#: ../admin/inst_lang.php:97 +#: ../dimensions/inquiry/search_dimensions.php:107 +#: ../gl/manage/bank_accounts.php:128 +#: ../gl/manage/currencies.php:162 +#: ../gl/manage/gl_account_classes.php:127 +#: ../gl/manage/gl_quick_entries.php:230 +#: ../includes/system_tests.inc:38 +#: ../includes/system_tests.inc:113 +#: ../includes/system_tests.inc:126 +#: ../includes/ui/ui_lists.inc:1675 - #: ../includes/ui/ui_lists.inc.orig:1673 +#: ../purchasing/manage/suppliers.php:122 +#: ../purchasing/manage/suppliers.php.orig:132 +#: ../reporting/rep101.php:125 +#: ../reporting/rep102.php:111 +#: ../reporting/rep102.php:113 +#: ../reporting/rep104.php:105 +#: ../reporting/rep106.php:75 +#: ../reporting/rep114.php:75 +#: ../reporting/rep201.php:113 +#: ../reporting/rep202.php:115 +#: ../reporting/rep202.php:117 +#: ../reporting/rep203.php:86 +#: ../reporting/rep303.php:96 +#: ../reporting/rep303.php:104 +#: ../reporting/rep501.php:107 +#: ../sales/manage/sales_points.php:94 +#: ../sales/manage/sales_points.php:95 +#: ../sales/manage/sales_types.php:119 +#: ../taxes/item_tax_types.php:133 msgid "Yes" msgstr "" - #: ../admin/create_coy.php:288 -#: admin/create_coy.php:288 admin/create_coy.php:292 ++#: ../admin/create_coy.php:292 msgid "The marked company is the current company which cannot be deleted." msgstr "" - #: ../admin/create_coy.php:335 - #: ../admin/create_coy.php:341 -#: admin/create_coy.php:335 admin/create_coy.php:341 admin/printers.php:84 -#: admin/create_coy.php:340 admin/create_coy.php:346 ++#: ../admin/create_coy.php:293 ++msgid "" ++"If no Admin Password is entered, the new Admin Password will be " ++"'password' by default " ++msgstr "" ++ ++#: ../admin/create_coy.php:340 ++#: ../admin/create_coy.php:346 +#: ../admin/printers.php:84 msgid "Host" msgstr "" - #: ../admin/create_coy.php:337 -#: admin/create_coy.php:337 admin/create_coy.php:342 ++#: ../admin/create_coy.php:342 msgid "Database Password" msgstr "" - #: ../admin/create_coy.php:339 -#: admin/create_coy.php:339 admin/inst_chart.php:68 admin/inst_chart.php:70 -#: admin/inst_lang.php:87 admin/inst_lang.php:90 admin/inst_lang.php.orig:87 -#: admin/inst_lang.php.orig:90 admin/inst_module.php:127 -#: admin/inst_theme.php:91 admin/inst_theme.php:93 admin/inst_upgrade.php:149 -#: gl/manage/gl_account_types.php:190 includes/ui/allocation_cart.inc:286 -#: admin/create_coy.php:344 ++#: ../admin/create_coy.php:344 +#: ../admin/inst_chart.php:68 +#: ../admin/inst_chart.php:70 +#: ../admin/inst_lang.php:87 +#: ../admin/inst_lang.php:90 +#: ../admin/inst_module.php:127 +#: ../admin/inst_theme.php:91 +#: ../admin/inst_theme.php:93 - #: ../admin/inst_upgrade.php:149 ++#: ../admin/inst_upgrade.php:153 +#: ../gl/manage/gl_account_types.php:190 +#: ../includes/ui/allocation_cart.inc:288 msgid "None" msgstr "" - #: ../admin/create_coy.php:350 -#: admin/create_coy.php:350 admin/create_coy.php:355 ++#: ../admin/create_coy.php:355 msgid "Database Script" msgstr "" - #: ../admin/create_coy.php:351 -#: admin/create_coy.php:351 admin/create_coy.php:356 ++#: ../admin/create_coy.php:356 msgid "New script Admin Password" msgstr "" - #: ../admin/create_coy.php:355 -#: admin/create_coy.php:355 gl/gl_budget.php:136 admin/create_coy.php:360 ++#: ../admin/create_coy.php:360 +#: ../gl/gl_budget.php:136 msgid "Save" msgstr "" - #: ../admin/create_coy.php:377 -#: admin/create_coy.php:377 admin/create_coy.php:382 ++#: ../admin/create_coy.php:382 msgid "Create a new company" msgstr "" @@@ -1275,17 -1072,12 +1278,16 @@@ msgstr " msgid "Fiscal Year End" msgstr "" -#: admin/fiscalyears.php:138 dimensions/inquiry/search_dimensions.php:133 -#: dimensions/inquiry/search_dimensions.php:139 -#: includes/ui/sav.ui_lists.inc:659 includes/ui/ui_lists.inc:676 -#: manufacturing/search_work_orders.php:108 reporting/rep501.php:85 -#: reporting/rep710.php:109 reporting/includes/excel_report.inc:234 -#: reporting/includes/pdf_report.inc:266 +#: ../admin/fiscalyears.php:138 +#: ../dimensions/inquiry/search_dimensions.php:133 +#: ../dimensions/inquiry/search_dimensions.php:139 - #: ../includes/ui/ui_input.inc:954 ++#: ../includes/ui/ui_input.inc:958 +#: ../includes/ui/ui_lists.inc:675 - #: ../includes/ui/ui_lists.inc.orig:675 +#: ../manufacturing/search_work_orders.php:108 +#: ../reporting/rep501.php:85 +#: ../reporting/rep710.php:109 +#: ../reporting/includes/excel_report.inc:234 +#: ../reporting/includes/pdf_report.inc:266 msgid "Closed" msgstr "" @@@ -1361,247 -1145,163 +1363,202 @@@ msgstr " msgid "The general GL setup has been updated." msgstr "" - #: ../admin/gl_setup.php:138 - #: ../admin/gl_setup.php.orig:137 -#: admin/gl_setup.php:132 ++#: ../admin/gl_setup.php.orig:138 msgid "General GL" msgstr "" - #: ../admin/gl_setup.php:140 - #: ../admin/gl_setup.php.orig:139 -#: admin/gl_setup.php:134 ++#: ../admin/gl_setup.php.orig:140 msgid "Past Due Days Interval:" msgstr "" - #: ../admin/gl_setup.php:140 - #: ../admin/gl_setup.php:180 - #: ../admin/gl_setup.php:188 - #: ../admin/gl_setup.php:206 - #: ../admin/gl_setup.php:228 - #: ../admin/gl_setup.php.orig:139 - #: ../admin/gl_setup.php.orig:176 - #: ../admin/gl_setup.php.orig:184 - #: ../admin/gl_setup.php.orig:202 - #: ../admin/gl_setup.php.orig:224 -#: admin/gl_setup.php:134 admin/gl_setup.php:169 admin/gl_setup.php:177 -#: admin/gl_setup.php:214 admin/payment_terms.php:140 ++#: ../admin/gl_setup.php.orig:140 ++#: ../admin/gl_setup.php.orig:180 ++#: ../admin/gl_setup.php.orig:188 ++#: ../admin/gl_setup.php.orig:206 ++#: ../admin/gl_setup.php.orig:228 +#: ../admin/payment_terms.php:140 msgid "days" msgstr "" - #: ../admin/gl_setup.php:142 - #: ../admin/gl_setup.php.orig:141 -#: admin/gl_setup.php:136 ++#: ../admin/gl_setup.php.orig:142 msgid "Retained Earnings:" msgstr "" - #: ../admin/gl_setup.php:144 - #: ../admin/gl_setup.php.orig:143 -#: admin/gl_setup.php:138 ++#: ../admin/gl_setup.php.orig:144 msgid "Profit/Loss Year:" msgstr "" - #: ../admin/gl_setup.php:146 - #: ../admin/gl_setup.php.orig:145 -#: admin/gl_setup.php:140 ++#: ../admin/gl_setup.php.orig:146 msgid "Exchange Variances Account:" msgstr "" - #: ../admin/gl_setup.php:148 - #: ../admin/gl_setup.php.orig:147 -#: admin/gl_setup.php:142 ++#: ../admin/gl_setup.php.orig:148 +#: ../gl/manage/bank_accounts.php:193 msgid "Bank Charges Account:" msgstr "" - #: ../admin/gl_setup.php:150 - #: ../admin/gl_setup.php.orig:149 -#: admin/gl_setup.php:146 ++#: ../admin/gl_setup.php.orig:150 +msgid "Tax Algorithm:" +msgstr "" + - #: ../admin/gl_setup.php:154 - #: ../admin/gl_setup.php.orig:153 ++#: ../admin/gl_setup.php.orig:154 msgid "Customers and Sales" msgstr "" - #: ../admin/gl_setup.php:156 - #: ../admin/gl_setup.php.orig:155 -#: admin/gl_setup.php:148 ++#: ../admin/gl_setup.php.orig:156 msgid "Default Credit Limit:" msgstr "" - #: ../admin/gl_setup.php:158 - #: ../admin/gl_setup.php.orig:157 -#: admin/gl_setup.php:150 ++#: ../admin/gl_setup.php.orig:158 msgid "Accumulate batch shipping:" msgstr "" - #: ../admin/gl_setup.php:160 - #: ../admin/gl_setup.php.orig:159 -#: admin/gl_setup.php:152 ++#: ../admin/gl_setup.php.orig:160 msgid "Legal Text on Invoice:" msgstr "" - #: ../admin/gl_setup.php:162 - #: ../admin/gl_setup.php.orig:161 -#: admin/gl_setup.php:154 ++#: ../admin/gl_setup.php.orig:162 msgid "Shipping Charged Account:" msgstr "" - #: ../admin/gl_setup.php:164 -#: admin/gl_setup.php:158 ++#: ../admin/gl_setup.php.orig:164 +msgid "Deferred Income Account:" +msgstr "" + - #: ../admin/gl_setup.php:165 ++#: ../admin/gl_setup.php.orig:165 +msgid "Not used" +msgstr "" + - #: ../admin/gl_setup.php:169 - #: ../admin/gl_setup.php.orig:165 ++#: ../admin/gl_setup.php.orig:169 msgid "Customers and Sales Defaults" msgstr "" - #: ../admin/gl_setup.php:171 - #: ../admin/gl_setup.php.orig:167 -#: admin/gl_setup.php:160 ++#: ../admin/gl_setup.php.orig:171 msgid "Receivable Account:" msgstr "" - #: ../admin/gl_setup.php:173 - #: ../admin/gl_setup.php:214 - #: ../admin/gl_setup.php.orig:169 - #: ../admin/gl_setup.php.orig:210 -#: admin/gl_setup.php:162 admin/gl_setup.php:200 -#: inventory/manage/item_categories.php:192 inventory/manage/items.php:354 -#: sales/manage/customer_branches.php:250 ++#: ../admin/gl_setup.php.orig:173 ++#: ../admin/gl_setup.php.orig:214 +#: ../inventory/manage/item_categories.php:192 +#: ../inventory/manage/items.php:361 +#: ../inventory/manage/items.php.orig:354 +#: ../sales/manage/customer_branches.php:251 msgid "Sales Account:" msgstr "" - #: ../admin/gl_setup.php:176 - #: ../admin/gl_setup.php.orig:172 -#: admin/gl_setup.php:165 sales/manage/customer_branches.php:251 ++#: ../admin/gl_setup.php.orig:176 +#: ../sales/manage/customer_branches.php:252 msgid "Sales Discount Account:" msgstr "" - #: ../admin/gl_setup.php:178 - #: ../admin/gl_setup.php.orig:174 -#: admin/gl_setup.php:167 sales/manage/customer_branches.php:253 ++#: ../admin/gl_setup.php.orig:178 +#: ../sales/manage/customer_branches.php:254 msgid "Prompt Payment Discount Account:" msgstr "" - #: ../admin/gl_setup.php:180 - #: ../admin/gl_setup.php.orig:176 -#: admin/gl_setup.php:169 ++#: ../admin/gl_setup.php.orig:180 msgid "Delivery Required By:" msgstr "" - #: ../admin/gl_setup.php:186 - #: ../admin/gl_setup.php.orig:182 -#: admin/gl_setup.php:175 ++#: ../admin/gl_setup.php.orig:186 msgid "Dimension Defaults" msgstr "" - #: ../admin/gl_setup.php:188 - #: ../admin/gl_setup.php.orig:184 -#: admin/gl_setup.php:177 ++#: ../admin/gl_setup.php.orig:188 msgid "Dimension Required By After:" msgstr "" - #: ../admin/gl_setup.php:192 - #: ../admin/gl_setup.php.orig:188 -#: admin/gl_setup.php:180 ++#: ../admin/gl_setup.php.orig:192 msgid "Suppliers and Purchasing" msgstr "" - #: ../admin/gl_setup.php:194 - #: ../admin/gl_setup.php.orig:190 -#: admin/gl_setup.php:182 ++#: ../admin/gl_setup.php.orig:194 msgid "Delivery Over-Receive Allowance:" msgstr "" - #: ../admin/gl_setup.php:196 - #: ../admin/gl_setup.php.orig:192 -#: admin/gl_setup.php:184 ++#: ../admin/gl_setup.php.orig:196 msgid "Invoice Over-Charge Allowance:" msgstr "" - #: ../admin/gl_setup.php:198 - #: ../admin/gl_setup.php.orig:194 -#: admin/gl_setup.php:186 ++#: ../admin/gl_setup.php.orig:198 msgid "Suppliers and Purchasing Defaults" msgstr "" - #: ../admin/gl_setup.php:200 - #: ../admin/gl_setup.php.orig:196 -#: admin/gl_setup.php:188 ++#: ../admin/gl_setup.php.orig:200 msgid "Payable Account:" msgstr "" - #: ../admin/gl_setup.php:202 - #: ../admin/gl_setup.php.orig:198 -#: admin/gl_setup.php:190 purchasing/manage/suppliers.php:126 ++#: ../admin/gl_setup.php.orig:202 +#: ../purchasing/manage/suppliers.php:132 +#: ../purchasing/manage/suppliers.php.orig:142 msgid "Purchase Discount Account:" msgstr "" - #: ../admin/gl_setup.php:204 - #: ../admin/gl_setup.php.orig:200 -#: admin/gl_setup.php:192 ++#: ../admin/gl_setup.php.orig:204 msgid "GRN Clearing Account:" msgstr "" - #: ../admin/gl_setup.php:204 - #: ../admin/gl_setup.php.orig:200 -#: admin/gl_setup.php:192 ++#: ../admin/gl_setup.php.orig:204 msgid "No postings on GRN" msgstr "" - #: ../admin/gl_setup.php:206 - #: ../admin/gl_setup.php.orig:202 -#: admin/gl_setup.php:194 reporting/reports_main.php:175 ++#: ../admin/gl_setup.php.orig:206 +msgid "Receival Required By:" +msgstr "" + - #: ../admin/gl_setup.php:208 - #: ../admin/gl_setup.php.orig:204 ++#: ../admin/gl_setup.php.orig:208 +#: ../reporting/reports_main.php:175 msgid "Inventory" msgstr "" - #: ../admin/gl_setup.php:210 - #: ../admin/gl_setup.php.orig:206 -#: admin/gl_setup.php:196 ++#: ../admin/gl_setup.php.orig:210 msgid "Allow Negative Inventory:" msgstr "" - #: ../admin/gl_setup.php:211 - #: ../admin/gl_setup.php.orig:207 -#: admin/gl_setup.php:197 ++#: ../admin/gl_setup.php.orig:211 msgid "Warning: This may cause a delay in GL postings" msgstr "" - #: ../admin/gl_setup.php:213 - #: ../admin/gl_setup.php.orig:209 -#: admin/gl_setup.php:199 ++#: ../admin/gl_setup.php.orig:213 msgid "Items Defaults" msgstr "" - #: ../admin/gl_setup.php:216 - #: ../admin/gl_setup.php.orig:212 -#: admin/gl_setup.php:202 inventory/manage/item_categories.php:202 -#: inventory/manage/items.php:358 ++#: ../admin/gl_setup.php.orig:216 +#: ../inventory/manage/item_categories.php:202 +#: ../inventory/manage/items.php:365 +#: ../inventory/manage/items.php.orig:358 msgid "Inventory Account:" msgstr "" - #: ../admin/gl_setup.php:218 - #: ../admin/gl_setup.php.orig:214 -#: admin/gl_setup.php:204 inventory/manage/item_categories.php:196 -#: inventory/manage/item_categories.php:204 inventory/manage/items.php:359 -#: inventory/manage/items.php:364 ++#: ../admin/gl_setup.php.orig:218 +#: ../inventory/manage/item_categories.php:196 +#: ../inventory/manage/item_categories.php:204 +#: ../inventory/manage/items.php:366 +#: ../inventory/manage/items.php:371 +#: ../inventory/manage/items.php.orig:359 +#: ../inventory/manage/items.php.orig:364 msgid "C.O.G.S. Account:" msgstr "" - #: ../admin/gl_setup.php:220 - #: ../admin/gl_setup.php.orig:216 -#: admin/gl_setup.php:206 inventory/manage/item_categories.php:205 -#: inventory/manage/items.php:360 ++#: ../admin/gl_setup.php.orig:220 +#: ../inventory/manage/item_categories.php:205 +#: ../inventory/manage/items.php:367 +#: ../inventory/manage/items.php.orig:360 msgid "Inventory Adjustments Account:" msgstr "" - #: ../admin/gl_setup.php:222 - #: ../admin/gl_setup.php.orig:218 -#: admin/gl_setup.php:208 inventory/manage/item_categories.php:209 -#: inventory/manage/items.php:371 ++#: ../admin/gl_setup.php.orig:222 +#: ../inventory/manage/item_categories.php:209 +#: ../inventory/manage/items.php:378 +#: ../inventory/manage/items.php.orig:371 msgid "Item Assembly Costs Account:" msgstr "" - #: ../admin/gl_setup.php:226 - #: ../admin/gl_setup.php.orig:222 -#: admin/gl_setup.php:212 ++#: ../admin/gl_setup.php.orig:226 msgid "Manufacturing Defaults" msgstr "" - #: ../admin/gl_setup.php:228 - #: ../admin/gl_setup.php.orig:224 -#: admin/gl_setup.php:214 ++#: ../admin/gl_setup.php.orig:228 msgid "Work Order Required By After:" msgstr "" @@@ -1617,11 -1317,9 +1574,11 @@@ msgstr " msgid "Chart" msgstr "" -#: admin/inst_chart.php:50 admin/inst_lang.php:36 admin/inst_lang.php.orig:36 -#: admin/inst_module.php:105 admin/inst_theme.php:74 -#: admin/inst_upgrade.php:155 +#: ../admin/inst_chart.php:50 +#: ../admin/inst_lang.php:36 +#: ../admin/inst_module.php:105 +#: ../admin/inst_theme.php:74 - #: ../admin/inst_upgrade.php:155 ++#: ../admin/inst_upgrade.php:159 msgid "Installed" msgstr "" @@@ -1651,12 -1340,10 +1608,12 @@@ msgstr " msgid "Unknown" msgstr "" -#: admin/inst_chart.php:74 admin/inst_lang.php:103 -#: admin/inst_lang.php.orig:103 admin/inst_module.php:133 -#: admin/inst_module.php:138 admin/inst_theme.php:96 -#: admin/inst_upgrade.php:137 +#: ../admin/inst_chart.php:74 +#: ../admin/inst_lang.php:103 +#: ../admin/inst_module.php:133 +#: ../admin/inst_module.php:138 +#: ../admin/inst_theme.php:96 - #: ../admin/inst_upgrade.php:137 ++#: ../admin/inst_upgrade.php:141 msgid "Install" msgstr "" @@@ -1797,13 -1472,10 +1754,11 @@@ msgstr " msgid "Install third-party extension." msgstr "" -#: admin/inst_module.php:169 includes/ui/sav.ui_lists.inc:659 -#: includes/ui/sav.ui_lists.inc:2131 includes/ui/ui_lists.inc:676 -#: includes/ui/ui_lists.inc:2152 reporting/includes/excel_report.inc:232 -#: reporting/includes/pdf_report.inc:264 +#: ../admin/inst_module.php:169 +#: ../includes/ui/ui_lists.inc:675 +#: ../includes/ui/ui_lists.inc:2156 - #: ../includes/ui/ui_lists.inc.orig:675 - #: ../includes/ui/ui_lists.inc.orig:2154 +#: ../reporting/includes/excel_report.inc:232 +#: ../reporting/includes/pdf_report.inc:264 msgid "Active" msgstr "" @@@ -1840,47 -1512,47 +1795,47 @@@ msgstr " msgid "Database upgrade for company '%s' (%s:%s*) started..." msgstr "" - #: ../admin/inst_upgrade.php:80 -#: admin/inst_upgrade.php:80 ++#: ../admin/inst_upgrade.php:83 msgid "Database upgrade finished." msgstr "" - #: ../admin/inst_upgrade.php:84 -#: admin/inst_upgrade.php:84 ++#: ../admin/inst_upgrade.php:86 msgid "" "Upgrade cannot be done because database has been already partially upgraded. " "Please downgrade database to clean previous version or try forced upgrade." msgstr "" - #: ../admin/inst_upgrade.php:102 -#: admin/inst_upgrade.php:102 ++#: ../admin/inst_upgrade.php:104 msgid "Cannot connect to database for company" msgstr "" - #: ../admin/inst_upgrade.php:114 -#: admin/inst_upgrade.php:114 ++#: ../admin/inst_upgrade.php:117 #, php-format msgid "Database upgrade to version %s failed for company '%s'." msgstr "" - #: ../admin/inst_upgrade.php:117 -#: admin/inst_upgrade.php:117 ++#: ../admin/inst_upgrade.php:120 msgid "You should restore company database from latest backup file" msgstr "" - #: ../admin/inst_upgrade.php:129 -#: admin/inst_upgrade.php:129 ++#: ../admin/inst_upgrade.php:133 msgid "All companies data has been successfully updated" msgstr "" - #: ../admin/inst_upgrade.php:137 -#: admin/inst_upgrade.php:137 ++#: ../admin/inst_upgrade.php:141 msgid "Sql file" msgstr "" - #: ../admin/inst_upgrade.php:138 -#: admin/inst_upgrade.php:138 ++#: ../admin/inst_upgrade.php:142 msgid "Force upgrade" msgstr "" - #: ../admin/inst_upgrade.php:161 -#: admin/inst_upgrade.php:161 ++#: ../admin/inst_upgrade.php:165 #, php-format msgid "Partially installed (%s)" msgstr "" - #: ../admin/inst_upgrade.php:170 -#: admin/inst_upgrade.php:170 ++#: ../admin/inst_upgrade.php:174 msgid "" "Database upgrades marked as partially installed cannot be installed " "automatically.\n" @@@ -1888,11 -1560,11 +1843,11 @@@ "upgrade." msgstr "" - #: ../admin/inst_upgrade.php:174 -#: admin/inst_upgrade.php:174 ++#: ../admin/inst_upgrade.php:178 msgid "Upgrade system" msgstr "" - #: ../admin/inst_upgrade.php:174 -#: admin/inst_upgrade.php:174 ++#: ../admin/inst_upgrade.php:178 msgid "Save database and perform upgrade" msgstr "" @@@ -1937,56 -1605,34 +1892,53 @@@ msgstr " msgid "Selected payment terms have been deleted" msgstr "" -#: admin/payment_terms.php:127 dimensions/dimension_entry.php:275 -#: dimensions/inquiry/search_dimensions.php:75 -#: dimensions/inquiry/search_dimensions.php:130 -#: dimensions/view/view_dimension.php:54 gl/bank_account_reconcile.php:233 -#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126 -#: gl/inquiry/journal_inquiry.php:129 gl/inquiry/tax_inquiry.php:82 -#: gl/manage/bank_accounts.php:106 gl/manage/bank_accounts.php.orig:106 -#: gl/manage/gl_quick_entries.php:186 gl/view/accrual_trans.php:52 -#: gl/includes/ui/gl_bank_ui.inc:92 gl/includes/ui/gl_bank_ui.inc.orig:80 -#: includes/ui/ui_view.inc:488 inventory/inquiry/stock_movements.php:81 -#: inventory/manage/item_categories.php:98 -#: manufacturing/search_work_orders.php:161 -#: manufacturing/includes/manufacturing_ui.inc:236 -#: manufacturing/includes/manufacturing_ui.inc:276 -#: manufacturing/includes/manufacturing_ui.inc:280 -#: manufacturing/includes/manufacturing_ui.inc:331 -#: purchasing/inquiry/supplier_allocation_inquiry.php:126 -#: purchasing/inquiry/supplier_inquiry.php:168 -#: purchasing/inquiry/supplier_inquiry.php.orig:162 reporting/rep102.php:132 -#: reporting/rep202.php:137 reporting/rep501.php:85 reporting/rep601.php:76 -#: reporting/rep702.php:58 reporting/rep704.php:79 reporting/rep704.php:82 -#: reporting/rep704.php:85 reporting/rep709.php:105 reporting/rep710.php:76 -#: reporting/rep710.php:84 reporting/reports_main.php:252 -#: reporting/reports_main.php:399 reporting/includes/doctext.inc:140 -#: reporting/includes/doctext.inc:181 reporting/includes/doctext.inc:200 -#: sales/inquiry/customer_allocation_inquiry.php:144 -#: sales/inquiry/customer_inquiry.php:224 -#: sales/inquiry/customer_inquiry.php.orig:224 +#: ../admin/payment_terms.php:127 +#: ../dimensions/dimension_entry.php:275 +#: ../dimensions/inquiry/search_dimensions.php:75 +#: ../dimensions/inquiry/search_dimensions.php:130 +#: ../dimensions/view/view_dimension.php:54 +#: ../gl/bank_account_reconcile.php:231 +#: ../gl/inquiry/bank_inquiry.php:70 +#: ../gl/inquiry/gl_account_inquiry.php:126 +#: ../gl/inquiry/journal_inquiry.php:129 +#: ../gl/inquiry/tax_inquiry.php:82 +#: ../gl/manage/bank_accounts.php:109 +#: ../gl/manage/gl_quick_entries.php:186 +#: ../gl/view/accrual_trans.php:52 +#: ../gl/includes/ui/gl_bank_ui.inc:92 +#: ../gl/includes/ui/gl_bank_ui.inc.orig:83 +#: ../includes/ui/ui_view.inc:488 - #: ../includes/ui/ui_view.inc.orig:488 +#: ../inventory/inquiry/stock_movements.php:77 +#: ../inventory/inquiry/stock_movements.php.orig:79 +#: ../inventory/manage/item_categories.php:98 +#: ../manufacturing/search_work_orders.php:161 +#: ../manufacturing/view/wo_costs_view.php:46 +#: ../manufacturing/includes/manufacturing_ui.inc:236 +#: ../manufacturing/includes/manufacturing_ui.inc:276 +#: ../manufacturing/includes/manufacturing_ui.inc:280 +#: ../manufacturing/includes/manufacturing_ui.inc:331 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:125 +#: ../purchasing/inquiry/supplier_inquiry.php:173 +#: ../purchasing/inquiry/supplier_inquiry.php.orig:170 +#: ../reporting/rep102.php:132 +#: ../reporting/rep202.php:137 +#: ../reporting/rep501.php:85 +#: ../reporting/rep601.php:76 +#: ../reporting/rep602.php:80 +#: ../reporting/rep702.php:58 +#: ../reporting/rep704.php:79 +#: ../reporting/rep704.php:82 +#: ../reporting/rep704.php:85 +#: ../reporting/rep709.php:105 +#: ../reporting/rep710.php:76 +#: ../reporting/rep710.php:84 +#: ../reporting/reports_main.php:252 +#: ../reporting/reports_main.php:399 +#: ../reporting/includes/doctext.inc:162 +#: ../reporting/includes/doctext.inc:203 +#: ../reporting/includes/doctext.inc:222 +#: ../sales/inquiry/customer_allocation_inquiry.php:144 - #: ../sales/inquiry/customer_allocation_inquiry.php.orig:144 +#: ../sales/inquiry/customer_inquiry.php:200 - #: ../sales/inquiry/customer_inquiry.php.orig:224 msgid "Type" msgstr "" @@@ -2181,14 -1824,11 +2133,14 @@@ msgstr " msgid "Role:" msgstr "" -#: admin/security_roles.php:180 gl/manage/gl_accounts.php:198 -#: gl/manage/gl_accounts.php.orig:198 inventory/manage/items.php:433 -#: purchasing/manage/suppliers.php:289 sales/manage/customers.php:324 -#: sales/manage/customers.php.orig:321 sales/manage/customers.php:326 -#: gl/manage/gl_accounts.php:199 +#: ../admin/security_roles.php:180 - #: ../gl/manage/gl_accounts.php:197 ++#: ../gl/manage/gl_accounts.php:198 +#: ../inventory/manage/items.php:440 +#: ../inventory/manage/items.php.orig:433 +#: ../purchasing/manage/suppliers.php:291 +#: ../purchasing/manage/suppliers.php.orig:294 - #: ../sales/manage/customers.php:324 ++#: ../sales/manage/customers.php:326 +#: ../sales/manage/sav.customers.php:324 msgid "Show inactive:" msgstr "" @@@ -2229,25 -1868,19 +2181,24 @@@ msgstr " msgid "Delete This Role" msgstr "" -#: admin/security_roles.php:249 admin/void_transaction.php:229 -#: gl/manage/gl_quick_entries.php:61 gl/includes/ui/gl_bank_ui.inc:277 -#: gl/includes/ui/gl_bank_ui.inc.orig:259 gl/includes/ui/gl_journal_ui.inc:223 -#: includes/ui/radio.ui_input.inc:209 includes/ui/simple_crud_class.inc:58 -#: includes/ui/simple_crud_class.inc:231 includes/ui/ui_controls.inc:587 -#: includes/ui/ui_input.inc:209 inventory/includes/item_adjustments_ui.inc:159 -#: inventory/includes/stock_transfers_ui.inc:139 -#: inventory/manage/items.php:416 -#: manufacturing/includes/work_order_issue_ui.inc:133 -#: purchasing/includes/ui/po_ui.inc:444 -#: sales/includes/ui/sales_credit_ui.inc:295 -#: sales/includes/ui/sales_order_ui.inc:557 -#: sales/includes/ui/sales_order_ui.inc:561 includes/ui/ui_input.inc:210 +#: ../admin/security_roles.php:249 +#: ../admin/void_transaction.php:229 +#: ../gl/manage/gl_quick_entries.php:61 +#: ../gl/includes/ui/gl_bank_ui.inc:277 +#: ../gl/includes/ui/gl_bank_ui.inc.orig:251 +#: ../gl/includes/ui/gl_journal_ui.inc:259 +#: ../includes/ui/simple_crud_class.inc:58 +#: ../includes/ui/simple_crud_class.inc:231 +#: ../includes/ui/ui_controls.inc:594 - #: ../includes/ui/ui_input.inc:210 ++#: ../includes/ui/ui_input.inc:211 +#: ../inventory/includes/item_adjustments_ui.inc:159 +#: ../inventory/includes/stock_transfers_ui.inc:139 +#: ../inventory/manage/items.php:423 +#: ../inventory/manage/items.php.orig:416 +#: ../manufacturing/includes/work_order_issue_ui.inc:133 - #: ../purchasing/includes/ui/po_ui.inc:459 ++#: ../purchasing/includes/ui/po_ui.inc.orig:459 +#: ../sales/includes/ui/sales_credit_ui.inc:295 - #: ../sales/includes/ui/sales_order_ui.inc:557 +#: ../sales/includes/ui/sales_order_ui.inc.orig:557 msgid "Cancel" msgstr "" @@@ -2257,13 -1888,11 +2208,13 @@@ msgid "Cancel Edition" msgstr "" -#: admin/shipping_companies.php:15 sales/customer_credit_invoice.php:256 -#: sales/customer_delivery.php:368 sales/customer_invoice.php:420 -#: sales/view/view_credit.php:74 sales/view/view_dispatch.php:92 -#: sales/view/view_invoice.php:91 sales/customer_credit_invoice.php:254 -#: sales/customer_invoice.php:422 +#: ../admin/shipping_companies.php:15 - #: ../sales/customer_credit_invoice.php:256 - #: ../sales/customer_delivery.php:376 - #: ../sales/customer_invoice.php:486 ++#: ../sales/customer_credit_invoice.php:254 ++#: ../sales/customer_delivery.php.orig:381 ++#: ../sales/customer_invoice.php:488 +#: ../sales/view/view_credit.php:74 +#: ../sales/view/view_dispatch.php:92 +#: ../sales/view/view_invoice.php:92 msgid "Shipping Company" msgstr "" @@@ -2484,19 -2090,14 +2435,16 @@@ msgstr " msgid "View or Print Transactions" msgstr "" -#: admin/view_print_transaction.php:43 admin/view_print_transaction.php:45 -#: admin/view_print_transaction.php:129 includes/ui/ui_controls.inc:188 -#: purchasing/inquiry/po_search_completed.php:113 -#: purchasing/inquiry/po_search.php:93 sales/inquiry/customer_inquiry.php:209 -#: sales/inquiry/customer_inquiry.php.orig:209 -#: sales/inquiry/sales_deliveries_view.php:160 -#: sales/inquiry/sales_orders_view.php:119 -#: sales/inquiry/sales_orders_view.php.orig:117 +#: ../admin/view_print_transaction.php:43 +#: ../admin/view_print_transaction.php:45 +#: ../admin/view_print_transaction.php:129 +#: ../includes/ui/ui_controls.inc:195 +#: ../purchasing/inquiry/po_search_completed.php:112 +#: ../purchasing/inquiry/po_search_completed.php.orig:111 +#: ../purchasing/inquiry/po_search.php:93 +#: ../sales/inquiry/customer_inquiry.php:185 - #: ../sales/inquiry/customer_inquiry.php.orig:209 +#: ../sales/inquiry/sales_deliveries_view.php:160 - #: ../sales/inquiry/sales_deliveries_view.php.orig:160 +#: ../sales/inquiry/sales_orders_view.php:125 - #: ../sales/inquiry/sales_orders_view.php.orig:116 msgid "Print" msgstr "" @@@ -2514,26 -2113,21 +2462,22 @@@ msgstr " msgid "to #:" msgstr "" -#: admin/view_print_transaction.php:83 admin/void_transaction.php:170 -#: dimensions/inquiry/search_dimensions.php:88 -#: gl/inquiry/journal_inquiry.php:53 manufacturing/search_work_orders.php:78 -#: purchasing/includes/ui/invoice_ui.inc:453 -#: purchasing/inquiry/po_search_completed.php:77 -#: purchasing/inquiry/po_search.php:76 -#: purchasing/inquiry/supplier_allocation_inquiry.php:57 -#: purchasing/inquiry/supplier_inquiry.php:58 -#: purchasing/inquiry/supplier_inquiry.php.orig:54 -#: sales/inquiry/customer_allocation_inquiry.php:51 -#: sales/inquiry/customer_inquiry.php:58 -#: sales/inquiry/customer_inquiry.php.orig:58 -#: sales/inquiry/sales_deliveries_view.php:116 -#: sales/inquiry/sales_orders_view.php:247 -#: sales/inquiry/sales_orders_view.php.orig:245 +#: ../admin/view_print_transaction.php:83 +#: ../admin/void_transaction.php:170 +#: ../dimensions/inquiry/search_dimensions.php:88 +#: ../gl/inquiry/journal_inquiry.php:53 +#: ../manufacturing/search_work_orders.php:78 +#: ../purchasing/includes/ui/invoice_ui.inc:474 +#: ../purchasing/inquiry/po_search_completed.php:74 +#: ../purchasing/inquiry/po_search_completed.php.orig:75 +#: ../purchasing/inquiry/po_search.php:76 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:57 +#: ../purchasing/inquiry/supplier_inquiry.php:55 +#: ../purchasing/inquiry/supplier_inquiry.php.orig:55 +#: ../sales/inquiry/customer_allocation_inquiry.php:51 - #: ../sales/inquiry/customer_allocation_inquiry.php.orig:51 +#: ../sales/inquiry/customer_inquiry.php:54 - #: ../sales/inquiry/customer_inquiry.php.orig:55 +#: ../sales/inquiry/sales_deliveries_view.php:116 - #: ../sales/inquiry/sales_deliveries_view.php.orig:116 +#: ../sales/inquiry/sales_orders_view.php:269 - #: ../sales/inquiry/sales_orders_view.php.orig:246 msgid "Search" msgstr "" @@@ -2549,150 -2143,97 +2493,144 @@@ msgid " "zero." msgstr "" -#: admin/view_print_transaction.php:127 admin/void_transaction.php:182 -#: dimensions/inquiry/search_dimensions.php:128 -#: dimensions/view/view_dimension.php:54 gl/bank_account_reconcile.php:235 -#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/journal_inquiry.php:131 -#: gl/view/bank_transfer_view.php:86 gl/view/gl_deposit_view.php:75 -#: gl/view/gl_payment_view.php:73 gl/view/gl_trans_view.php:35 -#: includes/ui/contacts_view.inc:41 inventory/inquiry/stock_movements.php:81 -#: inventory/view/view_adjustment.php:44 inventory/view/view_transfer.php:44 -#: manufacturing/search_work_orders.php:160 -#: manufacturing/view/wo_issue_view.php:43 -#: manufacturing/view/wo_production_view.php:44 -#: manufacturing/includes/manufacturing_ui.inc:157 -#: manufacturing/includes/manufacturing_ui.inc:200 -#: manufacturing/includes/manufacturing_ui.inc:276 -#: manufacturing/includes/manufacturing_ui.inc:280 -#: manufacturing/includes/manufacturing_ui.inc:331 -#: purchasing/includes/ui/grn_ui.inc:36 purchasing/includes/ui/grn_ui.inc:53 -#: purchasing/includes/ui/po_ui.inc:314 purchasing/view/view_po.php:115 -#: purchasing/view/view_supp_credit.php:43 -#: purchasing/view/view_supp_invoice.php:46 -#: purchasing/view/view_supp_payment.php:73 -#: purchasing/inquiry/po_search_completed.php:122 -#: purchasing/inquiry/po_search.php:131 -#: purchasing/inquiry/supplier_allocation_inquiry.php:128 -#: purchasing/inquiry/supplier_inquiry.php:170 -#: purchasing/inquiry/supplier_inquiry.php.orig:164 -#: purchasing/allocations/supplier_allocation_main.php:96 -#: reporting/rep501.php:85 reporting/rep601.php:76 reporting/rep702.php:51 -#: reporting/includes/doctext.inc:199 sales/customer_credit_invoice.php:247 -#: sales/customer_credit_invoice.php:249 sales/customer_delivery.php:348 -#: sales/customer_delivery.php:350 sales/customer_invoice.php:392 -#: sales/customer_invoice.php:394 -#: sales/allocations/customer_allocation_main.php:95 -#: sales/view/view_dispatch.php:85 sales/view/view_invoice.php:84 -#: sales/view/view_receipt.php:50 sales/view/view_sales_order.php:81 -#: sales/inquiry/customer_allocation_inquiry.php:146 -#: sales/inquiry/customer_inquiry.php:227 -#: sales/inquiry/customer_inquiry.php.orig:227 -#: sales/inquiry/sales_deliveries_view.php:184 -#: sales/includes/ui/sales_credit_ui.inc:85 -#: sales/includes/ui/sales_credit_ui.inc:87 -#: sales/includes/ui/sales_order_ui.inc:373 -#: sales/customer_credit_invoice.php:245 sales/customer_invoice.php:396 -#: sales/includes/ui/sales_order_ui.inc:377 +#: ../admin/view_print_transaction.php:127 +#: ../admin/void_transaction.php:182 +#: ../dimensions/inquiry/search_dimensions.php:128 +#: ../dimensions/view/view_dimension.php:54 +#: ../gl/bank_account_reconcile.php:233 +#: ../gl/inquiry/bank_inquiry.php:70 +#: ../gl/inquiry/journal_inquiry.php:131 +#: ../gl/view/bank_transfer_view.php:86 +#: ../gl/view/gl_deposit_view.php:75 +#: ../gl/view/gl_payment_view.php:73 +#: ../gl/view/gl_trans_view.php:35 +#: ../includes/ui/contacts_view.inc:41 +#: ../inventory/inquiry/stock_movements.php:77 +#: ../inventory/inquiry/stock_movements.php.orig:79 +#: ../inventory/view/view_adjustment.php:44 +#: ../inventory/view/view_transfer.php:44 +#: ../manufacturing/search_work_orders.php:160 +#: ../manufacturing/view/wo_issue_view.php:43 +#: ../manufacturing/view/wo_production_view.php:44 +#: ../manufacturing/includes/manufacturing_ui.inc:157 +#: ../manufacturing/includes/manufacturing_ui.inc:200 +#: ../manufacturing/includes/manufacturing_ui.inc:276 +#: ../manufacturing/includes/manufacturing_ui.inc:280 +#: ../manufacturing/includes/manufacturing_ui.inc:331 +#: ../purchasing/includes/ui/grn_ui.inc:36 +#: ../purchasing/includes/ui/grn_ui.inc:53 +#: ../purchasing/includes/ui/po_ui.inc:321 ++#: ../purchasing/includes/ui/po_ui.inc.orig:321 +#: ../purchasing/view/view_po.php:115 +#: ../purchasing/view/view_supp_credit.php:43 +#: ../purchasing/view/view_supp_invoice.php:47 +#: ../purchasing/view/view_supp_payment.php:73 +#: ../purchasing/inquiry/po_search_completed.php:121 +#: ../purchasing/inquiry/po_search_completed.php.orig:120 +#: ../purchasing/inquiry/po_search.php:131 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:127 +#: ../purchasing/inquiry/supplier_inquiry.php:175 +#: ../purchasing/inquiry/supplier_inquiry.php.orig:172 +#: ../purchasing/allocations/supplier_allocation_main.php:96 +#: ../reporting/rep501.php:85 +#: ../reporting/rep601.php:76 +#: ../reporting/rep602.php:80 +#: ../reporting/rep702.php:51 +#: ../reporting/includes/doctext.inc:221 ++#: ../sales/customer_credit_invoice.php:245 +#: ../sales/customer_credit_invoice.php:247 - #: ../sales/customer_credit_invoice.php:249 - #: ../sales/customer_delivery.php:356 - #: ../sales/customer_delivery.php:358 - #: ../sales/customer_invoice.php:458 ++#: ../sales/customer_delivery.php.orig:361 ++#: ../sales/customer_delivery.php.orig:363 +#: ../sales/customer_invoice.php:460 ++#: ../sales/customer_invoice.php:462 +#: ../sales/allocations/customer_allocation_main.php:95 +#: ../sales/view/view_dispatch.php:85 +#: ../sales/view/view_invoice.php:85 +#: ../sales/view/view_receipt.php:50 +#: ../sales/view/view_sales_order.php:94 +#: ../sales/view/view_sales_order.php.orig:81 +#: ../sales/inquiry/customer_allocation_inquiry.php:146 - #: ../sales/inquiry/customer_allocation_inquiry.php.orig:146 +#: ../sales/inquiry/customer_inquiry.php:203 - #: ../sales/inquiry/customer_inquiry.php.orig:227 +#: ../sales/inquiry/sales_deliveries_view.php:184 - #: ../sales/inquiry/sales_deliveries_view.php.orig:184 +#: ../sales/includes/ui/sales_credit_ui.inc:85 +#: ../sales/includes/ui/sales_credit_ui.inc:87 - #: ../sales/includes/ui/sales_order_ui.inc:373 +#: ../sales/includes/ui/sales_order_ui.inc.orig:373 msgid "Reference" msgstr "" -#: admin/view_print_transaction.php:128 admin/void_transaction.php:183 -#: dimensions/inquiry/search_dimensions.php:131 -#: dimensions/view/view_dimension.php:54 gl/accruals.php:90 -#: gl/accruals.php:195 gl/bank_account_reconcile.php:236 -#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126 -#: gl/inquiry/journal_inquiry.php:128 gl/view/accrual_trans.php:52 -#: gl/view/bank_transfer_view.php:83 gl/view/gl_deposit_view.php:68 -#: gl/view/gl_payment_view.php:66 gl/view/gl_trans_view.php:36 -#: includes/ui/allocation_cart.inc:263 includes/ui/ui_view.inc:488 -#: inventory/inquiry/stock_movements.php:81 -#: inventory/view/view_adjustment.php:45 inventory/view/view_transfer.php:47 -#: manufacturing/search_work_orders.php:166 -#: manufacturing/work_order_entry.php:419 -#: manufacturing/work_order_entry.php:425 -#: manufacturing/view/wo_production_view.php:45 -#: manufacturing/includes/manufacturing_ui.inc:157 -#: manufacturing/includes/manufacturing_ui.inc:200 -#: manufacturing/includes/manufacturing_ui.inc:236 -#: manufacturing/includes/manufacturing_ui.inc:277 -#: manufacturing/includes/manufacturing_ui.inc:281 -#: manufacturing/includes/manufacturing_ui.inc:332 -#: purchasing/includes/ui/invoice_ui.inc:103 -#: purchasing/includes/ui/po_ui.inc:328 purchasing/view/view_po.php:140 -#: purchasing/inquiry/supplier_allocation_inquiry.php:131 -#: purchasing/inquiry/supplier_inquiry.php:173 -#: purchasing/inquiry/supplier_inquiry.php.orig:167 -#: purchasing/allocations/supplier_allocation_main.php:97 -#: reporting/rep101.php:130 reporting/rep201.php:118 reporting/rep501.php:85 -#: reporting/rep601.php:76 reporting/rep704.php:79 reporting/rep704.php:82 -#: reporting/rep704.php:85 reporting/rep709.php:109 reporting/rep710.php:75 -#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186 -#: reporting/includes/doctext.inc:224 reporting/includes/header2.inc:135 -#: sales/customer_delivery.php:378 sales/customer_invoice.php:430 -#: sales/allocations/customer_allocation_main.php:96 -#: sales/view/view_credit.php:69 sales/view/view_sales_order.php:96 -#: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161 -#: sales/inquiry/customer_allocation_inquiry.php:148 -#: sales/inquiry/customer_inquiry.php:228 -#: sales/inquiry/customer_inquiry.php.orig:228 sales/customer_invoice.php:432 +#: ../admin/view_print_transaction.php:128 +#: ../admin/void_transaction.php:183 +#: ../dimensions/inquiry/search_dimensions.php:131 +#: ../dimensions/view/view_dimension.php:54 +#: ../gl/accruals.php:94 +#: ../gl/accruals.php:199 +#: ../gl/bank_account_reconcile.php:234 +#: ../gl/inquiry/bank_inquiry.php:70 +#: ../gl/inquiry/gl_account_inquiry.php:126 +#: ../gl/inquiry/journal_inquiry.php:128 +#: ../gl/view/accrual_trans.php:52 +#: ../gl/view/bank_transfer_view.php:83 +#: ../gl/view/gl_deposit_view.php:68 +#: ../gl/view/gl_payment_view.php:66 +#: ../gl/view/gl_trans_view.php:36 +#: ../includes/ui/allocation_cart.inc:264 +#: ../includes/ui/ui_view.inc:488 - #: ../includes/ui/ui_view.inc.orig:488 +#: ../inventory/inquiry/stock_movements.php:77 +#: ../inventory/inquiry/stock_movements.php.orig:79 +#: ../inventory/view/view_adjustment.php:45 +#: ../inventory/view/view_transfer.php:47 +#: ../manufacturing/search_work_orders.php:166 +#: ../manufacturing/work_order_entry.php:419 +#: ../manufacturing/work_order_entry.php:425 +#: ../manufacturing/view/wo_costs_view.php:46 +#: ../manufacturing/view/wo_production_view.php:45 +#: ../manufacturing/includes/manufacturing_ui.inc:157 +#: ../manufacturing/includes/manufacturing_ui.inc:200 +#: ../manufacturing/includes/manufacturing_ui.inc:236 +#: ../manufacturing/includes/manufacturing_ui.inc:277 +#: ../manufacturing/includes/manufacturing_ui.inc:281 +#: ../manufacturing/includes/manufacturing_ui.inc:332 +#: ../purchasing/includes/ui/invoice_ui.inc:114 +#: ../purchasing/includes/ui/po_ui.inc:335 ++#: ../purchasing/includes/ui/po_ui.inc.orig:335 +#: ../purchasing/view/view_po.php:140 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:130 +#: ../purchasing/inquiry/supplier_inquiry.php:178 +#: ../purchasing/inquiry/supplier_inquiry.php.orig:175 +#: ../purchasing/allocations/supplier_allocation_main.php:97 +#: ../reporting/rep101.php:130 +#: ../reporting/rep107.php:192 +#: ../reporting/rep201.php:118 +#: ../reporting/rep501.php:85 +#: ../reporting/rep601.php:76 +#: ../reporting/rep602.php:80 +#: ../reporting/rep704.php:79 +#: ../reporting/rep704.php:82 +#: ../reporting/rep704.php:85 +#: ../reporting/rep709.php:109 +#: ../reporting/rep710.php:75 +#: ../reporting/includes/doctext.inc:167 +#: ../reporting/includes/doctext.inc:208 +#: ../reporting/includes/doctext.inc:246 +#: ../reporting/includes/header2.inc:135 - #: ../sales/customer_delivery.php:386 - #: ../sales/customer_invoice.php:501 ++#: ../sales/customer_delivery.php.orig:391 ++#: ../sales/customer_invoice.php:503 +#: ../sales/allocations/customer_allocation_main.php:96 +#: ../sales/view/view_credit.php:69 +#: ../sales/view/view_sales_order.php:109 +#: ../sales/view/view_sales_order.php:142 +#: ../sales/view/view_sales_order.php:179 +#: ../sales/view/view_sales_order.php.orig:96 +#: ../sales/view/view_sales_order.php.orig:129 +#: ../sales/view/view_sales_order.php.orig:161 +#: ../sales/inquiry/customer_allocation_inquiry.php:148 - #: ../sales/inquiry/customer_allocation_inquiry.php.orig:148 +#: ../sales/inquiry/customer_inquiry.php:204 - #: ../sales/inquiry/customer_inquiry.php.orig:228 msgid "Date" msgstr "" -#: admin/view_print_transaction.php:130 admin/void_transaction.php:184 -#: includes/ui/ui_view.inc:51 +#: ../admin/view_print_transaction.php:130 +#: ../admin/void_transaction.php:184 +#: ../includes/ui/ui_view.inc:51 - #: ../includes/ui/ui_view.inc.orig:51 msgid "GL" msgstr "" @@@ -2700,12 -2241,11 +2638,11 @@@ msgid "Void a Transaction" msgstr "" -#: admin/void_transaction.php:126 admin/void_transaction.php:185 -#: includes/ui/radio.ui_input.inc:136 includes/ui/radio.ui_input.inc:280 -#: includes/ui/sav.ui_lists.inc:20 includes/ui/ui_input.inc:136 -#: includes/ui/ui_input.inc:280 includes/ui/ui_lists.inc:20 -#: includes/ui/ui_input.inc:137 includes/ui/ui_input.inc:281 +#: ../admin/void_transaction.php:126 +#: ../admin/void_transaction.php:185 - #: ../includes/ui/ui_input.inc:137 - #: ../includes/ui/ui_input.inc:281 ++#: ../includes/ui/ui_input.inc:138 ++#: ../includes/ui/ui_input.inc:282 +#: ../includes/ui/ui_lists.inc:20 - #: ../includes/ui/ui_lists.inc.orig:20 msgid "Select" msgstr "" @@@ -2721,23 -2257,17 +2658,22 @@@ msgstr " msgid "Voiding Date:" msgstr "" -#: admin/void_transaction.php:208 dimensions/dimension_entry.php:283 -#: gl/bank_transfer.php:93 gl/inquiry/journal_inquiry.php:56 -#: gl/manage/revaluate_currencies.php:106 includes/ui/ui_view.inc:308 -#: manufacturing/work_order_add_finished.php:210 -#: manufacturing/work_order_entry.php:451 -#: manufacturing/work_order_release.php:100 -#: purchasing/includes/ui/invoice_ui.inc:161 purchasing/po_entry_items.php:518 -#: purchasing/supplier_payment.php:313 sales/customer_payments.php:411 -#: gl/bank_transfer.php:98 purchasing/po_entry_items.php:522 -#: purchasing/supplier_payment.php:316 sales/customer_payments.php:414 -#: sales/customer_payments.php.orig:413 +#: ../admin/void_transaction.php:208 +#: ../dimensions/dimension_entry.php:283 - #: ../gl/bank_transfer.php:93 ++#: ../gl/bank_transfer.php:98 +#: ../gl/inquiry/journal_inquiry.php:56 +#: ../gl/manage/revaluate_currencies.php:106 +#: ../includes/ui/ui_view.inc:308 - #: ../includes/ui/ui_view.inc.orig:308 +#: ../manufacturing/work_order_add_finished.php:210 +#: ../manufacturing/work_order_costs.php:146 +#: ../manufacturing/work_order_entry.php:451 +#: ../manufacturing/work_order_release.php:100 +#: ../purchasing/includes/ui/invoice_ui.inc:180 - #: ../purchasing/includes/ui/po_ui.inc:492 - #: ../purchasing/po_entry_items.php:558 - #: ../purchasing/supplier_payment.php:313 - #: ../sales/customer_invoice.php:678 - #: ../sales/customer_payments.php:410 ++#: ../purchasing/includes/ui/po_ui.inc.orig:492 ++#: ../purchasing/po_entry_items.php.orig:558 ++#: ../purchasing/supplier_payment.php:316 ++#: ../sales/customer_invoice.php:680 ++#: ../sales/customer_payments.php:413 msgid "Memo:" msgstr "" @@@ -2766,23 -2293,17 +2702,23 @@@ msgstr " msgid "The selected transaction was closed for edition and cannot be voided." msgstr "" -#: admin/void_transaction.php:248 gl/accruals.php:32 gl/bank_transfer.php:110 -#: gl/gl_journal.php:156 gl/manage/exchange_rates.php:33 -#: gl/manage/revaluate_currencies.php:53 -#: manufacturing/work_order_add_finished.php:98 -#: manufacturing/work_order_costs.php:83 purchasing/po_receive_items.php:174 -#: purchasing/supplier_payment.php:179 sales/customer_credit_invoice.php:91 -#: sales/sales_order_entry.php:340 sales/manage/recurrent_invoices.php:41 -#: sales/manage/recurrent_invoices.php:46 -#: sales/manage/recurrent_invoices.php:51 gl/bank_transfer.php:115 -#: purchasing/supplier_payment.php:174 sales/sales_order_entry.php:349 -#: sales/sales_order_entry.php.orig:348 +#: ../admin/void_transaction.php:248 +#: ../gl/accruals.php:32 - #: ../gl/bank_transfer.php:110 - #: ../gl/gl_journal.php:158 ++#: ../gl/bank_transfer.php:115 ++#: ../gl/gl_journal.php:161 +#: ../gl/manage/close_period.php:34 +#: ../gl/manage/close_period.php.orig:34 +#: ../gl/manage/exchange_rates.php:33 +#: ../gl/manage/revaluate_currencies.php:53 +#: ../manufacturing/work_order_add_finished.php:98 +#: ../manufacturing/work_order_costs.php:80 +#: ../purchasing/po_receive_items.php:174 - #: ../purchasing/supplier_payment.php:179 ++#: ../purchasing/supplier_payment.php:174 +#: ../sales/customer_credit_invoice.php:91 - #: ../sales/sales_order_entry.php:345 ++#: ../sales/sales_order_entry.php:359 +#: ../sales/manage/recurrent_invoices.php:41 +#: ../sales/manage/recurrent_invoices.php:46 +#: ../sales/manage/recurrent_invoices.php:51 msgid "The entered date is invalid." msgstr "" @@@ -2827,51 -2381,104 +2763,49 @@@ msgstr " msgid "Open Balance" msgstr "" -#: admin/db/maintenance_db.inc:152 admin/db/maintenance_db.inc.orig:150 +#: ../admin/db/maintenance_db.inc:152 - #: ../admin/db/maintenance_db.inc.orig:150 #, php-format msgid "Cannot open the extension setup file '%s' for writing." msgstr "" -#: admin/db/maintenance_db.inc:160 admin/db/maintenance_db.inc.orig:158 +#: ../admin/db/maintenance_db.inc:160 - #: ../admin/db/maintenance_db.inc.orig:158 #, php-format msgid "Cannot write to the extensions setup file '%s'." msgstr "" -#: admin/db/maintenance_db.inc:178 admin/db/maintenance_db.inc.orig:176 +#: ../admin/db/maintenance_db.inc:178 - #: ../admin/db/maintenance_db.inc.orig:176 msgid "Cannot update system extensions list." msgstr "" -#: admin/db/maintenance_db.inc:196 admin/db/maintenance_db.inc.orig:194 +#: ../admin/db/maintenance_db.inc:196 - #: ../admin/db/maintenance_db.inc.orig:194 #, php-format msgid "Cannot update extensions list for company '%s'." msgstr "" -#: admin/db/maintenance_db.inc:233 admin/db/maintenance_db.inc.orig:231 +#: ../admin/db/maintenance_db.inc:233 - #: ../admin/db/maintenance_db.inc.orig:231 msgid "Cannot open the languages file - " msgstr "" -#: admin/db/maintenance_db.inc:240 admin/db/maintenance_db.inc.orig:238 +#: ../admin/db/maintenance_db.inc:240 - #: ../admin/db/maintenance_db.inc.orig:238 msgid "Cannot write to the language file - " msgstr "" -#: admin/db/maintenance_db.inc:250 admin/db/maintenance_db.inc.orig:248 +#: ../admin/db/maintenance_db.inc:250 - #: ../admin/db/maintenance_db.inc.orig:248 msgid "The language files folder " msgstr "" -#: admin/db/maintenance_db.inc:389 admin/db/maintenance_db.inc.orig:387 -#: admin/db/connect_db2.inc:156 -#, php-format -msgid "SQL script execution failed in line %d: %s" -msgstr "" - -#: admin/db/session.inc:133 includes/session.inc:133 -#: includes/session.inc.ldap.inc:39 -msgid "Incorrect Password" -msgstr "" - -#: admin/db/session.inc:134 includes/session.inc:134 -#: includes/session.inc.ldap.inc:40 -msgid "The user and password combination is not valid for the system." -msgstr "" - -#: admin/db/session.inc:136 includes/session.inc:136 -#: includes/session.inc.ldap.inc:42 -msgid "" -"If you are not an authorized user, please contact your system administrator " -"to obtain an account to enable you to use the system." -msgstr "" - -#: admin/db/session.inc:137 includes/session.inc:137 -#: includes/session.inc.ldap.inc:43 -msgid "Try again" -msgstr "" - -#: admin/db/session.inc:156 includes/session.inc:156 -#: includes/session.inc.ldap.inc:62 includes/session.inc:216 -msgid "Security settings have not been defined for your user account." -msgstr "" - -#: admin/db/session.inc:157 includes/session.inc:157 -#: includes/session.inc.ldap.inc:63 includes/session.inc:217 -msgid "Please contact your system administrator." -msgstr "" - -#: admin/db/session.inc:158 includes/session.inc:158 -#: includes/session.inc.ldap.inc:64 includes/session.inc:218 +#: ../admin/db/maintenance_db.inc:389 - #: ../admin/db/maintenance_db.inc.orig:386 + msgid "" -"Please remove $security_groups and $security_headings arrays from config.php " -"file!" ++"This is new format backup file which cannot be restored on database not " ++"migrated to utf8." + msgstr "" + -#: admin/db/session.inc:160 includes/session.inc:160 -#: includes/session.inc.ldap.inc:66 includes/session.inc:220 -msgid "" -"Access to application has been blocked until database upgrade is completed " -"by system administrator." -msgstr "" - -#: admin/db/session.inc:174 includes/session.inc:174 -#: includes/session.inc.ldap.inc:80 includes/session.inc:234 -msgid "" -"The security settings on your account do not permit you to access this " -"function" -msgstr "" - -#: admin/db/session.inc:183 includes/session.inc:183 -#: includes/session.inc.ldap.inc:89 includes/session.inc:243 -msgid "" -"System is blocked after source upgrade until database is updated on System/" -"Software Upgrade page" ++#: ../admin/db/maintenance_db.inc:471 +#, php-format +msgid "SQL script execution failed in line %d: %s" msgstr "" -#: admin/db/users_db.inc:210 admin/db/users_db.inc.orig:210 +#: ../admin/db/users_db.inc:210 msgid "user online" msgstr "" @@@ -2879,8 -2486,12 +2813,8 @@@ msgid "users online" msgstr "" -#: admin/db/voiding_db.inc:114 -#: manufacturing/includes/db/work_orders_db.inc:446 -#: manufacturing/includes/db/work_orders_db.inc:462 -#: sales/includes/db/sales_invoice_db.inc:205 -#: sales/includes/db/sales_invoice_db.inc.orig:208 -#: sales/includes/db/sales_invoice_db.inc:206 +#: ../admin/db/voiding_db.inc:114 - #: ../sales/includes/db/sales_invoice_db.inc:249 ++#: ../sales/includes/db/sales_invoice_db.inc.orig:249 msgid "Voided." msgstr "" @@@ -2971,53 -2571,50 +2905,53 @@@ msgstr " msgid "Customer Transaction &Inquiry" msgstr "" - #: ../applications/customers.php:57 -#: applications/customers.php:55 ++#: ../applications/customers.php:56 msgid "Customer Allocation &Inquiry" msgstr "" - #: ../applications/customers.php:60 -#: applications/customers.php:58 ++#: ../applications/customers.php:59 msgid "Customer and Sales &Reports" msgstr "" - #: ../applications/customers.php:63 -#: applications/customers.php:61 applications/dimensions.php:34 -#: applications/generalledger.php:55 applications/inventory.php:32 -#: applications/manufacturing.php:34 applications/setup.php:54 -#: applications/setup.php.orig:54 applications/suppliers.php:50 ++#: ../applications/customers.php:62 +#: ../applications/dimensions.php:34 +#: ../applications/generalledger.php:55 +#: ../applications/inventory.php:32 +#: ../applications/manufacturing.php:34 +#: ../applications/setup.php:54 - #: ../applications/suppliers.php:50 ++#: ../applications/suppliers.php:49 msgid "Maintenance" msgstr "" - #: ../applications/customers.php:64 -#: applications/customers.php:62 ++#: ../applications/customers.php:63 msgid "Add and Manage &Customers" msgstr "" - #: ../applications/customers.php:66 -#: applications/customers.php:64 ++#: ../applications/customers.php:65 msgid "Customer &Branches" msgstr "" - #: ../applications/customers.php:68 -#: applications/customers.php:66 ++#: ../applications/customers.php:67 msgid "Sales &Groups" msgstr "" - #: ../applications/customers.php:70 -#: applications/customers.php:68 ++#: ../applications/customers.php:69 msgid "Recurrent &Invoices" msgstr "" - #: ../applications/customers.php:72 -#: applications/customers.php:70 ++#: ../applications/customers.php:71 msgid "Sales T&ypes" msgstr "" - #: ../applications/customers.php:74 -#: applications/customers.php:72 ++#: ../applications/customers.php:73 msgid "Sales &Persons" msgstr "" - #: ../applications/customers.php:76 -#: applications/customers.php:74 ++#: ../applications/customers.php:75 msgid "Sales &Areas" msgstr "" - #: ../applications/customers.php:78 -#: applications/customers.php:76 ++#: ../applications/customers.php:77 msgid "Credit &Status Setup" msgstr "" @@@ -3232,8 -2823,8 +3166,8 @@@ msgstr " msgid "&Manufacturing" msgstr "" -#: applications/manufacturing.php:19 sales/sales_order_entry.php:112 -#: sales/sales_order_entry.php:120 sales/sales_order_entry.php.orig:120 +#: ../applications/manufacturing.php:19 - #: ../sales/sales_order_entry.php:113 ++#: ../sales/sales_order_entry.php:126 msgid "Work &Order Entry" msgstr "" @@@ -3418,15 -3009,15 +3352,15 @@@ msgstr " msgid "Supplier Transaction &Inquiry" msgstr "" - #: ../applications/suppliers.php:44 -#: applications/suppliers.php:44 ++#: ../applications/suppliers.php:43 msgid "Supplier Allocation &Inquiry" msgstr "" - #: ../applications/suppliers.php:47 -#: applications/suppliers.php:47 ++#: ../applications/suppliers.php:46 msgid "Supplier and Purchasing &Reports" msgstr "" - #: ../applications/suppliers.php:51 -#: applications/suppliers.php:51 ++#: ../applications/suppliers.php:50 msgid "&Suppliers" msgstr "" @@@ -3466,29 -3057,26 +3400,31 @@@ msgstr " msgid "The dimension reference must be entered." msgstr "" -#: dimensions/dimension_entry.php:123 gl/bank_transfer.php:171 -#: gl/gl_bank.php:255 gl/gl_journal.php:176 -#: gl/manage/revaluate_currencies.php:72 inventory/adjustments.php:103 -#: inventory/transfers.php:99 manufacturing/work_order_add_finished.php:84 -#: manufacturing/work_order_entry.php:139 -#: manufacturing/work_order_issue.php:98 purchasing/po_entry_items.php:363 -#: purchasing/po_receive_items.php:195 purchasing/supplier_credit.php:156 -#: purchasing/supplier_invoice.php:154 purchasing/supplier_payment.php:208 -#: sales/credit_note_entry.php:151 sales/customer_credit_invoice.php:108 -#: sales/customer_delivery.php:172 sales/customer_invoice.php:286 -#: sales/customer_payments.php:158 sales/customer_payments.php:165 -#: sales/customer_payments.php:246 sales/sales_order_entry.php:409 -#: sales/create_recurrent_invoices.php:55 sales/credit_note_entry.php:181 -#: sales/customer_credit_invoice.php:205 sales/customer_delivery.php:312 -#: sales/customer_invoice.php:319 sales/sales_order_entry.php:430 -#: gl/bank_transfer.php:176 purchasing/po_entry_items.php:366 -#: purchasing/supplier_payment.php:203 sales/customer_payments.php:248 -#: sales/customer_payments.php.orig:158 sales/customer_payments.php.orig:165 -#: sales/customer_payments.php.orig:248 sales/sales_order_entry.php:441 -#: sales/sales_order_entry.php.orig:440 +#: ../dimensions/dimension_entry.php:123 - #: ../gl/bank_transfer.php:171 - #: ../gl/gl_bank.php:257 - #: ../gl/gl_journal.php:178 ++#: ../gl/bank_transfer.php:176 ++#: ../gl/gl_bank.php:258 ++#: ../gl/gl_journal.php:181 +#: ../gl/manage/revaluate_currencies.php:72 +#: ../inventory/adjustments.php:103 +#: ../inventory/transfers.php:99 +#: ../manufacturing/work_order_add_finished.php:84 +#: ../manufacturing/work_order_entry.php:139 +#: ../manufacturing/work_order_issue.php:97 - #: ../purchasing/po_entry_items.php:365 ++#: ../purchasing/po_entry_items.php:368 ++#: ../purchasing/po_entry_items.php.orig:365 +#: ../purchasing/po_receive_items.php:193 +#: ../purchasing/supplier_credit.php:173 - #: ../purchasing/supplier_invoice.php:178 - #: ../purchasing/supplier_payment.php:208 - #: ../sales/credit_note_entry.php:151 - #: ../sales/customer_credit_invoice.php:108 - #: ../sales/customer_delivery.php:180 - #: ../sales/customer_invoice.php:338 ++#: ../purchasing/supplier_invoice.php:179 ++#: ../purchasing/supplier_payment.php:203 ++#: ../sales/create_recurrent_invoices.php:55 ++#: ../sales/credit_note_entry.php:181 ++#: ../sales/customer_credit_invoice.php:205 ++#: ../sales/customer_delivery.php.orig:184 ++#: ../sales/customer_invoice.php:379 +#: ../sales/customer_payments.php:158 +#: ../sales/customer_payments.php:165 - #: ../sales/customer_payments.php:246 - #: ../sales/sales_order_entry.php:420 ++#: ../sales/customer_payments.php:248 ++#: ../sales/sales_order_entry.php:457 msgid "The entered reference is already in use." msgstr "" @@@ -3496,10 -3084,9 +3432,11 @@@ msgid "The dimension name must be entered." msgstr "" -#: dimensions/dimension_entry.php:138 manufacturing/work_order_entry.php:154 -#: manufacturing/work_order_entry.php:234 purchasing/po_entry_items.php:235 -#: purchasing/po_entry_items.php:238 +#: ../dimensions/dimension_entry.php:138 +#: ../manufacturing/work_order_entry.php:154 +#: ../manufacturing/work_order_entry.php:234 - #: ../purchasing/po_entry_items.php:238 ++#: ../purchasing/po_entry_items.php:241 ++#: ../purchasing/po_entry_items.php.orig:238 msgid "The date entered is in an invalid format." msgstr "" @@@ -3622,92 -3187,53 +3559,87 @@@ msgstr " msgid "Account" msgstr "" -#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:98 -#: gl/bank_account_reconcile.php:237 gl/inquiry/bank_inquiry.php:71 -#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143 -#: gl/inquiry/gl_trial_balance.php:177 gl/inquiry/gl_trial_balance.php:179 -#: gl/inquiry/gl_trial_balance.php:181 gl/view/accrual_trans.php:60 -#: gl/view/gl_trans_view.php:64 gl/view/gl_trans_view.php:67 -#: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_journal_ui.inc:84 -#: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90 -#: purchasing/inquiry/supplier_allocation_inquiry.php:134 -#: purchasing/inquiry/supplier_inquiry.php:176 -#: purchasing/inquiry/supplier_inquiry.php.orig:170 reporting/rep601.php:77 -#: reporting/rep702.php:52 reporting/rep704.php:80 reporting/rep704.php:83 -#: reporting/rep704.php:86 reporting/rep708.php:179 reporting/rep708.php:180 -#: sales/inquiry/customer_allocation_inquiry.php:152 -#: sales/inquiry/customer_inquiry.php:233 -#: sales/inquiry/customer_inquiry.php.orig:233 +#: ../dimensions/includes/dimensions_ui.inc:31 +#: ../gl/accruals.php:102 +#: ../gl/bank_account_reconcile.php:235 +#: ../gl/inquiry/bank_inquiry.php:71 +#: ../gl/inquiry/gl_account_inquiry.php:141 +#: ../gl/inquiry/gl_account_inquiry.php:143 +#: ../gl/inquiry/gl_trial_balance.php:176 +#: ../gl/inquiry/gl_trial_balance.php:178 +#: ../gl/inquiry/gl_trial_balance.php:180 +#: ../gl/view/accrual_trans.php:60 +#: ../gl/view/gl_trans_view.php:69 +#: ../gl/view/gl_trans_view.php:72 +#: ../gl/view/gl_trans_view.php:75 +#: ../gl/includes/ui/gl_journal_ui.inc:87 +#: ../gl/includes/ui/gl_journal_ui.inc:90 +#: ../gl/includes/ui/gl_journal_ui.inc:93 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:133 +#: ../purchasing/inquiry/supplier_inquiry.php:181 +#: ../purchasing/inquiry/supplier_inquiry.php.orig:178 +#: ../reporting/rep601.php:77 +#: ../reporting/rep602.php:81 +#: ../reporting/rep702.php:52 +#: ../reporting/rep704.php:80 +#: ../reporting/rep704.php:83 +#: ../reporting/rep704.php:86 +#: ../reporting/rep708.php:179 +#: ../reporting/rep708.php:180 +#: ../sales/inquiry/customer_allocation_inquiry.php:152 - #: ../sales/inquiry/customer_allocation_inquiry.php.orig:152 +#: ../sales/inquiry/customer_inquiry.php:209 - #: ../sales/inquiry/customer_inquiry.php.orig:233 msgid "Debit" msgstr "" -#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:98 -#: gl/bank_account_reconcile.php:238 gl/inquiry/bank_inquiry.php:71 -#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143 -#: gl/inquiry/gl_trial_balance.php:178 gl/inquiry/gl_trial_balance.php:180 -#: gl/inquiry/gl_trial_balance.php:182 gl/view/accrual_trans.php:60 -#: gl/view/gl_trans_view.php:64 gl/view/gl_trans_view.php:67 -#: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_journal_ui.inc:84 -#: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90 -#: includes/sysnames.inc:85 -#: purchasing/inquiry/supplier_allocation_inquiry.php:135 -#: purchasing/inquiry/supplier_inquiry.php:177 -#: purchasing/inquiry/supplier_inquiry.php.orig:171 reporting/rep601.php:77 -#: reporting/rep702.php:52 reporting/rep704.php:80 reporting/rep704.php:83 -#: reporting/rep704.php:86 reporting/rep708.php:179 reporting/rep708.php:180 -#: sales/inquiry/customer_allocation_inquiry.php:153 -#: sales/inquiry/customer_inquiry.php:234 -#: sales/inquiry/customer_inquiry.php.orig:234 +#: ../dimensions/includes/dimensions_ui.inc:31 +#: ../gl/accruals.php:102 +#: ../gl/bank_account_reconcile.php:236 +#: ../gl/inquiry/bank_inquiry.php:71 +#: ../gl/inquiry/gl_account_inquiry.php:141 +#: ../gl/inquiry/gl_account_inquiry.php:143 +#: ../gl/inquiry/gl_trial_balance.php:177 +#: ../gl/inquiry/gl_trial_balance.php:179 +#: ../gl/inquiry/gl_trial_balance.php:181 +#: ../gl/view/accrual_trans.php:60 +#: ../gl/view/gl_trans_view.php:69 +#: ../gl/view/gl_trans_view.php:72 +#: ../gl/view/gl_trans_view.php:75 +#: ../gl/includes/ui/gl_journal_ui.inc:87 +#: ../gl/includes/ui/gl_journal_ui.inc:90 +#: ../gl/includes/ui/gl_journal_ui.inc:93 +#: ../includes/sysnames.inc:85 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:134 +#: ../purchasing/inquiry/supplier_inquiry.php:182 +#: ../purchasing/inquiry/supplier_inquiry.php.orig:179 +#: ../reporting/rep601.php:77 +#: ../reporting/rep602.php:81 +#: ../reporting/rep702.php:52 +#: ../reporting/rep704.php:80 +#: ../reporting/rep704.php:83 +#: ../reporting/rep704.php:86 +#: ../reporting/rep708.php:179 +#: ../reporting/rep708.php:180 +#: ../sales/inquiry/customer_allocation_inquiry.php:153 - #: ../sales/inquiry/customer_allocation_inquiry.php.orig:153 +#: ../sales/inquiry/customer_inquiry.php:210 - #: ../sales/inquiry/customer_inquiry.php.orig:234 msgid "Credit" msgstr "" -#: dimensions/includes/dimensions_ui.inc:45 -#: dimensions/inquiry/search_dimensions.php:134 gl/inquiry/bank_inquiry.php:71 -#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_trial_balance.php:175 -#: purchasing/inquiry/supplier_allocation_inquiry.php:137 -#: reporting/rep203.php:92 reporting/rep204.php:82 reporting/rep601.php:77 -#: reporting/rep701.php:109 reporting/rep704.php:80 reporting/rep704.php:83 -#: reporting/rep704.php:86 reporting/rep708.php:172 -#: sales/inquiry/customer_allocation_inquiry.php:155 +#: ../dimensions/includes/dimensions_ui.inc:45 +#: ../dimensions/inquiry/search_dimensions.php:134 +#: ../gl/inquiry/bank_inquiry.php:71 +#: ../gl/inquiry/gl_account_inquiry.php:141 +#: ../gl/inquiry/gl_trial_balance.php:174 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:136 +#: ../reporting/rep203.php:92 +#: ../reporting/rep204.php:82 +#: ../reporting/rep601.php:77 +#: ../reporting/rep602.php:81 +#: ../reporting/rep701.php:109 +#: ../reporting/rep704.php:80 +#: ../reporting/rep704.php:83 +#: ../reporting/rep704.php:86 +#: ../reporting/rep708.php:172 +#: ../sales/inquiry/customer_allocation_inquiry.php:155 - #: ../sales/inquiry/customer_allocation_inquiry.php.orig:155 msgid "Balance" msgstr "" @@@ -3719,92 -3245,63 +3651,91 @@@ msgstr " msgid "Search Dimensions" msgstr "" -#: dimensions/inquiry/search_dimensions.php:73 gl/bank_transfer.php:91 -#: gl/inquiry/journal_inquiry.php:45 gl/manage/revaluate_currencies.php:105 -#: gl/includes/ui/gl_bank_ui.inc:26 gl/includes/ui/gl_bank_ui.inc.orig:25 -#: gl/includes/ui/gl_journal_ui.inc:30 includes/ui/contacts_view.inc:94 -#: inventory/includes/item_adjustments_ui.inc:35 -#: inventory/includes/stock_transfers_ui.inc:40 -#: manufacturing/search_work_orders.php:67 -#: manufacturing/work_order_add_finished.php:198 -#: manufacturing/work_order_entry.php:378 -#: manufacturing/work_order_entry.php:385 -#: manufacturing/includes/work_order_issue_ui.inc:156 -#: purchasing/includes/ui/invoice_ui.inc:92 -#: purchasing/includes/ui/po_ui.inc:159 purchasing/includes/ui/po_ui.inc:164 -#: purchasing/supplier_payment.php:286 sales/customer_payments.php:380 -#: gl/bank_transfer.php:74 gl/bank_transfer.php:79 -#: purchasing/supplier_payment.php:289 sales/customer_payments.php:383 -#: sales/customer_payments.php.orig:382 +#: ../dimensions/inquiry/search_dimensions.php:73 - #: ../gl/bank_transfer.php:91 ++#: ../gl/bank_transfer.php:79 +#: ../gl/inquiry/journal_inquiry.php:45 +#: ../gl/manage/revaluate_currencies.php:105 +#: ../gl/includes/ui/gl_bank_ui.inc:26 +#: ../gl/includes/ui/gl_bank_ui.inc.orig:104 +#: ../gl/includes/ui/gl_journal_ui.inc:30 +#: ../includes/ui/contacts_view.inc:94 +#: ../inventory/includes/item_adjustments_ui.inc:35 +#: ../inventory/includes/stock_transfers_ui.inc:40 +#: ../manufacturing/search_work_orders.php:67 +#: ../manufacturing/work_order_add_finished.php:198 +#: ../manufacturing/work_order_costs.php:134 +#: ../manufacturing/work_order_entry.php:378 +#: ../manufacturing/work_order_entry.php:385 +#: ../manufacturing/includes/work_order_issue_ui.inc:156 +#: ../purchasing/includes/ui/invoice_ui.inc:104 +#: ../purchasing/includes/ui/po_ui.inc:166 +#: ../purchasing/includes/ui/po_ui.inc:171 - #: ../purchasing/supplier_payment.php:286 - #: ../sales/customer_payments.php:379 ++#: ../purchasing/includes/ui/po_ui.inc.orig:166 ++#: ../purchasing/includes/ui/po_ui.inc.orig:171 ++#: ../purchasing/supplier_payment.php:289 ++#: ../sales/customer_payments.php:382 msgid "Reference:" msgstr "" -#: dimensions/inquiry/search_dimensions.php:75 -#: includes/ui/allocation_cart.inc:284 includes/ui/sav.ui_lists.inc:1898 -#: includes/ui/ui_lists.inc:1919 reporting/rep101.php:112 -#: reporting/rep102.php:94 reporting/rep104.php:95 reporting/rep104.php:99 -#: reporting/rep105.php:93 reporting/rep105.php:97 reporting/rep201.php:100 -#: reporting/rep202.php:98 reporting/rep203.php:72 reporting/rep204.php:75 -#: reporting/rep301.php:90 reporting/rep301.php:97 reporting/rep302.php:103 -#: reporting/rep302.php:110 reporting/rep303.php:84 reporting/rep303.php:91 -#: reporting/rep304.php:96 reporting/rep304.php:101 reporting/rep304.php:106 -#: reporting/rep702.php:59 reporting/rep710.php:84 reporting/rep710.php:85 +#: ../dimensions/inquiry/search_dimensions.php:75 +#: ../includes/ui/allocation_cart.inc:286 +#: ../includes/ui/ui_lists.inc:1923 - #: ../includes/ui/ui_lists.inc.orig:1921 +#: ../reporting/rep101.php:112 +#: ../reporting/rep102.php:94 +#: ../reporting/rep104.php:95 +#: ../reporting/rep104.php:99 +#: ../reporting/rep105.php:93 +#: ../reporting/rep105.php:97 +#: ../reporting/rep201.php:100 +#: ../reporting/rep202.php:98 +#: ../reporting/rep203.php:72 +#: ../reporting/rep204.php:75 +#: ../reporting/rep301.php:90 +#: ../reporting/rep301.php:97 +#: ../reporting/rep302.php:103 +#: ../reporting/rep302.php:110 +#: ../reporting/rep303.php:84 +#: ../reporting/rep303.php:91 +#: ../reporting/rep304.php:96 +#: ../reporting/rep304.php:101 +#: ../reporting/rep304.php:106 +#: ../reporting/rep702.php:59 +#: ../reporting/rep710.php:84 +#: ../reporting/rep710.php:85 msgid "All" msgstr "" -#: dimensions/inquiry/search_dimensions.php:76 gl/inquiry/bank_inquiry.php:49 -#: gl/inquiry/gl_trial_balance.php:49 gl/inquiry/journal_inquiry.php:48 -#: gl/inquiry/profit_loss.php:163 gl/includes/ui/gl_bank_ui.inc:51 -#: gl/includes/ui/gl_bank_ui.inc:117 gl/includes/ui/gl_bank_ui.inc.orig:50 -#: gl/includes/ui/gl_bank_ui.inc.orig:105 -#: inventory/inquiry/stock_movements.php:62 -#: purchasing/inquiry/supplier_allocation_inquiry.php:50 -#: purchasing/inquiry/supplier_inquiry.php:53 -#: purchasing/inquiry/supplier_inquiry.php.orig:49 -#: sales/inquiry/customer_inquiry.php:50 -#: sales/inquiry/customer_inquiry.php.orig:50 +#: ../dimensions/inquiry/search_dimensions.php:76 +#: ../gl/inquiry/bank_inquiry.php:49 +#: ../gl/inquiry/gl_trial_balance.php:49 +#: ../gl/inquiry/journal_inquiry.php:48 +#: ../gl/inquiry/profit_loss.php:163 +#: ../gl/includes/ui/gl_bank_ui.inc:51 +#: ../gl/includes/ui/gl_bank_ui.inc:117 +#: ../gl/includes/ui/gl_bank_ui.inc.orig:23 +#: ../gl/includes/ui/gl_bank_ui.inc.orig:53 +#: ../inventory/inquiry/stock_movements.php:58 +#: ../inventory/inquiry/stock_movements.php.orig:60 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:50 +#: ../purchasing/inquiry/supplier_inquiry.php:50 +#: ../purchasing/inquiry/supplier_inquiry.php.orig:50 +#: ../sales/inquiry/customer_inquiry.php:46 - #: ../sales/inquiry/customer_inquiry.php.orig:47 msgid "From:" msgstr "" -#: dimensions/inquiry/search_dimensions.php:77 gl/inquiry/bank_inquiry.php:50 -#: gl/inquiry/gl_trial_balance.php:50 gl/inquiry/journal_inquiry.php:49 -#: gl/inquiry/profit_loss.php:164 gl/includes/ui/gl_bank_ui.inc:117 -#: gl/includes/ui/gl_bank_ui.inc.orig:105 -#: inventory/inquiry/stock_movements.php:63 -#: purchasing/inquiry/supplier_allocation_inquiry.php:51 -#: purchasing/inquiry/supplier_inquiry.php:54 -#: purchasing/inquiry/supplier_inquiry.php.orig:50 -#: sales/inquiry/customer_inquiry.php:51 -#: sales/inquiry/customer_inquiry.php.orig:51 +#: ../dimensions/inquiry/search_dimensions.php:77 +#: ../gl/inquiry/bank_inquiry.php:50 +#: ../gl/inquiry/gl_trial_balance.php:50 +#: ../gl/inquiry/journal_inquiry.php:49 +#: ../gl/inquiry/profit_loss.php:164 +#: ../gl/includes/ui/gl_bank_ui.inc:117 +#: ../gl/includes/ui/gl_bank_ui.inc.orig:23 +#: ../inventory/inquiry/stock_movements.php:59 +#: ../inventory/inquiry/stock_movements.php.orig:61 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:51 +#: ../purchasing/inquiry/supplier_inquiry.php:51 +#: ../purchasing/inquiry/supplier_inquiry.php.orig:51 +#: ../sales/inquiry/customer_inquiry.php:47 - #: ../sales/inquiry/customer_inquiry.php.orig:48 msgid "To:" msgstr "" @@@ -3818,35 -3315,25 +3749,32 @@@ msgstr " msgid "Only Open:" msgstr "" -#: dimensions/inquiry/search_dimensions.php:132 -#: dimensions/view/view_dimension.php:54 includes/ui/allocation_cart.inc:263 -#: purchasing/includes/ui/invoice_ui.inc:112 -#: purchasing/view/view_supp_credit.php:48 -#: purchasing/view/view_supp_invoice.php:51 -#: purchasing/inquiry/supplier_allocation_inquiry.php:132 -#: purchasing/inquiry/supplier_inquiry.php:174 -#: purchasing/inquiry/supplier_inquiry.php.orig:168 reporting/rep101.php:130 -#: reporting/rep201.php:118 reporting/rep203.php:91 reporting/rep501.php:85 -#: reporting/includes/doctext.inc:100 reporting/includes/doctext.inc:122 -#: reporting/includes/doctext.inc:143 reporting/includes/doctext.inc:145 -#: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:184 -#: reporting/includes/doctext.inc:186 sales/customer_invoice.php:437 -#: sales/view/view_dispatch.php:97 sales/view/view_invoice.php:96 -#: sales/inquiry/customer_allocation_inquiry.php:149 -#: sales/inquiry/customer_inquiry.php:229 -#: sales/inquiry/customer_inquiry.php.orig:229 -#: sales/includes/ui/sales_order_ui.inc:596 sales/customer_invoice.php:439 -#: sales/includes/ui/sales_order_ui.inc:600 +#: ../dimensions/inquiry/search_dimensions.php:132 +#: ../dimensions/view/view_dimension.php:54 +#: ../includes/ui/allocation_cart.inc:264 +#: ../purchasing/includes/ui/invoice_ui.inc:123 +#: ../purchasing/view/view_supp_credit.php:48 +#: ../purchasing/view/view_supp_invoice.php:52 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:131 +#: ../purchasing/inquiry/supplier_inquiry.php:179 +#: ../purchasing/inquiry/supplier_inquiry.php.orig:176 +#: ../reporting/rep101.php:130 +#: ../reporting/rep201.php:118 +#: ../reporting/rep203.php:91 +#: ../reporting/rep501.php:85 +#: ../reporting/includes/doctext.inc:112 +#: ../reporting/includes/doctext.inc:144 +#: ../reporting/includes/doctext.inc:165 +#: ../reporting/includes/doctext.inc:167 +#: ../reporting/includes/doctext.inc:188 +#: ../reporting/includes/doctext.inc:206 +#: ../reporting/includes/doctext.inc:208 - #: ../sales/customer_invoice.php:508 ++#: ../sales/customer_invoice.php:510 +#: ../sales/view/view_dispatch.php:97 +#: ../sales/view/view_invoice.php:96 +#: ../sales/inquiry/customer_allocation_inquiry.php:149 - #: ../sales/inquiry/customer_allocation_inquiry.php.orig:149 +#: ../sales/inquiry/customer_inquiry.php:205 - #: ../sales/inquiry/customer_inquiry.php.orig:229 - #: ../sales/includes/ui/sales_order_ui.inc:596 +#: ../sales/includes/ui/sales_order_ui.inc.orig:596 msgid "Due Date" msgstr "" @@@ -3866,33 -3353,23 +3794,27 @@@ msgstr " msgid "This dimension is closed." msgstr "" -#: dimensions/view/view_dimension.php:84 gl/inquiry/gl_account_inquiry.php:71 -#: gl/inquiry/tax_inquiry.php:61 purchasing/inquiry/po_search_completed.php:65 -#: purchasing/inquiry/po_search.php:64 -#: sales/inquiry/customer_allocation_inquiry.php:44 -#: sales/inquiry/sales_deliveries_view.php:104 -#: sales/inquiry/sales_orders_view.php:229 -#: sales/inquiry/sales_orders_view.php.orig:227 +#: ../dimensions/view/view_dimension.php:84 +#: ../gl/inquiry/gl_account_inquiry.php:71 +#: ../gl/inquiry/tax_inquiry.php:61 +#: ../purchasing/inquiry/po_search_completed.php:62 +#: ../purchasing/inquiry/po_search_completed.php.orig:63 +#: ../purchasing/inquiry/po_search.php:64 +#: ../sales/inquiry/customer_allocation_inquiry.php:44 - #: ../sales/inquiry/customer_allocation_inquiry.php.orig:44 +#: ../sales/inquiry/sales_deliveries_view.php:104 - #: ../sales/inquiry/sales_deliveries_view.php.orig:104 +#: ../sales/inquiry/sales_orders_view.php:251 - #: ../sales/inquiry/sales_orders_view.php.orig:228 msgid "from:" msgstr "" -#: dimensions/view/view_dimension.php:85 gl/inquiry/gl_account_inquiry.php:72 -#: gl/inquiry/tax_inquiry.php:62 purchasing/inquiry/po_search_completed.php:66 -#: purchasing/inquiry/po_search.php:65 -#: sales/inquiry/customer_allocation_inquiry.php:45 -#: sales/inquiry/sales_deliveries_view.php:105 -#: sales/inquiry/sales_orders_view.php:230 -#: sales/inquiry/sales_orders_view.php.orig:228 +#: ../dimensions/view/view_dimension.php:85 +#: ../gl/inquiry/gl_account_inquiry.php:72 +#: ../gl/inquiry/tax_inquiry.php:62 +#: ../purchasing/inquiry/po_search_completed.php:63 +#: ../purchasing/inquiry/po_search_completed.php.orig:64 +#: ../purchasing/inquiry/po_search.php:65 +#: ../sales/inquiry/customer_allocation_inquiry.php:45 - #: ../sales/inquiry/customer_allocation_inquiry.php.orig:45 +#: ../sales/inquiry/sales_deliveries_view.php:105 - #: ../sales/inquiry/sales_deliveries_view.php.orig:105 +#: ../sales/inquiry/sales_orders_view.php:252 - #: ../sales/inquiry/sales_orders_view.php.orig:229 msgid "to:" msgstr "" @@@ -3911,34 -3384,7 +3833,36 @@@ msgstr " msgid "Revenue / Cost Accruals" msgstr "" -#: gl/accruals.php:44 +#: ../gl/accruals.php:38 - #: ../gl/bank_transfer.php:116 - #: ../gl/gl_bank.php:269 - #: ../gl/gl_journal.php:164 ++#: ../gl/bank_transfer.php:121 ++#: ../gl/gl_bank.php:270 ++#: ../gl/gl_journal.php:167 +#: ../gl/manage/revaluate_currencies.php:59 +#: ../inventory/adjustments.php:116 +#: ../inventory/transfers.php:111 +#: ../manufacturing/work_order_add_finished.php:104 +#: ../manufacturing/work_order_costs.php:86 +#: ../manufacturing/work_order_entry.php:160 +#: ../manufacturing/work_order_issue.php:84 - #: ../purchasing/po_entry_items.php:342 ++#: ../purchasing/po_entry_items.php:345 ++#: ../purchasing/po_entry_items.php.orig:342 +#: ../purchasing/po_receive_items.php:179 +#: ../purchasing/supplier_credit.php:193 - #: ../purchasing/supplier_invoice.php:198 - #: ../purchasing/supplier_payment.php:185 - #: ../sales/create_recurrent_invoices.php:108 - #: ../sales/credit_note_entry.php:161 ++#: ../purchasing/supplier_invoice.php:199 ++#: ../purchasing/supplier_payment.php:180 ++#: ../sales/create_recurrent_invoices.php:119 ++#: ../sales/credit_note_entry.php:157 +#: ../sales/customer_credit_invoice.php:95 - #: ../sales/customer_delivery.php:161 ++#: ../sales/customer_delivery.php:165 ++#: ../sales/customer_delivery.php.orig:165 +#: ../sales/customer_invoice.php:318 +#: ../sales/customer_payments.php:145 - #: ../sales/sales_order_entry.php:350 ++#: ../sales/sales_order_entry.php:364 +msgid "" +"The entered date is out of fiscal year or is closed for further data entry." +msgstr "" + +#: ../gl/accruals.php:44 msgid "The amount can not be 0." msgstr "" @@@ -3957,147 -3403,84 +3881,145 @@@ msgstr " msgid "Accruals for %s" msgstr "" -#: gl/accruals.php:92 gl/accruals.php:94 gl/accruals.php:203 -#: gl/accruals.php:205 gl/gl_budget.php:71 gl/gl_budget.php:72 -#: gl/gl_budget.php:76 gl/inquiry/balance_sheet.php:128 -#: gl/inquiry/balance_sheet.php:130 gl/inquiry/gl_account_inquiry.php:79 -#: gl/inquiry/gl_account_inquiry.php:81 gl/inquiry/gl_account_inquiry.php:134 -#: gl/inquiry/gl_account_inquiry.php:136 gl/inquiry/gl_trial_balance.php:52 -#: gl/inquiry/gl_trial_balance.php:54 gl/inquiry/profit_loss.php:174 -#: gl/inquiry/profit_loss.php:176 gl/manage/gl_quick_entries.php:261 -#: gl/manage/gl_quick_entries.php:263 gl/manage/gl_quick_entries.php:343 -#: gl/manage/gl_quick_entries.php:345 gl/view/accrual_trans.php:54 -#: gl/view/accrual_trans.php:56 gl/view/gl_deposit_view.php:99 -#: gl/view/gl_deposit_view.php:102 gl/view/gl_payment_view.php:98 -#: gl/view/gl_payment_view.php:101 gl/view/gl_trans_view.php:63 -#: gl/view/gl_trans_view.php:66 gl/includes/ui/gl_bank_ui.inc:150 -#: gl/includes/ui/gl_bank_ui.inc:151 gl/includes/ui/gl_bank_ui.inc:153 -#: gl/includes/ui/gl_bank_ui.inc.orig:132 -#: gl/includes/ui/gl_bank_ui.inc.orig:133 -#: gl/includes/ui/gl_bank_ui.inc.orig:135 gl/includes/ui/gl_journal_ui.inc:83 -#: gl/includes/ui/gl_journal_ui.inc:84 gl/includes/ui/gl_journal_ui.inc:86 -#: includes/sysnames.inc:43 includes/sysnames.inc:165 -#: inventory/manage/item_categories.php:216 -#: inventory/manage/item_categories.php:218 inventory/manage/items.php:343 -#: inventory/manage/items.php:345 purchasing/includes/ui/invoice_ui.inc:245 -#: purchasing/includes/ui/invoice_ui.inc:247 -#: purchasing/manage/suppliers.php:137 purchasing/manage/suppliers.php:138 -#: purchasing/manage/suppliers.php:140 reporting/rep501.php:90 -#: reporting/rep704.php:79 reporting/rep704.php:82 reporting/rep704.php:93 -#: reporting/rep704.php:95 reporting/rep704.php:103 reporting/rep705.php:245 -#: reporting/rep705.php:247 reporting/rep705.php:258 reporting/rep706.php:190 -#: reporting/rep706.php:192 reporting/rep706.php:200 reporting/rep707.php:214 -#: reporting/rep707.php:216 reporting/rep707.php:224 reporting/rep708.php:188 -#: reporting/rep708.php:190 reporting/rep708.php:197 -#: reporting/reports_main.php:265 reporting/reports_main.php:266 -#: reporting/reports_main.php:271 reporting/reports_main.php:272 -#: reporting/reports_main.php:279 reporting/reports_main.php:280 -#: reporting/reports_main.php:290 reporting/reports_main.php:291 -#: reporting/reports_main.php:302 reporting/reports_main.php:303 -#: reporting/reports_main.php:314 reporting/reports_main.php:319 -#: reporting/reports_main.php:326 reporting/reports_main.php:336 -#: reporting/reports_main.php:347 sales/customer_delivery.php:395 -#: sales/customer_delivery.php:403 sales/customer_invoice.php:407 -#: sales/customer_invoice.php:445 sales/manage/customers.php:269 -#: sales/manage/customers.php:271 sales/manage/customers.php.orig:266 -#: sales/manage/customers.php.orig:268 -#: sales/includes/ui/sales_credit_ui.inc:132 -#: sales/includes/ui/sales_credit_ui.inc:137 -#: sales/includes/ui/sales_order_ui.inc:451 -#: sales/includes/ui/sales_order_ui.inc:456 sales/customer_invoice.php:409 -#: sales/customer_invoice.php:447 sales/manage/customers.php:270 -#: sales/manage/customers.php:272 sales/includes/ui/sales_order_ui.inc:455 -#: sales/includes/ui/sales_order_ui.inc:460 +#: ../gl/accruals.php:96 +#: ../gl/accruals.php:98 +#: ../gl/accruals.php:207 +#: ../gl/accruals.php:209 +#: ../gl/gl_budget.php:71 +#: ../gl/gl_budget.php:72 +#: ../gl/gl_budget.php:76 +#: ../gl/inquiry/balance_sheet.php:128 +#: ../gl/inquiry/balance_sheet.php:130 +#: ../gl/inquiry/gl_account_inquiry.php:79 +#: ../gl/inquiry/gl_account_inquiry.php:81 +#: ../gl/inquiry/gl_account_inquiry.php:134 +#: ../gl/inquiry/gl_account_inquiry.php:136 +#: ../gl/inquiry/gl_trial_balance.php:52 +#: ../gl/inquiry/gl_trial_balance.php:54 +#: ../gl/inquiry/profit_loss.php:174 +#: ../gl/inquiry/profit_loss.php:176 +#: ../gl/manage/gl_quick_entries.php:261 +#: ../gl/manage/gl_quick_entries.php:263 +#: ../gl/manage/gl_quick_entries.php:343 +#: ../gl/manage/gl_quick_entries.php:345 +#: ../gl/view/accrual_trans.php:54 +#: ../gl/view/accrual_trans.php:56 +#: ../gl/view/gl_deposit_view.php:99 +#: ../gl/view/gl_deposit_view.php:102 +#: ../gl/view/gl_payment_view.php:98 +#: ../gl/view/gl_payment_view.php:101 +#: ../gl/view/gl_trans_view.php:68 +#: ../gl/view/gl_trans_view.php:71 +#: ../gl/includes/ui/gl_bank_ui.inc:150 +#: ../gl/includes/ui/gl_bank_ui.inc:151 +#: ../gl/includes/ui/gl_bank_ui.inc:153 +#: ../gl/includes/ui/gl_bank_ui.inc.orig:124 +#: ../gl/includes/ui/gl_bank_ui.inc.orig:125 +#: ../gl/includes/ui/gl_bank_ui.inc.orig:127 +#: ../gl/includes/ui/gl_journal_ui.inc:86 +#: ../gl/includes/ui/gl_journal_ui.inc:87 +#: ../gl/includes/ui/gl_journal_ui.inc:89 +#: ../includes/sysnames.inc:43 +#: ../includes/sysnames.inc:166 +#: ../inventory/manage/item_categories.php:216 +#: ../inventory/manage/item_categories.php:218 +#: ../inventory/manage/items.php:350 +#: ../inventory/manage/items.php:352 +#: ../inventory/manage/items.php.orig:343 +#: ../inventory/manage/items.php.orig:345 +#: ../purchasing/includes/ui/invoice_ui.inc:265 +#: ../purchasing/includes/ui/invoice_ui.inc:267 +#: ../purchasing/manage/suppliers.php:145 +#: ../purchasing/manage/suppliers.php:146 +#: ../purchasing/manage/suppliers.php:148 +#: ../purchasing/manage/suppliers.php.orig:148 +#: ../purchasing/manage/suppliers.php.orig:149 +#: ../purchasing/manage/suppliers.php.orig:151 +#: ../reporting/rep501.php:90 +#: ../reporting/rep704.php:79 +#: ../reporting/rep704.php:82 +#: ../reporting/rep704.php:93 +#: ../reporting/rep704.php:95 +#: ../reporting/rep704.php:103 +#: ../reporting/rep705.php:245 +#: ../reporting/rep705.php:247 +#: ../reporting/rep705.php:258 +#: ../reporting/rep706.php:190 +#: ../reporting/rep706.php:192 +#: ../reporting/rep706.php:200 +#: ../reporting/rep707.php:214 +#: ../reporting/rep707.php:216 +#: ../reporting/rep707.php:224 +#: ../reporting/rep708.php:188 +#: ../reporting/rep708.php:190 +#: ../reporting/rep708.php:197 +#: ../reporting/reports_main.php:265 +#: ../reporting/reports_main.php:266 +#: ../reporting/reports_main.php:271 +#: ../reporting/reports_main.php:272 +#: ../reporting/reports_main.php:279 +#: ../reporting/reports_main.php:280 +#: ../reporting/reports_main.php:290 +#: ../reporting/reports_main.php:291 +#: ../reporting/reports_main.php:302 +#: ../reporting/reports_main.php:303 +#: ../reporting/reports_main.php:314 +#: ../reporting/reports_main.php:319 +#: ../reporting/reports_main.php:326 +#: ../reporting/reports_main.php:336 +#: ../reporting/reports_main.php:347 - #: ../sales/customer_delivery.php:403 - #: ../sales/customer_delivery.php:411 - #: ../sales/customer_invoice.php:473 - #: ../sales/customer_invoice.php:516 - #: ../sales/manage/customers.php:269 - #: ../sales/manage/customers.php:271 ++#: ../sales/customer_delivery.php.orig:408 ++#: ../sales/customer_delivery.php.orig:416 ++#: ../sales/customer_invoice.php:475 ++#: ../sales/customer_invoice.php:518 ++#: ../sales/manage/customers.php:270 ++#: ../sales/manage/customers.php:272 +#: ../sales/manage/sav.customers.php:269 +#: ../sales/manage/sav.customers.php:271 +#: ../sales/includes/ui/sales_credit_ui.inc:132 +#: ../sales/includes/ui/sales_credit_ui.inc:137 - #: ../sales/includes/ui/sales_order_ui.inc:451 - #: ../sales/includes/ui/sales_order_ui.inc:456 +#: ../sales/includes/ui/sales_order_ui.inc.orig:451 +#: ../sales/includes/ui/sales_order_ui.inc.orig:456 msgid "Dimension" msgstr "" -#: gl/accruals.php:98 gl/accruals.php:213 -#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143 -#: gl/inquiry/journal_inquiry.php:133 gl/view/accrual_trans.php:60 -#: gl/view/gl_deposit_view.php:100 gl/view/gl_deposit_view.php:103 -#: gl/view/gl_deposit_view.php:106 gl/view/gl_payment_view.php:99 -#: gl/view/gl_payment_view.php:102 gl/view/gl_payment_view.php:105 -#: gl/view/gl_trans_view.php:64 gl/view/gl_trans_view.php:67 -#: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_bank_ui.inc:151 -#: gl/includes/ui/gl_bank_ui.inc:154 gl/includes/ui/gl_bank_ui.inc:157 -#: gl/includes/ui/gl_bank_ui.inc:297 gl/includes/ui/gl_bank_ui.inc.orig:133 -#: gl/includes/ui/gl_bank_ui.inc.orig:136 -#: gl/includes/ui/gl_bank_ui.inc.orig:139 -#: gl/includes/ui/gl_bank_ui.inc.orig:279 gl/includes/ui/gl_journal_ui.inc:84 -#: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90 -#: gl/includes/ui/gl_journal_ui.inc:240 -#: inventory/includes/item_adjustments_ui.inc:181 -#: inventory/includes/stock_transfers_ui.inc:161 -#: manufacturing/includes/work_order_issue_ui.inc:169 -#: purchasing/includes/ui/invoice_ui.inc:245 -#: purchasing/includes/ui/invoice_ui.inc:247 -#: purchasing/includes/ui/invoice_ui.inc:249 -#: sales/customer_credit_invoice.php:366 sales/customer_delivery.php:519 -#: sales/customer_invoice.php:576 sales/includes/ui/sales_credit_ui.inc:339 -#: sales/customer_credit_invoice.php:364 sales/customer_invoice.php:578 +#: ../gl/accruals.php:102 +#: ../gl/accruals.php:217 +#: ../gl/inquiry/gl_account_inquiry.php:141 +#: ../gl/inquiry/gl_account_inquiry.php:143 +#: ../gl/inquiry/journal_inquiry.php:133 +#: ../gl/view/accrual_trans.php:60 +#: ../gl/view/gl_deposit_view.php:100 +#: ../gl/view/gl_deposit_view.php:103 +#: ../gl/view/gl_deposit_view.php:106 +#: ../gl/view/gl_payment_view.php:99 +#: ../gl/view/gl_payment_view.php:102 +#: ../gl/view/gl_payment_view.php:105 +#: ../gl/view/gl_trans_view.php:69 +#: ../gl/view/gl_trans_view.php:72 +#: ../gl/view/gl_trans_view.php:75 +#: ../gl/includes/ui/gl_bank_ui.inc:151 +#: ../gl/includes/ui/gl_bank_ui.inc:154 +#: ../gl/includes/ui/gl_bank_ui.inc:157 +#: ../gl/includes/ui/gl_bank_ui.inc:297 +#: ../gl/includes/ui/gl_bank_ui.inc.orig:125 +#: ../gl/includes/ui/gl_bank_ui.inc.orig:128 +#: ../gl/includes/ui/gl_bank_ui.inc.orig:131 +#: ../gl/includes/ui/gl_bank_ui.inc.orig:271 +#: ../gl/includes/ui/gl_journal_ui.inc:87 +#: ../gl/includes/ui/gl_journal_ui.inc:90 +#: ../gl/includes/ui/gl_journal_ui.inc:93 +#: ../gl/includes/ui/gl_journal_ui.inc:276 +#: ../inventory/includes/item_adjustments_ui.inc:181 +#: ../inventory/includes/stock_transfers_ui.inc:161 +#: ../manufacturing/view/wo_costs_view.php:46 +#: ../manufacturing/includes/work_order_issue_ui.inc:169 +#: ../purchasing/includes/ui/invoice_ui.inc:265 +#: ../purchasing/includes/ui/invoice_ui.inc:267 +#: ../purchasing/includes/ui/invoice_ui.inc:269 - #: ../sales/customer_credit_invoice.php:366 - #: ../sales/customer_delivery.php:527 ++#: ../sales/customer_credit_invoice.php:364 ++#: ../sales/customer_delivery.php.orig:532 +#: ../sales/includes/ui/sales_credit_ui.inc:339 msgid "Memo" msgstr "" @@@ -4117,11 -3500,10 +4039,11 @@@ msgstr " msgid "Bi-weekly" msgstr "" -#: gl/accruals.php:182 gl/manage/gl_quick_entries.php:240 -#: gl/includes/ui/gl_journal_ui.inc:57 sales/create_recurrent_invoices.php:115 -#: sales/manage/recurrent_invoices.php:102 -#: sales/create_recurrent_invoices.php:132 +#: ../gl/accruals.php:186 +#: ../gl/manage/gl_quick_entries.php:240 +#: ../gl/includes/ui/gl_journal_ui.inc:57 - #: ../sales/create_recurrent_invoices.php:115 ++#: ../sales/create_recurrent_invoices.php:132 +#: ../sales/manage/recurrent_invoices.php:102 msgid "Monthly" msgstr "" @@@ -4141,55 -3523,31 +4063,54 @@@ msgstr " msgid "Revenue / Cost Account" msgstr "" -#: gl/accruals.php:208 gl/gl_budget.php:91 gl/gl_budget.php:93 -#: gl/inquiry/journal_inquiry.php:132 gl/inquiry/tax_inquiry.php:82 -#: gl/manage/gl_quick_entries.php:261 gl/manage/gl_quick_entries.php:263 -#: gl/manage/gl_quick_entries.php:265 gl/manage/gl_quick_entries.php:339 -#: gl/view/bank_transfer_view.php:70 gl/view/bank_transfer_view.php:80 -#: gl/view/gl_deposit_view.php:67 gl/view/gl_deposit_view.php:100 -#: gl/view/gl_deposit_view.php:103 gl/view/gl_deposit_view.php:106 -#: gl/view/gl_payment_view.php:65 gl/view/gl_payment_view.php:99 -#: gl/view/gl_payment_view.php:102 gl/view/gl_payment_view.php:105 -#: gl/includes/ui/gl_bank_ui.inc:151 gl/includes/ui/gl_bank_ui.inc:154 -#: gl/includes/ui/gl_bank_ui.inc:157 gl/includes/ui/gl_bank_ui.inc.orig:133 -#: gl/includes/ui/gl_bank_ui.inc.orig:136 -#: gl/includes/ui/gl_bank_ui.inc.orig:139 includes/sysnames.inc:132 -#: includes/ui/allocation_cart.inc:263 includes/ui/sav.ui_lists.inc:1163 -#: includes/ui/ui_lists.inc:1184 -#: manufacturing/includes/manufacturing_ui.inc:236 -#: purchasing/includes/ui/invoice_ui.inc:245 -#: purchasing/includes/ui/invoice_ui.inc:247 -#: purchasing/includes/ui/invoice_ui.inc:249 -#: purchasing/view/view_supp_payment.php:60 -#: purchasing/view/view_supp_payment.php:72 reporting/rep102.php:241 -#: reporting/rep107.php:182 reporting/rep109.php:191 reporting/rep110.php:195 -#: reporting/rep111.php:178 reporting/rep113.php:181 reporting/rep202.php:249 -#: reporting/rep209.php:197 reporting/rep706.php:303 reporting/rep707.php:321 -#: reporting/rep710.php:76 sales/view/view_receipt.php:44 +#: ../gl/accruals.php:212 +#: ../gl/gl_budget.php:91 +#: ../gl/gl_budget.php:93 +#: ../gl/inquiry/journal_inquiry.php:132 +#: ../gl/inquiry/tax_inquiry.php:82 +#: ../gl/manage/gl_quick_entries.php:261 +#: ../gl/manage/gl_quick_entries.php:263 +#: ../gl/manage/gl_quick_entries.php:265 +#: ../gl/manage/gl_quick_entries.php:339 +#: ../gl/view/bank_transfer_view.php:70 +#: ../gl/view/bank_transfer_view.php:80 +#: ../gl/view/gl_deposit_view.php:67 +#: ../gl/view/gl_deposit_view.php:100 +#: ../gl/view/gl_deposit_view.php:103 +#: ../gl/view/gl_deposit_view.php:106 +#: ../gl/view/gl_payment_view.php:65 +#: ../gl/view/gl_payment_view.php:99 +#: ../gl/view/gl_payment_view.php:102 +#: ../gl/view/gl_payment_view.php:105 +#: ../gl/includes/ui/gl_bank_ui.inc:151 +#: ../gl/includes/ui/gl_bank_ui.inc:154 +#: ../gl/includes/ui/gl_bank_ui.inc:157 +#: ../gl/includes/ui/gl_bank_ui.inc.orig:125 +#: ../gl/includes/ui/gl_bank_ui.inc.orig:128 +#: ../gl/includes/ui/gl_bank_ui.inc.orig:131 +#: ../includes/sysnames.inc:133 +#: ../includes/ui/allocation_cart.inc:264 +#: ../includes/ui/ui_lists.inc:1182 - #: ../includes/ui/ui_lists.inc.orig:1182 +#: ../manufacturing/view/wo_costs_view.php:46 +#: ../manufacturing/includes/manufacturing_ui.inc:236 +#: ../purchasing/includes/ui/invoice_ui.inc:265 +#: ../purchasing/includes/ui/invoice_ui.inc:267 +#: ../purchasing/includes/ui/invoice_ui.inc:269 +#: ../purchasing/view/view_supp_payment.php:60 +#: ../purchasing/view/view_supp_payment.php:72 +#: ../reporting/rep102.php:241 +#: ../reporting/rep107.php:194 +#: ../reporting/rep107.php:251 +#: ../reporting/rep109.php:192 +#: ../reporting/rep110.php:195 +#: ../reporting/rep111.php:177 +#: ../reporting/rep113.php:181 +#: ../reporting/rep202.php:249 +#: ../reporting/rep209.php:200 +#: ../reporting/rep706.php:303 +#: ../reporting/rep707.php:321 +#: ../reporting/rep710.php:76 +#: ../sales/view/view_receipt.php:44 msgid "Amount" msgstr "" @@@ -4325,80 -3670,74 +4246,81 @@@ msgstr " msgid "To Account:" msgstr "" - #: ../gl/bank_transfer.php:72 -#: gl/bank_transfer.php:72 gl/bank_transfer.php:77 ++#: ../gl/bank_transfer.php:77 msgid "Transfer Date:" msgstr "" - #: ../gl/bank_transfer.php:78 - #: ../gl/bank_transfer.php:85 - #: ../sales/customer_payments.php:408 -#: gl/bank_transfer.php:78 gl/bank_transfer.php:85 -#: sales/customer_payments.php:409 gl/bank_transfer.php:82 -#: gl/bank_transfer.php:89 gl/bank_transfer.php:87 gl/bank_transfer.php:94 -#: sales/customer_payments.php:412 sales/customer_payments.php.orig:411 ++#: ../gl/bank_transfer.php:87 ++#: ../gl/bank_transfer.php:94 ++#: ../sales/customer_payments.php:411 msgid "Amount:" msgstr "" - #: ../gl/bank_transfer.php:79 - #: ../gl/bank_transfer.php:86 - #: ../purchasing/supplier_payment.php:299 - #: ../sales/customer_payments.php:393 -#: gl/bank_transfer.php:79 gl/bank_transfer.php:86 -#: purchasing/supplier_payment.php:299 sales/customer_payments.php:394 -#: gl/bank_transfer.php:83 gl/bank_transfer.php:90 gl/bank_transfer.php:88 -#: gl/bank_transfer.php:95 purchasing/supplier_payment.php:302 -#: sales/customer_payments.php:397 sales/customer_payments.php.orig:396 ++#: ../gl/bank_transfer.php:88 ++#: ../gl/bank_transfer.php:95 ++#: ../purchasing/supplier_payment.php:302 ++#: ../sales/customer_payments.php:396 msgid "Bank Charge:" msgstr "" - #: ../gl/bank_transfer.php:97 -#: gl/bank_transfer.php:97 gl/bank_transfer.php:102 ++#: ../gl/bank_transfer.php:102 msgid "Enter Transfer" msgstr "" - #: ../gl/bank_transfer.php:123 - #: ../gl/bank_transfer.php:153 - #: ../purchasing/supplier_payment.php:130 - #: ../purchasing/supplier_payment.php:136 -#: gl/bank_transfer.php:123 gl/bank_transfer.php:153 -#: purchasing/supplier_payment.php:130 purchasing/supplier_payment.php:136 -#: gl/bank_transfer.php:128 gl/bank_transfer.php:158 -#: purchasing/supplier_payment.php:125 purchasing/supplier_payment.php:131 ++#: ../gl/bank_transfer.php:128 ++#: ../gl/bank_transfer.php:158 ++#: ../purchasing/supplier_payment.php:125 ++#: ../purchasing/supplier_payment.php:131 msgid "The entered amount is invalid or less than zero." msgstr "" - #: ../gl/bank_transfer.php:128 - #: ../gl/gl_bank.php:227 -#: gl/bank_transfer.php:128 gl/gl_bank.php:225 gl/bank_transfer.php:133 ++#: ../gl/bank_transfer.php:133 ++#: ../gl/gl_bank.php:228 msgid "The total bank amount cannot be 0." msgstr "" - #: ../gl/bank_transfer.php:139 -#: gl/bank_transfer.php:139 gl/bank_transfer.php:144 ++#: ../gl/bank_transfer.php:144 #, php-format msgid "The total bank amount exceeds allowed limit (%s) for source account." msgstr "" - #: ../gl/bank_transfer.php:145 - #: ../gl/gl_bank.php:244 -#: gl/bank_transfer.php:145 gl/gl_bank.php:242 gl/bank_transfer.php:150 ++#: ../gl/bank_transfer.php:150 ++#: ../gl/gl_bank.php:245 #, php-format msgid "" "The bank transaction would result in exceed of authorized overdraft limit " "for transaction: %s #%s on %s." msgstr "" - #: ../gl/bank_transfer.php:158 - #: ../purchasing/supplier_payment.php:144 -#: gl/bank_transfer.php:158 purchasing/supplier_payment.php:144 -#: sales/customer_payments.php:184 gl/bank_transfer.php:163 -#: purchasing/supplier_payment.php:139 sales/customer_payments.php.orig:184 ++#: ../gl/bank_transfer.php:163 ++#: ../purchasing/supplier_payment.php:139 +#: ../sales/customer_payments.php:184 msgid "" "The Bank Charge Account has not been set in System and General GL Setup." msgstr "" - #: ../gl/bank_transfer.php:164 - #: ../gl/gl_bank.php:251 - #: ../gl/gl_journal.php:170 -#: gl/bank_transfer.php:164 gl/gl_bank.php:249 gl/gl_journal.php:168 -#: gl/manage/revaluate_currencies.php:65 inventory/adjustments.php:96 -#: inventory/transfers.php:93 manufacturing/work_order_add_finished.php:77 -#: manufacturing/work_order_entry.php:132 -#: manufacturing/work_order_issue.php:91 purchasing/po_receive_items.php:188 -#: purchasing/supplier_payment.php:201 sales/credit_note_entry.php:147 -#: sales/customer_credit_invoice.php:102 sales/customer_delivery.php:166 -#: sales/customer_invoice.php:280 sales/customer_payments.php:151 -#: sales/sales_order_entry.php:403 gl/bank_transfer.php:169 -#: purchasing/supplier_payment.php:196 sales/customer_payments.php.orig:151 -#: sales/sales_order_entry.php:412 sales/sales_order_entry.php.orig:411 ++#: ../gl/bank_transfer.php:169 ++#: ../gl/gl_bank.php:252 ++#: ../gl/gl_journal.php:173 +#: ../gl/manage/revaluate_currencies.php:65 +#: ../inventory/adjustments.php:96 +#: ../inventory/transfers.php:93 +#: ../manufacturing/work_order_add_finished.php:77 +#: ../manufacturing/work_order_entry.php:132 +#: ../manufacturing/work_order_issue.php:90 +#: ../purchasing/po_receive_items.php:186 - #: ../purchasing/supplier_payment.php:201 ++#: ../purchasing/supplier_payment.php:196 +#: ../sales/credit_note_entry.php:147 +#: ../sales/customer_credit_invoice.php:102 - #: ../sales/customer_delivery.php:174 ++#: ../sales/customer_delivery.php:178 ++#: ../sales/customer_delivery.php.orig:178 +#: ../sales/customer_invoice.php:332 +#: ../sales/customer_payments.php:151 - #: ../sales/sales_order_entry.php:414 ++#: ../sales/sales_order_entry.php:428 msgid "You must enter a reference." msgstr "" - #: ../gl/bank_transfer.php:178 -#: gl/bank_transfer.php:178 gl/bank_transfer.php:183 ++#: ../gl/bank_transfer.php:183 msgid "The source and destination bank accouts cannot be the same." msgstr "" @@@ -4418,114 -3757,102 +4340,116 @@@ msgstr " msgid "Modify Bank Deposit Entry" msgstr "" - #: ../gl/gl_bank.php:73 -#: gl/gl_bank.php:73 ++#: ../gl/gl_bank.php:76 #, php-format msgid "Payment %d has been entered" msgstr "" - #: ../gl/gl_bank.php:75 - #: ../gl/gl_bank.php:93 -#: gl/gl_bank.php:75 gl/gl_bank.php:93 ++#: ../gl/gl_bank.php:78 ++#: ../gl/gl_bank.php:96 msgid "&View the GL Postings for this Payment" msgstr "" - #: ../gl/gl_bank.php:77 - #: ../gl/gl_bank.php:95 -#: gl/gl_bank.php:77 gl/gl_bank.php:95 ++#: ../gl/gl_bank.php:80 ++#: ../gl/gl_bank.php:98 msgid "Enter Another &Payment" msgstr "" - #: ../gl/gl_bank.php:79 - #: ../gl/gl_bank.php:97 -#: gl/gl_bank.php:79 gl/gl_bank.php:97 ++#: ../gl/gl_bank.php:82 ++#: ../gl/gl_bank.php:100 msgid "Enter A &Deposit" msgstr "" - #: ../gl/gl_bank.php:81 - #: ../gl/gl_journal.php:62 -#: gl/gl_bank.php:81 gl/gl_journal.php:61 inventory/adjustments.php:50 -#: manufacturing/work_order_entry.php:68 purchasing/po_entry_items.php:109 -#: purchasing/po_entry_items.php:133 purchasing/supplier_credit.php:49 -#: purchasing/supplier_invoice.php:52 sales/credit_note_entry.php:77 -#: sales/customer_credit_invoice.php:62 sales/customer_invoice.php:66 -#: sales/sales_order_entry.php:226 purchasing/po_entry_items.php:112 -#: purchasing/po_entry_items.php:136 sales/sales_order_entry.php:234 -#: sales/sales_order_entry.php.orig:234 ++#: ../gl/gl_bank.php:84 ++#: ../gl/gl_journal.php:63 +#: ../inventory/adjustments.php:50 +#: ../manufacturing/work_order_entry.php:68 - #: ../purchasing/po_entry_items.php:112 - #: ../purchasing/po_entry_items.php:136 ++#: ../purchasing/po_entry_items.php:115 ++#: ../purchasing/po_entry_items.php:139 ++#: ../purchasing/po_entry_items.php.orig:112 ++#: ../purchasing/po_entry_items.php.orig:136 +#: ../purchasing/supplier_credit.php:84 - #: ../purchasing/supplier_invoice.php:74 ++#: ../purchasing/supplier_invoice.php:75 +#: ../sales/credit_note_entry.php:77 +#: ../sales/customer_credit_invoice.php:62 - #: ../sales/customer_invoice.php:68 - #: ../sales/sales_order_entry.php:227 ++#: ../sales/customer_invoice.php:69 ++#: ../sales/sales_order_entry.php:240 msgid "Add an Attachment" msgstr "" - #: ../gl/gl_bank.php:107 -#: gl/gl_bank.php:107 ++#: ../gl/gl_bank.php:110 #, php-format msgid "Deposit %d has been entered" msgstr "" - #: ../gl/gl_bank.php:109 -#: gl/gl_bank.php:109 ++#: ../gl/gl_bank.php:112 msgid "View the GL Postings for this Deposit" msgstr "" - #: ../gl/gl_bank.php:111 -#: gl/gl_bank.php:111 ++#: ../gl/gl_bank.php:114 msgid "Enter Another Deposit" msgstr "" - #: ../gl/gl_bank.php:113 -#: gl/gl_bank.php:113 ++#: ../gl/gl_bank.php:116 msgid "Enter A Payment" msgstr "" - #: ../gl/gl_bank.php:122 -#: gl/gl_bank.php:124 ++#: ../gl/gl_bank.php:125 +#, php-format +msgid "Deposit %d has been modified" +msgstr "" + - #: ../gl/gl_bank.php:124 ++#: ../gl/gl_bank.php:127 msgid "&View the GL Postings for this Deposit" msgstr "" - #: ../gl/gl_bank.php:126 -#: gl/gl_bank.php:126 ++#: ../gl/gl_bank.php:129 msgid "Enter Another &Deposit" msgstr "" - #: ../gl/gl_bank.php:128 -#: gl/gl_bank.php:128 ++#: ../gl/gl_bank.php:131 msgid "Enter A &Payment" msgstr "" - #: ../gl/gl_bank.php:221 -#: gl/gl_bank.php:219 ++#: ../gl/gl_bank.php:222 msgid "You must enter at least one payment line." msgstr "" - #: ../gl/gl_bank.php:238 - #: ../purchasing/supplier_payment.php:194 -#: gl/gl_bank.php:236 purchasing/supplier_payment.php:194 -#: purchasing/supplier_payment.php:189 ++#: ../gl/gl_bank.php:239 ++#: ../purchasing/supplier_payment.php:189 #, php-format msgid "The total bank amount exceeds allowed limit (%s)." msgstr "" - #: ../gl/gl_bank.php:263 -#: gl/gl_bank.php:261 ++#: ../gl/gl_bank.php:264 msgid "The entered date for the payment is invalid." msgstr "" - #: ../gl/gl_bank.php:275 -#: gl/gl_bank.php:273 ++#: ../gl/gl_bank.php:276 msgid "You have to select customer and customer branch." msgstr "" - #: ../gl/gl_bank.php:279 -#: gl/gl_bank.php:277 ++#: ../gl/gl_bank.php:280 msgid "You have to select supplier." msgstr "" - #: ../gl/gl_bank.php:325 -#: gl/gl_bank.php:323 gl/gl_bank.php:325 ++#: ../gl/gl_bank.php:328 msgid "The amount entered is not a valid number or is less than zero." msgstr "" - #: ../gl/gl_bank.php:397 -#: gl/gl_bank.php:395 gl/gl_bank.php:397 ++#: ../gl/gl_bank.php:400 msgid "Payment Items" msgstr "" - #: ../gl/gl_bank.php:397 -#: gl/gl_bank.php:395 gl/gl_bank.php:397 ++#: ../gl/gl_bank.php:400 msgid "Deposit Items" msgstr "" - #: ../gl/gl_bank.php:405 -#: gl/gl_bank.php:403 gl/gl_bank.php:405 ++#: ../gl/gl_bank.php:408 msgid "Process Payment" msgstr "" - #: ../gl/gl_bank.php:405 -#: gl/gl_bank.php:403 gl/gl_bank.php:405 ++#: ../gl/gl_bank.php:408 msgid "Process Deposit" msgstr "" @@@ -4548,9 -3875,10 +4472,9 @@@ msgstr " msgid "The Budget has been deleted." msgstr "" -#: gl/gl_budget.php:64 gl/manage/gl_accounts.php:230 -#: gl/manage/gl_accounts.php:240 gl/manage/gl_accounts.php.orig:230 -#: gl/manage/gl_accounts.php.orig:240 gl/manage/gl_accounts.php:231 -#: gl/manage/gl_accounts.php:241 +#: ../gl/gl_budget.php:64 - #: ../gl/manage/gl_accounts.php:229 - #: ../gl/manage/gl_accounts.php:239 ++#: ../gl/manage/gl_accounts.php:230 ++#: ../gl/manage/gl_accounts.php:240 msgid "Account Code:" msgstr "" @@@ -4559,36 -3886,17 +4483,36 @@@ msgid "Get" msgstr "" -#: gl/gl_budget.php:91 gl/gl_budget.php:93 gl/inquiry/profit_loss.php:231 -#: gl/manage/gl_quick_entries.php:240 reporting/rep101.php:136 -#: reporting/rep105.php:116 reporting/rep106.php:90 reporting/rep114.php:88 -#: reporting/rep201.php:124 reporting/rep304.php:119 reporting/rep305.php:100 -#: reporting/rep601.php:82 reporting/rep702.php:57 reporting/rep704.php:91 -#: reporting/rep704.php:101 reporting/rep704.php:109 reporting/rep706.php:181 -#: reporting/rep706.php:189 reporting/rep706.php:199 reporting/rep706.php:207 -#: reporting/rep707.php:206 reporting/rep707.php:213 reporting/rep707.php:223 -#: reporting/rep707.php:231 reporting/rep708.php:187 reporting/rep708.php:196 -#: reporting/rep708.php:203 reporting/rep709.php:104 reporting/rep710.php:83 -#: reporting/rep305.php:103 +#: ../gl/gl_budget.php:91 +#: ../gl/gl_budget.php:93 +#: ../gl/inquiry/profit_loss.php:231 +#: ../gl/manage/gl_quick_entries.php:240 +#: ../reporting/rep101.php:136 +#: ../reporting/rep105.php:116 +#: ../reporting/rep106.php:90 +#: ../reporting/rep114.php:88 +#: ../reporting/rep201.php:124 +#: ../reporting/rep304.php:119 - #: ../reporting/rep305.php:100 ++#: ../reporting/rep305.php:103 +#: ../reporting/rep601.php:82 +#: ../reporting/rep602.php:86 +#: ../reporting/rep702.php:57 +#: ../reporting/rep704.php:91 +#: ../reporting/rep704.php:101 +#: ../reporting/rep704.php:109 +#: ../reporting/rep706.php:181 +#: ../reporting/rep706.php:189 +#: ../reporting/rep706.php:199 +#: ../reporting/rep706.php:207 +#: ../reporting/rep707.php:206 +#: ../reporting/rep707.php:213 +#: ../reporting/rep707.php:223 +#: ../reporting/rep707.php:231 +#: ../reporting/rep708.php:187 +#: ../reporting/rep708.php:196 +#: ../reporting/rep708.php:203 +#: ../reporting/rep709.php:104 +#: ../reporting/rep710.php:83 msgid "Period" msgstr "" @@@ -4601,75 -3908,43 +4525,74 @@@ msgstr " msgid "Last Year" msgstr "" -#: gl/gl_budget.php:127 gl/inquiry/balance_sheet.php:98 -#: gl/inquiry/balance_sheet.php:205 gl/inquiry/balance_sheet.php:236 -#: gl/inquiry/gl_trial_balance.php:210 gl/inquiry/profit_loss.php:115 -#: gl/inquiry/profit_loss.php:283 gl/view/gl_deposit_view.php:132 -#: gl/view/gl_payment_view.php:131 gl/view/gl_trans_view.php:106 -#: gl/includes/ui/gl_bank_ui.inc:200 gl/includes/ui/gl_bank_ui.inc.orig:182 -#: gl/includes/ui/gl_journal_ui.inc:141 -#: inventory/includes/item_adjustments_ui.inc:63 -#: inventory/includes/item_adjustments_ui.inc:102 -#: manufacturing/includes/manufacturing_ui.inc:178 -#: purchasing/includes/ui/invoice_ui.inc:309 -#: purchasing/includes/ui/invoice_ui.inc:474 -#: purchasing/includes/ui/invoice_ui.inc:544 -#: purchasing/po_receive_items.php:63 purchasing/view/view_po.php:140 -#: purchasing/allocations/supplier_allocation_main.php:100 -#: reporting/rep101.php:237 reporting/rep106.php:82 reporting/rep106.php:115 -#: reporting/rep106.php:158 reporting/rep114.php:156 reporting/rep201.php:221 -#: reporting/rep203.php:92 reporting/rep203.php:167 reporting/rep204.php:109 -#: reporting/rep204.php:137 reporting/rep301.php:130 reporting/rep301.php:167 -#: reporting/rep304.php:142 reporting/rep304.php:184 reporting/rep305.php:95 -#: reporting/rep305.php:119 reporting/rep305.php:176 reporting/rep702.php:138 -#: reporting/rep705.php:152 reporting/rep705.php:309 reporting/rep706.php:106 -#: reporting/rep706.php:249 reporting/rep706.php:284 reporting/rep707.php:115 -#: reporting/rep707.php:291 reporting/rep708.php:235 -#: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:170 -#: sales/customer_credit_invoice.php:283 sales/customer_delivery.php:433 -#: sales/customer_invoice.php:468 -#: sales/allocations/customer_allocation_main.php:99 -#: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113 -#: sales/view/view_invoice.php:114 sales/view/view_sales_order.php:96 -#: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161 -#: sales/view/view_sales_order.php:202 -#: sales/includes/ui/sales_credit_ui.inc:168 -#: sales/includes/ui/sales_order_ui.inc:142 reporting/rep305.php:98 -#: reporting/rep305.php:122 reporting/rep305.php:178 -#: sales/customer_credit_invoice.php:281 sales/customer_invoice.php:470 -#: sales/includes/ui/sales_order_ui.inc:146 +#: ../gl/gl_budget.php:127 +#: ../gl/inquiry/balance_sheet.php:98 +#: ../gl/inquiry/balance_sheet.php:205 +#: ../gl/inquiry/balance_sheet.php:236 +#: ../gl/inquiry/gl_trial_balance.php:209 +#: ../gl/inquiry/profit_loss.php:115 +#: ../gl/inquiry/profit_loss.php:283 +#: ../gl/view/gl_deposit_view.php:132 +#: ../gl/view/gl_payment_view.php:131 +#: ../gl/view/gl_trans_view.php:115 +#: ../gl/includes/ui/gl_bank_ui.inc:200 +#: ../gl/includes/ui/gl_bank_ui.inc.orig:174 +#: ../gl/includes/ui/gl_journal_ui.inc:153 +#: ../inventory/includes/item_adjustments_ui.inc:63 +#: ../inventory/includes/item_adjustments_ui.inc:102 +#: ../manufacturing/includes/manufacturing_ui.inc:178 +#: ../purchasing/includes/ui/invoice_ui.inc:329 +#: ../purchasing/includes/ui/invoice_ui.inc:495 +#: ../purchasing/includes/ui/invoice_ui.inc:566 +#: ../purchasing/po_receive_items.php:63 +#: ../purchasing/view/view_po.php:140 +#: ../purchasing/allocations/supplier_allocation_main.php:100 +#: ../reporting/rep101.php:237 +#: ../reporting/rep106.php:82 +#: ../reporting/rep106.php:115 +#: ../reporting/rep106.php:158 +#: ../reporting/rep114.php:156 +#: ../reporting/rep201.php:221 +#: ../reporting/rep203.php:92 +#: ../reporting/rep203.php:167 +#: ../reporting/rep204.php:109 +#: ../reporting/rep204.php:137 +#: ../reporting/rep301.php:130 +#: ../reporting/rep301.php:167 +#: ../reporting/rep304.php:142 +#: ../reporting/rep304.php:184 - #: ../reporting/rep305.php:95 - #: ../reporting/rep305.php:119 - #: ../reporting/rep305.php:176 ++#: ../reporting/rep305.php:98 ++#: ../reporting/rep305.php:122 ++#: ../reporting/rep305.php:178 +#: ../reporting/rep702.php:138 +#: ../reporting/rep705.php:152 +#: ../reporting/rep705.php:309 +#: ../reporting/rep706.php:106 +#: ../reporting/rep706.php:249 +#: ../reporting/rep706.php:284 +#: ../reporting/rep707.php:115 +#: ../reporting/rep707.php:291 +#: ../reporting/rep708.php:235 +#: ../reporting/includes/doctext.inc:30 +#: ../reporting/includes/doctext.inc:192 - #: ../sales/customer_credit_invoice.php:283 - #: ../sales/customer_delivery.php:441 - #: ../sales/customer_invoice.php:540 - #: ../sales/customer_invoice.php:543 ++#: ../sales/customer_credit_invoice.php:281 ++#: ../sales/customer_delivery.php.orig:446 ++#: ../sales/customer_invoice.php:542 ++#: ../sales/customer_invoice.php:545 +#: ../sales/allocations/customer_allocation_main.php:99 +#: ../sales/view/view_credit.php:91 +#: ../sales/view/view_dispatch.php:113 +#: ../sales/view/view_invoice.php:116 +#: ../sales/view/view_sales_order.php:109 +#: ../sales/view/view_sales_order.php:142 +#: ../sales/view/view_sales_order.php:179 +#: ../sales/view/view_sales_order.php:220 +#: ../sales/view/view_sales_order.php.orig:96 +#: ../sales/view/view_sales_order.php.orig:129 +#: ../sales/view/view_sales_order.php.orig:161 +#: ../sales/view/view_sales_order.php.orig:202 +#: ../sales/includes/ui/sales_credit_ui.inc:168 - #: ../sales/includes/ui/sales_order_ui.inc:142 +#: ../sales/includes/ui/sales_order_ui.inc.orig:142 msgid "Total" msgstr "" @@@ -4684,87 -3957,82 +4607,86 @@@ msgstr " msgid "Journal Entry" msgstr "" - #: ../gl/gl_journal.php:55 -#: gl/gl_journal.php:54 ++#: ../gl/gl_journal.php:56 msgid "Journal entry has been entered" msgstr "" - #: ../gl/gl_journal.php:57 - #: ../gl/gl_journal.php:72 -#: gl/gl_journal.php:56 gl/gl_journal.php:71 ++#: ../gl/gl_journal.php:58 ++#: ../gl/gl_journal.php:73 msgid "&View this Journal Entry" msgstr "" - #: ../gl/gl_journal.php:60 -#: gl/gl_journal.php:59 ++#: ../gl/gl_journal.php:61 msgid "Enter &New Journal Entry" msgstr "" - #: ../gl/gl_journal.php:70 -#: gl/gl_journal.php:69 ++#: ../gl/gl_journal.php:71 msgid "Journal entry has been updated" msgstr "" - #: ../gl/gl_journal.php:74 -#: gl/gl_journal.php:73 ++#: ../gl/gl_journal.php:75 msgid "Return to Journal &Inquiry" msgstr "" - #: ../gl/gl_journal.php:87 -#: gl/gl_journal.php:86 ++#: ../gl/gl_journal.php:90 msgid "" "You can edit directly only journal entries created via Journal Entry page." msgstr "" - #: ../gl/gl_journal.php:88 -#: gl/gl_journal.php:87 ++#: ../gl/gl_journal.php:91 msgid "Entry &New Journal Entry" msgstr "" - #: ../gl/gl_journal.php:145 -#: gl/gl_journal.php:143 ++#: ../gl/gl_journal.php:148 msgid "You must enter at least one journal line." msgstr "" - #: ../gl/gl_journal.php:151 -#: gl/gl_journal.php:149 ++#: ../gl/gl_journal.php:154 +#: ../includes/ui/gl_cart.inc:128 msgid "" "The journal must balance (debits equal to credits) before it can be " "processed." msgstr "" - #: ../gl/gl_journal.php:213 - #: ../gl/gl_journal.php:220 -#: gl/gl_journal.php:211 gl/gl_journal.php:218 ++#: ../gl/gl_journal.php:216 ++#: ../gl/gl_journal.php:223 msgid "Dimension is closed." msgstr "" - #: ../gl/gl_journal.php:227 -#: gl/gl_journal.php:225 ++#: ../gl/gl_journal.php:230 msgid "You must enter either a debit amount or a credit amount." msgstr "" - #: ../gl/gl_journal.php:234 -#: gl/gl_journal.php:232 ++#: ../gl/gl_journal.php:237 msgid "The debit amount entered is not a valid number or is less than zero." msgstr "" - #: ../gl/gl_journal.php:239 -#: gl/gl_journal.php:237 ++#: ../gl/gl_journal.php:242 msgid "The credit amount entered is not a valid number or is less than zero." msgstr "" - #: ../gl/gl_journal.php:245 - #: ../includes/ui/ui_view.inc:673 - #: ../includes/ui/ui_view.inc.orig:672 -#: gl/gl_journal.php:243 includes/ui/ui_view.inc:672 -#: purchasing/supplier_credit.php:119 purchasing/supplier_invoice.php:119 -#: includes/ui/ui_view.inc:673 ++#: ../gl/gl_journal.php:248 ++#: ../includes/ui/ui_view.inc:674 +#: ../purchasing/supplier_credit.php:136 - #: ../purchasing/supplier_invoice.php:143 ++#: ../purchasing/supplier_invoice.php:144 msgid "Cannot post to GL account used by more than one tax type." msgstr "" - #: ../gl/gl_journal.php:252 -#: gl/gl_journal.php:250 ++#: ../gl/gl_journal.php:255 msgid "" "You cannot make a journal entry for a bank account. Please use one of the " "banking functions for bank transactions." msgstr "" - #: ../gl/gl_journal.php:331 -#: gl/gl_journal.php:329 ++#: ../gl/gl_journal.php:334 msgid "Rows" msgstr "" - #: ../gl/gl_journal.php:337 -#: gl/gl_journal.php:335 ++#: ../gl/gl_journal.php:340 msgid "Process Journal Entry" msgstr "" - #: ../gl/gl_journal.php:338 -#: gl/gl_journal.php:336 ++#: ../gl/gl_journal.php:341 msgid "Process journal entry only if debits equal to credits" msgstr "" @@@ -4862,14 -4112,11 +4784,14 @@@ msgstr " msgid "Only balances" msgstr "" -#: gl/inquiry/gl_trial_balance.php:90 gl/inquiry/gl_trial_balance.php:142 -#: reporting/rep706.php:302 reporting/rep707.php:320 reporting/rep708.php:51 -#: reporting/rep708.php:117 sales/create_recurrent_invoices.php:115 -#: sales/manage/recurrent_invoices.php:102 -#: sales/create_recurrent_invoices.php:132 +#: ../gl/inquiry/gl_trial_balance.php:88 +#: ../gl/inquiry/gl_trial_balance.php:140 +#: ../reporting/rep706.php:302 +#: ../reporting/rep707.php:320 +#: ../reporting/rep708.php:51 +#: ../reporting/rep708.php:117 - #: ../sales/create_recurrent_invoices.php:115 ++#: ../sales/create_recurrent_invoices.php:132 +#: ../sales/manage/recurrent_invoices.php:102 msgid "Group" msgstr "" @@@ -4943,21 -4179,21 +4865,21 @@@ msgstr " msgid "Profit & Loss Drilldown" msgstr "" -#: gl/inquiry/profit_loss.php:168 reporting/rep707.php:206 -#: reporting/includes/reports_classes.inc:234 -#: reporting/includes/reports_classes.inc:238 +#: ../gl/inquiry/profit_loss.php:168 +#: ../reporting/rep707.php:206 - #: ../reporting/includes/reports_classes.inc:234 ++#: ../reporting/includes/reports_classes.inc:238 msgid "Accumulated" msgstr "" -#: gl/inquiry/profit_loss.php:168 reporting/rep707.php:251 -#: reporting/includes/reports_classes.inc:234 -#: reporting/includes/reports_classes.inc:238 +#: ../gl/inquiry/profit_loss.php:168 +#: ../reporting/rep707.php:251 - #: ../reporting/includes/reports_classes.inc:234 ++#: ../reporting/includes/reports_classes.inc:238 msgid "Period Y-1" msgstr "" -#: gl/inquiry/profit_loss.php:168 reporting/rep707.php:242 -#: reporting/includes/reports_classes.inc:234 -#: reporting/includes/reports_classes.inc:238 +#: ../gl/inquiry/profit_loss.php:168 +#: ../reporting/rep707.php:242 - #: ../reporting/includes/reports_classes.inc:234 ++#: ../reporting/includes/reports_classes.inc:238 msgid "Budget" msgstr "" @@@ -4981,13 -4214,13 +4903,13 @@@ msgstr " msgid "Tax Inquiry" msgstr "" -#: gl/inquiry/tax_inquiry.php:82 reporting/rep709.php:172 -#: reporting/rep709.php:176 +#: ../gl/inquiry/tax_inquiry.php:82 - #: ../reporting/rep709.php:172 ++#: ../reporting/rep709.php:176 msgid "Outputs" msgstr "" -#: gl/inquiry/tax_inquiry.php:82 reporting/rep709.php:172 -#: reporting/rep709.php:176 +#: ../gl/inquiry/tax_inquiry.php:82 - #: ../reporting/rep709.php:172 ++#: ../reporting/rep709.php:176 msgid "Inputs" msgstr "" @@@ -4995,8 -4228,8 +4917,8 @@@ msgid "Charged on sales" msgstr "" -#: gl/inquiry/tax_inquiry.php:100 reporting/rep709.php:172 -#: reporting/rep709.php:176 +#: ../gl/inquiry/tax_inquiry.php:100 - #: ../reporting/rep709.php:172 ++#: ../reporting/rep709.php:176 msgid "Output Tax" msgstr "" @@@ -5004,8 -4237,8 +4926,8 @@@ msgid "Paid on purchases" msgstr "" -#: gl/inquiry/tax_inquiry.php:106 reporting/rep709.php:172 -#: reporting/rep709.php:176 +#: ../gl/inquiry/tax_inquiry.php:106 - #: ../reporting/rep709.php:172 ++#: ../reporting/rep709.php:176 msgid "Input Tax" msgstr "" @@@ -5013,8 -4246,8 +4935,8 @@@ msgid "Net payable or collectible" msgstr "" -#: gl/inquiry/tax_inquiry.php:119 reporting/rep709.php:203 -#: reporting/rep709.php:207 +#: ../gl/inquiry/tax_inquiry.php:119 - #: ../reporting/rep709.php:203 ++#: ../reporting/rep709.php:207 msgid "Total payable or refund" msgstr "" @@@ -5055,59 -4288,46 +4977,51 @@@ msgstr " msgid "Selected bank account has been deleted" msgstr "" -#: gl/manage/bank_accounts.php:106 gl/manage/bank_accounts.php.orig:106 -#: gl/view/bank_transfer_view.php:69 gl/view/bank_transfer_view.php:78 -#: gl/view/gl_deposit_view.php:66 gl/view/gl_payment_view.php:64 -#: inventory/prices.php:133 inventory/purchasing_data.php:129 -#: purchasing/view/view_supp_credit.php:49 -#: purchasing/view/view_supp_invoice.php:53 -#: purchasing/inquiry/po_search_completed.php:127 -#: purchasing/inquiry/po_search.php:136 -#: purchasing/inquiry/supplier_allocation_inquiry.php:133 -#: purchasing/inquiry/supplier_allocation_inquiry.php:143 -#: purchasing/inquiry/supplier_inquiry.php:76 -#: purchasing/inquiry/supplier_inquiry.php:175 -#: purchasing/inquiry/supplier_inquiry.php:186 -#: purchasing/inquiry/supplier_inquiry.php.orig:72 -#: purchasing/inquiry/supplier_inquiry.php.orig:169 -#: purchasing/inquiry/supplier_inquiry.php.orig:180 -#: purchasing/allocations/supplier_allocation_main.php:99 -#: purchasing/allocations/supplier_allocation_main.php:107 -#: reporting/rep101.php:138 reporting/rep102.php:131 reporting/rep102.php:137 -#: reporting/rep104.php:114 reporting/rep201.php:126 reporting/rep202.php:136 -#: reporting/rep203.php:99 sales/customer_credit_invoice.php:239 -#: sales/customer_delivery.php:340 sales/customer_invoice.php:402 -#: sales/allocations/customer_allocation_main.php:98 -#: sales/allocations/customer_allocation_main.php:106 -#: sales/view/view_credit.php:70 sales/view/view_dispatch.php:86 -#: sales/view/view_invoice.php:85 -#: sales/inquiry/customer_allocation_inquiry.php:151 -#: sales/inquiry/customer_allocation_inquiry.php:161 -#: sales/inquiry/customer_inquiry.php:80 -#: sales/inquiry/customer_inquiry.php:232 -#: sales/inquiry/customer_inquiry.php:245 -#: sales/inquiry/customer_inquiry.php.orig:80 -#: sales/inquiry/customer_inquiry.php.orig:232 -#: sales/inquiry/customer_inquiry.php.orig:245 -#: sales/inquiry/sales_deliveries_view.php:189 -#: sales/inquiry/sales_orders_view.php:272 -#: sales/inquiry/sales_orders_view.php:286 -#: sales/inquiry/sales_orders_view.php.orig:270 -#: sales/inquiry/sales_orders_view.php.orig:284 -#: sales/customer_credit_invoice.php:237 sales/customer_invoice.php:404 +#: ../gl/manage/bank_accounts.php:109 +#: ../gl/view/bank_transfer_view.php:69 +#: ../gl/view/bank_transfer_view.php:78 +#: ../gl/view/gl_deposit_view.php:66 +#: ../gl/view/gl_payment_view.php:64 +#: ../inventory/prices.php:133 +#: ../inventory/purchasing_data.php:129 +#: ../purchasing/view/view_supp_credit.php:49 +#: ../purchasing/view/view_supp_invoice.php:54 +#: ../purchasing/inquiry/po_search_completed.php:126 +#: ../purchasing/inquiry/po_search_completed.php.orig:125 +#: ../purchasing/inquiry/po_search.php:136 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:132 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:142 +#: ../purchasing/inquiry/supplier_inquiry.php:73 +#: ../purchasing/inquiry/supplier_inquiry.php:180 +#: ../purchasing/inquiry/supplier_inquiry.php:192 +#: ../purchasing/inquiry/supplier_inquiry.php.orig:73 +#: ../purchasing/inquiry/supplier_inquiry.php.orig:177 +#: ../purchasing/inquiry/supplier_inquiry.php.orig:189 +#: ../purchasing/allocations/supplier_allocation_main.php:99 +#: ../purchasing/allocations/supplier_allocation_main.php:107 +#: ../reporting/rep101.php:138 +#: ../reporting/rep102.php:131 +#: ../reporting/rep102.php:137 +#: ../reporting/rep104.php:114 +#: ../reporting/rep201.php:126 +#: ../reporting/rep202.php:136 +#: ../reporting/rep203.php:99 - #: ../sales/customer_credit_invoice.php:239 - #: ../sales/customer_delivery.php:348 - #: ../sales/customer_invoice.php:468 ++#: ../sales/customer_credit_invoice.php:237 ++#: ../sales/customer_delivery.php.orig:353 ++#: ../sales/customer_invoice.php:470 +#: ../sales/allocations/customer_allocation_main.php:98 +#: ../sales/allocations/customer_allocation_main.php:106 +#: ../sales/view/view_credit.php:70 +#: ../sales/view/view_dispatch.php:86 +#: ../sales/view/view_invoice.php:86 +#: ../sales/inquiry/customer_allocation_inquiry.php:151 +#: ../sales/inquiry/customer_allocation_inquiry.php:161 - #: ../sales/inquiry/customer_allocation_inquiry.php.orig:151 - #: ../sales/inquiry/customer_allocation_inquiry.php.orig:161 +#: ../sales/inquiry/customer_inquiry.php:76 +#: ../sales/inquiry/customer_inquiry.php:208 +#: ../sales/inquiry/customer_inquiry.php:221 - #: ../sales/inquiry/customer_inquiry.php.orig:77 - #: ../sales/inquiry/customer_inquiry.php.orig:232 - #: ../sales/inquiry/customer_inquiry.php.orig:245 +#: ../sales/inquiry/sales_deliveries_view.php:189 - #: ../sales/inquiry/sales_deliveries_view.php.orig:189 +#: ../sales/inquiry/sales_orders_view.php:294 +#: ../sales/inquiry/sales_orders_view.php:308 - #: ../sales/inquiry/sales_orders_view.php.orig:271 - #: ../sales/inquiry/sales_orders_view.php.orig:285 msgid "Currency" msgstr "" @@@ -5120,9 -4340,8 +5034,8 @@@ msgstr " msgid "Bank" msgstr "" -#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107 -#: includes/ui/ui_view.inc:488 +#: ../gl/manage/bank_accounts.php:110 +#: ../includes/ui/ui_view.inc:488 - #: ../includes/ui/ui_view.inc.orig:488 msgid "Number" msgstr "" @@@ -5345,11 -4512,8 +5258,9 @@@ msgstr " msgid "Date to Use From:" msgstr "" -#: gl/manage/exchange_rates.php:141 includes/ui/ui_view.inc:288 -#: includes/ui/ui_view.inc:290 +#: ../gl/manage/exchange_rates.php:141 +#: ../includes/ui/ui_view.inc:288 +#: ../includes/ui/ui_view.inc:290 - #: ../includes/ui/ui_view.inc.orig:288 - #: ../includes/ui/ui_view.inc.orig:290 msgid "Exchange Rate:" msgstr "" @@@ -5463,100 -4623,122 +5374,104 @@@ msgstr " msgid "The account code must be numeric." msgstr "" - #: ../gl/manage/gl_accounts.php:81 -#: gl/manage/gl_accounts.php:81 gl/manage/gl_accounts.php.orig:81 -#: gl/manage/gl_accounts.php:80 ++#: ../gl/manage/gl_accounts.php:80 msgid "The account belongs to a bank account and cannot be inactivated." msgstr "" - #: ../gl/manage/gl_accounts.php:90 -#: gl/manage/gl_accounts.php:90 gl/manage/gl_accounts.php.orig:90 -#: gl/manage/gl_accounts.php:89 ++#: ../gl/manage/gl_accounts.php:89 msgid "Account data has been updated." msgstr "" - #: ../gl/manage/gl_accounts.php:99 -#: gl/manage/gl_accounts.php:99 gl/manage/gl_accounts.php.orig:99 -#: gl/manage/gl_accounts.php:98 ++#: ../gl/manage/gl_accounts.php:98 msgid "New account has been added." msgstr "" - #: ../gl/manage/gl_accounts.php:116 -#: gl/manage/gl_accounts.php:116 gl/manage/gl_accounts.php.orig:116 -#: gl/manage/gl_accounts.php:117 ++#: ../gl/manage/gl_accounts.php:102 ++msgid "Account not added, possible duplicate Account Code." ++msgstr "" ++ ++#: ../gl/manage/gl_accounts.php:117 msgid "" "Cannot delete this account because transactions have been created using this " "account." msgstr "" - #: ../gl/manage/gl_accounts.php:122 -#: gl/manage/gl_accounts.php:122 gl/manage/gl_accounts.php.orig:122 -#: gl/manage/gl_accounts.php:123 ++#: ../gl/manage/gl_accounts.php:123 msgid "" "Cannot delete this account because it is used as one of the company default " "GL accounts." msgstr "" - #: ../gl/manage/gl_accounts.php:128 -#: gl/manage/gl_accounts.php:128 gl/manage/gl_accounts.php.orig:128 -#: gl/manage/gl_accounts.php:129 ++#: ../gl/manage/gl_accounts.php:129 msgid "Cannot delete this account because it is used by a bank account." msgstr "" - #: ../gl/manage/gl_accounts.php:134 -#: gl/manage/gl_accounts.php:134 gl/manage/gl_accounts.php.orig:134 -#: gl/manage/gl_accounts.php:135 ++#: ../gl/manage/gl_accounts.php:135 msgid "" "Cannot delete this account because it is used by one or more Item Categories." msgstr "" - #: ../gl/manage/gl_accounts.php:140 -#: gl/manage/gl_accounts.php:140 gl/manage/gl_accounts.php.orig:140 -#: gl/manage/gl_accounts.php:141 ++#: ../gl/manage/gl_accounts.php:141 msgid "Cannot delete this account because it is used by one or more Items." msgstr "" - #: ../gl/manage/gl_accounts.php:146 -#: gl/manage/gl_accounts.php:146 gl/manage/gl_accounts.php.orig:146 -#: gl/manage/gl_accounts.php:147 ++#: ../gl/manage/gl_accounts.php:147 msgid "Cannot delete this account because it is used by one or more Taxes." msgstr "" - #: ../gl/manage/gl_accounts.php:152 -#: gl/manage/gl_accounts.php:152 gl/manage/gl_accounts.php.orig:152 -#: gl/manage/gl_accounts.php:153 ++#: ../gl/manage/gl_accounts.php:153 msgid "" "Cannot delete this account because it is used by one or more Customer " "Branches." msgstr "" - #: ../gl/manage/gl_accounts.php:157 -#: gl/manage/gl_accounts.php:158 gl/manage/gl_accounts.php.orig:158 -#: gl/manage/gl_accounts.php:159 ++#: ../gl/manage/gl_accounts.php:158 msgid "Cannot delete this account because it is used by one or more suppliers." msgstr "" - #: ../gl/manage/gl_accounts.php:163 -#: gl/manage/gl_accounts.php:164 gl/manage/gl_accounts.php.orig:164 -#: gl/manage/gl_accounts.php:165 ++#: ../gl/manage/gl_accounts.php:164 msgid "" "Cannot delete this account because it is used by one or more Quick Entry " "Lines." msgstr "" - #: ../gl/manage/gl_accounts.php:181 -#: gl/manage/gl_accounts.php:182 gl/manage/gl_accounts.php.orig:182 -#: gl/manage/gl_accounts.php:183 ++#: ../gl/manage/gl_accounts.php:182 msgid "Selected account has been deleted" msgstr "" - #: ../gl/manage/gl_accounts.php:196 -#: gl/manage/gl_accounts.php:197 gl/manage/gl_accounts.php.orig:197 -#: gl/manage/gl_accounts.php:198 ++#: ../gl/manage/gl_accounts.php:197 msgid "New account" msgstr "" - #: ../gl/manage/gl_accounts.php:242 -#: gl/manage/gl_accounts.php:243 gl/manage/gl_accounts.php.orig:243 -#: gl/manage/gl_accounts.php:244 ++#: ../gl/manage/gl_accounts.php:243 msgid "Account Code 2:" msgstr "" - #: ../gl/manage/gl_accounts.php:244 -#: gl/manage/gl_accounts.php:245 gl/manage/gl_accounts.php.orig:245 -#: gl/manage/gl_accounts.php:246 ++#: ../gl/manage/gl_accounts.php:245 msgid "Account Name:" msgstr "" - #: ../gl/manage/gl_accounts.php:246 -#: gl/manage/gl_accounts.php:247 gl/manage/gl_accounts.php.orig:247 -#: gl/manage/gl_accounts.php:248 ++#: ../gl/manage/gl_accounts.php:247 msgid "Account Group:" msgstr "" - #: ../gl/manage/gl_accounts.php:248 -#: gl/manage/gl_accounts.php:249 gl/manage/gl_accounts.php.orig:249 -#: gl/manage/gl_accounts.php:250 ++#: ../gl/manage/gl_accounts.php:249 msgid "Account Tags:" msgstr "" - #: ../gl/manage/gl_accounts.php:250 -#: gl/manage/gl_accounts.php:251 gl/manage/gl_accounts.php.orig:251 -#: gl/manage/gl_accounts.php:252 ++#: ../gl/manage/gl_accounts.php:251 msgid "Account status:" msgstr "" - #: ../gl/manage/gl_accounts.php:255 -#: gl/manage/gl_accounts.php:256 gl/manage/gl_accounts.php.orig:256 -#: gl/manage/gl_accounts.php:257 ++#: ../gl/manage/gl_accounts.php:256 msgid "Add Account" msgstr "" - #: ../gl/manage/gl_accounts.php:259 -#: gl/manage/gl_accounts.php:260 gl/manage/gl_accounts.php.orig:260 -#: gl/manage/gl_accounts.php:261 ++#: ../gl/manage/gl_accounts.php:260 msgid "Update Account" msgstr "" - #: ../gl/manage/gl_accounts.php:260 -#: gl/manage/gl_accounts.php:261 gl/manage/gl_accounts.php.orig:261 -#: gl/manage/gl_accounts.php:262 ++#: ../gl/manage/gl_accounts.php:261 msgid "Delete account" msgstr "" @@@ -5629,9 -4810,9 +5544,9 @@@ msgstr " msgid "Quick Entries" msgstr "" -#: gl/manage/gl_quick_entries.php:58 includes/ui/radio.ui_input.inc:204 -#: includes/ui/simple_crud_class.inc:221 includes/ui/ui_input.inc:204 -#: includes/ui/ui_input.inc:205 +#: ../gl/manage/gl_quick_entries.php:58 +#: ../includes/ui/simple_crud_class.inc:221 - #: ../includes/ui/ui_input.inc:205 ++#: ../includes/ui/ui_input.inc:206 msgid "Add new" msgstr "" @@@ -5720,10 -4898,8 +5635,10 @@@ msgstr " msgid "Posted" msgstr "" -#: gl/manage/gl_quick_entries.php:329 sales/customer_delivery.php:433 -#: sales/customer_invoice.php:468 sales/customer_invoice.php:470 +#: ../gl/manage/gl_quick_entries.php:329 - #: ../sales/customer_delivery.php:441 - #: ../sales/customer_invoice.php:540 - #: ../sales/customer_invoice.php:543 ++#: ../sales/customer_delivery.php.orig:446 ++#: ../sales/customer_invoice.php:542 ++#: ../sales/customer_invoice.php:545 msgid "Tax Type" msgstr "" @@@ -5978,41 -5109,34 +5893,41 @@@ msgstr " msgid "To the Order of:" msgstr "" -#: gl/includes/ui/gl_bank_ui.inc:63 gl/includes/ui/gl_bank_ui.inc.orig:62 -#: inventory/purchasing_data.php:184 inventory/purchasing_data.php:188 -#: purchasing/includes/ui/invoice_ui.inc:73 -#: purchasing/includes/ui/invoice_ui.inc:80 -#: purchasing/includes/ui/po_ui.inc:120 purchasing/includes/ui/po_ui.inc:125 +#: ../gl/includes/ui/gl_bank_ui.inc:63 +#: ../gl/includes/ui/gl_bank_ui.inc.orig:65 +#: ../inventory/purchasing_data.php:184 +#: ../inventory/purchasing_data.php:188 +#: ../inventory/purchasing_data.php.orig:112 +#: ../purchasing/includes/ui/invoice_ui.inc:80 +#: ../purchasing/includes/ui/invoice_ui.inc:88 +#: ../purchasing/includes/ui/invoice_ui.inc:90 +#: ../purchasing/includes/ui/po_ui.inc:125 +#: ../purchasing/includes/ui/po_ui.inc:130 ++#: ../purchasing/includes/ui/po_ui.inc.orig:125 ++#: ../purchasing/includes/ui/po_ui.inc.orig:130 msgid "Supplier:" msgstr "" -#: gl/includes/ui/gl_bank_ui.inc:66 gl/includes/ui/gl_bank_ui.inc.orig:65 -#: sales/manage/recurrent_invoices.php:169 -#: sales/includes/ui/sales_credit_ui.inc:29 -#: sales/includes/ui/sales_order_ui.inc:278 -#: sales/includes/ui/sales_order_ui.inc:282 +#: ../gl/includes/ui/gl_bank_ui.inc:66 +#: ../gl/includes/ui/gl_bank_ui.inc.orig:68 +#: ../sales/manage/recurrent_invoices.php:169 +#: ../sales/includes/ui/sales_credit_ui.inc:29 - #: ../sales/includes/ui/sales_order_ui.inc:278 +#: ../sales/includes/ui/sales_order_ui.inc.orig:278 msgid "Customer:" msgstr "" -#: gl/includes/ui/gl_bank_ui.inc:70 gl/includes/ui/gl_bank_ui.inc.orig:69 -#: sales/customer_payments.php:360 sales/manage/recurrent_invoices.php:172 -#: sales/includes/ui/sales_credit_ui.inc:37 -#: sales/includes/ui/sales_order_ui.inc:285 -#: sales/includes/ui/sales_order_ui.inc:289 sales/customer_payments.php:363 -#: sales/customer_payments.php.orig:362 +#: ../gl/includes/ui/gl_bank_ui.inc:70 +#: ../gl/includes/ui/gl_bank_ui.inc.orig:72 - #: ../sales/customer_payments.php:360 ++#: ../sales/customer_payments.php:363 +#: ../sales/manage/recurrent_invoices.php:172 +#: ../sales/includes/ui/sales_credit_ui.inc:37 - #: ../sales/includes/ui/sales_order_ui.inc:285 +#: ../sales/includes/ui/sales_order_ui.inc.orig:285 msgid "Branch:" msgstr "" -#: gl/includes/ui/gl_bank_ui.inc:84 gl/includes/ui/gl_bank_ui.inc:87 -#: sales/customer_payments.php:369 sales/customer_payments.php:372 -#: sales/customer_payments.php.orig:371 +#: ../gl/includes/ui/gl_bank_ui.inc:84 +#: ../gl/includes/ui/gl_bank_ui.inc:87 - #: ../sales/customer_payments.php:369 ++#: ../sales/customer_payments.php:372 msgid "This customer account is on hold." msgstr "" @@@ -6024,84 -5146,76 +5939,80 @@@ msgid "Go" msgstr "" -#: gl/includes/ui/gl_bank_ui.inc:185 gl/includes/ui/gl_bank_ui.inc.orig:167 -#: includes/ui/simple_crud_class.inc:52 -#: inventory/includes/item_adjustments_ui.inc:88 -#: inventory/includes/stock_transfers_ui.inc:80 -#: manufacturing/includes/work_order_issue_ui.inc:59 -#: purchasing/includes/ui/invoice_ui.inc:520 -#: purchasing/includes/ui/po_ui.inc:267 -#: sales/includes/ui/sales_credit_ui.inc:198 -#: sales/includes/ui/sales_order_ui.inc:203 -#: sales/includes/ui/sales_order_ui.inc:207 +#: ../gl/includes/ui/gl_bank_ui.inc:185 +#: ../gl/includes/ui/gl_bank_ui.inc.orig:159 +#: ../includes/ui/simple_crud_class.inc:52 +#: ../inventory/includes/item_adjustments_ui.inc:88 +#: ../inventory/includes/stock_transfers_ui.inc:80 +#: ../manufacturing/includes/work_order_issue_ui.inc:59 +#: ../purchasing/includes/ui/invoice_ui.inc:542 +#: ../purchasing/includes/ui/po_ui.inc:274 ++#: ../purchasing/includes/ui/po_ui.inc.orig:274 +#: ../sales/includes/ui/sales_credit_ui.inc:198 - #: ../sales/includes/ui/sales_order_ui.inc:203 +#: ../sales/includes/ui/sales_order_ui.inc.orig:203 msgid "Edit document line" msgstr "" -#: gl/includes/ui/gl_bank_ui.inc:187 gl/includes/ui/gl_bank_ui.inc.orig:169 -#: includes/ui/simple_crud_class.inc:54 -#: inventory/includes/item_adjustments_ui.inc:90 -#: inventory/includes/stock_transfers_ui.inc:82 -#: manufacturing/includes/work_order_issue_ui.inc:61 -#: purchasing/includes/ui/invoice_ui.inc:285 -#: purchasing/includes/ui/po_ui.inc:269 -#: sales/includes/ui/sales_credit_ui.inc:200 -#: sales/includes/ui/sales_order_ui.inc:205 -#: sales/includes/ui/sales_order_ui.inc:209 +#: ../gl/includes/ui/gl_bank_ui.inc:187 +#: ../gl/includes/ui/gl_bank_ui.inc.orig:161 +#: ../includes/ui/simple_crud_class.inc:54 +#: ../inventory/includes/item_adjustments_ui.inc:90 +#: ../inventory/includes/stock_transfers_ui.inc:82 +#: ../manufacturing/includes/work_order_issue_ui.inc:61 +#: ../purchasing/includes/ui/invoice_ui.inc:305 +#: ../purchasing/includes/ui/po_ui.inc:276 ++#: ../purchasing/includes/ui/po_ui.inc.orig:276 +#: ../sales/includes/ui/sales_credit_ui.inc:200 - #: ../sales/includes/ui/sales_order_ui.inc:205 +#: ../sales/includes/ui/sales_order_ui.inc.orig:205 msgid "Remove line from document" msgstr "" -#: gl/includes/ui/gl_bank_ui.inc:276 gl/includes/ui/gl_bank_ui.inc.orig:258 -#: gl/includes/ui/gl_journal_ui.inc:222 includes/ui/simple_crud_class.inc:56 -#: inventory/includes/item_adjustments_ui.inc:158 -#: inventory/includes/stock_transfers_ui.inc:138 -#: manufacturing/includes/work_order_issue_ui.inc:132 -#: purchasing/includes/ui/po_ui.inc:443 -#: sales/includes/ui/sales_credit_ui.inc:294 -#: sales/includes/ui/sales_order_ui.inc:556 -#: sales/includes/ui/sales_order_ui.inc:560 +#: ../gl/includes/ui/gl_bank_ui.inc:276 +#: ../gl/includes/ui/gl_bank_ui.inc.orig:250 +#: ../gl/includes/ui/gl_journal_ui.inc:258 +#: ../includes/ui/simple_crud_class.inc:56 +#: ../inventory/includes/item_adjustments_ui.inc:158 +#: ../inventory/includes/stock_transfers_ui.inc:138 +#: ../manufacturing/includes/work_order_issue_ui.inc:132 - #: ../purchasing/includes/ui/po_ui.inc:458 ++#: ../purchasing/includes/ui/po_ui.inc.orig:458 +#: ../sales/includes/ui/sales_credit_ui.inc:294 - #: ../sales/includes/ui/sales_order_ui.inc:556 +#: ../sales/includes/ui/sales_order_ui.inc.orig:556 msgid "Confirm changes" msgstr "" -#: gl/includes/ui/gl_bank_ui.inc:278 gl/includes/ui/gl_bank_ui.inc.orig:260 -#: gl/includes/ui/gl_journal_ui.inc:224 includes/ui/simple_crud_class.inc:58 -#: inventory/includes/item_adjustments_ui.inc:160 -#: inventory/includes/stock_transfers_ui.inc:140 -#: manufacturing/includes/work_order_issue_ui.inc:134 -#: purchasing/includes/ui/po_ui.inc:445 -#: sales/includes/ui/sales_credit_ui.inc:296 -#: sales/includes/ui/sales_order_ui.inc:558 -#: sales/includes/ui/sales_order_ui.inc:562 +#: ../gl/includes/ui/gl_bank_ui.inc:278 +#: ../gl/includes/ui/gl_bank_ui.inc.orig:252 +#: ../gl/includes/ui/gl_journal_ui.inc:260 +#: ../includes/ui/simple_crud_class.inc:58 +#: ../inventory/includes/item_adjustments_ui.inc:160 +#: ../inventory/includes/stock_transfers_ui.inc:140 +#: ../manufacturing/includes/work_order_issue_ui.inc:134 - #: ../purchasing/includes/ui/po_ui.inc:460 ++#: ../purchasing/includes/ui/po_ui.inc.orig:460 +#: ../sales/includes/ui/sales_credit_ui.inc:296 - #: ../sales/includes/ui/sales_order_ui.inc:558 +#: ../sales/includes/ui/sales_order_ui.inc.orig:558 msgid "Cancel changes" msgstr "" -#: gl/includes/ui/gl_bank_ui.inc:283 gl/includes/ui/gl_bank_ui.inc.orig:265 -#: gl/includes/ui/gl_journal_ui.inc:228 -#: inventory/includes/item_adjustments_ui.inc:166 -#: inventory/includes/stock_transfers_ui.inc:146 -#: manufacturing/includes/work_order_issue_ui.inc:140 -#: purchasing/includes/ui/po_ui.inc:451 -#: sales/includes/ui/sales_credit_ui.inc:302 -#: sales/includes/ui/sales_order_ui.inc:564 -#: sales/includes/ui/sales_order_ui.inc:568 +#: ../gl/includes/ui/gl_bank_ui.inc:283 +#: ../gl/includes/ui/gl_bank_ui.inc.orig:257 +#: ../gl/includes/ui/gl_journal_ui.inc:264 +#: ../inventory/includes/item_adjustments_ui.inc:166 +#: ../inventory/includes/stock_transfers_ui.inc:146 +#: ../manufacturing/includes/work_order_issue_ui.inc:140 - #: ../purchasing/includes/ui/po_ui.inc:466 ++#: ../purchasing/includes/ui/po_ui.inc.orig:466 +#: ../sales/includes/ui/sales_credit_ui.inc:302 - #: ../sales/includes/ui/sales_order_ui.inc:564 +#: ../sales/includes/ui/sales_order_ui.inc.orig:564 msgid "Add Item" msgstr "" -#: gl/includes/ui/gl_bank_ui.inc:284 gl/includes/ui/gl_bank_ui.inc.orig:266 -#: inventory/includes/item_adjustments_ui.inc:167 -#: inventory/includes/stock_transfers_ui.inc:147 -#: manufacturing/includes/work_order_issue_ui.inc:141 -#: purchasing/includes/ui/po_ui.inc:452 -#: sales/includes/ui/sales_credit_ui.inc:303 -#: sales/includes/ui/sales_order_ui.inc:565 -#: sales/includes/ui/sales_order_ui.inc:569 +#: ../gl/includes/ui/gl_bank_ui.inc:284 +#: ../gl/includes/ui/gl_bank_ui.inc.orig:258 +#: ../inventory/includes/item_adjustments_ui.inc:167 +#: ../inventory/includes/stock_transfers_ui.inc:147 +#: ../manufacturing/includes/work_order_issue_ui.inc:141 - #: ../purchasing/includes/ui/po_ui.inc:467 ++#: ../purchasing/includes/ui/po_ui.inc.orig:467 +#: ../sales/includes/ui/sales_credit_ui.inc:303 - #: ../sales/includes/ui/sales_order_ui.inc:565 +#: ../sales/includes/ui/sales_order_ui.inc.orig:565 msgid "Add new item to document" msgstr "" @@@ -6314,7 -5420,7 +6225,11 @@@ msgstr " msgid "Password changes" msgstr "" -#: includes/access_levels.inc:127 ++#: ../includes/access_levels.inc:123 ++msgid "Edit other users transactions" ++msgstr "" ++ +#: ../includes/access_levels.inc:127 msgid "Sales types" msgstr "" @@@ -6682,40 -5780,14 +6597,44 @@@ msgstr " msgid "GL reports and inquiries" msgstr "" -#: includes/banking.inc:100 includes/data_checks.inc:52 +#: ../includes/banking.inc:100 ++#: ../includes/data_checks.inc:52 #, php-format msgid "" "Cannot retrieve exchange rate for currency %s as of %s. Please add exchange " "rate manually on Exchange Rates page." msgstr "" - #: ../includes/current_user.inc:88 -#: includes/errors.inc:123 ++#: ../includes/current_user.inc.orig:97 +msgid "" +"Before software upgrade you have to include old $security_groups and " +"$security_headings arrays from old config.php file to the new one." +msgstr "" + - #: ../includes/current_user.inc:89 ++#: ../includes/current_user.inc.orig:98 +#: ../includes/ui/ui_controls.inc:197 - #: ../includes/ui/ui_view.inc:844 - #: ../includes/ui/ui_view.inc.orig:843 ++#: ../includes/ui/ui_view.inc:845 +msgid "Back" +msgstr "" + - #: ../includes/current_user.inc:99 ++#: ../includes/current_user.inc.orig:108 +msgid "System is available for site admin only until full database upgrade" +msgstr "" + - #: ../includes/current_user.inc:462 ++#: ../includes/current_user.inc.orig:471 +msgid "Requesting data..." +msgstr "" + - #: ../includes/data_checks.inc:495 ++#: ../includes/data_checks.inc:508 +#, php-format +msgid "%s #%s is closed for further edition." +msgstr "" + ++#: ../includes/data_checks.inc:534 ++msgid "You have no edit access to transactions created by other users." ++msgstr "" ++ +#: ../includes/errors.inc:123 msgid "in file" msgstr "" @@@ -6780,58 -5850,7 +6699,65 @@@ msgstr " msgid "Package '%s' not found." msgstr "" -#: includes/sysnames.inc:23 includes/sysnames.inc:148 +#: ../includes/session.inc:133 +msgid "Incorrect Password" +msgstr "" + +#: ../includes/session.inc:134 +msgid "The user and password combination is not valid for the system." +msgstr "" + +#: ../includes/session.inc:136 +msgid "" +"If you are not an authorized user, please contact your system administrator " +"to obtain an account to enable you to use the system." +msgstr "" + +#: ../includes/session.inc:137 +msgid "Try again" +msgstr "" + - #: ../includes/session.inc:156 ++#: ../includes/session.inc:185 ++#, php-format ++msgid "" ++"Brute force attack on account '%s' detected. Access for non-logged users " ++"temporarily blocked." ++msgstr "" ++ ++#: ../includes/session.inc:216 +msgid "Security settings have not been defined for your user account." +msgstr "" + - #: ../includes/session.inc:157 ++#: ../includes/session.inc:217 +msgid "Please contact your system administrator." +msgstr "" + - #: ../includes/session.inc:158 ++#: ../includes/session.inc:218 +msgid "" +"Please remove $security_groups and $security_headings arrays from config.php " +"file!" +msgstr "" + - #: ../includes/session.inc:160 ++#: ../includes/session.inc:220 +msgid "" +"Access to application has been blocked until database upgrade is completed " +"by system administrator." +msgstr "" + - #: ../includes/session.inc:174 ++#: ../includes/session.inc:234 +msgid "" +"The security settings on your account do not permit you to access this " +"function" +msgstr "" + - #: ../includes/session.inc:183 ++#: ../includes/session.inc:243 +msgid "" +"System is blocked after source upgrade until database is updated on System/" +"Software Upgrade page" +msgstr "" + +#: ../includes/sysnames.inc:23 +#: ../includes/sysnames.inc:149 msgid "Bank Payment" msgstr "" @@@ -6869,9 -5886,8 +6795,10 @@@ msgstr " msgid "Inventory Adjustment" msgstr "" -#: includes/sysnames.inc:32 purchasing/includes/ui/po_ui.inc:323 -#: purchasing/view/view_po.php:30 +#: ../includes/sysnames.inc:32 +#: ../purchasing/includes/ui/po_ui.inc:330 ++#: ../purchasing/includes/ui/po_ui.inc.orig:330 +#: ../purchasing/view/view_po.php:30 msgid "Purchase Order" msgstr "" @@@ -6906,16 -5919,16 +6833,14 @@@ msgstr " msgid "Work Order Production" msgstr "" -#: includes/sysnames.inc:40 sales/inquiry/sales_orders_view.php:139 -#: sales/inquiry/sales_orders_view.php:161 -#: sales/inquiry/sales_orders_view.php.orig:137 -#: sales/inquiry/sales_orders_view.php.orig:159 +#: ../includes/sysnames.inc:40 +#: ../sales/inquiry/sales_orders_view.php:151 +#: ../sales/inquiry/sales_orders_view.php:173 - #: ../sales/inquiry/sales_orders_view.php.orig:138 - #: ../sales/inquiry/sales_orders_view.php.orig:160 msgid "Sales Order" msgstr "" -#: includes/sysnames.inc:41 sales/sales_order_entry.php:614 -#: sales/sales_order_entry.php:618 sales/sales_order_entry.php:629 -#: sales/sales_order_entry.php.orig:628 +#: ../includes/sysnames.inc:41 - #: ../sales/sales_order_entry.php:625 ++#: ../sales/sales_order_entry.php:645 msgid "Sales Quotation" msgstr "" @@@ -6951,8 -5964,8 +6876,8 @@@ msgstr " msgid "CP" msgstr "" -#: includes/sysnames.inc:54 sales/customer_invoice.php:471 -#: sales/customer_invoice.php:473 +#: ../includes/sysnames.inc:54 - #: ../sales/customer_invoice.php:545 ++#: ../sales/customer_invoice.php:547 msgid "DN" msgstr "" @@@ -6980,9 -5993,8 +6905,9 @@@ msgstr " msgid "SP" msgstr "" -#: includes/sysnames.inc:61 reporting/rep204.php:82 reporting/rep305.php:95 -#: reporting/rep305.php:98 +#: ../includes/sysnames.inc:61 +#: ../reporting/rep204.php:82 - #: ../reporting/rep305.php:95 ++#: ../reporting/rep305.php:98 msgid "GRN" msgstr "" @@@ -7044,75 -6054,53 +6969,69 @@@ msgstr " msgid "Cash" msgstr "" -#: includes/sysnames.inc:96 reporting/rep101.php:137 reporting/rep102.php:123 -#: reporting/rep102.php:130 reporting/rep105.php:107 reporting/rep106.php:81 -#: reporting/rep114.php:93 reporting/rep304.php:112 reporting/rep304.php:122 -#: reporting/reports_main.php:32 reporting/reports_main.php:36 -#: reporting/reports_main.php:43 reporting/reports_main.php:108 -#: reporting/reports_main.php:203 sales/create_recurrent_invoices.php:115 -#: sales/customer_credit_invoice.php:237 sales/customer_delivery.php:338 -#: sales/customer_invoice.php:378 -#: sales/allocations/customer_allocation_main.php:97 -#: sales/allocations/customer_allocation_main.php:105 -#: sales/manage/recurrent_invoices.php:102 sales/view/view_credit.php:47 -#: sales/inquiry/customer_allocation_inquiry.php:150 -#: sales/inquiry/customer_allocation_inquiry.php:160 -#: sales/inquiry/customer_inquiry.php:230 -#: sales/inquiry/customer_inquiry.php:244 -#: sales/inquiry/customer_inquiry.php.orig:230 -#: sales/inquiry/customer_inquiry.php.orig:244 -#: sales/inquiry/sales_deliveries_view.php:180 -#: sales/inquiry/sales_orders_view.php:264 -#: sales/inquiry/sales_orders_view.php:278 -#: sales/inquiry/sales_orders_view.php.orig:262 -#: sales/inquiry/sales_orders_view.php.orig:276 -#: sales/create_recurrent_invoices.php:132 -#: sales/customer_credit_invoice.php:235 sales/customer_invoice.php:380 +#: ../includes/sysnames.inc:96 +#: ../includes/sysnames.inc:195 +#: ../reporting/rep101.php:137 +#: ../reporting/rep102.php:123 +#: ../reporting/rep102.php:130 +#: ../reporting/rep105.php:107 +#: ../reporting/rep106.php:81 +#: ../reporting/rep114.php:93 +#: ../reporting/rep304.php:112 +#: ../reporting/rep304.php:122 +#: ../reporting/reports_main.php:32 +#: ../reporting/reports_main.php:36 +#: ../reporting/reports_main.php:43 +#: ../reporting/reports_main.php:108 +#: ../reporting/reports_main.php:203 - #: ../sales/create_recurrent_invoices.php:115 - #: ../sales/customer_credit_invoice.php:237 - #: ../sales/customer_delivery.php:346 - #: ../sales/customer_invoice.php:444 ++#: ../sales/create_recurrent_invoices.php:132 ++#: ../sales/customer_credit_invoice.php:235 ++#: ../sales/customer_delivery.php.orig:351 ++#: ../sales/customer_invoice.php:446 +#: ../sales/allocations/customer_allocation_main.php:97 +#: ../sales/allocations/customer_allocation_main.php:105 +#: ../sales/manage/recurrent_invoices.php:102 +#: ../sales/view/view_credit.php:47 +#: ../sales/inquiry/customer_allocation_inquiry.php:150 +#: ../sales/inquiry/customer_allocation_inquiry.php:160 - #: ../sales/inquiry/customer_allocation_inquiry.php.orig:150 - #: ../sales/inquiry/customer_allocation_inquiry.php.orig:160 +#: ../sales/inquiry/customer_inquiry.php:206 +#: ../sales/inquiry/customer_inquiry.php:220 - #: ../sales/inquiry/customer_inquiry.php.orig:230 - #: ../sales/inquiry/customer_inquiry.php.orig:244 +#: ../sales/inquiry/sales_deliveries_view.php:180 - #: ../sales/inquiry/sales_deliveries_view.php.orig:180 +#: ../sales/inquiry/sales_orders_view.php:286 +#: ../sales/inquiry/sales_orders_view.php:300 - #: ../sales/inquiry/sales_orders_view.php.orig:263 - #: ../sales/inquiry/sales_orders_view.php.orig:277 msgid "Customer" msgstr "" -#: includes/sysnames.inc:97 includes/sysnames.inc:172 -#: inventory/purchasing_data.php:129 purchasing/includes/ui/grn_ui.inc:20 -#: purchasing/includes/ui/po_ui.inc:316 -#: purchasing/view/view_supp_credit.php:42 -#: purchasing/view/view_supp_invoice.php:45 -#: purchasing/inquiry/po_search_completed.php:123 -#: purchasing/inquiry/po_search.php:132 -#: purchasing/inquiry/supplier_allocation_inquiry.php:129 -#: purchasing/inquiry/supplier_allocation_inquiry.php:142 -#: purchasing/inquiry/supplier_inquiry.php:171 -#: purchasing/inquiry/supplier_inquiry.php:185 -#: purchasing/inquiry/supplier_inquiry.php.orig:165 -#: purchasing/inquiry/supplier_inquiry.php.orig:179 -#: purchasing/allocations/supplier_allocation_main.php:98 -#: purchasing/allocations/supplier_allocation_main.php:106 -#: reporting/rep201.php:125 reporting/rep202.php:128 reporting/rep202.php:135 -#: reporting/rep203.php:98 reporting/rep204.php:88 -#: reporting/reports_main.php:132 reporting/reports_main.php:136 -#: reporting/reports_main.php:143 reporting/reports_main.php:153 -#: reporting/reports_main.php:159 +#: ../includes/sysnames.inc:97 +#: ../includes/sysnames.inc:173 +#: ../includes/sysnames.inc:196 +#: ../inventory/purchasing_data.php:129 +#: ../purchasing/includes/ui/grn_ui.inc:20 +#: ../purchasing/includes/ui/po_ui.inc:323 ++#: ../purchasing/includes/ui/po_ui.inc.orig:323 +#: ../purchasing/view/view_supp_credit.php:42 +#: ../purchasing/view/view_supp_invoice.php:46 +#: ../purchasing/inquiry/po_search_completed.php:122 +#: ../purchasing/inquiry/po_search_completed.php.orig:121 +#: ../purchasing/inquiry/po_search.php:132 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:128 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:141 +#: ../purchasing/inquiry/supplier_inquiry.php:176 +#: ../purchasing/inquiry/supplier_inquiry.php:191 +#: ../purchasing/inquiry/supplier_inquiry.php.orig:173 +#: ../purchasing/inquiry/supplier_inquiry.php.orig:188 +#: ../purchasing/allocations/supplier_allocation_main.php:98 +#: ../purchasing/allocations/supplier_allocation_main.php:106 +#: ../reporting/rep201.php:125 +#: ../reporting/rep202.php:128 +#: ../reporting/rep202.php:135 +#: ../reporting/rep203.php:98 +#: ../reporting/rep204.php:88 +#: ../reporting/reports_main.php:132 +#: ../reporting/reports_main.php:136 +#: ../reporting/reports_main.php:143 +#: ../reporting/reports_main.php:153 +#: ../reporting/reports_main.php:159 msgid "Supplier" msgstr "" @@@ -7250,20 -6233,8 +7169,19 @@@ msgstr " msgid "Day In Following Month" msgstr "" -#: includes/system_tests.inc:15 includes/ui/ui_view.inc:210 -#: reporting/rep705.php:250 reporting/rep705.php:261 reporting/rep705.php:270 +#: ../includes/sysnames.inc:187 +msgid "Sum per line taxes" +msgstr "" + +#: ../includes/sysnames.inc:188 +msgid "Taxes from totals" +msgstr "" + +#: ../includes/system_tests.inc:15 +#: ../includes/ui/ui_view.inc:210 - #: ../includes/ui/ui_view.inc.orig:210 +#: ../reporting/rep705.php:250 +#: ../reporting/rep705.php:261 +#: ../reporting/rep705.php:270 msgid "Info" msgstr "" @@@ -7383,13 -6354,10 +7301,14 @@@ msgstr " msgid "Company subdirectories consistency" msgstr "" -#: includes/system_tests.inc:193 includes/system_tests.inc:200 -#: includes/system_tests.inc:208 includes/system_tests.inc:225 -#: includes/system_tests.inc:340 includes/system_tests.inc:349 -#: includes/system_tests.inc:358 includes/system_tests.inc:366 +#: ../includes/system_tests.inc:193 +#: ../includes/system_tests.inc:200 +#: ../includes/system_tests.inc:208 +#: ../includes/system_tests.inc:225 +#: ../includes/system_tests.inc:340 +#: ../includes/system_tests.inc:349 +#: ../includes/system_tests.inc:358 ++#: ../includes/system_tests.inc:366 #, php-format msgid "'%s' is not writeable" msgstr "" @@@ -7455,100 -6421,73 +7374,100 @@@ msgstr " msgid "Extensions system" msgstr "" - #: ../includes/system_tests.inc:363 -#: includes/system_tests.inc:363 includes/system_tests.inc:371 ++#: ../includes/system_tests.inc:371 msgid "Extensions configuration files and directories should be writeable" msgstr "" - #: ../includes/system_tests.inc:375 -#: includes/system_tests.inc:375 includes/system_tests.inc:384 ++#: ../includes/system_tests.inc:384 #, php-format msgid "Non-standard theme directory '%s' is not writable" msgstr "" - #: ../includes/system_tests.inc:385 -#: includes/system_tests.inc:385 includes/system_tests.inc:394 ++#: ../includes/system_tests.inc:394 msgid "" "OpenSSL PHP extension have to be enabled to use extension repository system." msgstr "" - #: ../includes/system_tests.inc:388 -#: includes/system_tests.inc:388 includes/system_tests.inc:397 ++#: ../includes/system_tests.inc:397 msgid "" "OpenSSL have to be available on your server to use extension repository " "system." msgstr "" - #: ../includes/system_tests.inc:411 -#: includes/system_tests.inc:411 includes/system_tests.inc:420 ++#: ../includes/system_tests.inc:420 msgid "Test" msgstr "" - #: ../includes/system_tests.inc:411 -#: includes/system_tests.inc:411 includes/system_tests.inc:420 ++#: ../includes/system_tests.inc:420 msgid "Test type" msgstr "" - #: ../includes/system_tests.inc:411 -#: includes/system_tests.inc:411 includes/ui/view_package.php:37 -#: reporting/rep204.php:83 reporting/rep301.php:103 -#: includes/system_tests.inc:420 ++#: ../includes/system_tests.inc:420 +#: ../includes/ui/view_package.php:37 +#: ../reporting/rep204.php:83 +#: ../reporting/rep301.php:103 msgid "Value" msgstr "" - #: ../includes/system_tests.inc:411 -#: includes/system_tests.inc:411 reporting/reports_main.php:39 -#: reporting/reports_main.php:49 reporting/reports_main.php:57 -#: reporting/reports_main.php:63 reporting/reports_main.php:71 -#: reporting/reports_main.php:79 reporting/reports_main.php:85 -#: reporting/reports_main.php:93 reporting/reports_main.php:100 -#: reporting/reports_main.php:106 reporting/reports_main.php:112 -#: reporting/reports_main.php:119 reporting/reports_main.php:125 -#: reporting/reports_main.php:130 reporting/reports_main.php:139 -#: reporting/reports_main.php:149 reporting/reports_main.php:156 -#: reporting/reports_main.php:160 reporting/reports_main.php:167 -#: reporting/reports_main.php:173 reporting/reports_main.php:182 -#: reporting/reports_main.php:187 reporting/reports_main.php:196 -#: reporting/reports_main.php:204 reporting/reports_main.php:209 -#: reporting/reports_main.php:216 reporting/reports_main.php:222 -#: reporting/reports_main.php:230 reporting/reports_main.php:241 -#: reporting/reports_main.php:247 reporting/reports_main.php:253 -#: reporting/reports_main.php:267 reporting/reports_main.php:274 -#: reporting/reports_main.php:284 reporting/reports_main.php:295 -#: reporting/reports_main.php:304 reporting/reports_main.php:315 -#: reporting/reports_main.php:321 reporting/reports_main.php:330 -#: reporting/reports_main.php:340 reporting/reports_main.php:348 -#: reporting/reports_main.php:358 reporting/reports_main.php:363 -#: reporting/reports_main.php:371 reporting/reports_main.php:380 -#: reporting/reports_main.php:387 reporting/reports_main.php:394 -#: reporting/reports_main.php:401 reporting/includes/excel_report.inc:295 -#: reporting/includes/excel_report.inc:428 -#: reporting/includes/pdf_report.inc:346 reporting/includes/pdf_report.inc:618 -#: sales/view/view_sales_order.php:85 includes/system_tests.inc:420 -#: reporting/includes/pdf_report.inc:619 ++#: ../includes/system_tests.inc:420 +#: ../reporting/reports_main.php:39 +#: ../reporting/reports_main.php:49 +#: ../reporting/reports_main.php:57 +#: ../reporting/reports_main.php:63 +#: ../reporting/reports_main.php:71 +#: ../reporting/reports_main.php:79 +#: ../reporting/reports_main.php:85 +#: ../reporting/reports_main.php:93 +#: ../reporting/reports_main.php:100 +#: ../reporting/reports_main.php:106 +#: ../reporting/reports_main.php:112 +#: ../reporting/reports_main.php:119 +#: ../reporting/reports_main.php:125 +#: ../reporting/reports_main.php:130 +#: ../reporting/reports_main.php:139 +#: ../reporting/reports_main.php:149 +#: ../reporting/reports_main.php:156 +#: ../reporting/reports_main.php:160 +#: ../reporting/reports_main.php:167 +#: ../reporting/reports_main.php:173 +#: ../reporting/reports_main.php:182 +#: ../reporting/reports_main.php:187 +#: ../reporting/reports_main.php:196 +#: ../reporting/reports_main.php:204 +#: ../reporting/reports_main.php:209 +#: ../reporting/reports_main.php:216 +#: ../reporting/reports_main.php:222 +#: ../reporting/reports_main.php:230 +#: ../reporting/reports_main.php:241 +#: ../reporting/reports_main.php:247 +#: ../reporting/reports_main.php:253 +#: ../reporting/reports_main.php:267 +#: ../reporting/reports_main.php:274 +#: ../reporting/reports_main.php:284 +#: ../reporting/reports_main.php:295 +#: ../reporting/reports_main.php:304 +#: ../reporting/reports_main.php:315 +#: ../reporting/reports_main.php:321 +#: ../reporting/reports_main.php:330 +#: ../reporting/reports_main.php:340 +#: ../reporting/reports_main.php:348 +#: ../reporting/reports_main.php:358 +#: ../reporting/reports_main.php:363 +#: ../reporting/reports_main.php:371 +#: ../reporting/reports_main.php:380 +#: ../reporting/reports_main.php:387 +#: ../reporting/reports_main.php:394 +#: ../reporting/reports_main.php:401 +#: ../reporting/includes/excel_report.inc:295 +#: ../reporting/includes/excel_report.inc:428 +#: ../reporting/includes/pdf_report.inc:346 - #: ../reporting/includes/pdf_report.inc:618 ++#: ../reporting/includes/pdf_report.inc:619 +#: ../sales/view/view_sales_order.php:98 +#: ../sales/view/view_sales_order.php.orig:85 msgid "Comments" msgstr "" - #: ../includes/system_tests.inc:435 -#: includes/system_tests.inc:435 includes/system_tests.inc:444 ++#: ../includes/system_tests.inc:444 msgid "Ok" msgstr "" @@@ -7580,24 -6519,16 +7499,21 @@@ msgstr " msgid "Transaction Type" msgstr "" -#: includes/ui/allocation_cart.inc:263 reporting/rep704.php:79 -#: reporting/rep704.php:82 reporting/rep704.php:85 reporting/rep709.php:109 -#: sales/view/view_credit.php:68 sales/view/view_sales_order.php:96 -#: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161 -#: sales/inquiry/sales_orders_view.php:226 -#: sales/inquiry/sales_orders_view.php:263 -#: sales/inquiry/sales_orders_view.php:277 -#: sales/inquiry/sales_orders_view.php.orig:224 -#: sales/inquiry/sales_orders_view.php.orig:261 -#: sales/inquiry/sales_orders_view.php.orig:275 +#: ../includes/ui/allocation_cart.inc:264 +#: ../reporting/rep704.php:79 +#: ../reporting/rep704.php:82 +#: ../reporting/rep704.php:85 +#: ../reporting/rep709.php:109 +#: ../sales/view/view_credit.php:68 +#: ../sales/view/view_sales_order.php:109 +#: ../sales/view/view_sales_order.php:142 +#: ../sales/view/view_sales_order.php:179 +#: ../sales/view/view_sales_order.php.orig:96 +#: ../sales/view/view_sales_order.php.orig:129 +#: ../sales/view/view_sales_order.php.orig:161 +#: ../sales/inquiry/sales_orders_view.php:248 +#: ../sales/inquiry/sales_orders_view.php:285 +#: ../sales/inquiry/sales_orders_view.php:299 - #: ../sales/inquiry/sales_orders_view.php.orig:225 - #: ../sales/inquiry/sales_orders_view.php.orig:262 - #: ../sales/inquiry/sales_orders_view.php.orig:276 msgid "Ref" msgstr "" @@@ -7605,24 -6536,17 +7521,22 @@@ msgid "Other Allocations" msgstr "" -#: includes/ui/allocation_cart.inc:264 includes/ui/ui_view.inc:489 -#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186 +#: ../includes/ui/allocation_cart.inc:265 +#: ../includes/ui/ui_view.inc:489 - #: ../includes/ui/ui_view.inc.orig:489 +#: ../reporting/includes/doctext.inc:167 +#: ../reporting/includes/doctext.inc:208 msgid "This Allocation" msgstr "" -#: includes/ui/allocation_cart.inc:264 includes/ui/allocation_cart.inc:311 -#: includes/ui/ui_view.inc:489 -#: purchasing/allocations/supplier_allocation_main.php:101 -#: reporting/rep112.php:153 reporting/rep210.php:166 -#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186 -#: sales/allocations/customer_allocation_main.php:100 +#: ../includes/ui/allocation_cart.inc:265 +#: ../includes/ui/allocation_cart.inc:314 +#: ../includes/ui/ui_view.inc:489 - #: ../includes/ui/ui_view.inc.orig:489 +#: ../purchasing/allocations/supplier_allocation_main.php:101 +#: ../reporting/rep112.php:141 +#: ../reporting/rep210.php:154 +#: ../reporting/includes/doctext.inc:167 +#: ../reporting/includes/doctext.inc:208 +#: ../sales/allocations/customer_allocation_main.php:100 msgid "Left to Allocate" msgstr "" @@@ -7726,8 -6639,8 +7640,8 @@@ msgstr " msgid "You have to select at least one category." msgstr "" -#: includes/ui/db_pager_view.inc:166 includes/ui/radio.ui_input.inc:899 -#: includes/ui/ui_input.inc:898 includes/ui/ui_input.inc:902 +#: ../includes/ui/db_pager_view.inc:166 - #: ../includes/ui/ui_input.inc:899 ++#: ../includes/ui/ui_input.inc:903 msgid "Show also Inactive" msgstr "" @@@ -7756,327 -6669,213 +7670,276 @@@ msgstr " msgid "No records" msgstr "" -#: includes/ui/radio.ui_input.inc:206 includes/ui/simple_crud_class.inc:227 -#: includes/ui/ui_input.inc:206 includes/ui/ui_input.inc:207 +#: ../includes/ui/simple_crud_class.inc:227 - #: ../includes/ui/ui_input.inc:207 ++#: ../includes/ui/ui_input.inc:208 msgid "Submit changes" msgstr "" -#: includes/ui/radio.ui_input.inc:207 includes/ui/simple_crud_class.inc:229 -#: includes/ui/ui_input.inc:207 includes/ui/ui_input.inc:208 +#: ../includes/ui/simple_crud_class.inc:229 - #: ../includes/ui/ui_input.inc:208 ++#: ../includes/ui/ui_input.inc:209 msgid "Clone" msgstr "" -#: includes/ui/radio.ui_input.inc:208 includes/ui/simple_crud_class.inc:229 -#: includes/ui/ui_input.inc:208 includes/ui/ui_input.inc:209 +#: ../includes/ui/simple_crud_class.inc:229 - #: ../includes/ui/ui_input.inc:209 ++#: ../includes/ui/ui_input.inc:210 msgid "Edit new record with current data" msgstr "" -#: includes/ui/radio.ui_input.inc:209 includes/ui/simple_crud_class.inc:231 -#: includes/ui/ui_input.inc:209 includes/ui/ui_input.inc:210 +#: ../includes/ui/simple_crud_class.inc:231 - #: ../includes/ui/ui_input.inc:210 ++#: ../includes/ui/ui_input.inc:211 msgid "Cancel edition" msgstr "" -#: includes/ui/radio.ui_input.inc:628 includes/ui/ui_input.inc:627 -#: reporting/includes/reports_classes.inc:216 includes/ui/ui_input.inc:631 -#: reporting/includes/reports_classes.inc:219 +#: ../includes/ui/ui_controls.inc:79 +msgid "Request from outside of this page is forbidden." +msgstr "" + +#: ../includes/ui/ui_controls.inc:80 +msgid "CSRF attack detected from: " +msgstr "" + +#: ../includes/ui/ui_controls.inc:146 +msgid "You should automatically be forwarded." +msgstr "" + +#: ../includes/ui/ui_controls.inc:147 +msgid "If this does not happen" +msgstr "" + +#: ../includes/ui/ui_controls.inc:147 +msgid "click here" +msgstr "" + +#: ../includes/ui/ui_controls.inc:147 +msgid "to continue" +msgstr "" + +#: ../includes/ui/ui_controls.inc:194 +msgid "View Attachment" +msgstr "" + +#: ../includes/ui/ui_controls.inc:197 +msgid "Close" +msgstr "" + +#: ../includes/ui/ui_controls.inc:457 +#: ../sales/manage/customers.php:23 +#: ../sales/manage/sav.customers.php:23 +msgid "Customers" +msgstr "" + +#: ../includes/ui/ui_controls.inc:459 +msgid "Branches" +msgstr "" + +#: ../includes/ui/ui_controls.inc:461 +#: ../purchasing/manage/suppliers.php:22 +#: ../purchasing/manage/suppliers.php.orig:23 +msgid "Suppliers" +msgstr "" + +#: ../includes/ui/ui_controls.inc:463 +#: ../inventory/transfers.php:230 +#: ../inventory/manage/items.php:22 +#: ../inventory/manage/items.php.orig:21 +msgid "Items" +msgstr "" + +#: ../includes/ui/ui_controls.inc:608 +msgid "Entered data has not been saved yet.\\nDo you want to abandon changes?" +msgstr "" + - #: ../includes/ui/ui_input.inc:628 - #: ../reporting/includes/reports_classes.inc:216 ++#: ../includes/ui/ui_input.inc:632 ++#: ../reporting/includes/reports_classes.inc:219 msgid "Click Here to Pick up the date" msgstr "" - #: ../includes/ui/ui_input.inc:911 -#: includes/ui/radio.ui_input.inc:911 includes/ui/sav.ui_lists.inc:2131 -#: includes/ui/ui_input.inc:910 includes/ui/ui_lists.inc:2152 -#: reporting/rep301.php:152 reporting/rep302.php:166 reporting/rep303.php:170 -#: reporting/rep304.php:166 reporting/rep304.php:170 -#: sales/manage/customer_branches.php:302 includes/ui/ui_input.inc:914 ++#: ../includes/ui/ui_input.inc:915 +#: ../includes/ui/ui_lists.inc:2156 - #: ../includes/ui/ui_lists.inc.orig:2154 +#: ../reporting/rep301.php:152 +#: ../reporting/rep302.php:166 +#: ../reporting/rep303.php:170 +#: ../reporting/rep304.php:166 +#: ../reporting/rep304.php:170 +#: ../sales/manage/customer_branches.php:304 msgid "Inactive" msgstr "" - #: ../includes/ui/ui_input.inc:921 - #: ../includes/ui/ui_input.inc:933 -#: includes/ui/radio.ui_input.inc:921 includes/ui/radio.ui_input.inc:933 -#: includes/ui/ui_input.inc:920 includes/ui/ui_input.inc:932 -#: includes/ui/ui_input.inc:924 includes/ui/ui_input.inc:936 ++#: ../includes/ui/ui_input.inc:925 ++#: ../includes/ui/ui_input.inc:937 msgid "Current Credit:" msgstr "" - #: ../includes/ui/ui_input.inc:967 -#: includes/ui/radio.ui_input.inc:947 includes/ui/ui_input.inc:946 -#: includes/ui/ui_input.inc:950 ++#: ../includes/ui/ui_input.inc:971 msgid "Bank Balance:" msgstr "" -#: includes/ui/sav.ui_lists.inc:17 includes/ui/ui_lists.inc:17 +#: ../includes/ui/ui_lists.inc:17 - #: ../includes/ui/ui_lists.inc.orig:17 msgid "Set filter" msgstr "" -#: includes/ui/sav.ui_lists.inc:100 includes/ui/ui_lists.inc:100 +#: ../includes/ui/ui_lists.inc:100 - #: ../includes/ui/ui_lists.inc.orig:100 msgid "Press Space tab for search pattern entry" msgstr "" -#: includes/ui/sav.ui_lists.inc:104 includes/ui/ui_lists.inc:104 +#: ../includes/ui/ui_lists.inc:104 - #: ../includes/ui/ui_lists.inc.orig:104 msgid "Enter code fragment to search or * for all" msgstr "" -#: includes/ui/sav.ui_lists.inc:105 includes/ui/ui_lists.inc:105 +#: ../includes/ui/ui_lists.inc:105 - #: ../includes/ui/ui_lists.inc.orig:105 msgid "Enter description fragment to search or * for all" msgstr "" -#: includes/ui/sav.ui_lists.inc:449 includes/ui/sav.ui_lists.inc:1367 -#: includes/ui/ui_lists.inc:453 includes/ui/ui_lists.inc:1388 +#: ../includes/ui/ui_lists.inc:453 +#: ../includes/ui/ui_lists.inc:1386 - #: ../includes/ui/ui_lists.inc.orig:453 - #: ../includes/ui/ui_lists.inc.orig:1386 msgid "All Suppliers" msgstr "" -#: includes/ui/sav.ui_lists.inc:453 includes/ui/ui_lists.inc:457 +#: ../includes/ui/ui_lists.inc:457 - #: ../includes/ui/ui_lists.inc.orig:457 msgid "Press Space tab to filter by name fragment" msgstr "" -#: includes/ui/sav.ui_lists.inc:454 includes/ui/ui_lists.inc:458 +#: ../includes/ui/ui_lists.inc:458 - #: ../includes/ui/ui_lists.inc.orig:458 msgid "Select supplier" msgstr "" -#: includes/ui/sav.ui_lists.inc:498 includes/ui/ui_lists.inc:505 +#: ../includes/ui/ui_lists.inc:505 - #: ../includes/ui/ui_lists.inc.orig:505 msgid "All Customers" msgstr "" -#: includes/ui/sav.ui_lists.inc:502 includes/ui/ui_lists.inc:509 +#: ../includes/ui/ui_lists.inc:509 - #: ../includes/ui/ui_lists.inc.orig:509 msgid "Press Space tab to filter by name fragment; F2 - entry new customer" msgstr "" -#: includes/ui/sav.ui_lists.inc:503 includes/ui/ui_lists.inc:510 +#: ../includes/ui/ui_lists.inc:510 - #: ../includes/ui/ui_lists.inc.orig:510 msgid "Select customer" msgstr "" -#: includes/ui/sav.ui_lists.inc:546 includes/ui/ui_lists.inc:558 +#: ../includes/ui/ui_lists.inc:557 - #: ../includes/ui/ui_lists.inc.orig:557 msgid "All branches" msgstr "" -#: includes/ui/sav.ui_lists.inc:549 includes/ui/ui_lists.inc:561 +#: ../includes/ui/ui_lists.inc:560 - #: ../includes/ui/ui_lists.inc.orig:560 msgid "Select customer branch" msgstr "" -#: includes/ui/sav.ui_lists.inc:584 includes/ui/ui_lists.inc:601 +#: ../includes/ui/ui_lists.inc:600 - #: ../includes/ui/ui_lists.inc.orig:600 msgid "All Locations" msgstr "" -#: includes/ui/sav.ui_lists.inc:736 includes/ui/sav.ui_lists.inc:801 -#: includes/ui/ui_lists.inc:753 includes/ui/ui_lists.inc:822 +#: ../includes/ui/ui_lists.inc:752 +#: ../includes/ui/ui_lists.inc:820 - #: ../includes/ui/ui_lists.inc.orig:752 - #: ../includes/ui/ui_lists.inc.orig:820 msgid "All Items" msgstr "" -#: includes/ui/sav.ui_lists.inc:1274 includes/ui/ui_lists.inc:1295 +#: ../includes/ui/ui_lists.inc:1293 - #: ../includes/ui/ui_lists.inc.orig:1293 msgid "All Sales Types" msgstr "" -#: includes/ui/sav.ui_lists.inc:1603 includes/ui/ui_lists.inc:1624 +#: ../includes/ui/ui_lists.inc:1628 - #: ../includes/ui/ui_lists.inc.orig:1626 msgid "Use Item Sales Accounts" msgstr "" -#: includes/ui/sav.ui_lists.inc:1915 includes/ui/sav.ui_lists.inc:1932 -#: includes/ui/sav.ui_lists.inc:1949 includes/ui/ui_lists.inc:1936 -#: includes/ui/ui_lists.inc:1953 includes/ui/ui_lists.inc:1970 +#: ../includes/ui/ui_lists.inc:1940 +#: ../includes/ui/ui_lists.inc:1957 +#: ../includes/ui/ui_lists.inc:1974 - #: ../includes/ui/ui_lists.inc.orig:1938 - #: ../includes/ui/ui_lists.inc.orig:1955 - #: ../includes/ui/ui_lists.inc.orig:1972 msgid "All Types" msgstr "" -#: includes/ui/sav.ui_lists.inc:1916 includes/ui/ui_lists.inc:1937 -#: sales/view/view_sales_order.php:127 +#: ../includes/ui/ui_lists.inc:1941 - #: ../includes/ui/ui_lists.inc.orig:1939 +#: ../sales/view/view_sales_order.php:140 +#: ../sales/view/view_sales_order.php.orig:127 msgid "Sales Invoices" msgstr "" -#: includes/ui/sav.ui_lists.inc:1917 includes/ui/sav.ui_lists.inc:1934 -#: includes/ui/sav.ui_lists.inc:1952 includes/ui/ui_lists.inc:1938 -#: includes/ui/ui_lists.inc:1955 includes/ui/ui_lists.inc:1973 +#: ../includes/ui/ui_lists.inc:1942 +#: ../includes/ui/ui_lists.inc:1959 +#: ../includes/ui/ui_lists.inc:1977 - #: ../includes/ui/ui_lists.inc.orig:1940 - #: ../includes/ui/ui_lists.inc.orig:1957 - #: ../includes/ui/ui_lists.inc.orig:1975 msgid "Overdue Invoices" msgstr "" -#: includes/ui/sav.ui_lists.inc:1918 includes/ui/sav.ui_lists.inc:1935 -#: includes/ui/sav.ui_lists.inc:1953 includes/ui/ui_lists.inc:1939 -#: includes/ui/ui_lists.inc:1956 includes/ui/ui_lists.inc:1974 -#: includes/ui/ui_view.inc:484 +#: ../includes/ui/ui_lists.inc:1943 +#: ../includes/ui/ui_lists.inc:1960 +#: ../includes/ui/ui_lists.inc:1978 - #: ../includes/ui/ui_lists.inc.orig:1941 - #: ../includes/ui/ui_lists.inc.orig:1958 - #: ../includes/ui/ui_lists.inc.orig:1976 - #: ../includes/ui/ui_view.inc:550 - #: ../includes/ui/ui_view.inc:554 - #: ../includes/ui/ui_view.inc.orig:484 ++#: ../includes/ui/ui_view.inc:551 ++#: ../includes/ui/ui_view.inc:555 msgid "Payments" msgstr "" -#: includes/ui/sav.ui_lists.inc:1919 includes/ui/sav.ui_lists.inc:1936 -#: includes/ui/sav.ui_lists.inc:1954 includes/ui/ui_lists.inc:1940 -#: includes/ui/ui_lists.inc:1957 includes/ui/ui_lists.inc:1975 -#: sales/view/view_sales_order.php:158 +#: ../includes/ui/ui_lists.inc:1944 +#: ../includes/ui/ui_lists.inc:1961 +#: ../includes/ui/ui_lists.inc:1979 - #: ../includes/ui/ui_lists.inc.orig:1942 - #: ../includes/ui/ui_lists.inc.orig:1959 - #: ../includes/ui/ui_lists.inc.orig:1977 +#: ../sales/view/view_sales_order.php:176 +#: ../sales/view/view_sales_order.php.orig:158 msgid "Credit Notes" msgstr "" -#: includes/ui/sav.ui_lists.inc:1920 includes/ui/ui_lists.inc:1941 -#: sales/view/view_sales_order.php:93 +#: ../includes/ui/ui_lists.inc:1945 - #: ../includes/ui/ui_lists.inc.orig:1943 +#: ../sales/view/view_sales_order.php:106 +#: ../sales/view/view_sales_order.php.orig:93 msgid "Delivery Notes" msgstr "" -#: includes/ui/sav.ui_lists.inc:1933 includes/ui/sav.ui_lists.inc:1951 -#: includes/ui/ui_lists.inc:1954 includes/ui/ui_lists.inc:1972 +#: ../includes/ui/ui_lists.inc:1958 +#: ../includes/ui/ui_lists.inc:1976 - #: ../includes/ui/ui_lists.inc.orig:1956 - #: ../includes/ui/ui_lists.inc.orig:1974 msgid "Invoices" msgstr "" -#: includes/ui/sav.ui_lists.inc:1937 includes/ui/sav.ui_lists.inc:1955 -#: includes/ui/ui_lists.inc:1958 includes/ui/ui_lists.inc:1976 +#: ../includes/ui/ui_lists.inc:1962 +#: ../includes/ui/ui_lists.inc:1980 - #: ../includes/ui/ui_lists.inc.orig:1960 - #: ../includes/ui/ui_lists.inc.orig:1978 msgid "Overdue Credit Notes" msgstr "" -#: includes/ui/sav.ui_lists.inc:1950 includes/ui/ui_lists.inc:1971 +#: ../includes/ui/ui_lists.inc:1975 - #: ../includes/ui/ui_lists.inc.orig:1973 msgid "GRNs" msgstr "" -#: includes/ui/sav.ui_lists.inc:1968 includes/ui/ui_lists.inc:1989 +#: ../includes/ui/ui_lists.inc:1993 - #: ../includes/ui/ui_lists.inc.orig:1991 msgid "Automatically put balance on back order" msgstr "" -#: includes/ui/sav.ui_lists.inc:1969 includes/ui/ui_lists.inc:1990 +#: ../includes/ui/ui_lists.inc:1994 - #: ../includes/ui/ui_lists.inc.orig:1992 msgid "Cancel any quantites not delivered" msgstr "" -#: includes/ui/sav.ui_lists.inc:1986 includes/ui/ui_lists.inc:2007 +#: ../includes/ui/ui_lists.inc:2011 - #: ../includes/ui/ui_lists.inc.orig:2009 msgid "Items Returned to Inventory Location" msgstr "" -#: includes/ui/sav.ui_lists.inc:1987 includes/ui/ui_lists.inc:2008 +#: ../includes/ui/ui_lists.inc:2012 - #: ../includes/ui/ui_lists.inc.orig:2010 msgid "Items Written Off" msgstr "" -#: includes/ui/sav.ui_lists.inc:2157 includes/ui/ui_lists.inc:2178 +#: ../includes/ui/ui_lists.inc:2182 - #: ../includes/ui/ui_lists.inc.orig:2180 msgid "New role" msgstr "" -#: includes/ui/sav.ui_lists.inc:2215 includes/ui/ui_lists.inc:2236 +#: ../includes/ui/ui_lists.inc:2240 - #: ../includes/ui/ui_lists.inc.orig:2238 msgid "No tags defined." msgstr "" -#: includes/ui/sav.ui_lists.inc:2215 includes/ui/ui_lists.inc:2236 +#: ../includes/ui/ui_lists.inc:2240 - #: ../includes/ui/ui_lists.inc.orig:2238 msgid "No active tags defined." msgstr "" -#: includes/ui/sav.ui_lists.inc:2253 includes/ui/ui_lists.inc:2274 +#: ../includes/ui/ui_lists.inc:2278 - #: ../includes/ui/ui_lists.inc.orig:2276 #, php-format msgid "Activated for '%s'" msgstr "" -#: includes/ui/sav.ui_lists.inc:2256 includes/ui/ui_lists.inc:2277 +#: ../includes/ui/ui_lists.inc:2281 - #: ../includes/ui/ui_lists.inc.orig:2279 msgid "Available and/or installed" msgstr "" -#: includes/ui/sav.ui_lists.inc:2326 includes/ui/ui_lists.inc:2347 +#: ../includes/ui/ui_lists.inc:2351 - #: ../includes/ui/ui_lists.inc.orig:2349 msgid "Standard new company American COA (4 digit)" msgstr "" -#: includes/ui/sav.ui_lists.inc:2328 includes/ui/ui_lists.inc:2349 +#: ../includes/ui/ui_lists.inc:2353 - #: ../includes/ui/ui_lists.inc.orig:2351 msgid "Standard American COA (4 digit) with demo data" msgstr "" -#: includes/ui/sav.ui_lists.inc:2349 includes/ui/ui_lists.inc:2370 +#: ../includes/ui/ui_lists.inc:2374 - #: ../includes/ui/ui_lists.inc.orig:2372 msgid "No payment Link" msgstr "" @@@ -8084,179 -6937,131 +7947,147 @@@ msgid "in units of : " msgstr "" -#: includes/ui/ui_view.inc:306 +#: ../includes/ui/ui_view.inc:306 - #: ../includes/ui/ui_view.inc.orig:306 msgid "Date Voided:" msgstr "" -#: includes/ui/ui_view.inc:407 reporting/rep107.php:173 -#: reporting/rep109.php:182 reporting/rep110.php:186 reporting/rep111.php:169 -#: reporting/rep113.php:172 reporting/rep209.php:188 +#: ../includes/ui/ui_view.inc:407 - #: ../includes/ui/ui_view.inc.orig:407 +#: ../reporting/rep107.php:242 +#: ../reporting/rep109.php:183 +#: ../reporting/rep110.php:186 +#: ../reporting/rep111.php:168 +#: ../reporting/rep113.php:172 +#: ../reporting/rep209.php:191 msgid "Total Tax Excluded" msgstr "" -#: includes/ui/ui_view.inc:413 includes/ui/ui_view.inc:432 -#: includes/ui/ui_view.inc:451 reporting/rep107.php:182 -#: reporting/rep109.php:191 reporting/rep110.php:195 reporting/rep111.php:178 -#: reporting/rep113.php:181 reporting/rep209.php:197 +#: ../includes/ui/ui_view.inc:413 +#: ../includes/ui/ui_view.inc:432 +#: ../includes/ui/ui_view.inc:451 - #: ../includes/ui/ui_view.inc.orig:413 - #: ../includes/ui/ui_view.inc.orig:432 - #: ../includes/ui/ui_view.inc.orig:451 +#: ../reporting/rep107.php:251 +#: ../reporting/rep109.php:192 +#: ../reporting/rep110.php:195 +#: ../reporting/rep111.php:177 +#: ../reporting/rep113.php:181 +#: ../reporting/rep209.php:200 msgid "Included" msgstr "" -#: includes/ui/ui_view.inc:484 -#: purchasing/inquiry/supplier_allocation_inquiry.php:100 -msgid "Allocations" -msgstr "" - -#: includes/ui/ui_view.inc:488 reporting/includes/doctext.inc:145 -#: reporting/includes/doctext.inc:186 +#: ../includes/ui/ui_view.inc:488 - #: ../includes/ui/ui_view.inc.orig:488 +#: ../reporting/includes/doctext.inc:167 +#: ../reporting/includes/doctext.inc:208 msgid "Total Amount" msgstr "" - #: ../includes/ui/ui_view.inc:511 - #: ../includes/ui/ui_view.inc.orig:512 -#: includes/ui/ui_view.inc:512 includes/ui/ui_view.inc:513 ++#: ../includes/ui/ui_view.inc:512 msgid "Total Allocated:" msgstr "" - #: ../includes/ui/ui_view.inc:517 - #: ../includes/ui/ui_view.inc.orig:516 -#: includes/ui/ui_view.inc:516 includes/ui/ui_view.inc:517 ++#: ../includes/ui/ui_view.inc:518 msgid "Left to Allocate:" msgstr "" - #: ../includes/ui/ui_view.inc:533 - #: ../includes/ui/ui_view.inc:537 - #: ../includes/ui/ui_view.inc.orig:484 -#: includes/ui/ui_view.inc:569 includes/ui/ui_view.inc:570 ++#: ../includes/ui/ui_view.inc:534 ++#: ../includes/ui/ui_view.inc:538 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:99 +msgid "Allocations" +msgstr "" + - #: ../includes/ui/ui_view.inc:550 - #: ../includes/ui/ui_view.inc:554 ++#: ../includes/ui/ui_view.inc:551 ++#: ../includes/ui/ui_view.inc:555 +msgid "Pre-Payments" +msgstr "" + - #: ../includes/ui/ui_view.inc:570 - #: ../includes/ui/ui_view.inc.orig:569 ++#: ../includes/ui/ui_view.inc:571 msgid "No Quick Entries are defined." msgstr "" - #: ../includes/ui/ui_view.inc:598 - #: ../includes/ui/ui_view.inc.orig:597 -#: includes/ui/ui_view.inc:597 includes/ui/ui_view.inc:598 ++#: ../includes/ui/ui_view.inc:599 msgid "No Quick Entry lines are defined." msgstr "" - #: ../includes/ui/ui_view.inc:780 - #: ../includes/ui/ui_view.inc.orig:779 -#: includes/ui/ui_view.inc:779 purchasing/includes/ui/invoice_ui.inc:452 -#: includes/ui/ui_view.inc:780 ++#: ../includes/ui/ui_view.inc:781 +#: ../purchasing/includes/ui/invoice_ui.inc:473 msgid "and" msgstr "" - #: ../includes/ui/ui_view.inc:841 - #: ../includes/ui/ui_view.inc.orig:840 -#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841 ++#: ../includes/ui/ui_view.inc:842 msgid "January" msgstr "" - #: ../includes/ui/ui_view.inc:841 - #: ../includes/ui/ui_view.inc.orig:840 -#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841 ++#: ../includes/ui/ui_view.inc:842 msgid "February" msgstr "" - #: ../includes/ui/ui_view.inc:841 - #: ../includes/ui/ui_view.inc.orig:840 -#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841 ++#: ../includes/ui/ui_view.inc:842 msgid "March" msgstr "" - #: ../includes/ui/ui_view.inc:841 - #: ../includes/ui/ui_view.inc.orig:840 -#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841 ++#: ../includes/ui/ui_view.inc:842 msgid "April" msgstr "" - #: ../includes/ui/ui_view.inc:841 - #: ../includes/ui/ui_view.inc.orig:840 -#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841 ++#: ../includes/ui/ui_view.inc:842 msgid "May" msgstr "" - #: ../includes/ui/ui_view.inc:841 - #: ../includes/ui/ui_view.inc.orig:840 -#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841 ++#: ../includes/ui/ui_view.inc:842 msgid "June" msgstr "" - #: ../includes/ui/ui_view.inc:841 - #: ../includes/ui/ui_view.inc.orig:840 -#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841 ++#: ../includes/ui/ui_view.inc:842 msgid "July" msgstr "" - #: ../includes/ui/ui_view.inc:841 - #: ../includes/ui/ui_view.inc.orig:840 -#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841 ++#: ../includes/ui/ui_view.inc:842 msgid "August" msgstr "" - #: ../includes/ui/ui_view.inc:841 - #: ../includes/ui/ui_view.inc.orig:840 -#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841 ++#: ../includes/ui/ui_view.inc:842 msgid "September" msgstr "" - #: ../includes/ui/ui_view.inc:841 - #: ../includes/ui/ui_view.inc.orig:840 -#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841 ++#: ../includes/ui/ui_view.inc:842 msgid "October" msgstr "" - #: ../includes/ui/ui_view.inc:841 - #: ../includes/ui/ui_view.inc.orig:840 -#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841 ++#: ../includes/ui/ui_view.inc:842 msgid "November" msgstr "" - #: ../includes/ui/ui_view.inc:841 - #: ../includes/ui/ui_view.inc.orig:840 -#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841 ++#: ../includes/ui/ui_view.inc:842 msgid "December" msgstr "" - #: ../includes/ui/ui_view.inc:842 - #: ../includes/ui/ui_view.inc.orig:841 -#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842 ++#: ../includes/ui/ui_view.inc:843 msgid "Su" msgstr "" - #: ../includes/ui/ui_view.inc:842 - #: ../includes/ui/ui_view.inc.orig:841 -#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842 ++#: ../includes/ui/ui_view.inc:843 msgid "Mo" msgstr "" - #: ../includes/ui/ui_view.inc:842 - #: ../includes/ui/ui_view.inc.orig:841 -#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842 ++#: ../includes/ui/ui_view.inc:843 msgid "Tu" msgstr "" - #: ../includes/ui/ui_view.inc:842 - #: ../includes/ui/ui_view.inc.orig:841 -#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842 ++#: ../includes/ui/ui_view.inc:843 msgid "We" msgstr "" - #: ../includes/ui/ui_view.inc:842 - #: ../includes/ui/ui_view.inc.orig:841 -#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842 ++#: ../includes/ui/ui_view.inc:843 msgid "Th" msgstr "" - #: ../includes/ui/ui_view.inc:842 - #: ../includes/ui/ui_view.inc.orig:841 -#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842 ++#: ../includes/ui/ui_view.inc:843 msgid "Fr" msgstr "" - #: ../includes/ui/ui_view.inc:842 - #: ../includes/ui/ui_view.inc.orig:841 -#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842 ++#: ../includes/ui/ui_view.inc:843 msgid "Sa" msgstr "" - #: ../includes/ui/ui_view.inc:843 - #: ../includes/ui/ui_view.inc.orig:842 -#: includes/ui/ui_view.inc:842 includes/ui/ui_view.inc:843 ++#: ../includes/ui/ui_view.inc:844 msgid "W" msgstr "" @@@ -8351,9 -7155,9 +8182,9 @@@ msgstr " msgid "Enter &Another Adjustment" msgstr "" -#: inventory/adjustments.php:90 inventory/transfers.php:87 -#: sales/sales_order_entry.php:350 sales/sales_order_entry.php:359 -#: sales/sales_order_entry.php.orig:358 +#: ../inventory/adjustments.php:90 +#: ../inventory/transfers.php:87 - #: ../sales/sales_order_entry.php:355 ++#: ../sales/sales_order_entry.php:369 msgid "You must enter at least one non empty item line." msgstr "" @@@ -8412,22 -7213,15 +8243,20 @@@ msgstr " msgid "View the GL Journal Entries for this Cost Update" msgstr "" -#: inventory/cost_update.php:85 inventory/prices.php:56 -#: inventory/purchasing_data.php:101 inventory/reorder_level.php:43 -#: inventory/inquiry/stock_movements.php:53 -#: inventory/inquiry/stock_status.php:47 inventory/manage/item_codes.php:105 -#: manufacturing/work_order_entry.php:396 -#: manufacturing/work_order_entry.php:401 purchasing/inquiry/po_search.php:74 -#: sales/inquiry/sales_deliveries_view.php:114 -#: sales/inquiry/sales_orders_view.php:241 -#: sales/inquiry/sales_orders_view.php.orig:239 +#: ../inventory/cost_update.php:85 +#: ../inventory/prices.php:56 +#: ../inventory/purchasing_data.php:101 +#: ../inventory/reorder_level.php:43 +#: ../inventory/inquiry/stock_movements.php:49 +#: ../inventory/inquiry/stock_movements.php.orig:51 +#: ../inventory/inquiry/stock_status.php:41 +#: ../inventory/inquiry/stock_status.php.orig:47 +#: ../inventory/manage/item_codes.php:105 +#: ../manufacturing/work_order_entry.php:396 +#: ../manufacturing/work_order_entry.php:401 +#: ../purchasing/inquiry/po_search.php:74 +#: ../sales/inquiry/sales_deliveries_view.php:114 - #: ../sales/inquiry/sales_deliveries_view.php.orig:114 +#: ../sales/inquiry/sales_orders_view.php:263 - #: ../sales/inquiry/sales_orders_view.php.orig:240 msgid "Item:" msgstr "" @@@ -8480,37 -7270,25 +8309,37 @@@ msgstr " msgid "The selected price has been deleted." msgstr "" -#: inventory/prices.php:133 reporting/rep104.php:116 -#: sales/customer_delivery.php:355 sales/customer_invoice.php:400 -#: sales/view/view_credit.php:73 sales/view/view_dispatch.php:93 -#: sales/view/view_invoice.php:92 sales/includes/ui/sales_credit_ui.inc:102 -#: sales/customer_invoice.php:402 +#: ../inventory/prices.php:133 +#: ../reporting/rep104.php:116 - #: ../sales/customer_delivery.php:363 - #: ../sales/customer_invoice.php:466 ++#: ../sales/customer_delivery.php.orig:368 ++#: ../sales/customer_invoice.php:468 +#: ../sales/view/view_credit.php:73 +#: ../sales/view/view_dispatch.php:93 +#: ../sales/view/view_invoice.php:93 +#: ../sales/includes/ui/sales_credit_ui.inc:102 msgid "Sales Type" msgstr "" -#: inventory/prices.php:133 inventory/purchasing_data.php:129 -#: purchasing/includes/ui/invoice_ui.inc:484 -#: purchasing/po_receive_items.php:63 purchasing/view/view_grn.php:41 -#: purchasing/view/view_po.php:45 reporting/rep104.php:109 -#: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:170 -#: sales/customer_credit_invoice.php:283 sales/customer_delivery.php:433 -#: sales/customer_invoice.php:468 sales/view/view_credit.php:91 -#: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:114 -#: sales/view/view_sales_order.php:202 -#: sales/includes/ui/sales_credit_ui.inc:168 -#: sales/customer_credit_invoice.php:281 sales/customer_invoice.php:470 +#: ../inventory/prices.php:133 +#: ../inventory/purchasing_data.php:129 +#: ../inventory/purchasing_data.php.orig:224 +#: ../purchasing/includes/ui/invoice_ui.inc:505 +#: ../purchasing/po_receive_items.php:63 +#: ../purchasing/view/view_grn.php:41 +#: ../purchasing/view/view_po.php:45 +#: ../reporting/rep104.php:109 +#: ../reporting/includes/doctext.inc:30 +#: ../reporting/includes/doctext.inc:192 - #: ../sales/customer_credit_invoice.php:283 - #: ../sales/customer_delivery.php:441 - #: ../sales/customer_invoice.php:540 - #: ../sales/customer_invoice.php:543 ++#: ../sales/customer_credit_invoice.php:281 ++#: ../sales/customer_delivery.php.orig:446 ++#: ../sales/customer_invoice.php:542 ++#: ../sales/customer_invoice.php:545 +#: ../sales/view/view_credit.php:91 +#: ../sales/view/view_dispatch.php:113 +#: ../sales/view/view_invoice.php:116 +#: ../sales/view/view_sales_order.php:220 +#: ../sales/view/view_sales_order.php.orig:202 +#: ../sales/includes/ui/sales_credit_ui.inc:168 msgid "Price" msgstr "" @@@ -8546,18 -7320,14 +8375,20 @@@ msgstr " msgid "Supplier Purchasing Data" msgstr "" -#: inventory/purchasing_data.php:23 purchasing/po_entry_items.php:64 -#: purchasing/po_entry_items.php:67 +#: ../inventory/purchasing_data.php:23 +#: ../inventory/purchasing_data.php.orig:24 - #: ../purchasing/po_entry_items.php:67 ++#: ../purchasing/po_entry_items.php:70 ++#: ../purchasing/po_entry_items.php.orig:67 msgid "There are no purchasable inventory items defined in the system." msgstr "" -#: inventory/purchasing_data.php:24 purchasing/po_entry_items.php:62 -#: purchasing/supplier_credit.php:32 purchasing/supplier_invoice.php:32 -#: purchasing/supplier_payment.php:40 purchasing/po_entry_items.php:65 +#: ../inventory/purchasing_data.php:24 +#: ../inventory/purchasing_data.php.orig:25 - #: ../purchasing/po_entry_items.php:65 ++#: ../purchasing/po_entry_items.php:68 ++#: ../purchasing/po_entry_items.php.orig:65 +#: ../purchasing/supplier_credit.php:31 +#: ../purchasing/supplier_invoice.php:30 +#: ../purchasing/supplier_payment.php:40 msgid "There are no suppliers defined in the system." msgstr "" @@@ -8632,70 -7390,7 +8463,70 @@@ msgstr " msgid "Supplier's Code or Description:" msgstr "" -#: inventory/reorder_level.php:16 +#: ../inventory/purchasing_data.php.orig:116 +msgid "Show all:" +msgstr "" + +#: ../inventory/purchasing_data.php.orig:185 +msgid "Stock item:" +msgstr "" + +#: ../inventory/purchasing_data.php.orig:219 +msgid "Supplier Code/Description" +msgstr "" + +#: ../inventory/purchasing_data.php.orig:220 +#: ../inventory/includes/item_adjustments_ui.inc:62 +#: ../inventory/includes/stock_transfers_ui.inc:60 +#: ../manufacturing/includes/work_order_issue_ui.inc:33 +#: ../purchasing/includes/ui/po_ui.inc:243 ++#: ../purchasing/includes/ui/po_ui.inc.orig:243 +#: ../purchasing/po_receive_items.php:62 +#: ../purchasing/view/view_grn.php:40 +#: ../purchasing/view/view_po.php:45 +#: ../reporting/includes/doctext.inc:29 +#: ../reporting/includes/doctext.inc:191 +#: ../reporting/includes/doctext.inc:228 - #: ../sales/customer_credit_invoice.php:282 - #: ../sales/customer_delivery.php:439 - #: ../sales/customer_invoice.php:539 - #: ../sales/customer_invoice.php:542 ++#: ../sales/customer_credit_invoice.php:280 ++#: ../sales/customer_delivery.php.orig:444 ++#: ../sales/customer_invoice.php:541 ++#: ../sales/customer_invoice.php:544 +#: ../sales/view/view_credit.php:90 +#: ../sales/view/view_dispatch.php:112 +#: ../sales/view/view_invoice.php:115 +#: ../sales/view/view_sales_order.php:219 +#: ../sales/view/view_sales_order.php.orig:201 +#: ../sales/includes/ui/sales_credit_ui.inc:167 - #: ../sales/includes/ui/sales_order_ui.inc:140 +#: ../sales/includes/ui/sales_order_ui.inc.orig:140 +msgid "Item Code" +msgstr "" + +#: ../inventory/purchasing_data.php.orig:221 +#: ../inventory/includes/item_adjustments_ui.inc:62 +#: ../inventory/includes/stock_transfers_ui.inc:60 +#: ../manufacturing/includes/work_order_issue_ui.inc:33 +#: ../purchasing/includes/ui/po_ui.inc:243 ++#: ../purchasing/includes/ui/po_ui.inc.orig:243 +#: ../purchasing/view/view_grn.php:40 +#: ../purchasing/view/view_po.php:45 +#: ../reporting/includes/doctext.inc:29 +#: ../reporting/includes/doctext.inc:191 +#: ../reporting/includes/doctext.inc:228 - #: ../sales/customer_credit_invoice.php:282 - #: ../sales/customer_delivery.php:439 - #: ../sales/customer_invoice.php:539 - #: ../sales/customer_invoice.php:542 ++#: ../sales/customer_credit_invoice.php:280 ++#: ../sales/customer_delivery.php.orig:444 ++#: ../sales/customer_invoice.php:541 ++#: ../sales/customer_invoice.php:544 +#: ../sales/view/view_credit.php:90 +#: ../sales/view/view_dispatch.php:112 +#: ../sales/view/view_invoice.php:115 +#: ../sales/view/view_sales_order.php:219 +#: ../sales/view/view_sales_order.php.orig:201 +#: ../sales/includes/ui/sales_credit_ui.inc:167 - #: ../sales/includes/ui/sales_order_ui.inc:140 +#: ../sales/includes/ui/sales_order_ui.inc.orig:140 +msgid "Item Description" +msgstr "" + +#: ../inventory/reorder_level.php:16 msgid "Reorder Levels" msgstr "" @@@ -8733,23 -7416,19 +8564,26 @@@ msgstr " msgid "Location" msgstr "" -#: inventory/reorder_level.php:57 inventory/inquiry/stock_movements.php:82 -#: inventory/inquiry/stock_status.php:76 purchasing/supplier_credit.php:203 -#: sales/sales_order_entry.php:492 sales/includes/ui/sales_order_ui.inc:175 -#: sales/sales_order_entry.php:496 sales/includes/ui/sales_order_ui.inc:179 -#: sales/sales_order_entry.php:507 sales/sales_order_entry.php.orig:506 +#: ../inventory/reorder_level.php:57 +#: ../inventory/inquiry/stock_movements.php:78 +#: ../inventory/inquiry/stock_movements.php.orig:80 +#: ../inventory/inquiry/stock_status.php:70 +#: ../inventory/inquiry/stock_status.php.orig:76 +#: ../purchasing/supplier_credit.php:220 - #: ../sales/sales_order_entry.php:503 - #: ../sales/includes/ui/sales_order_ui.inc:175 ++#: ../sales/sales_order_entry.php:523 +#: ../sales/includes/ui/sales_order_ui.inc.orig:175 msgid "Quantity On Hand" msgstr "" -#: inventory/reorder_level.php:57 inventory/inquiry/stock_status.php:76 -#: sales/includes/db/sales_order_db.inc:110 -#: sales/includes/db/sales_order_db.inc:263 -#: sales/includes/db/sales_order_db.inc.orig:110 -#: sales/includes/db/sales_order_db.inc.orig:263 +#: ../inventory/reorder_level.php:57 +#: ../inventory/inquiry/stock_status.php:70 +#: ../inventory/inquiry/stock_status.php.orig:76 ++#: ../sales/includes/db/old.sales_order_db.inc:110 ++#: ../sales/includes/db/old.sales_order_db.inc:263 +#: ../sales/includes/db/sales_order_db.inc:112 +#: ../sales/includes/db/sales_order_db.inc:275 ++#: ../sales/includes/db/sales_order_db.inc.orig:112 ++#: ../sales/includes/db/sales_order_db.inc.orig:275 msgid "Re-Order Level" msgstr "" @@@ -8799,13 -7477,11 +8633,11 @@@ msgstr " msgid "For Part :" msgstr "" -#: inventory/includes/item_adjustments_ui.inc:34 -#: manufacturing/work_order_entry.php:210 purchasing/inquiry/po_search.php:67 -#: sales/inquiry/sales_deliveries_view.php:107 -#: sales/inquiry/sales_orders_view.php:232 -#: sales/inquiry/sales_orders_view.php.orig:230 +#: ../inventory/includes/item_adjustments_ui.inc:34 +#: ../manufacturing/work_order_entry.php:210 +#: ../purchasing/inquiry/po_search.php:67 +#: ../sales/inquiry/sales_deliveries_view.php:107 - #: ../sales/inquiry/sales_deliveries_view.php.orig:107 +#: ../sales/inquiry/sales_orders_view.php:254 - #: ../sales/inquiry/sales_orders_view.php.orig:231 msgid "Location:" msgstr "" @@@ -8821,58 -7497,76 +8653,58 @@@ msgstr " msgid "Negative Adjustment" msgstr "" -#: inventory/includes/item_adjustments_ui.inc:62 -#: inventory/includes/stock_transfers_ui.inc:60 -#: manufacturing/includes/work_order_issue_ui.inc:33 -#: purchasing/includes/ui/po_ui.inc:236 purchasing/po_receive_items.php:62 -#: purchasing/view/view_grn.php:40 purchasing/view/view_po.php:45 -#: reporting/includes/doctext.inc:29 reporting/includes/doctext.inc:169 -#: reporting/includes/doctext.inc:206 sales/customer_credit_invoice.php:282 -#: sales/customer_delivery.php:431 sales/customer_invoice.php:467 -#: sales/view/view_credit.php:90 sales/view/view_dispatch.php:112 -#: sales/view/view_invoice.php:113 sales/view/view_sales_order.php:201 -#: sales/includes/ui/sales_credit_ui.inc:167 -#: sales/includes/ui/sales_order_ui.inc:140 -#: sales/customer_credit_invoice.php:280 sales/customer_invoice.php:469 -#: sales/includes/ui/sales_order_ui.inc:144 -msgid "Item Code" -msgstr "" - -#: inventory/includes/item_adjustments_ui.inc:62 -#: inventory/includes/stock_transfers_ui.inc:60 -#: manufacturing/includes/work_order_issue_ui.inc:33 -#: purchasing/includes/ui/po_ui.inc:236 purchasing/view/view_grn.php:40 -#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:29 -#: reporting/includes/doctext.inc:169 reporting/includes/doctext.inc:206 -#: sales/customer_credit_invoice.php:282 sales/customer_delivery.php:431 -#: sales/customer_invoice.php:467 sales/view/view_credit.php:90 -#: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:113 -#: sales/view/view_sales_order.php:201 -#: sales/includes/ui/sales_credit_ui.inc:167 -#: sales/includes/ui/sales_order_ui.inc:140 -#: sales/customer_credit_invoice.php:280 sales/customer_invoice.php:469 -#: sales/includes/ui/sales_order_ui.inc:144 -msgid "Item Description" -msgstr "" - -#: inventory/includes/item_adjustments_ui.inc:62 -#: inventory/includes/stock_transfers_ui.inc:60 -#: inventory/manage/item_codes.php:124 inventory/manage/sales_kits.php:40 -#: inventory/view/view_adjustment.php:56 inventory/view/view_transfer.php:56 -#: manufacturing/view/wo_issue_view.php:77 -#: manufacturing/manage/bom_edit.php:71 -#: manufacturing/includes/manufacturing_ui.inc:29 -#: manufacturing/includes/manufacturing_ui.inc:157 -#: manufacturing/includes/manufacturing_ui.inc:332 -#: manufacturing/includes/work_order_issue_ui.inc:33 -#: purchasing/includes/ui/invoice_ui.inc:484 -#: purchasing/includes/ui/po_ui.inc:236 purchasing/view/view_grn.php:40 -#: purchasing/view/view_po.php:45 reporting/rep301.php:103 -#: reporting/rep303.php:109 reporting/rep303.php:115 reporting/rep401.php:69 -#: reporting/includes/doctext.inc:29 reporting/includes/doctext.inc:170 -#: reporting/includes/doctext.inc:203 sales/view/view_credit.php:90 -#: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:113 -#: sales/view/view_sales_order.php:201 -#: sales/includes/ui/sales_credit_ui.inc:167 -#: sales/includes/ui/sales_order_ui.inc:140 -#: sales/includes/ui/sales_order_ui.inc:144 +#: ../inventory/includes/item_adjustments_ui.inc:62 +#: ../inventory/includes/stock_transfers_ui.inc:60 +#: ../inventory/manage/item_codes.php:124 +#: ../inventory/manage/sales_kits.php:40 +#: ../inventory/view/view_adjustment.php:56 +#: ../inventory/view/view_transfer.php:56 +#: ../manufacturing/view/wo_issue_view.php:77 +#: ../manufacturing/manage/bom_edit.php:71 +#: ../manufacturing/includes/manufacturing_ui.inc:29 +#: ../manufacturing/includes/manufacturing_ui.inc:157 +#: ../manufacturing/includes/manufacturing_ui.inc:332 +#: ../manufacturing/includes/work_order_issue_ui.inc:33 +#: ../purchasing/includes/ui/invoice_ui.inc:505 +#: ../purchasing/includes/ui/po_ui.inc:243 ++#: ../purchasing/includes/ui/po_ui.inc.orig:243 +#: ../purchasing/view/view_grn.php:40 +#: ../purchasing/view/view_po.php:45 +#: ../reporting/rep301.php:103 +#: ../reporting/rep303.php:109 +#: ../reporting/rep303.php:115 +#: ../reporting/rep401.php:69 +#: ../reporting/includes/doctext.inc:29 +#: ../reporting/includes/doctext.inc:192 +#: ../reporting/includes/doctext.inc:225 - #: ../sales/customer_invoice.php:539 ++#: ../sales/customer_invoice.php:541 +#: ../sales/view/view_credit.php:90 +#: ../sales/view/view_dispatch.php:112 +#: ../sales/view/view_invoice.php:115 +#: ../sales/view/view_sales_order.php:219 +#: ../sales/view/view_sales_order.php.orig:201 +#: ../sales/includes/ui/sales_credit_ui.inc:167 - #: ../sales/includes/ui/sales_order_ui.inc:140 +#: ../sales/includes/ui/sales_order_ui.inc.orig:140 msgid "Quantity" msgstr "" -#: inventory/includes/item_adjustments_ui.inc:63 -#: inventory/includes/stock_transfers_ui.inc:60 -#: inventory/manage/item_units.php:94 -#: manufacturing/includes/work_order_issue_ui.inc:34 -#: purchasing/includes/ui/po_ui.inc:237 purchasing/view/view_grn.php:41 -#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:30 -#: reporting/includes/doctext.inc:170 sales/view/view_credit.php:91 -#: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:114 -#: sales/view/view_sales_order.php:201 -#: sales/includes/ui/sales_credit_ui.inc:167 -#: sales/includes/ui/sales_order_ui.inc:142 -#: sales/includes/ui/sales_order_ui.inc:146 +#: ../inventory/includes/item_adjustments_ui.inc:63 +#: ../inventory/includes/stock_transfers_ui.inc:60 +#: ../inventory/manage/item_units.php:94 +#: ../manufacturing/includes/work_order_issue_ui.inc:34 +#: ../purchasing/includes/ui/po_ui.inc:244 ++#: ../purchasing/includes/ui/po_ui.inc.orig:244 +#: ../purchasing/view/view_grn.php:41 +#: ../purchasing/view/view_po.php:45 +#: ../reporting/includes/doctext.inc:30 +#: ../reporting/includes/doctext.inc:192 +#: ../sales/view/view_credit.php:91 +#: ../sales/view/view_dispatch.php:113 +#: ../sales/view/view_invoice.php:116 +#: ../sales/view/view_sales_order.php:219 +#: ../sales/view/view_sales_order.php.orig:201 +#: ../sales/includes/ui/sales_credit_ui.inc:167 - #: ../sales/includes/ui/sales_order_ui.inc:142 +#: ../sales/includes/ui/sales_order_ui.inc.orig:142 msgid "Unit" msgstr "" @@@ -8935,16 -7625,14 +8767,14 @@@ msgstr " msgid "Show Movements" msgstr "" -#: inventory/inquiry/stock_movements.php:65 -#: purchasing/includes/ui/invoice_ui.inc:453 -#: purchasing/inquiry/supplier_allocation_inquiry.php:57 -#: purchasing/inquiry/supplier_inquiry.php:58 -#: purchasing/inquiry/supplier_inquiry.php.orig:54 -#: sales/inquiry/customer_allocation_inquiry.php:51 -#: sales/inquiry/customer_inquiry.php:58 -#: sales/inquiry/customer_inquiry.php.orig:58 +#: ../inventory/inquiry/stock_movements.php:61 +#: ../inventory/inquiry/stock_movements.php.orig:63 +#: ../purchasing/includes/ui/invoice_ui.inc:474 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:57 +#: ../purchasing/inquiry/supplier_inquiry.php:55 +#: ../purchasing/inquiry/supplier_inquiry.php.orig:55 +#: ../sales/inquiry/customer_allocation_inquiry.php:51 - #: ../sales/inquiry/customer_allocation_inquiry.php.orig:51 +#: ../sales/inquiry/customer_inquiry.php:54 - #: ../sales/inquiry/customer_inquiry.php.orig:55 msgid "Refresh Inquiry" msgstr "" @@@ -9032,18 -7706,13 +8862,18 @@@ msgstr " msgid "Tax type" msgstr "" -#: inventory/manage/item_categories.php:98 inventory/manage/item_codes.php:124 -#: inventory/manage/sales_kits.php:40 inventory/view/view_adjustment.php:57 -#: inventory/view/view_transfer.php:56 manufacturing/view/wo_issue_view.php:77 -#: manufacturing/manage/bom_edit.php:71 purchasing/po_receive_items.php:62 -#: sales/customer_credit_invoice.php:282 sales/customer_delivery.php:432 -#: sales/customer_invoice.php:467 sales/customer_credit_invoice.php:280 -#: sales/customer_invoice.php:469 +#: ../inventory/manage/item_categories.php:98 +#: ../inventory/manage/item_codes.php:124 +#: ../inventory/manage/sales_kits.php:40 +#: ../inventory/view/view_adjustment.php:57 +#: ../inventory/view/view_transfer.php:56 +#: ../manufacturing/view/wo_issue_view.php:77 +#: ../manufacturing/manage/bom_edit.php:71 +#: ../purchasing/po_receive_items.php:62 - #: ../sales/customer_credit_invoice.php:282 - #: ../sales/customer_delivery.php:440 - #: ../sales/customer_invoice.php:539 - #: ../sales/customer_invoice.php:542 ++#: ../sales/customer_credit_invoice.php:280 ++#: ../sales/customer_delivery.php.orig:445 ++#: ../sales/customer_invoice.php:541 ++#: ../sales/customer_invoice.php:544 msgid "Units" msgstr "" @@@ -9103,8 -7764,9 +8933,8 @@@ msgstr " msgid "Foreign Item Codes" msgstr "" -#: inventory/manage/item_codes.php:23 sales/sales_order_entry.php:659 -#: sales/sales_order_entry.php:663 sales/sales_order_entry.php:674 -#: sales/sales_order_entry.php.orig:673 +#: ../inventory/manage/item_codes.php:23 - #: ../sales/sales_order_entry.php:670 ++#: ../sales/sales_order_entry.php:690 msgid "There are no inventory items defined in the system." msgstr "" @@@ -9335,22 -7946,15 +9165,22 @@@ msgstr " msgid "New item" msgstr "" -#: inventory/manage/items.php:454 purchasing/manage/suppliers.php:306 -#: sales/manage/customer_branches.php:322 sales/manage/customers.php:342 -#: sales/manage/customers.php.orig:339 sales/manage/customers.php:344 +#: ../inventory/manage/items.php:461 +#: ../inventory/manage/items.php.orig:454 +#: ../purchasing/manage/suppliers.php:308 +#: ../purchasing/manage/suppliers.php.orig:311 +#: ../sales/manage/customer_branches.php:324 - #: ../sales/manage/customers.php:342 ++#: ../sales/manage/customers.php:344 +#: ../sales/manage/sav.customers.php:342 msgid "&General settings" msgstr "" -#: inventory/manage/items.php:455 purchasing/manage/suppliers.php:308 -#: sales/manage/customers.php:344 sales/manage/customers.php.orig:341 -#: sales/manage/customers.php:346 +#: ../inventory/manage/items.php:462 +#: ../inventory/manage/items.php.orig:455 +#: ../purchasing/manage/suppliers.php:310 +#: ../purchasing/manage/suppliers.php.orig:313 - #: ../sales/manage/customers.php:344 ++#: ../sales/manage/customers.php:346 +#: ../sales/manage/sav.customers.php:344 msgid "&Transactions" msgstr "" @@@ -9660,14 -8252,12 +9490,12 @@@ msgstr " msgid "for item:" msgstr "" -#: manufacturing/search_work_orders.php:78 -#: purchasing/inquiry/po_search_completed.php:77 -#: purchasing/inquiry/po_search.php:76 -#: sales/inquiry/sales_deliveries_view.php:116 -#: sales/inquiry/sales_orders_view.php:247 -#: sales/inquiry/sales_orders_view.php.orig:245 +#: ../manufacturing/search_work_orders.php:78 +#: ../purchasing/inquiry/po_search_completed.php:74 +#: ../purchasing/inquiry/po_search_completed.php.orig:75 +#: ../purchasing/inquiry/po_search.php:76 +#: ../sales/inquiry/sales_deliveries_view.php:116 - #: ../sales/inquiry/sales_deliveries_view.php.orig:116 +#: ../sales/inquiry/sales_orders_view.php:269 - #: ../sales/inquiry/sales_orders_view.php.orig:246 msgid "Select documents" msgstr "" @@@ -9691,12 -8281,11 +9519,11 @@@ msgstr " msgid "Required" msgstr "" -#: manufacturing/search_work_orders.php:167 -#: manufacturing/includes/manufacturing_ui.inc:277 -#: manufacturing/includes/manufacturing_ui.inc:281 -#: reporting/includes/doctext.inc:205 sales/inquiry/sales_orders_view.php:268 -#: sales/inquiry/sales_orders_view.php.orig:266 +#: ../manufacturing/search_work_orders.php:167 +#: ../manufacturing/includes/manufacturing_ui.inc:277 +#: ../manufacturing/includes/manufacturing_ui.inc:281 +#: ../reporting/includes/doctext.inc:227 +#: ../sales/inquiry/sales_orders_view.php:290 - #: ../sales/inquiry/sales_orders_view.php.orig:267 msgid "Required By" msgstr "" @@@ -10352,10 -8927,12 +10179,12 @@@ msgstr " msgid "Reversed the production " msgstr "" -#: manufacturing/includes/db/work_orders_db.inc:278 -#: purchasing/includes/db/po_db.inc:116 -#: sales/includes/db/cust_trans_db.inc:111 -#: sales/includes/db/sales_order_db.inc:249 -#: sales/includes/db/sales_order_db.inc.orig:249 -#: sales/includes/db/cust_trans_db.inc.orig:111 +#: ../manufacturing/includes/db/work_orders_db.inc:79 +#: ../purchasing/includes/db/po_db.inc:123 +#: ../sales/includes/db/cust_trans_db.inc:114 ++#: ../sales/includes/db/old.sales_order_db.inc:249 +#: ../sales/includes/db/sales_order_db.inc:261 ++#: ../sales/includes/db/sales_order_db.inc.orig:261 msgid "Updated." msgstr "" @@@ -10379,12 -8961,10 +10208,10 @@@ msgstr " msgid "Supplier invoice adjustment for zero inventory of " msgstr "" -#: purchasing/includes/db/invoice_db.inc:284 reporting/rep106.php:81 -#: sales/inquiry/sales_deliveries_view.php:166 -#: sales/inquiry/sales_orders_view.php:147 -#: sales/inquiry/sales_orders_view.php.orig:145 +#: ../purchasing/includes/db/invoice_db.inc:298 +#: ../reporting/rep106.php:81 +#: ../sales/inquiry/sales_deliveries_view.php:166 - #: ../sales/inquiry/sales_deliveries_view.php.orig:166 +#: ../sales/inquiry/sales_orders_view.php:159 - #: ../sales/inquiry/sales_orders_view.php.orig:146 msgid "Invoice" msgstr "" @@@ -10393,10 -8973,8 +10220,11 @@@ msgid "GRN Removal" msgstr "" -#: purchasing/includes/ui/grn_ui.inc:23 purchasing/includes/ui/po_ui.inc:319 -#: sales/view/view_sales_order.php:74 +#: ../purchasing/includes/ui/grn_ui.inc:23 +#: ../purchasing/includes/ui/po_ui.inc:326 ++#: ../purchasing/includes/ui/po_ui.inc.orig:326 +#: ../sales/view/view_sales_order.php:74 +#: ../sales/view/view_sales_order.php.orig:74 msgid "Order Currency" msgstr "" @@@ -10410,10 -8986,8 +10238,12 @@@ msgstr " msgid "Ordered On" msgstr "" -#: purchasing/includes/ui/grn_ui.inc:40 purchasing/includes/ui/grn_ui.inc:54 -#: purchasing/includes/ui/po_ui.inc:334 purchasing/includes/ui/po_ui.inc:339 +#: ../purchasing/includes/ui/grn_ui.inc:40 +#: ../purchasing/includes/ui/grn_ui.inc:54 +#: ../purchasing/includes/ui/po_ui.inc:341 +#: ../purchasing/includes/ui/po_ui.inc:346 ++#: ../purchasing/includes/ui/po_ui.inc.orig:341 ++#: ../purchasing/includes/ui/po_ui.inc.orig:346 msgid "Deliver Into Location" msgstr "" @@@ -10421,28 -8995,23 +10251,31 @@@ msgid "Date Items Received" msgstr "" -#: purchasing/includes/ui/grn_ui.inc:49 purchasing/includes/ui/grn_ui.inc:55 -#: purchasing/includes/ui/po_ui.inc:344 -#: purchasing/view/view_supp_credit.php:44 -#: purchasing/view/view_supp_invoice.php:47 -#: purchasing/inquiry/po_search_completed.php:125 -#: purchasing/inquiry/po_search.php:134 -#: purchasing/inquiry/supplier_inquiry.php:172 -#: purchasing/inquiry/supplier_inquiry.php.orig:166 +#: ../purchasing/includes/ui/grn_ui.inc:49 +#: ../purchasing/includes/ui/grn_ui.inc:55 +#: ../purchasing/includes/ui/po_ui.inc:351 ++#: ../purchasing/includes/ui/po_ui.inc.orig:351 +#: ../purchasing/view/view_supp_credit.php:44 +#: ../purchasing/view/view_supp_invoice.php:48 +#: ../purchasing/inquiry/po_search_completed.php:124 +#: ../purchasing/inquiry/po_search_completed.php.orig:123 +#: ../purchasing/inquiry/po_search.php:134 +#: ../purchasing/inquiry/supplier_inquiry.php:177 +#: ../purchasing/inquiry/supplier_inquiry.php.orig:174 msgid "Supplier's Reference" msgstr "" -#: purchasing/includes/ui/grn_ui.inc:62 purchasing/includes/ui/po_ui.inc:348 -#: sales/view/view_sales_order.php:79 +#: ../purchasing/includes/ui/grn_ui.inc:62 +#: ../purchasing/includes/ui/po_ui.inc:355 ++#: ../purchasing/includes/ui/po_ui.inc.orig:355 +#: ../sales/view/view_sales_order.php:92 +#: ../sales/view/view_sales_order.php.orig:79 msgid "Delivery Address" msgstr "" -#: purchasing/includes/ui/grn_ui.inc:65 purchasing/includes/ui/po_ui.inc:352 +#: ../purchasing/includes/ui/grn_ui.inc:65 +#: ../purchasing/includes/ui/po_ui.inc:367 ++#: ../purchasing/includes/ui/po_ui.inc.orig:367 msgid "Order Comments" msgstr "" @@@ -10466,12 -9029,10 +10299,12 @@@ msgstr " msgid "Supplier's Currency:" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:130 -#: purchasing/manage/suppliers.php:105 sales/manage/customer_branches.php:246 -#: sales/manage/customers.php:292 sales/manage/customers.php.orig:289 -#: sales/manage/customers.php:294 +#: ../purchasing/includes/ui/invoice_ui.inc:141 +#: ../purchasing/manage/suppliers.php:107 +#: ../purchasing/manage/suppliers.php.orig:108 +#: ../sales/manage/customer_branches.php:247 - #: ../sales/manage/customers.php:292 ++#: ../sales/manage/customers.php:294 +#: ../sales/manage/sav.customers.php:292 msgid "Tax Group:" msgstr "" @@@ -10483,19 -9044,14 +10316,19 @@@ msgstr " msgid "Invoice Total:" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:156 -#: sales/customer_credit_invoice.php:332 -#: sales/includes/ui/sales_credit_ui.inc:233 -#: sales/customer_credit_invoice.php:330 +#: ../purchasing/includes/ui/invoice_ui.inc:170 - #: ../sales/customer_credit_invoice.php:332 ++#: ../sales/customer_credit_invoice.php:330 +#: ../sales/includes/ui/sales_credit_ui.inc:233 msgid "Credit Note Total" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:187 +#: ../purchasing/includes/ui/invoice_ui.inc:175 - #: ../purchasing/includes/ui/po_ui.inc:487 - #: ../purchasing/po_entry_items.php:554 ++#: ../purchasing/includes/ui/po_ui.inc.orig:487 ++#: ../purchasing/po_entry_items.php.orig:554 +msgid "Tax algorithm:" +msgstr "" + +#: ../purchasing/includes/ui/invoice_ui.inc:207 msgid "Add GL Line" msgstr "" @@@ -10528,8 -9084,8 +10361,8 @@@ msgstr " msgid "Add to Credit Note" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:396 sales/customer_invoice.php:522 -#: sales/customer_invoice.php:524 +#: ../purchasing/includes/ui/invoice_ui.inc:416 - #: ../sales/customer_invoice.php:601 ++#: ../sales/customer_invoice.php:603 msgid "Remove" msgstr "" @@@ -10572,10 -9127,10 +10405,9 @@@ msgstr " msgid "Add All Items" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:471 -#: purchasing/includes/ui/invoice_ui.inc:483 -#: sales/inquiry/sales_orders_view.php:155 -#: sales/inquiry/sales_orders_view.php.orig:153 +#: ../purchasing/includes/ui/invoice_ui.inc:492 +#: ../purchasing/includes/ui/invoice_ui.inc:504 +#: ../sales/inquiry/sales_orders_view.php:167 - #: ../sales/inquiry/sales_orders_view.php.orig:154 msgid "Delivery" msgstr "" @@@ -10606,17 -9155,17 +10438,17 @@@ msgstr " msgid "Qty Yet To Invoice" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:473 -#: purchasing/includes/ui/po_ui.inc:238 -#: sales/includes/ui/sales_order_ui.inc:142 -#: sales/includes/ui/sales_order_ui.inc:146 +#: ../purchasing/includes/ui/invoice_ui.inc:494 +#: ../purchasing/includes/ui/po_ui.inc:245 - #: ../sales/includes/ui/sales_order_ui.inc:142 ++#: ../purchasing/includes/ui/po_ui.inc.orig:245 +#: ../sales/includes/ui/sales_order_ui.inc.orig:142 msgid "Price after Tax" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:473 -#: purchasing/includes/ui/po_ui.inc:238 -#: sales/includes/ui/sales_order_ui.inc:142 -#: sales/includes/ui/sales_order_ui.inc:146 +#: ../purchasing/includes/ui/invoice_ui.inc:494 +#: ../purchasing/includes/ui/po_ui.inc:245 - #: ../sales/includes/ui/sales_order_ui.inc:142 ++#: ../purchasing/includes/ui/po_ui.inc.orig:245 +#: ../sales/includes/ui/sales_order_ui.inc.orig:142 msgid "Price before Tax" msgstr "" @@@ -10644,381 -9193,345 +10476,437 @@@ msgstr " msgid "Credits can only be applied to invoiced items." msgstr "" -#: purchasing/includes/ui/po_ui.inc:149 +#: ../purchasing/includes/ui/po_ui.inc:156 ++#: ../purchasing/includes/ui/po_ui.inc.orig:156 msgid "Supplier Currency:" msgstr "" -#: purchasing/includes/ui/po_ui.inc:178 sales/sales_order_entry.php:683 -#: sales/sales_order_entry.php:687 sales/sales_order_entry.php:698 -#: sales/sales_order_entry.php.orig:697 +#: ../purchasing/includes/ui/po_ui.inc:185 - #: ../sales/sales_order_entry.php:694 ++#: ../purchasing/includes/ui/po_ui.inc.orig:185 ++#: ../sales/sales_order_entry.php:714 msgid "Order Date:" msgstr "" -#: purchasing/includes/ui/po_ui.inc:179 sales/sales_order_entry.php:670 -#: sales/sales_order_entry.php:674 sales/sales_order_entry.php:685 -#: sales/sales_order_entry.php.orig:684 +#: ../purchasing/includes/ui/po_ui.inc:186 - #: ../sales/sales_order_entry.php:681 ++#: ../purchasing/includes/ui/po_ui.inc.orig:186 ++#: ../sales/sales_order_entry.php:701 msgid "Delivery Date:" msgstr "" -#: purchasing/includes/ui/po_ui.inc:179 sales/sales_order_entry.php:664 -#: sales/sales_order_entry.php:668 sales/sales_order_entry.php:679 -#: sales/sales_order_entry.php.orig:678 +#: ../purchasing/includes/ui/po_ui.inc:186 - #: ../sales/sales_order_entry.php:675 ++#: ../purchasing/includes/ui/po_ui.inc.orig:186 ++#: ../sales/sales_order_entry.php:695 msgid "Invoice Date:" msgstr "" -#: purchasing/includes/ui/po_ui.inc:190 +#: ../purchasing/includes/ui/po_ui.inc:197 ++#: ../purchasing/includes/ui/po_ui.inc.orig:197 msgid "Due Date:" msgstr "" -#: purchasing/includes/ui/po_ui.inc:192 +#: ../purchasing/includes/ui/po_ui.inc:199 ++#: ../purchasing/includes/ui/po_ui.inc.orig:199 msgid "Supplier's Reference:" msgstr "" -#: purchasing/includes/ui/po_ui.inc:193 +#: ../purchasing/includes/ui/po_ui.inc:200 ++#: ../purchasing/includes/ui/po_ui.inc.orig:200 msgid "Receive Into:" msgstr "" -#: purchasing/includes/ui/po_ui.inc:218 +#: ../purchasing/includes/ui/po_ui.inc:225 ++#: ../purchasing/includes/ui/po_ui.inc.orig:225 msgid "" "The default stock location set up for this user is not a currently defined " "stock location. Your system administrator needs to amend your user record." msgstr "" -#: purchasing/includes/ui/po_ui.inc:222 +#: ../purchasing/includes/ui/po_ui.inc:229 ++#: ../purchasing/includes/ui/po_ui.inc.orig:229 msgid "Deliver to:" msgstr "" -#: purchasing/includes/ui/po_ui.inc:231 +#: ../purchasing/includes/ui/po_ui.inc:238 ++#: ../purchasing/includes/ui/po_ui.inc.orig:238 msgid "Order Items" msgstr "" -#: purchasing/includes/ui/po_ui.inc:237 purchasing/po_receive_items.php:62 +#: ../purchasing/includes/ui/po_ui.inc:244 ++#: ../purchasing/includes/ui/po_ui.inc.orig:244 +#: ../purchasing/po_receive_items.php:62 msgid "Received" msgstr "" -#: purchasing/includes/ui/po_ui.inc:238 -#: sales/includes/ui/sales_order_ui.inc:611 -#: sales/includes/ui/sales_order_ui.inc:615 +#: ../purchasing/includes/ui/po_ui.inc:245 - #: ../sales/includes/ui/sales_order_ui.inc:611 ++#: ../purchasing/includes/ui/po_ui.inc.orig:245 +#: ../sales/includes/ui/sales_order_ui.inc.orig:611 msgid "Required Delivery Date" msgstr "" -#: purchasing/includes/ui/po_ui.inc:238 purchasing/view/view_grn.php:41 -#: purchasing/view/view_po.php:46 +#: ../purchasing/includes/ui/po_ui.inc:245 ++#: ../purchasing/includes/ui/po_ui.inc.orig:245 +#: ../purchasing/view/view_grn.php:41 +#: ../purchasing/view/view_po.php:46 msgid "Line Total" msgstr "" -#: purchasing/includes/ui/po_ui.inc:289 purchasing/po_receive_items.php:114 -#: reporting/rep107.php:148 reporting/rep109.php:151 reporting/rep110.php:161 -#: reporting/rep111.php:138 reporting/rep113.php:147 reporting/rep209.php:167 -#: sales/customer_credit_invoice.php:324 sales/customer_delivery.php:501 -#: sales/customer_invoice.php:563 sales/view/view_dispatch.php:146 -#: sales/view/view_invoice.php:148 sales/includes/ui/sales_credit_ui.inc:217 -#: sales/includes/ui/sales_order_ui.inc:229 -#: sales/customer_credit_invoice.php:322 sales/customer_invoice.php:565 -#: sales/includes/ui/sales_order_ui.inc:233 +#: ../purchasing/includes/ui/po_ui.inc:296 ++#: ../purchasing/includes/ui/po_ui.inc.orig:296 +#: ../purchasing/po_receive_items.php:114 +#: ../reporting/rep107.php:217 +#: ../reporting/rep109.php:152 +#: ../reporting/rep110.php:161 +#: ../reporting/rep111.php:137 +#: ../reporting/rep113.php:147 +#: ../reporting/rep209.php:167 - #: ../sales/customer_credit_invoice.php:324 - #: ../sales/customer_delivery.php:509 - #: ../sales/customer_invoice.php:645 ++#: ../sales/customer_credit_invoice.php:322 ++#: ../sales/customer_delivery.php.orig:514 ++#: ../sales/customer_invoice.php:647 +#: ../sales/view/view_dispatch.php:146 +#: ../sales/view/view_invoice.php:150 +#: ../sales/includes/ui/sales_credit_ui.inc:217 - #: ../sales/includes/ui/sales_order_ui.inc:229 +#: ../sales/includes/ui/sales_order_ui.inc.orig:229 msgid "Sub-total" msgstr "" -#: purchasing/includes/ui/po_ui.inc:298 purchasing/po_receive_items.php:122 -#: purchasing/view/view_grn.php:79 purchasing/view/view_po.php:93 -#: sales/customer_delivery.php:508 sales/view/view_sales_order.php:244 -#: sales/includes/ui/sales_order_ui.inc:236 -#: sales/includes/ui/sales_order_ui.inc:240 +#: ../purchasing/includes/ui/po_ui.inc:305 ++#: ../purchasing/includes/ui/po_ui.inc.orig:305 +#: ../purchasing/po_receive_items.php:122 +#: ../purchasing/view/view_grn.php:79 +#: ../purchasing/view/view_po.php:93 - #: ../sales/customer_delivery.php:516 ++#: ../sales/customer_delivery.php.orig:521 +#: ../sales/view/view_sales_order.php:262 +#: ../sales/view/view_sales_order.php.orig:244 - #: ../sales/includes/ui/sales_order_ui.inc:236 +#: ../sales/includes/ui/sales_order_ui.inc.orig:236 msgid "Amount Total" msgstr "" -#: purchasing/includes/ui/po_ui.inc:299 -#: purchasing/allocations/supplier_allocate.php:64 -#: sales/allocations/customer_allocate.php:63 -#: sales/includes/ui/sales_order_ui.inc:237 -#: sales/includes/ui/sales_order_ui.inc:241 +#: ../purchasing/includes/ui/po_ui.inc:306 ++#: ../purchasing/includes/ui/po_ui.inc.orig:306 +#: ../purchasing/allocations/supplier_allocate.php:64 +#: ../sales/allocations/customer_allocate.php:63 - #: ../sales/includes/ui/sales_order_ui.inc:237 +#: ../sales/includes/ui/sales_order_ui.inc.orig:237 msgid "Refresh" msgstr "" -#: purchasing/po_entry_items.php:38 purchasing/po_entry_items.php:41 +#: ../purchasing/includes/ui/po_ui.inc:361 ++#: ../purchasing/includes/ui/po_ui.inc.orig:361 +#: ../sales/view/view_sales_order.php:83 +msgid "Required Pre-Payment" +msgstr "" + +#: ../purchasing/includes/ui/po_ui.inc:362 ++#: ../purchasing/includes/ui/po_ui.inc.orig:362 +msgid "Pre-Payments Allocated" +msgstr "" + - #: ../purchasing/includes/ui/po_ui.inc:488 - #: ../purchasing/po_entry_items.php:555 - #: ../sales/customer_invoice.php:452 - #: ../sales/includes/ui/sales_order_ui.inc:407 - #: ../sales/includes/ui/sales_order_ui.inc:409 - #: ../sales/includes/ui/sales_order_ui.inc.orig:405 ++#: ../purchasing/includes/ui/po_ui.inc.orig:488 ++#: ../purchasing/po_entry_items.php.orig:555 ++#: ../sales/customer_invoice.php:454 ++#: ../sales/includes/ui/sales_order_ui.inc.orig:407 +#: ../sales/includes/ui/sales_order_ui.inc.orig:409 +msgid "Payment:" +msgstr "" + - #: ../purchasing/includes/ui/po_ui.inc:488 - #: ../purchasing/po_entry_items.php:555 ++#: ../purchasing/includes/ui/po_ui.inc.orig:488 ++#: ../purchasing/po_entry_items.php.orig:555 +msgid "Delayed" +msgstr "" + - #: ../purchasing/includes/ui/po_ui.inc:490 - #: ../sales/includes/ui/sales_order_ui.inc:622 - #: ../sales/includes/ui/sales_order_ui.inc:624 ++#: ../purchasing/includes/ui/po_ui.inc.orig:490 ++#: ../sales/includes/ui/sales_order_ui.inc.orig:622 ++#: ../sales/includes/ui/sales_order_ui.inc.orig:624 +msgid "Pre-Payment Required:" +msgstr "" + - #: ../purchasing/po_entry_items.php:38 ++#: ../purchasing/po_entry_items.php:41 ++#: ../purchasing/po_entry_items.php.orig:38 msgid "Modify Purchase Order #" msgstr "" - #: ../purchasing/po_entry_items.php:43 -#: purchasing/po_entry_items.php:43 purchasing/po_entry_items.php:46 ++#: ../purchasing/po_entry_items.php:46 ++#: ../purchasing/po_entry_items.php.orig:43 msgid "Purchase Order Entry" msgstr "" - #: ../purchasing/po_entry_items.php:48 -#: purchasing/po_entry_items.php:48 purchasing/po_entry_items.php:51 ++#: ../purchasing/po_entry_items.php:51 ++#: ../purchasing/po_entry_items.php.orig:48 msgid "Direct GRN Entry" msgstr "" - #: ../purchasing/po_entry_items.php:53 -#: purchasing/po_entry_items.php:53 purchasing/po_entry_items.php:56 ++#: ../purchasing/po_entry_items.php:56 ++#: ../purchasing/po_entry_items.php.orig:53 msgid "Direct Purchase Invoice Entry" msgstr "" - #: ../purchasing/po_entry_items.php:77 -#: purchasing/po_entry_items.php:74 purchasing/po_entry_items.php:77 ++#: ../purchasing/po_entry_items.php:80 ++#: ../purchasing/po_entry_items.php.orig:77 msgid "Purchase Order has been entered" msgstr "" - #: ../purchasing/po_entry_items.php:79 -#: purchasing/po_entry_items.php:76 purchasing/po_entry_items.php:79 ++#: ../purchasing/po_entry_items.php:82 ++#: ../purchasing/po_entry_items.php.orig:79 msgid "Purchase Order has been updated" msgstr "" - #: ../purchasing/po_entry_items.php:80 -#: purchasing/po_entry_items.php:77 purchasing/po_entry_items.php:80 ++#: ../purchasing/po_entry_items.php:83 ++#: ../purchasing/po_entry_items.php.orig:80 msgid "&View this order" msgstr "" - #: ../purchasing/po_entry_items.php:82 - #: ../sales/sales_order_entry.php:106 - #: ../sales/sales_order_entry.php:126 -#: purchasing/po_entry_items.php:79 sales/sales_order_entry.php:105 -#: sales/sales_order_entry.php:125 purchasing/po_entry_items.php:82 -#: sales/sales_order_entry.php:113 sales/sales_order_entry.php:133 -#: sales/sales_order_entry.php.orig:113 sales/sales_order_entry.php.orig:133 ++#: ../purchasing/po_entry_items.php:85 ++#: ../purchasing/po_entry_items.php.orig:82 ++#: ../sales/sales_order_entry.php:119 ++#: ../sales/sales_order_entry.php:139 msgid "&Print This Order" msgstr "" - #: ../purchasing/po_entry_items.php:84 - #: ../sales/sales_order_entry.php:107 - #: ../sales/sales_order_entry.php:127 -#: purchasing/po_entry_items.php:81 sales/sales_order_entry.php:106 -#: sales/sales_order_entry.php:126 purchasing/po_entry_items.php:84 -#: sales/sales_order_entry.php:114 sales/sales_order_entry.php:134 -#: sales/sales_order_entry.php.orig:114 sales/sales_order_entry.php.orig:134 ++#: ../purchasing/po_entry_items.php:87 ++#: ../purchasing/po_entry_items.php.orig:84 ++#: ../sales/sales_order_entry.php:120 ++#: ../sales/sales_order_entry.php:140 msgid "&Email This Order" msgstr "" - #: ../purchasing/po_entry_items.php:86 -#: purchasing/po_entry_items.php:83 purchasing/po_entry_items.php:86 ++#: ../purchasing/po_entry_items.php:89 ++#: ../purchasing/po_entry_items.php.orig:86 msgid "&Receive Items on this Purchase Order" msgstr "" - #: ../purchasing/po_entry_items.php:88 -#: purchasing/po_entry_items.php:85 purchasing/po_entry_items.php:88 ++#: ../purchasing/po_entry_items.php:91 ++#: ../purchasing/po_entry_items.php.orig:88 msgid "Enter &Another Purchase Order" msgstr "" - #: ../purchasing/po_entry_items.php:90 -#: purchasing/po_entry_items.php:87 purchasing/po_entry_items.php:90 ++#: ../purchasing/po_entry_items.php:93 ++#: ../purchasing/po_entry_items.php.orig:90 msgid "Select An &Outstanding Purchase Order" msgstr "" - #: ../purchasing/po_entry_items.php:99 -#: purchasing/po_entry_items.php:96 purchasing/po_entry_items.php:99 ++#: ../purchasing/po_entry_items.php:102 ++#: ../purchasing/po_entry_items.php.orig:99 msgid "Direct GRN has been entered" msgstr "" - #: ../purchasing/po_entry_items.php:101 -#: purchasing/po_entry_items.php:98 purchasing/po_entry_items.php:101 ++#: ../purchasing/po_entry_items.php:104 ++#: ../purchasing/po_entry_items.php.orig:101 msgid "&View this GRN" msgstr "" - #: ../purchasing/po_entry_items.php:105 -#: purchasing/po_entry_items.php:102 purchasing/po_receive_items.php:40 -#: purchasing/po_entry_items.php:105 ++#: ../purchasing/po_entry_items.php:108 ++#: ../purchasing/po_entry_items.php.orig:105 +#: ../purchasing/po_receive_items.php:40 msgid "View the GL Journal Entries for this Delivery" msgstr "" - #: ../purchasing/po_entry_items.php:110 -#: purchasing/po_entry_items.php:107 purchasing/po_receive_items.php:42 -#: purchasing/po_entry_items.php:110 ++#: ../purchasing/po_entry_items.php:113 ++#: ../purchasing/po_entry_items.php.orig:110 +#: ../purchasing/po_receive_items.php:42 msgid "Entry purchase &invoice for this receival" msgstr "" - #: ../purchasing/po_entry_items.php:115 -#: purchasing/po_entry_items.php:112 purchasing/po_entry_items.php:115 ++#: ../purchasing/po_entry_items.php:118 ++#: ../purchasing/po_entry_items.php.orig:115 msgid "Enter &Another GRN" msgstr "" - #: ../purchasing/po_entry_items.php:124 -#: purchasing/po_entry_items.php:121 purchasing/po_entry_items.php:124 ++#: ../purchasing/po_entry_items.php:127 ++#: ../purchasing/po_entry_items.php.orig:124 msgid "Direct Purchase Invoice has been entered" msgstr "" - #: ../purchasing/po_entry_items.php:126 -#: purchasing/po_entry_items.php:123 purchasing/po_entry_items.php:126 ++#: ../purchasing/po_entry_items.php:129 ++#: ../purchasing/po_entry_items.php.orig:126 msgid "&View this Invoice" msgstr "" - #: ../purchasing/po_entry_items.php:131 - #: ../purchasing/supplier_invoice.php:68 -#: purchasing/po_entry_items.php:128 purchasing/supplier_invoice.php:46 -#: purchasing/po_entry_items.php:131 ++#: ../purchasing/po_entry_items.php:134 ++#: ../purchasing/po_entry_items.php.orig:131 ++#: ../purchasing/supplier_invoice.php:69 msgid "View the GL Journal Entries for this Invoice" msgstr "" - #: ../purchasing/po_entry_items.php:133 - #: ../purchasing/supplier_invoice.php:70 -#: purchasing/po_entry_items.php:130 purchasing/supplier_invoice.php:48 -#: purchasing/po_entry_items.php:133 ++#: ../purchasing/po_entry_items.php:136 ++#: ../purchasing/po_entry_items.php.orig:133 ++#: ../purchasing/supplier_invoice.php:71 msgid "Entry supplier &payment for this invoice" msgstr "" - #: ../purchasing/po_entry_items.php:139 -#: purchasing/po_entry_items.php:136 purchasing/po_entry_items.php:139 ++#: ../purchasing/po_entry_items.php:142 ++#: ../purchasing/po_entry_items.php.orig:139 msgid "Enter &Another Direct Invoice" msgstr "" - #: ../purchasing/po_entry_items.php:171 -#: purchasing/po_entry_items.php:168 purchasing/po_entry_items.php:171 ++#: ../purchasing/po_entry_items.php:174 ++#: ../purchasing/po_entry_items.php.orig:171 msgid "" "This item cannot be deleted because some of it has already been received." msgstr "" - #: ../purchasing/po_entry_items.php:186 -#: purchasing/po_entry_items.php:183 purchasing/po_entry_items.php:186 ++#: ../purchasing/po_entry_items.php:189 ++#: ../purchasing/po_entry_items.php.orig:186 msgid "" "This order cannot be cancelled because some of it has already been received." msgstr "" - #: ../purchasing/po_entry_items.php:187 -#: purchasing/po_entry_items.php:184 purchasing/po_entry_items.php:187 ++#: ../purchasing/po_entry_items.php:190 ++#: ../purchasing/po_entry_items.php.orig:187 msgid "" "The line item quantities may be modified to quantities more than already " "received. prices cannot be altered for lines that have already been received " "and quantities cannot be reduced below the quantity already received." msgstr "" - #: ../purchasing/po_entry_items.php:202 -#: purchasing/po_entry_items.php:199 purchasing/po_entry_items.php:202 ++#: ../purchasing/po_entry_items.php:205 ++#: ../purchasing/po_entry_items.php.orig:202 msgid "This purchase order has been cancelled." msgstr "" - #: ../purchasing/po_entry_items.php:204 -#: purchasing/po_entry_items.php:201 purchasing/po_entry_items.php:204 ++#: ../purchasing/po_entry_items.php:207 ++#: ../purchasing/po_entry_items.php.orig:204 msgid "Enter a new purchase order" msgstr "" - #: ../purchasing/po_entry_items.php:216 - #: ../sales/sales_order_entry.php:475 -#: purchasing/po_entry_items.php:213 sales/sales_order_entry.php:464 -#: sales/sales_order_entry.php:468 purchasing/po_entry_items.php:216 -#: sales/sales_order_entry.php:479 sales/sales_order_entry.php.orig:478 ++#: ../purchasing/po_entry_items.php:219 ++#: ../purchasing/po_entry_items.php.orig:216 ++#: ../sales/sales_order_entry.php:495 msgid "Item description cannot be empty." msgstr "" - #: ../purchasing/po_entry_items.php:226 -#: purchasing/po_entry_items.php:223 purchasing/po_entry_items.php:226 ++#: ../purchasing/po_entry_items.php:229 ++#: ../purchasing/po_entry_items.php.orig:226 msgid "The quantity of the order item must be numeric and not less than " msgstr "" - #: ../purchasing/po_entry_items.php:233 -#: purchasing/po_entry_items.php:230 purchasing/po_entry_items.php:233 ++#: ../purchasing/po_entry_items.php:236 ++#: ../purchasing/po_entry_items.php.orig:233 msgid "The price entered must be numeric and not less than zero." msgstr "" - #: ../purchasing/po_entry_items.php:257 -#: purchasing/po_entry_items.php:254 purchasing/po_entry_items.php:257 ++#: ../purchasing/po_entry_items.php:260 ++#: ../purchasing/po_entry_items.php.orig:257 msgid "" "You are attempting to make the quantity ordered a quantity less than has " "already been invoiced or received. This is prohibited." msgstr "" - #: ../purchasing/po_entry_items.php:258 -#: purchasing/po_entry_items.php:255 purchasing/po_entry_items.php:258 ++#: ../purchasing/po_entry_items.php:261 ++#: ../purchasing/po_entry_items.php.orig:258 msgid "" "The quantity received can only be modified by entering a negative receipt " "and the quantity invoiced can only be reduced by entering a credit note " "against this item." msgstr "" - #: ../purchasing/po_entry_items.php:286 -#: purchasing/po_entry_items.php:283 purchasing/po_entry_items.php:286 ++#: ../purchasing/po_entry_items.php:289 ++#: ../purchasing/po_entry_items.php.orig:286 msgid "The selected item is already on this order." msgstr "" - #: ../purchasing/po_entry_items.php:313 -#: purchasing/po_entry_items.php:310 purchasing/po_entry_items.php:313 ++#: ../purchasing/po_entry_items.php:316 ++#: ../purchasing/po_entry_items.php.orig:313 msgid "" "The selected item does not exist or it is a kit part and therefore cannot be " "purchased." msgstr "" - #: ../purchasing/po_entry_items.php:329 - #: ../purchasing/supplier_invoice.php:381 - #: ../purchasing/supplier_payment.php:118 -#: purchasing/po_entry_items.php:326 purchasing/supplier_invoice.php:343 -#: purchasing/supplier_payment.php:118 purchasing/po_entry_items.php:329 -#: purchasing/supplier_payment.php:113 ++#: ../purchasing/po_entry_items.php:332 ++#: ../purchasing/po_entry_items.php.orig:329 ++#: ../purchasing/supplier_invoice.php:382 ++#: ../purchasing/supplier_payment.php:113 msgid "There is no supplier selected." msgstr "" - #: ../purchasing/po_entry_items.php:336 -#: purchasing/po_entry_items.php:333 purchasing/po_entry_items.php:336 ++#: ../purchasing/po_entry_items.php:339 ++#: ../purchasing/po_entry_items.php.orig:336 msgid "The entered order date is invalid." msgstr "" - #: ../purchasing/po_entry_items.php:349 -#: purchasing/po_entry_items.php:340 purchasing/po_receive_items.php:181 -#: sales/sales_order_entry.php:345 purchasing/po_entry_items.php:343 -#: sales/sales_order_entry.php:354 sales/sales_order_entry.php.orig:353 -msgid "The entered date is not in fiscal year" -msgstr "" - -#: purchasing/po_entry_items.php:347 purchasing/po_entry_items.php:350 ++#: ../purchasing/po_entry_items.php:352 ++#: ../purchasing/po_entry_items.php.orig:349 msgid "The entered due date is invalid." msgstr "" - #: ../purchasing/po_entry_items.php:358 -#: purchasing/po_entry_items.php:356 purchasing/po_entry_items.php:359 ++#: ../purchasing/po_entry_items.php:361 ++#: ../purchasing/po_entry_items.php.orig:358 msgid "There is no reference entered for this purchase order." msgstr "" - #: ../purchasing/po_entry_items.php:373 - #: ../purchasing/supplier_invoice.php:185 -#: purchasing/po_entry_items.php:371 purchasing/supplier_invoice.php:161 -#: purchasing/po_entry_items.php:374 ++#: ../purchasing/po_entry_items.php:376 ++#: ../purchasing/po_entry_items.php.orig:373 ++#: ../purchasing/supplier_invoice.php:186 msgid "You must enter a supplier's invoice reference." msgstr "" - #: ../purchasing/po_entry_items.php:380 - #: ../purchasing/supplier_invoice.php:211 -#: purchasing/po_entry_items.php:378 purchasing/supplier_invoice.php:187 -#: purchasing/po_entry_items.php:381 ++#: ../purchasing/po_entry_items.php:383 ++#: ../purchasing/po_entry_items.php.orig:380 ++#: ../purchasing/supplier_invoice.php:212 msgid "" "This invoice number has already been entered. It cannot be entered again." msgstr "" - #: ../purchasing/po_entry_items.php:386 -#: purchasing/po_entry_items.php:384 purchasing/po_entry_items.php:387 ++#: ../purchasing/po_entry_items.php:389 ++#: ../purchasing/po_entry_items.php.orig:386 msgid "There is no delivery address specified." msgstr "" - #: ../purchasing/po_entry_items.php:392 -#: purchasing/po_entry_items.php:390 purchasing/po_entry_items.php:393 ++#: ../purchasing/po_entry_items.php:395 ++#: ../purchasing/po_entry_items.php.orig:392 msgid "There is no location specified to move any items into." msgstr "" - #: ../purchasing/po_entry_items.php:399 -#: purchasing/po_entry_items.php:397 purchasing/po_entry_items.php:401 ++#: ../purchasing/po_entry_items.php:403 ++#: ../purchasing/po_entry_items.php.orig:399 msgid "" "The order cannot be placed because there are no lines entered on this order." msgstr "" - #: ../purchasing/po_entry_items.php:404 -#: purchasing/po_entry_items.php:523 sales/sales_order_entry.php:687 -#: sales/sales_order_entry.php:691 purchasing/po_entry_items.php:527 -#: sales/sales_order_entry.php:702 sales/sales_order_entry.php.orig:701 ++#: ../purchasing/po_entry_items.php:408 ++#: ../purchasing/po_entry_items.php.orig:404 +msgid "Required prepayment is greater than total invoice value." +msgstr "" + - #: ../purchasing/po_entry_items.php:492 ++#: ../purchasing/po_entry_items.php.orig:492 +msgid "Payment for:" +msgstr "" + - #: ../purchasing/po_entry_items.php:563 - #: ../sales/sales_order_entry.php:698 ++#: ../purchasing/po_entry_items.php.orig:563 ++#: ../sales/sales_order_entry.php:718 msgid "Place Order" msgstr "" - #: ../purchasing/po_entry_items.php:564 -#: purchasing/po_entry_items.php:524 purchasing/po_entry_items.php:528 ++#: ../purchasing/po_entry_items.php.orig:564 msgid "Update Order" msgstr "" - #: ../purchasing/po_entry_items.php:565 - #: ../sales/sales_order_entry.php:697 -#: purchasing/po_entry_items.php:525 sales/sales_order_entry.php:686 -#: sales/sales_order_entry.php:690 purchasing/po_entry_items.php:529 -#: sales/sales_order_entry.php:701 sales/sales_order_entry.php.orig:700 ++#: ../purchasing/po_entry_items.php.orig:565 ++#: ../sales/sales_order_entry.php:717 msgid "Cancel Order" msgstr "" - #: ../purchasing/po_entry_items.php:567 -#: purchasing/po_entry_items.php:527 purchasing/po_entry_items.php:531 ++#: ../purchasing/po_entry_items.php.orig:567 msgid "Process GRN" msgstr "" - #: ../purchasing/po_entry_items.php:568 -#: purchasing/po_entry_items.php:528 purchasing/po_entry_items.php:532 ++#: ../purchasing/po_entry_items.php.orig:568 msgid "Update GRN" msgstr "" - #: ../purchasing/po_entry_items.php:569 -#: purchasing/po_entry_items.php:529 purchasing/po_entry_items.php:533 ++#: ../purchasing/po_entry_items.php.orig:569 msgid "Cancel GRN" msgstr "" - #: ../purchasing/po_entry_items.php:572 - #: ../sales/customer_invoice.php:684 -#: purchasing/po_entry_items.php:532 sales/customer_invoice.php:582 -#: sales/customer_invoice.php:584 purchasing/po_entry_items.php:536 ++#: ../purchasing/po_entry_items.php.orig:572 ++#: ../sales/customer_invoice.php:686 msgid "Process Invoice" msgstr "" - #: ../purchasing/po_entry_items.php:573 -#: purchasing/po_entry_items.php:533 purchasing/po_entry_items.php:537 ++#: ../purchasing/po_entry_items.php.orig:573 msgid "Update Invoice" msgstr "" - #: ../purchasing/po_entry_items.php:574 - #: ../sales/sales_order_entry.php:678 -#: purchasing/po_entry_items.php:534 sales/sales_order_entry.php:667 -#: sales/sales_order_entry.php:671 purchasing/po_entry_items.php:538 -#: sales/sales_order_entry.php:682 sales/sales_order_entry.php.orig:681 ++#: ../purchasing/po_entry_items.php.orig:574 ++#: ../sales/sales_order_entry.php:698 msgid "Cancel Invoice" msgstr "" @@@ -11044,9 -9557,8 +10932,9 @@@ msgid " "select a purchase order first." msgstr "" -#: purchasing/po_receive_items.php:62 reporting/rep105.php:112 -#: sales/customer_delivery.php:432 +#: ../purchasing/po_receive_items.php:62 +#: ../reporting/rep105.php:112 - #: ../sales/customer_delivery.php:440 ++#: ../sales/customer_delivery.php.orig:445 msgid "Ordered" msgstr "" @@@ -11059,8 -9568,7 +10947,8 @@@ msgid "Outstanding" msgstr "" -#: purchasing/po_receive_items.php:63 sales/customer_delivery.php:433 +#: ../purchasing/po_receive_items.php:63 - #: ../sales/customer_delivery.php:441 ++#: ../sales/customer_delivery.php.orig:446 msgid "This Delivery" msgstr "" @@@ -11127,15 -9629,13 +11015,15 @@@ msgstr " msgid "Enter Another Credit Note" msgstr "" -#: purchasing/supplier_credit.php:102 purchasing/supplier_invoice.php:102 +#: ../purchasing/supplier_credit.php:119 - #: ../purchasing/supplier_invoice.php:126 ++#: ../purchasing/supplier_invoice.php:127 msgid "" "The account code entered is not a valid code, this line cannot be added to " "the transaction." msgstr "" -#: purchasing/supplier_credit.php:112 purchasing/supplier_invoice.php:112 +#: ../purchasing/supplier_credit.php:129 - #: ../purchasing/supplier_invoice.php:136 ++#: ../purchasing/supplier_invoice.php:137 msgid "" "The amount entered is not numeric. This line cannot be added to the " "transaction." @@@ -11161,8 -9661,7 +11049,8 @@@ msgid " "not valid." msgstr "" -#: purchasing/supplier_credit.php:182 purchasing/supplier_invoice.php:180 +#: ../purchasing/supplier_credit.php:199 - #: ../purchasing/supplier_invoice.php:204 ++#: ../purchasing/supplier_invoice.php:205 msgid "" "The invoice as entered cannot be processed because the due date is in an " "incorrect format." @@@ -11193,64 -9692,58 +11081,64 @@@ msgstr " msgid "Enter Credit Note" msgstr "" - #: ../purchasing/supplier_invoice.php:46 -#: purchasing/supplier_invoice.php:28 ++#: ../purchasing/supplier_invoice.php:43 msgid "Enter Supplier Invoice" msgstr "" - #: ../purchasing/supplier_invoice.php:51 -#: purchasing/supplier_invoice.php:43 ++#: ../purchasing/supplier_invoice.php:48 +#, php-format +msgid "Modifying Purchase Invoice # %d" +msgstr "" + - #: ../purchasing/supplier_invoice.php:65 ++#: ../purchasing/supplier_invoice.php:66 msgid "Supplier invoice has been processed." msgstr "" - #: ../purchasing/supplier_invoice.php:66 -#: purchasing/supplier_invoice.php:44 ++#: ../purchasing/supplier_invoice.php:67 msgid "View this Invoice" msgstr "" - #: ../purchasing/supplier_invoice.php:72 -#: purchasing/supplier_invoice.php:50 ++#: ../purchasing/supplier_invoice.php:73 msgid "Enter Another Invoice" msgstr "" - #: ../purchasing/supplier_invoice.php:165 -#: purchasing/supplier_invoice.php:141 ++#: ../purchasing/supplier_invoice.php:166 msgid "" "The invoice cannot be processed because the there are no items or values on " "the invoice. Invoices are expected to have a charge." msgstr "" - #: ../purchasing/supplier_invoice.php:171 -#: purchasing/supplier_invoice.php:147 ++#: ../purchasing/supplier_invoice.php:172 msgid "You must enter an invoice reference." msgstr "" - #: ../purchasing/supplier_invoice.php:192 -#: purchasing/supplier_invoice.php:168 ++#: ../purchasing/supplier_invoice.php:193 msgid "" "The invoice as entered cannot be processed because the invoice date is in an " "incorrect format." msgstr "" - #: ../purchasing/supplier_invoice.php:253 -#: purchasing/supplier_invoice.php:224 ++#: ../purchasing/supplier_invoice.php:254 msgid "The quantity to invoice must be numeric and greater than zero." msgstr "" - #: ../purchasing/supplier_invoice.php:260 -#: purchasing/supplier_invoice.php:231 ++#: ../purchasing/supplier_invoice.php:261 msgid "The price is not numeric." msgstr "" - #: ../purchasing/supplier_invoice.php:273 -#: purchasing/supplier_invoice.php:244 ++#: ../purchasing/supplier_invoice.php:274 msgid "" "The price being invoiced is more than the purchase order price by more than " "the allowed over-charge percentage. The system is set up to prohibit this. " "See the system administrator to modify the set up parameters if necessary." msgstr "" - #: ../purchasing/supplier_invoice.php:274 - #: ../purchasing/supplier_invoice.php:287 -#: purchasing/supplier_invoice.php:245 purchasing/supplier_invoice.php:258 ++#: ../purchasing/supplier_invoice.php:275 ++#: ../purchasing/supplier_invoice.php:288 msgid "The over-charge percentage allowance is :" msgstr "" - #: ../purchasing/supplier_invoice.php:286 -#: purchasing/supplier_invoice.php:257 ++#: ../purchasing/supplier_invoice.php:287 msgid "" "The quantity being invoiced is more than the outstanding quantity by more " "than the allowed over-charge percentage. The system is set up to prohibit " @@@ -11258,12 -9751,12 +11146,12 @@@ "necessary." msgstr "" - #: ../purchasing/supplier_invoice.php:363 -#: purchasing/supplier_invoice.php:325 ++#: ../purchasing/supplier_invoice.php:364 #, php-format msgid "All yet non-invoiced items on delivery line # %d has been removed." msgstr "" - #: ../purchasing/supplier_invoice.php:405 -#: purchasing/supplier_invoice.php:367 ++#: ../purchasing/supplier_invoice.php:406 msgid "Enter Invoice" msgstr "" @@@ -11271,72 -9764,74 +11159,72 @@@ msgid "Supplier Payment Entry" msgstr "" - #: ../purchasing/supplier_payment.php:90 -#: purchasing/supplier_payment.php:90 purchasing/supplier_payment.php:85 ++#: ../purchasing/supplier_payment.php:85 msgid "Invalid purchase invoice number." msgstr "" - #: ../purchasing/supplier_payment.php:96 -#: purchasing/supplier_payment.php:96 purchasing/supplier_payment.php:91 ++#: ../purchasing/supplier_payment.php:91 msgid "Payment has been sucessfully entered" msgstr "" - #: ../purchasing/supplier_payment.php:98 -#: purchasing/supplier_payment.php:98 purchasing/supplier_payment.php:93 ++#: ../purchasing/supplier_payment.php:93 msgid "&Print This Remittance" msgstr "" - #: ../purchasing/supplier_payment.php:99 -#: purchasing/supplier_payment.php:99 purchasing/supplier_payment.php:94 ++#: ../purchasing/supplier_payment.php:94 msgid "&Email This Remittance" msgstr "" - #: ../purchasing/supplier_payment.php:101 -#: purchasing/supplier_payment.php:101 purchasing/supplier_payment.php:96 ++#: ../purchasing/supplier_payment.php:96 msgid "View the GL &Journal Entries for this Payment" msgstr "" - #: ../purchasing/supplier_payment.php:105 -#: purchasing/supplier_payment.php:105 purchasing/supplier_payment.php:100 ++#: ../purchasing/supplier_payment.php:100 msgid "Enter another supplier &payment" msgstr "" - #: ../purchasing/supplier_payment.php:152 -#: purchasing/supplier_payment.php:152 sales/customer_payments.php:192 -#: purchasing/supplier_payment.php:147 sales/customer_payments.php.orig:192 ++#: ../purchasing/supplier_payment.php:147 +#: ../sales/customer_payments.php:192 msgid "The exchange rate must be numeric and greater than zero." msgstr "" - #: ../purchasing/supplier_payment.php:164 -#: purchasing/supplier_payment.php:164 purchasing/supplier_payment.php:159 ++#: ../purchasing/supplier_payment.php:159 msgid "The entered discount is invalid or less than zero." msgstr "" - #: ../purchasing/supplier_payment.php:172 -#: purchasing/supplier_payment.php:172 purchasing/supplier_payment.php:167 ++#: ../purchasing/supplier_payment.php:167 msgid "" "The total of the amount and the discount is zero or negative. Please enter " "positive values." msgstr "" - #: ../purchasing/supplier_payment.php:273 -#: purchasing/supplier_payment.php:273 purchasing/supplier_payment.php:270 ++#: ../purchasing/supplier_payment.php:270 msgid "Payment To:" msgstr "" - #: ../purchasing/supplier_payment.php:280 -#: purchasing/supplier_payment.php:280 purchasing/supplier_payment.php:283 ++#: ../purchasing/supplier_payment.php:283 msgid "From Bank Account:" msgstr "" - #: ../purchasing/supplier_payment.php:288 -#: purchasing/supplier_payment.php:288 -#: purchasing/view/view_supp_payment.php:55 -#: purchasing/supplier_payment.php:291 ++#: ../purchasing/supplier_payment.php:291 +#: ../purchasing/view/view_supp_payment.php:55 msgid "Date Paid" msgstr "" - #: ../purchasing/supplier_payment.php:311 - #: ../sales/customer_payments.php:406 -#: purchasing/supplier_payment.php:311 sales/customer_payments.php:407 -#: purchasing/supplier_payment.php:314 sales/customer_payments.php:410 -#: sales/customer_payments.php.orig:409 ++#: ../purchasing/supplier_payment.php:314 ++#: ../sales/customer_payments.php:409 msgid "Amount of Discount:" msgstr "" - #: ../purchasing/supplier_payment.php:312 -#: purchasing/supplier_payment.php:312 purchasing/supplier_payment.php:315 ++#: ../purchasing/supplier_payment.php:315 msgid "Amount of Payment:" msgstr "" - #: ../purchasing/supplier_payment.php:318 -#: purchasing/supplier_payment.php:318 purchasing/supplier_payment.php:321 ++#: ../purchasing/supplier_payment.php:321 msgid "The amount and discount are in the bank account's currency." msgstr "" - #: ../purchasing/supplier_payment.php:321 -#: purchasing/supplier_payment.php:321 purchasing/supplier_payment.php:324 ++#: ../purchasing/supplier_payment.php:324 msgid "Enter Payment" msgstr "" @@@ -11356,12 -9849,9 +11244,11 @@@ msgstr " msgid "Line Details" msgstr "" -#: purchasing/view/view_grn.php:40 reporting/includes/doctext.inc:65 -#: reporting/includes/doctext.inc:170 reporting/includes/doctext.inc:222 -#: sales/inquiry/sales_deliveries_view.php:186 +#: ../purchasing/view/view_grn.php:40 +#: ../reporting/includes/doctext.inc:77 +#: ../reporting/includes/doctext.inc:192 +#: ../reporting/includes/doctext.inc:244 +#: ../sales/inquiry/sales_deliveries_view.php:186 - #: ../sales/inquiry/sales_deliveries_view.php.orig:186 msgid "Delivery Date" msgstr "" @@@ -11391,18 -9878,16 +11278,14 @@@ msgstr " msgid "Requested By" msgstr "" -#: purchasing/view/view_po.php:100 -#: purchasing/inquiry/supplier_allocation_inquiry.php:148 -#: purchasing/inquiry/supplier_inquiry.php:193 -#: purchasing/inquiry/supplier_inquiry.php.orig:187 -#: sales/inquiry/customer_allocation_inquiry.php:165 -#: sales/inquiry/customer_inquiry.php:251 -#: sales/inquiry/customer_inquiry.php.orig:251 -#: sales/inquiry/sales_deliveries_view.php:206 -#: sales/inquiry/sales_orders_view.php:318 -#: sales/inquiry/sales_orders_view.php.orig:316 +#: ../purchasing/view/view_po.php:100 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:147 +#: ../purchasing/inquiry/supplier_inquiry.php:197 +#: ../purchasing/inquiry/supplier_inquiry.php.orig:196 +#: ../sales/inquiry/customer_allocation_inquiry.php:165 - #: ../sales/inquiry/customer_allocation_inquiry.php.orig:165 +#: ../sales/inquiry/customer_inquiry.php:227 - #: ../sales/inquiry/customer_inquiry.php.orig:251 +#: ../sales/inquiry/sales_deliveries_view.php:206 - #: ../sales/inquiry/sales_deliveries_view.php.orig:206 +#: ../sales/inquiry/sales_orders_view.php:344 - #: ../sales/inquiry/sales_orders_view.php.orig:317 msgid "Marked items are overdue." msgstr "" @@@ -11431,11 -9912,10 +11314,11 @@@ msgstr " msgid "SUPPLIER CREDIT NOTE" msgstr "" -#: purchasing/view/view_supp_credit.php:47 -#: purchasing/view/view_supp_invoice.php:50 -#: sales/customer_credit_invoice.php:270 sales/view/view_invoice.php:95 -#: sales/customer_credit_invoice.php:268 +#: ../purchasing/view/view_supp_credit.php:47 +#: ../purchasing/view/view_supp_invoice.php:51 +#: ../reporting/includes/doctext.inc:141 - #: ../sales/customer_credit_invoice.php:270 ++#: ../sales/customer_credit_invoice.php:268 +#: ../sales/view/view_invoice.php:100 msgid "Invoice Date" msgstr "" @@@ -11485,13 -9960,9 +11368,13 @@@ msgstr " msgid "Payment Currency" msgstr "" -#: purchasing/view/view_supp_payment.php:62 sales/customer_delivery.php:433 -#: sales/customer_invoice.php:468 sales/view/view_receipt.php:45 -#: sales/view/view_sales_order.php:202 sales/customer_invoice.php:470 +#: ../purchasing/view/view_supp_payment.php:62 - #: ../sales/customer_delivery.php:441 - #: ../sales/customer_invoice.php:540 - #: ../sales/customer_invoice.php:543 ++#: ../sales/customer_delivery.php.orig:446 ++#: ../sales/customer_invoice.php:542 ++#: ../sales/customer_invoice.php:545 +#: ../sales/view/view_receipt.php:45 +#: ../sales/view/view_sales_order.php:220 +#: ../sales/view/view_sales_order.php.orig:202 msgid "Discount" msgstr "" @@@ -11542,17 -10004,13 +11425,17 @@@ msgstr " msgid "Bank Name/Account:" msgstr "" -#: purchasing/manage/suppliers.php:110 sales/manage/customers.php:263 -#: sales/manage/customers.php.orig:260 sales/manage/customers.php:264 +#: ../purchasing/manage/suppliers.php:112 +#: ../purchasing/manage/suppliers.php.orig:122 - #: ../sales/manage/customers.php:263 ++#: ../sales/manage/customers.php:264 +#: ../sales/manage/sav.customers.php:263 msgid "Credit Limit:" msgstr "" -#: purchasing/manage/suppliers.php:111 sales/manage/customers.php:265 -#: sales/manage/customers.php.orig:262 sales/manage/customers.php:266 +#: ../purchasing/manage/suppliers.php:113 +#: ../purchasing/manage/suppliers.php.orig:123 - #: ../sales/manage/customers.php:265 ++#: ../sales/manage/customers.php:266 +#: ../sales/manage/sav.customers.php:265 msgid "Payment Terms:" msgstr "" @@@ -11624,11 -10055,9 +11507,11 @@@ msgstr " msgid "General" msgstr "" -#: purchasing/manage/suppliers.php:153 sales/manage/customer_branches.php:269 -#: sales/manage/customers.php:286 sales/manage/customers.php.orig:283 -#: sales/manage/customers.php:287 +#: ../purchasing/manage/suppliers.php:162 +#: ../purchasing/manage/suppliers.php.orig:164 +#: ../sales/manage/customer_branches.php:271 - #: ../sales/manage/customers.php:286 ++#: ../sales/manage/customers.php:287 +#: ../sales/manage/sav.customers.php:286 msgid "General Notes:" msgstr "" @@@ -11712,11 -10130,9 +11595,11 @@@ msgstr " msgid "New supplier" msgstr "" -#: purchasing/manage/suppliers.php:307 sales/manage/customer_branches.php:323 -#: sales/manage/customers.php:343 sales/manage/customers.php.orig:340 -#: sales/manage/customers.php:345 +#: ../purchasing/manage/suppliers.php:309 +#: ../purchasing/manage/suppliers.php.orig:312 +#: ../sales/manage/customer_branches.php:325 - #: ../sales/manage/customers.php:343 ++#: ../sales/manage/customers.php:345 +#: ../sales/manage/sav.customers.php:343 msgid "&Contacts" msgstr "" @@@ -11730,13 -10144,11 +11613,11 @@@ msgstr " msgid "Search Purchase Orders" msgstr "" -#: purchasing/inquiry/po_search_completed.php:63 -#: purchasing/inquiry/po_search.php:62 -#: sales/inquiry/sales_deliveries_view.php:103 -#: sales/inquiry/sales_orders_view.php:225 -#: sales/inquiry/sales_orders_view.php.orig:223 +#: ../purchasing/inquiry/po_search_completed.php:60 +#: ../purchasing/inquiry/po_search_completed.php.orig:61 +#: ../purchasing/inquiry/po_search.php:62 +#: ../sales/inquiry/sales_deliveries_view.php:103 - #: ../sales/inquiry/sales_deliveries_view.php.orig:103 +#: ../sales/inquiry/sales_orders_view.php:247 - #: ../sales/inquiry/sales_orders_view.php.orig:224 msgid "#:" msgstr "" @@@ -11745,19 -10156,17 +11626,17 @@@ msgid "into location:" msgstr "" -#: purchasing/inquiry/po_search_completed.php:126 -#: purchasing/inquiry/po_search.php:135 -#: sales/inquiry/sales_orders_view.php:267 -#: sales/inquiry/sales_orders_view.php.orig:265 +#: ../purchasing/inquiry/po_search_completed.php:125 +#: ../purchasing/inquiry/po_search_completed.php.orig:124 +#: ../purchasing/inquiry/po_search.php:135 +#: ../sales/inquiry/sales_orders_view.php:289 - #: ../sales/inquiry/sales_orders_view.php.orig:266 msgid "Order Date" msgstr "" -#: purchasing/inquiry/po_search_completed.php:128 -#: purchasing/inquiry/po_search.php:137 -#: sales/inquiry/sales_orders_view.php:270 -#: sales/inquiry/sales_orders_view.php.orig:268 +#: ../purchasing/inquiry/po_search_completed.php:127 +#: ../purchasing/inquiry/po_search_completed.php.orig:126 +#: ../purchasing/inquiry/po_search.php:137 +#: ../sales/inquiry/sales_orders_view.php:292 - #: ../sales/inquiry/sales_orders_view.php.orig:269 msgid "Order Total" msgstr "" @@@ -11777,9 -10186,8 +11656,8 @@@ msgstr " msgid "Supplier Allocation Inquiry" msgstr "" -#: purchasing/inquiry/supplier_allocation_inquiry.php:55 -#: sales/inquiry/customer_allocation_inquiry.php:49 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:55 +#: ../sales/inquiry/customer_allocation_inquiry.php:49 - #: ../sales/inquiry/customer_allocation_inquiry.php.orig:49 msgid "show settled:" msgstr "" @@@ -11787,12 -10199,10 +11665,11 @@@ msgid "Supp Reference" msgstr "" -#: purchasing/inquiry/supplier_allocation_inquiry.php:136 -#: reporting/rep101.php:131 reporting/rep201.php:119 -#: reporting/includes/doctext.inc:225 -#: sales/inquiry/customer_allocation_inquiry.php:154 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:135 +#: ../reporting/rep101.php:131 +#: ../reporting/rep201.php:119 +#: ../reporting/includes/doctext.inc:247 +#: ../sales/inquiry/customer_allocation_inquiry.php:154 - #: ../sales/inquiry/customer_allocation_inquiry.php.orig:154 msgid "Allocated" msgstr "" @@@ -11806,81 -10216,62 +11683,73 @@@ msgstr " msgid "Select a supplier:" msgstr "" -#: purchasing/inquiry/supplier_inquiry.php:70 -#: purchasing/inquiry/supplier_inquiry.php:71 -#: purchasing/inquiry/supplier_inquiry.php:72 -#: purchasing/inquiry/supplier_inquiry.php.orig:66 -#: purchasing/inquiry/supplier_inquiry.php.orig:67 -#: purchasing/inquiry/supplier_inquiry.php.orig:68 reporting/rep102.php:118 -#: reporting/rep102.php:119 reporting/rep102.php:120 reporting/rep102.php:240 -#: reporting/rep108.php:150 reporting/rep108.php:151 reporting/rep108.php:152 -#: reporting/rep202.php:122 reporting/rep202.php:123 reporting/rep202.php:124 -#: reporting/rep202.php:154 reporting/rep202.php:155 reporting/rep202.php:156 -#: reporting/rep202.php:248 sales/create_recurrent_invoices.php:115 -#: sales/manage/recurrent_invoices.php:102 -#: sales/inquiry/customer_inquiry.php:75 sales/inquiry/customer_inquiry.php:76 -#: sales/inquiry/customer_inquiry.php:77 -#: sales/inquiry/customer_inquiry.php.orig:75 -#: sales/inquiry/customer_inquiry.php.orig:76 -#: sales/inquiry/customer_inquiry.php.orig:77 -#: sales/create_recurrent_invoices.php:132 +#: ../purchasing/inquiry/supplier_inquiry.php:67 +#: ../purchasing/inquiry/supplier_inquiry.php:68 +#: ../purchasing/inquiry/supplier_inquiry.php:69 +#: ../purchasing/inquiry/supplier_inquiry.php.orig:67 +#: ../purchasing/inquiry/supplier_inquiry.php.orig:68 +#: ../purchasing/inquiry/supplier_inquiry.php.orig:69 +#: ../reporting/rep102.php:118 +#: ../reporting/rep102.php:119 +#: ../reporting/rep102.php:120 +#: ../reporting/rep102.php:240 +#: ../reporting/rep108.php:150 +#: ../reporting/rep108.php:151 +#: ../reporting/rep108.php:152 +#: ../reporting/rep202.php:122 +#: ../reporting/rep202.php:123 +#: ../reporting/rep202.php:124 +#: ../reporting/rep202.php:154 +#: ../reporting/rep202.php:155 +#: ../reporting/rep202.php:156 +#: ../reporting/rep202.php:248 - #: ../sales/create_recurrent_invoices.php:115 ++#: ../sales/create_recurrent_invoices.php:132 +#: ../sales/manage/recurrent_invoices.php:102 +#: ../sales/inquiry/customer_inquiry.php:71 +#: ../sales/inquiry/customer_inquiry.php:72 +#: ../sales/inquiry/customer_inquiry.php:73 - #: ../sales/inquiry/customer_inquiry.php.orig:72 - #: ../sales/inquiry/customer_inquiry.php.orig:73 - #: ../sales/inquiry/customer_inquiry.php.orig:74 msgid "Days" msgstr "" -#: purchasing/inquiry/supplier_inquiry.php:72 -#: purchasing/inquiry/supplier_inquiry.php.orig:68 reporting/rep102.php:120 -#: reporting/rep108.php:152 reporting/rep202.php:124 reporting/rep202.php:156 -#: sales/inquiry/customer_inquiry.php:77 -#: sales/inquiry/customer_inquiry.php.orig:77 +#: ../purchasing/inquiry/supplier_inquiry.php:69 +#: ../purchasing/inquiry/supplier_inquiry.php.orig:69 +#: ../reporting/rep102.php:120 +#: ../reporting/rep108.php:152 +#: ../reporting/rep202.php:124 +#: ../reporting/rep202.php:156 +#: ../sales/inquiry/customer_inquiry.php:73 - #: ../sales/inquiry/customer_inquiry.php.orig:74 msgid "Over" msgstr "" -#: purchasing/inquiry/supplier_inquiry.php:76 -#: purchasing/inquiry/supplier_inquiry.php.orig:72 -#: sales/inquiry/customer_inquiry.php:80 -#: sales/inquiry/customer_inquiry.php.orig:80 +#: ../purchasing/inquiry/supplier_inquiry.php:73 +#: ../purchasing/inquiry/supplier_inquiry.php.orig:73 +#: ../sales/inquiry/customer_inquiry.php:76 - #: ../sales/inquiry/customer_inquiry.php.orig:77 msgid "Terms" msgstr "" -#: purchasing/inquiry/supplier_inquiry.php:76 -#: purchasing/inquiry/supplier_inquiry.php.orig:72 reporting/rep102.php:123 -#: reporting/rep102.php:238 reporting/rep108.php:154 reporting/rep202.php:128 -#: reporting/rep202.php:246 sales/inquiry/customer_inquiry.php:80 -#: sales/inquiry/customer_inquiry.php.orig:80 +#: ../purchasing/inquiry/supplier_inquiry.php:73 +#: ../purchasing/inquiry/supplier_inquiry.php.orig:73 +#: ../reporting/rep102.php:123 +#: ../reporting/rep102.php:238 +#: ../reporting/rep108.php:154 +#: ../reporting/rep202.php:128 +#: ../reporting/rep202.php:246 +#: ../sales/inquiry/customer_inquiry.php:76 - #: ../sales/inquiry/customer_inquiry.php.orig:77 msgid "Current" msgstr "" -#: purchasing/inquiry/supplier_inquiry.php:77 -#: purchasing/inquiry/supplier_inquiry.php.orig:73 reporting/rep102.php:124 -#: reporting/rep108.php:154 reporting/rep202.php:129 -#: sales/inquiry/customer_inquiry.php:81 -#: sales/inquiry/customer_inquiry.php.orig:81 +#: ../purchasing/inquiry/supplier_inquiry.php:74 +#: ../purchasing/inquiry/supplier_inquiry.php.orig:74 +#: ../reporting/rep102.php:124 +#: ../reporting/rep108.php:154 +#: ../reporting/rep202.php:129 +#: ../sales/inquiry/customer_inquiry.php:77 - #: ../sales/inquiry/customer_inquiry.php.orig:78 msgid "Total Balance" msgstr "" -#: purchasing/inquiry/supplier_inquiry.php:133 -#: purchasing/inquiry/supplier_inquiry.php.orig:127 -#: sales/inquiry/customer_inquiry.php:164 -#: sales/inquiry/customer_inquiry.php.orig:164 +#: ../purchasing/inquiry/supplier_inquiry.php:133 +#: ../purchasing/inquiry/supplier_inquiry.php.orig:130 +#: ../sales/inquiry/customer_inquiry.php:162 - #: ../sales/inquiry/customer_inquiry.php.orig:161 msgid "Credit This" msgstr "" @@@ -12003,16 -10378,10 +11872,16 @@@ msgstr " msgid "Customer Balances" msgstr "" -#: reporting/rep101.php:244 reporting/rep102.php:224 reporting/rep106.php:167 -#: reporting/rep201.php:231 reporting/rep202.php:231 reporting/rep203.php:177 -#: reporting/rep204.php:144 reporting/rep301.php:176 reporting/rep304.php:191 -#: reporting/rep305.php:181 reporting/rep305.php:183 +#: ../reporting/rep101.php:244 +#: ../reporting/rep102.php:224 +#: ../reporting/rep106.php:167 +#: ../reporting/rep201.php:231 +#: ../reporting/rep202.php:231 +#: ../reporting/rep203.php:177 +#: ../reporting/rep204.php:144 +#: ../reporting/rep301.php:176 +#: ../reporting/rep304.php:191 - #: ../reporting/rep305.php:181 ++#: ../reporting/rep305.php:183 msgid "Grand Total" msgstr "" @@@ -12189,36 -10526,29 +12058,30 @@@ msgstr " msgid "Back Orders Only" msgstr "" -#: reporting/rep105.php:107 reporting/rep204.php:82 -#: sales/inquiry/customer_allocation_inquiry.php:147 -#: sales/inquiry/customer_inquiry.php:226 -#: sales/inquiry/customer_inquiry.php.orig:226 +#: ../reporting/rep105.php:107 +#: ../reporting/rep204.php:82 +#: ../sales/inquiry/customer_allocation_inquiry.php:147 - #: ../sales/inquiry/customer_allocation_inquiry.php.orig:147 +#: ../sales/inquiry/customer_inquiry.php:202 - #: ../sales/inquiry/customer_inquiry.php.orig:226 msgid "Order" msgstr "" -#: reporting/rep105.php:107 reporting/rep106.php:81 reporting/rep112.php:176 -#: sales/create_recurrent_invoices.php:115 -#: sales/customer_credit_invoice.php:238 sales/customer_delivery.php:339 -#: sales/customer_invoice.php:379 sales/manage/customers.php:251 -#: sales/manage/customers.php:289 sales/manage/customers.php.orig:248 -#: sales/manage/customers.php.orig:286 sales/manage/recurrent_invoices.php:102 -#: sales/view/view_credit.php:58 sales/inquiry/customer_inquiry.php:231 -#: sales/inquiry/customer_inquiry.php.orig:231 -#: sales/inquiry/sales_deliveries_view.php:182 -#: sales/inquiry/sales_orders_view.php:265 -#: sales/inquiry/sales_orders_view.php:279 -#: sales/inquiry/sales_orders_view.php.orig:263 -#: sales/inquiry/sales_orders_view.php.orig:277 -#: sales/create_recurrent_invoices.php:132 -#: sales/customer_credit_invoice.php:236 sales/customer_invoice.php:381 -#: sales/manage/customers.php:290 +#: ../reporting/rep105.php:107 +#: ../reporting/rep106.php:81 +#: ../reporting/rep112.php:164 - #: ../sales/create_recurrent_invoices.php:115 - #: ../sales/customer_credit_invoice.php:238 - #: ../sales/customer_delivery.php:347 - #: ../sales/customer_invoice.php:445 ++#: ../sales/create_recurrent_invoices.php:132 ++#: ../sales/customer_credit_invoice.php:236 ++#: ../sales/customer_delivery.php.orig:352 ++#: ../sales/customer_invoice.php:447 +#: ../sales/manage/customers.php:251 - #: ../sales/manage/customers.php:289 ++#: ../sales/manage/customers.php:290 +#: ../sales/manage/recurrent_invoices.php:102 +#: ../sales/manage/sav.customers.php:251 +#: ../sales/manage/sav.customers.php:289 +#: ../sales/view/view_credit.php:58 +#: ../sales/inquiry/customer_inquiry.php:207 - #: ../sales/inquiry/customer_inquiry.php.orig:231 +#: ../sales/inquiry/sales_deliveries_view.php:182 - #: ../sales/inquiry/sales_deliveries_view.php.orig:182 +#: ../sales/inquiry/sales_orders_view.php:287 +#: ../sales/inquiry/sales_orders_view.php:301 - #: ../sales/inquiry/sales_orders_view.php.orig:264 - #: ../sales/inquiry/sales_orders_view.php.orig:278 msgid "Branch" msgstr "" @@@ -12240,9 -10568,8 +12103,9 @@@ msgstr " msgid "Loc" msgstr "" -#: reporting/rep105.php:112 sales/customer_delivery.php:432 -#: sales/customer_invoice.php:467 sales/customer_invoice.php:469 +#: ../reporting/rep105.php:112 - #: ../sales/customer_delivery.php:440 - #: ../sales/customer_invoice.php:542 ++#: ../sales/customer_delivery.php.orig:445 ++#: ../sales/customer_invoice.php:544 msgid "Invoiced" msgstr "" @@@ -12545,9 -10819,8 +12408,9 @@@ msgstr " msgid "Shortage" msgstr "" -#: reporting/rep303.php:109 reporting/rep303.php:115 reporting/rep305.php:95 -#: reporting/rep305.php:98 +#: ../reporting/rep303.php:109 +#: ../reporting/rep303.php:115 - #: ../reporting/rep305.php:95 ++#: ../reporting/rep305.php:98 msgid "Stock ID" msgstr "" @@@ -12563,15 -10836,13 +12426,15 @@@ msgstr " msgid "Stock Check Sheets" msgstr "" -#: reporting/rep304.php:112 reporting/rep305.php:95 reporting/rep305.php:98 +#: ../reporting/rep304.php:112 - #: ../reporting/rep305.php:95 ++#: ../reporting/rep305.php:98 msgid "Qty" msgstr "" -#: reporting/rep304.php:112 sales/manage/customer_branches.php:240 -#: sales/manage/customers.php:259 sales/manage/customers.php.orig:256 -#: sales/manage/customers.php:260 +#: ../reporting/rep304.php:112 +#: ../sales/manage/customer_branches.php:241 - #: ../sales/manage/customers.php:259 ++#: ../sales/manage/customers.php:260 +#: ../sales/manage/sav.customers.php:259 msgid "Sales" msgstr "" @@@ -12587,23 -10858,23 +12450,23 @@@ msgstr " msgid "Inventory Sales Report" msgstr "" - #: ../reporting/rep305.php:95 -#: reporting/rep305.php:95 reporting/rep305.php:98 ++#: ../reporting/rep305.php:98 msgid "PO No" msgstr "" - #: ../reporting/rep305.php:95 -#: reporting/rep305.php:95 reporting/rep305.php:98 ++#: ../reporting/rep305.php:98 msgid "Inv" msgstr "" - #: ../reporting/rep305.php:95 -#: reporting/rep305.php:95 reporting/rep305.php:98 ++#: ../reporting/rep305.php:98 msgid "Inv Price" msgstr "" - #: ../reporting/rep305.php:95 -#: reporting/rep305.php:95 reporting/rep305.php:98 ++#: ../reporting/rep305.php:98 msgid "PO Price" msgstr "" - #: ../reporting/rep305.php:102 -#: reporting/rep305.php:102 reporting/rep305.php:105 ++#: ../reporting/rep305.php:105 msgid "GRN Valuation Report" msgstr "" @@@ -12742,11 -10979,11 +12605,11 @@@ msgstr " msgid "Rate" msgstr "" - #: ../reporting/rep709.php:172 -#: reporting/rep709.php:172 reporting/rep709.php:176 ++#: ../reporting/rep709.php:176 msgid "Tax Rate" msgstr "" - #: ../reporting/rep709.php:172 -#: reporting/rep709.php:172 reporting/rep709.php:176 ++#: ../reporting/rep709.php:176 msgid "Net Tax" msgstr "" @@@ -13141,14 -11325,12 +13004,13 @@@ msgstr " msgid "Delivered To" msgstr "" -#: reporting/includes/doctext.inc:30 sales/customer_credit_invoice.php:283 -#: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113 -#: sales/view/view_invoice.php:114 sales/includes/ui/sales_credit_ui.inc:168 -#: sales/includes/ui/sales_order_ui.inc:142 -#: sales/customer_credit_invoice.php:281 -#: sales/includes/ui/sales_order_ui.inc:146 +#: ../reporting/includes/doctext.inc:30 - #: ../sales/customer_credit_invoice.php:283 ++#: ../sales/customer_credit_invoice.php:281 +#: ../sales/view/view_credit.php:91 +#: ../sales/view/view_dispatch.php:113 +#: ../sales/view/view_invoice.php:116 +#: ../sales/includes/ui/sales_credit_ui.inc:168 - #: ../sales/includes/ui/sales_order_ui.inc:142 +#: ../sales/includes/ui/sales_order_ui.inc.orig:142 msgid "Discount %" msgstr "" @@@ -13199,13 -11369,11 +13061,11 @@@ msgstr " msgid "Our Quotation No" msgstr "" -#: reporting/includes/doctext.inc:48 sales/view/view_sales_order.php:69 -#: sales/inquiry/sales_orders_view.php:282 -#: sales/inquiry/sales_orders_view.php.orig:280 -#: sales/includes/ui/sales_order_ui.inc:606 -#: sales/includes/ui/sales_order_ui.inc:610 +#: ../reporting/includes/doctext.inc:60 +#: ../sales/view/view_sales_order.php:69 +#: ../sales/view/view_sales_order.php.orig:69 +#: ../sales/inquiry/sales_orders_view.php:304 - #: ../sales/inquiry/sales_orders_view.php.orig:281 - #: ../sales/includes/ui/sales_order_ui.inc:606 +#: ../sales/includes/ui/sales_order_ui.inc.orig:606 msgid "Valid until" msgstr "" @@@ -13303,8 -11445,8 +13163,8 @@@ msgstr " msgid "DueDate" msgstr "" -#: reporting/includes/doctext.inc:259 reporting/includes/pdf_report.inc:1013 -#: reporting/includes/pdf_report.inc:1014 +#: ../reporting/includes/doctext.inc:272 - #: ../reporting/includes/pdf_report.inc:1013 ++#: ../reporting/includes/pdf_report.inc:1014 msgid "You can pay through" msgstr "" @@@ -13332,13 -11473,13 +13192,13 @@@ msgstr " msgid "Report Date" msgstr "" -#: reporting/includes/excel_report.inc:413 -#: reporting/includes/pdf_report.inc:600 reporting/includes/pdf_report.inc:601 +#: ../reporting/includes/excel_report.inc:413 - #: ../reporting/includes/pdf_report.inc:600 ++#: ../reporting/includes/pdf_report.inc:601 msgid "Generated At" msgstr "" -#: reporting/includes/excel_report.inc:419 -#: reporting/includes/pdf_report.inc:609 reporting/includes/pdf_report.inc:610 +#: ../reporting/includes/excel_report.inc:419 - #: ../reporting/includes/pdf_report.inc:609 ++#: ../reporting/includes/pdf_report.inc:610 msgid "Generated By" msgstr "" @@@ -13350,51 -11491,59 +13210,51 @@@ msgstr " msgid "Domicile" msgstr "" -#: reporting/includes/header2.inc:143 reporting/includes/pdf_report.inc:352 -#: reporting/includes/pdf_report.inc:500 reporting/includes/pdf_report.inc:628 -#: reporting/includes/pdf_report.inc:501 reporting/includes/pdf_report.inc:629 +#: ../reporting/includes/header2.inc:143 +#: ../reporting/includes/pdf_report.inc:352 - #: ../reporting/includes/pdf_report.inc:500 - #: ../reporting/includes/pdf_report.inc:628 ++#: ../reporting/includes/pdf_report.inc:501 ++#: ../reporting/includes/pdf_report.inc:629 msgid "Page" msgstr "" - #: ../reporting/includes/pdf_report.inc:583 -#: reporting/includes/pdf_report.inc:583 reporting/includes/pdf_report.inc:584 ++#: ../reporting/includes/pdf_report.inc:584 msgid "Report Period" msgstr "" - #: ../reporting/includes/pdf_report.inc:980 -#: reporting/includes/pdf_report.inc:980 reporting/includes/pdf_report.inc:981 ++#: ../reporting/includes/pdf_report.inc:981 msgid "You have no email contact defined for this type of document" msgstr "" - #: ../reporting/includes/pdf_report.inc:999 -#: reporting/includes/pdf_report.inc:999 -#: reporting/includes/pdf_report.inc:1000 ++#: ../reporting/includes/pdf_report.inc:1000 msgid "Dear" msgstr "" - #: ../reporting/includes/pdf_report.inc:1000 -#: reporting/includes/pdf_report.inc:1000 -#: reporting/includes/pdf_report.inc:1001 ++#: ../reporting/includes/pdf_report.inc:1001 msgid "Attached you will find " msgstr "" - #: ../reporting/includes/pdf_report.inc:1016 -#: reporting/includes/pdf_report.inc:1016 -#: reporting/includes/pdf_report.inc:1017 ++#: ../reporting/includes/pdf_report.inc:1017 msgid "Kindest regards" msgstr "" - #: ../reporting/includes/pdf_report.inc:1028 -#: reporting/includes/pdf_report.inc:1028 -#: reporting/includes/pdf_report.inc:1029 ++#: ../reporting/includes/pdf_report.inc:1029 msgid "There is no contact email set for this document type." msgstr "" - #: ../reporting/includes/pdf_report.inc:1031 -#: reporting/includes/pdf_report.inc:1031 -#: reporting/includes/pdf_report.inc:1032 ++#: ../reporting/includes/pdf_report.inc:1032 msgid "Sending document by email failed" msgstr "" - #: ../reporting/includes/pdf_report.inc:1031 - #: ../reporting/includes/pdf_report.inc:1034 -#: reporting/includes/pdf_report.inc:1031 -#: reporting/includes/pdf_report.inc:1034 -#: reporting/includes/pdf_report.inc:1032 -#: reporting/includes/pdf_report.inc:1035 ++#: ../reporting/includes/pdf_report.inc:1032 ++#: ../reporting/includes/pdf_report.inc:1035 msgid "Email:" msgstr "" - #: ../reporting/includes/pdf_report.inc:1034 -#: reporting/includes/pdf_report.inc:1034 -#: reporting/includes/pdf_report.inc:1035 ++#: ../reporting/includes/pdf_report.inc:1035 msgid "has been sent by email to destination." msgstr "" - #: ../reporting/includes/pdf_report.inc:1064 -#: reporting/includes/pdf_report.inc:1064 -#: reporting/includes/pdf_report.inc:1065 ++#: ../reporting/includes/pdf_report.inc:1065 msgid "Report has been sent to network printer " msgstr "" @@@ -13446,131 -11595,163 +13306,135 @@@ msgstr " msgid "No Currency Filter" msgstr "" - #: ../reporting/includes/reports_classes.inc:227 -#: reporting/includes/reports_classes.inc:227 -#: reporting/includes/reports_classes.inc:231 ++#: ../reporting/includes/reports_classes.inc:231 msgid "PDF/Printer" msgstr "" - #: ../reporting/includes/reports_classes.inc:238 -#: reporting/includes/reports_classes.inc:238 -#: reporting/includes/reports_classes.inc:242 ++#: ../reporting/includes/reports_classes.inc:242 msgid "No Graphics" msgstr "" - #: ../reporting/includes/reports_classes.inc:238 -#: reporting/includes/reports_classes.inc:238 -#: reporting/includes/reports_classes.inc:242 ++#: ../reporting/includes/reports_classes.inc:242 msgid "Vertical bars" msgstr "" - #: ../reporting/includes/reports_classes.inc:238 -#: reporting/includes/reports_classes.inc:238 -#: reporting/includes/reports_classes.inc:242 ++#: ../reporting/includes/reports_classes.inc:242 msgid "Horizontal bars" msgstr "" - #: ../reporting/includes/reports_classes.inc:239 -#: reporting/includes/reports_classes.inc:239 -#: reporting/includes/reports_classes.inc:243 ++#: ../reporting/includes/reports_classes.inc:243 msgid "Dots" msgstr "" - #: ../reporting/includes/reports_classes.inc:239 -#: reporting/includes/reports_classes.inc:239 -#: reporting/includes/reports_classes.inc:243 ++#: ../reporting/includes/reports_classes.inc:243 msgid "Lines" msgstr "" - #: ../reporting/includes/reports_classes.inc:239 -#: reporting/includes/reports_classes.inc:239 -#: reporting/includes/reports_classes.inc:243 ++#: ../reporting/includes/reports_classes.inc:243 msgid "Pie" msgstr "" - #: ../reporting/includes/reports_classes.inc:239 -#: reporting/includes/reports_classes.inc:239 -#: reporting/includes/reports_classes.inc:243 ++#: ../reporting/includes/reports_classes.inc:243 msgid "Donut" msgstr "" - #: ../reporting/includes/reports_classes.inc:243 - #: ../reporting/includes/reports_classes.inc:246 -#: reporting/includes/reports_classes.inc:243 -#: reporting/includes/reports_classes.inc:246 -#: reporting/includes/reports_classes.inc:247 -#: reporting/includes/reports_classes.inc:250 ++#: ../reporting/includes/reports_classes.inc:247 ++#: ../reporting/includes/reports_classes.inc:250 msgid "No Type Filter" msgstr "" - #: ../reporting/includes/reports_classes.inc:256 -#: reporting/includes/reports_classes.inc:256 -#: reporting/includes/reports_classes.inc:260 ++#: ../reporting/includes/reports_classes.inc:260 msgid "No Account Group Filter" msgstr "" - #: ../reporting/includes/reports_classes.inc:271 - #: ../reporting/includes/reports_classes.inc:277 - #: ../reporting/includes/reports_classes.inc:283 -#: reporting/includes/reports_classes.inc:271 -#: reporting/includes/reports_classes.inc:277 -#: reporting/includes/reports_classes.inc:283 -#: reporting/includes/reports_classes.inc:275 -#: reporting/includes/reports_classes.inc:281 -#: reporting/includes/reports_classes.inc:287 ++#: ../reporting/includes/reports_classes.inc:275 ++#: ../reporting/includes/reports_classes.inc:281 ++#: ../reporting/includes/reports_classes.inc:287 msgid "No Dimension Filter" msgstr "" - #: ../reporting/includes/reports_classes.inc:289 -#: reporting/includes/reports_classes.inc:289 -#: reporting/includes/reports_classes.inc:293 ++#: ../reporting/includes/reports_classes.inc:293 msgid "No Customer Filter" msgstr "" - #: ../reporting/includes/reports_classes.inc:297 -#: reporting/includes/reports_classes.inc:297 -#: reporting/includes/reports_classes.inc:301 ++#: ../reporting/includes/reports_classes.inc:301 msgid "No Supplier Filter" msgstr "" - #: ../reporting/includes/reports_classes.inc:379 -#: reporting/includes/reports_classes.inc:379 -#: reporting/includes/reports_classes.inc:383 ++#: ../reporting/includes/reports_classes.inc:383 msgid "No Location Filter" msgstr "" - #: ../reporting/includes/reports_classes.inc:382 -#: reporting/includes/reports_classes.inc:382 -#: reporting/includes/reports_classes.inc:386 ++#: ../reporting/includes/reports_classes.inc:386 msgid "No Category Filter" msgstr "" - #: ../reporting/includes/reports_classes.inc:391 -#: reporting/includes/reports_classes.inc:391 -#: reporting/includes/reports_classes.inc:395 ++#: ../reporting/includes/reports_classes.inc:395 msgid "No Sales Folk Filter" msgstr "" - #: ../reporting/includes/reports_classes.inc:398 -#: reporting/includes/reports_classes.inc:398 -#: reporting/includes/reports_classes.inc:402 ++#: ../reporting/includes/reports_classes.inc:402 msgid "No Users Filter" msgstr "" - #: ../sales/create_recurrent_invoices.php:24 -#: sales/create_recurrent_invoices.php:24 -#: sales/create_recurrent_invoices.php:26 ++#: ../sales/create_recurrent_invoices.php:26 msgid "Create and Print Recurrent Invoices" msgstr "" - #: ../sales/create_recurrent_invoices.php:40 -#: sales/create_recurrent_invoices.php:40 -#: sales/create_recurrent_invoices.php:42 ++#: ../sales/create_recurrent_invoices.php:42 #, php-format msgid "Recurrent Invoice covers period %s - %s." msgstr "" - #: ../sales/create_recurrent_invoices.php:97 -#: sales/create_recurrent_invoices.php:97 -#: sales/create_recurrent_invoices.php:108 ++#: ../sales/create_recurrent_invoices.php:108 #, php-format msgid "%s recurrent invoice(s) created, # %s - # %s." msgstr "" - #: ../sales/create_recurrent_invoices.php:102 -#: sales/create_recurrent_invoices.php:102 -#: sales/create_recurrent_invoices.php:113 ++#: ../sales/create_recurrent_invoices.php:113 #, php-format msgid "&Print Recurrent Invoices # %s - # %s" msgstr "" - #: ../sales/create_recurrent_invoices.php:104 -#: sales/create_recurrent_invoices.php:104 -#: sales/create_recurrent_invoices.php:115 ++#: ../sales/create_recurrent_invoices.php:115 #, php-format msgid "&Email Recurrent Invoices # %s - # %s" msgstr "" - #: ../sales/create_recurrent_invoices.php:115 -#: sales/create_recurrent_invoices.php:115 -#: sales/manage/recurrent_invoices.php:102 -#: sales/create_recurrent_invoices.php:132 ++#: ../sales/create_recurrent_invoices.php:127 ++msgid "Invoice date:" ++msgstr "" ++ ++#: ../sales/create_recurrent_invoices.php:132 +#: ../sales/manage/recurrent_invoices.php:102 msgid "Template No" msgstr "" - #: ../sales/create_recurrent_invoices.php:115 -#: sales/create_recurrent_invoices.php:115 -#: sales/manage/recurrent_invoices.php:102 -#: sales/create_recurrent_invoices.php:132 ++#: ../sales/create_recurrent_invoices.php:132 +#: ../sales/manage/recurrent_invoices.php:102 msgid "Begin" msgstr "" - #: ../sales/create_recurrent_invoices.php:115 -#: sales/create_recurrent_invoices.php:115 -#: sales/manage/recurrent_invoices.php:102 -#: sales/create_recurrent_invoices.php:132 ++#: ../sales/create_recurrent_invoices.php:132 +#: ../sales/manage/recurrent_invoices.php:102 msgid "End" msgstr "" - #: ../sales/create_recurrent_invoices.php:115 -#: sales/create_recurrent_invoices.php:115 -#: sales/manage/recurrent_invoices.php:102 -#: sales/manage/recurrent_invoices.php:185 -#: sales/create_recurrent_invoices.php:132 ++#: ../sales/create_recurrent_invoices.php:132 +#: ../sales/manage/recurrent_invoices.php:102 +#: ../sales/manage/recurrent_invoices.php:185 msgid "Last Created" msgstr "" - #: ../sales/create_recurrent_invoices.php:156 -#: sales/create_recurrent_invoices.php:156 -#: sales/create_recurrent_invoices.php:173 ++#: ../sales/create_recurrent_invoices.php:173 msgid "Create Invoices" msgstr "" - #: ../sales/create_recurrent_invoices.php:164 -#: sales/create_recurrent_invoices.php:164 -#: sales/create_recurrent_invoices.php:181 ++#: ../sales/create_recurrent_invoices.php:181 msgid "Marked items are due." msgstr "" - #: ../sales/create_recurrent_invoices.php:166 -#: sales/create_recurrent_invoices.php:166 -#: sales/create_recurrent_invoices.php:183 ++#: ../sales/create_recurrent_invoices.php:183 msgid "No recurrent invoices are due." msgstr "" @@@ -13579,8 -11760,9 +13443,8 @@@ msgid "Modifying Customer Credit Note #%d" msgstr "" -#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:661 -#: sales/sales_order_entry.php:665 sales/sales_order_entry.php:676 -#: sales/sales_order_entry.php.orig:675 +#: ../sales/credit_note_entry.php:51 - #: ../sales/sales_order_entry.php:672 ++#: ../sales/sales_order_entry.php:692 msgid "" "There are no customers, or there are no customers with branches. Please " "define customers and customer branches." @@@ -13613,40 -11794,40 +13477,40 @@@ msgstr " msgid "Enter Another &Credit Note" msgstr "" - #: ../sales/credit_note_entry.php:157 -#: sales/credit_note_entry.php:157 sales/credit_note_entry.php:153 ++#: ../sales/credit_note_entry.php:153 msgid "The entered date for the credit note is invalid." msgstr "" - #: ../sales/credit_note_entry.php:174 -#: sales/credit_note_entry.php:174 sales/credit_note_entry.php:170 ++#: ../sales/credit_note_entry.php:170 msgid "" "For credit notes created to write off the stock, a general ledger account is " "required to be selected." msgstr "" - #: ../sales/credit_note_entry.php:175 -#: sales/credit_note_entry.php:175 sales/credit_note_entry.php:171 ++#: ../sales/credit_note_entry.php:171 msgid "" "Please select an account to write the cost of the stock off to, then click " "on Process again." msgstr "" - #: ../sales/credit_note_entry.php:195 -#: sales/credit_note_entry.php:195 sales/credit_note_entry.php:197 ++#: ../sales/credit_note_entry.php:197 msgid "The quantity must be greater than zero." msgstr "" - #: ../sales/credit_note_entry.php:200 -#: sales/credit_note_entry.php:200 sales/credit_note_entry.php:202 ++#: ../sales/credit_note_entry.php:202 msgid "The entered price is negative or invalid." msgstr "" - #: ../sales/credit_note_entry.php:205 -#: sales/credit_note_entry.php:205 sales/credit_note_entry.php:207 ++#: ../sales/credit_note_entry.php:207 msgid "The entered discount percent is negative, greater than 100 or invalid." msgstr "" - #: ../sales/credit_note_entry.php:273 -#: sales/credit_note_entry.php:273 sales/credit_note_entry.php:275 ++#: ../sales/credit_note_entry.php:275 msgid "Credit Note Items" msgstr "" - #: ../sales/credit_note_entry.php:283 - #: ../sales/customer_credit_invoice.php:384 -#: sales/credit_note_entry.php:283 sales/customer_credit_invoice.php:384 -#: sales/credit_note_entry.php:285 sales/customer_credit_invoice.php:382 ++#: ../sales/credit_note_entry.php:285 ++#: ../sales/customer_credit_invoice.php:382 msgid "Process Credit Note" msgstr "" @@@ -13682,270 -11860,268 +13546,308 @@@ msgstr " msgid "Credit Note has been updated" msgstr "" - #: ../sales/customer_credit_invoice.php:114 -#: sales/customer_credit_invoice.php:114 sales/customer_credit_invoice.php:109 ++#: ../sales/customer_credit_invoice.php:109 msgid "The entered shipping cost is invalid or less than zero." msgstr "" - #: ../sales/customer_credit_invoice.php:119 - #: ../sales/customer_credit_invoice.php:141 -#: sales/customer_credit_invoice.php:119 sales/customer_credit_invoice.php:141 -#: sales/customer_credit_invoice.php:114 sales/customer_credit_invoice.php:136 ++#: ../sales/customer_credit_invoice.php:114 ++#: ../sales/customer_credit_invoice.php:136 msgid "" "Selected quantity cannot be less than zero nor more than quantity not " "credited yet." msgstr "" - #: ../sales/customer_credit_invoice.php:139 -#: sales/customer_credit_invoice.php:139 sales/customer_credit_invoice.php:134 ++#: ../sales/customer_credit_invoice.php:134 msgid "" "This page can only be opened if an invoice has been selected for crediting." msgstr "" - #: ../sales/customer_credit_invoice.php:251 -#: sales/customer_credit_invoice.php:251 sales/customer_credit_invoice.php:249 ++#: ../sales/customer_credit_invoice.php:249 msgid "Crediting Invoice" msgstr "" - #: ../sales/customer_credit_invoice.php:272 -#: sales/customer_credit_invoice.php:272 sales/customer_credit_invoice.php:270 ++#: ../sales/customer_credit_invoice.php:270 msgid "Credit Note Date" msgstr "" - #: ../sales/customer_credit_invoice.php:282 -#: sales/customer_credit_invoice.php:282 sales/customer_credit_invoice.php:280 ++#: ../sales/customer_credit_invoice.php:280 msgid "Invoiced Quantity" msgstr "" - #: ../sales/customer_credit_invoice.php:283 -#: sales/customer_credit_invoice.php:283 sales/customer_credit_invoice.php:281 ++#: ../sales/customer_credit_invoice.php:281 msgid "Credit Quantity" msgstr "" - #: ../sales/customer_credit_invoice.php:317 -#: sales/customer_credit_invoice.php:317 sales/customer_credit_invoice.php:315 ++#: ../sales/customer_credit_invoice.php:315 msgid "Credit Shipping Cost" msgstr "" - #: ../sales/customer_credit_invoice.php:350 -#: sales/customer_credit_invoice.php:350 -#: sales/includes/ui/sales_credit_ui.inc:323 -#: sales/customer_credit_invoice.php:348 ++#: ../sales/customer_credit_invoice.php:348 +#: ../sales/includes/ui/sales_credit_ui.inc:323 msgid "Credit Note Type" msgstr "" - #: ../sales/customer_credit_invoice.php:358 -#: sales/customer_credit_invoice.php:358 -#: sales/includes/ui/sales_credit_ui.inc:331 -#: sales/customer_credit_invoice.php:356 ++#: ../sales/customer_credit_invoice.php:356 +#: ../sales/includes/ui/sales_credit_ui.inc:331 msgid "Items Returned to Location" msgstr "" - #: ../sales/customer_credit_invoice.php:363 -#: sales/customer_credit_invoice.php:363 -#: sales/includes/ui/sales_credit_ui.inc:336 -#: sales/customer_credit_invoice.php:361 ++#: ../sales/customer_credit_invoice.php:361 +#: ../sales/includes/ui/sales_credit_ui.inc:336 msgid "Write off the cost of the items to" msgstr "" - #: ../sales/customer_credit_invoice.php:382 -#: sales/customer_credit_invoice.php:382 sales/customer_credit_invoice.php:380 ++#: ../sales/customer_credit_invoice.php:380 msgid "Update credit value for quantities entered" msgstr "" -#: sales/customer_delivery.php:37 +#: ../sales/customer_delivery.php:37 ++#: ../sales/customer_delivery.php.orig:37 #, php-format msgid "Modifying Delivery Note # %d." msgstr "" -#: sales/customer_delivery.php:41 +#: ../sales/customer_delivery.php:41 ++#: ../sales/customer_delivery.php.orig:41 msgid "Deliver Items for a Sales Order" msgstr "" -#: sales/customer_delivery.php:50 sales/sales_order_entry.php:175 -#: sales/sales_order_entry.php:183 sales/sales_order_entry.php.orig:183 +#: ../sales/customer_delivery.php:50 - #: ../sales/sales_order_entry.php:176 ++#: ../sales/customer_delivery.php.orig:50 ++#: ../sales/sales_order_entry.php:189 #, php-format msgid "Delivery # %d has been entered." msgstr "" -#: sales/customer_delivery.php:52 sales/sales_order_entry.php:177 -#: sales/sales_order_entry.php:185 sales/sales_order_entry.php.orig:185 +#: ../sales/customer_delivery.php:52 - #: ../sales/sales_order_entry.php:178 ++#: ../sales/customer_delivery.php.orig:52 ++#: ../sales/sales_order_entry.php:191 msgid "&View This Delivery" msgstr "" -#: sales/customer_delivery.php:54 sales/customer_delivery.php:75 -#: sales/sales_order_entry.php:179 sales/sales_order_entry.php:187 -#: sales/sales_order_entry.php.orig:187 +#: ../sales/customer_delivery.php:54 - #: ../sales/customer_delivery.php:75 - #: ../sales/sales_order_entry.php:180 ++#: ../sales/customer_delivery.php:76 ++#: ../sales/customer_delivery.php.orig:54 ++#: ../sales/customer_delivery.php.orig:76 ++#: ../sales/sales_order_entry.php:193 msgid "&Print Delivery Note" msgstr "" -#: sales/customer_delivery.php:55 sales/customer_delivery.php:76 -#: sales/sales_order_entry.php:180 sales/sales_order_entry.php:188 -#: sales/sales_order_entry.php.orig:188 +#: ../sales/customer_delivery.php:55 - #: ../sales/customer_delivery.php:76 - #: ../sales/sales_order_entry.php:181 ++#: ../sales/customer_delivery.php:77 ++#: ../sales/customer_delivery.php.orig:55 ++#: ../sales/customer_delivery.php.orig:77 ++#: ../sales/sales_order_entry.php:194 msgid "&Email Delivery Note" msgstr "" -#: sales/customer_delivery.php:56 sales/customer_delivery.php:77 -#: sales/sales_order_entry.php:181 sales/sales_order_entry.php:189 -#: sales/sales_order_entry.php.orig:189 +#: ../sales/customer_delivery.php:56 - #: ../sales/customer_delivery.php:77 - #: ../sales/sales_order_entry.php:182 ++#: ../sales/customer_delivery.php:78 ++#: ../sales/customer_delivery.php.orig:56 ++#: ../sales/customer_delivery.php.orig:78 ++#: ../sales/sales_order_entry.php:195 msgid "P&rint as Packing Slip" msgstr "" -#: sales/customer_delivery.php:57 sales/customer_delivery.php:78 -#: sales/sales_order_entry.php:182 sales/sales_order_entry.php:190 -#: sales/sales_order_entry.php.orig:190 +#: ../sales/customer_delivery.php:57 - #: ../sales/customer_delivery.php:78 - #: ../sales/sales_order_entry.php:183 ++#: ../sales/customer_delivery.php:79 ++#: ../sales/customer_delivery.php.orig:57 ++#: ../sales/customer_delivery.php.orig:79 ++#: ../sales/sales_order_entry.php:196 msgid "E&mail as Packing Slip" msgstr "" -#: sales/customer_delivery.php:59 sales/sales_order_entry.php:185 -#: sales/sales_order_entry.php:193 sales/sales_order_entry.php.orig:193 +#: ../sales/customer_delivery.php:59 - #: ../sales/sales_order_entry.php:186 ++#: ../sales/customer_delivery.php.orig:59 ++#: ../sales/sales_order_entry.php:199 msgid "View the GL Journal Entries for this Dispatch" msgstr "" - #: ../sales/customer_delivery.php:61 -#: sales/customer_delivery.php:61 ++#: ../sales/customer_delivery.php:62 ++#: ../sales/customer_delivery.php.orig:62 msgid "Invoice This Delivery" msgstr "" - #: ../sales/customer_delivery.php:63 -#: sales/customer_delivery.php:63 ++#: ../sales/customer_delivery.php:64 ++#: ../sales/customer_delivery.php.orig:64 msgid "Select Another Order For Dispatch" msgstr "" - #: ../sales/customer_delivery.php:71 -#: sales/customer_delivery.php:71 ++#: ../sales/customer_delivery.php:72 ++#: ../sales/customer_delivery.php.orig:72 #, php-format msgid "Delivery Note # %d has been updated." msgstr "" - #: ../sales/customer_delivery.php:73 -#: sales/customer_delivery.php:73 ++#: ../sales/customer_delivery.php:74 ++#: ../sales/customer_delivery.php.orig:74 msgid "View this delivery" msgstr "" - #: ../sales/customer_delivery.php:80 -#: sales/customer_delivery.php:80 ++#: ../sales/customer_delivery.php:82 ++#: ../sales/customer_delivery.php.orig:82 msgid "Confirm Delivery and Invoice" msgstr "" - #: ../sales/customer_delivery.php:82 -#: sales/customer_delivery.php:82 ++#: ../sales/customer_delivery.php:84 ++#: ../sales/customer_delivery.php.orig:84 msgid "Select A Different Delivery" msgstr "" -#: sales/customer_delivery.php:94 -msgid "Select a different sales order to delivery" +#: ../sales/customer_delivery.php:94 - #: ../sales/customer_delivery.php:99 - msgid "Select a different sales order to delivery" ++#: ../sales/customer_delivery.php.orig:94 ++#: ../sales/customer_invoice.php:152 ++msgid "" ++"You have to set Deferred Income Account in GL Setup to entry prepayment " ++"invoices." msgstr "" - #: ../sales/customer_delivery.php:95 -#: sales/customer_delivery.php:95 ++#: ../sales/customer_delivery.php:97 ++#: ../sales/customer_delivery.php.orig:97 msgid "This order has no items. There is nothing to delivery." msgstr "" - #: ../sales/customer_delivery.php:101 -#: sales/customer_delivery.php:110 ++#: ../sales/customer_delivery.php:100 ++#: ../sales/customer_delivery.php:105 ++#: ../sales/customer_delivery.php.orig:100 ++#: ../sales/customer_delivery.php.orig:105 ++msgid "Select a different sales order to delivery" ++msgstr "" ++ ++#: ../sales/customer_delivery.php:103 ++#: ../sales/customer_delivery.php.orig:103 +msgid "" +"This prepayment order is not yet ready for delivery due to insufficient " +"amount received." +msgstr "" + - #: ../sales/customer_delivery.php:118 ++#: ../sales/customer_delivery.php:122 ++#: ../sales/customer_delivery.php.orig:122 msgid "Select a different delivery" msgstr "" - #: ../sales/customer_delivery.php:119 -#: sales/customer_delivery.php:111 ++#: ../sales/customer_delivery.php:123 ++#: ../sales/customer_delivery.php.orig:123 msgid "This delivery has all items invoiced. There is nothing to modify." msgstr "" - #: ../sales/customer_delivery.php:129 -#: sales/customer_delivery.php:121 ++#: ../sales/customer_delivery.php:133 ++#: ../sales/customer_delivery.php.orig:133 msgid "" "This page can only be opened if an order or delivery note has been selected. " "Please select it first." msgstr "" - #: ../sales/customer_delivery.php:131 -#: sales/customer_delivery.php:123 ++#: ../sales/customer_delivery.php:135 ++#: ../sales/customer_delivery.php.orig:135 msgid "Select a Sales Order to Delivery" msgstr "" - #: ../sales/customer_delivery.php:140 -#: sales/customer_delivery.php:132 ++#: ../sales/customer_delivery.php:144 ++#: ../sales/customer_delivery.php.orig:144 msgid "" "Selected quantity cannot be less than quantity invoiced nor more than " "quantity\tnot dispatched on sales order." msgstr "" - #: ../sales/customer_delivery.php:143 -#: sales/customer_delivery.php:135 ++#: ../sales/customer_delivery.php:147 ++#: ../sales/customer_delivery.php.orig:147 msgid "Freight cost cannot be less than zero" msgstr "" - #: ../sales/customer_delivery.php:155 -#: sales/customer_delivery.php:147 ++#: ../sales/customer_delivery.php:159 ++#: ../sales/customer_delivery.php.orig:159 msgid "The entered date of delivery is invalid." msgstr "" - #: ../sales/customer_delivery.php:167 -#: sales/customer_delivery.php:153 -msgid "The entered date of delivery is not in fiscal year." -msgstr "" - -#: sales/customer_delivery.php:159 ++#: ../sales/customer_delivery.php:171 ++#: ../sales/customer_delivery.php.orig:171 msgid "The entered dead-line for invoice is invalid." msgstr "" - #: ../sales/customer_delivery.php:190 - #: ../sales/customer_invoice.php:351 -#: sales/customer_delivery.php:182 sales/customer_invoice.php:297 -#: sales/customer_delivery.php:176 sales/customer_invoice.php:291 ++#: ../sales/customer_delivery.php:188 ++#: ../sales/customer_delivery.php.orig:194 ++#: ../sales/customer_invoice.php:345 msgid "The entered shipping value is not numeric." msgstr "" - #: ../sales/customer_delivery.php:196 -#: sales/customer_delivery.php:188 sales/customer_delivery.php:182 ++#: ../sales/customer_delivery.php:194 ++#: ../sales/customer_delivery.php.orig:200 msgid "There are no item quantities on this delivery note." msgstr "" - #: ../sales/customer_delivery.php:299 - #: ../sales/sales_order_entry.php:501 - #: ../sales/includes/ui/sales_order_ui.inc:244 -#: sales/customer_delivery.php:291 sales/sales_order_entry.php:490 -#: sales/includes/ui/sales_order_ui.inc:244 sales/customer_delivery.php:285 -#: sales/sales_order_entry.php:494 sales/includes/ui/sales_order_ui.inc:248 -#: sales/sales_order_entry.php:505 sales/sales_order_entry.php.orig:504 ++#: ../sales/customer_delivery.php:297 ++#: ../sales/customer_delivery.php.orig:303 ++#: ../sales/sales_order_entry.php:521 +#: ../sales/includes/ui/sales_order_ui.inc.orig:244 msgid "" "The delivery cannot be processed because there is an insufficient quantity " "for item:" msgstr "" - #: ../sales/customer_delivery.php:361 -#: sales/customer_delivery.php:353 ++#: ../sales/customer_delivery.php.orig:366 msgid "For Sales Order" msgstr "" - #: ../sales/customer_delivery.php:370 -#: sales/customer_delivery.php:362 ++#: ../sales/customer_delivery.php.orig:375 msgid "Delivery From" msgstr "" - #: ../sales/customer_delivery.php:419 -#: sales/customer_delivery.php:411 ++#: ../sales/customer_delivery.php.orig:424 msgid "Invoice Dead-line" msgstr "" - #: ../sales/customer_delivery.php:429 - #: ../sales/customer_invoice.php:528 - #: ../sales/includes/ui/sales_order_ui.inc:82 - #: ../sales/includes/ui/sales_order_ui.inc:368 -#: sales/customer_delivery.php:421 sales/customer_invoice.php:457 -#: sales/includes/ui/sales_order_ui.inc:82 -#: sales/includes/ui/sales_order_ui.inc:368 sales/customer_invoice.php:459 -#: sales/includes/ui/sales_order_ui.inc:84 -#: sales/includes/ui/sales_order_ui.inc:372 ++#: ../sales/customer_delivery.php.orig:434 ++#: ../sales/customer_invoice.php:530 ++#: ../sales/includes/ui/sales_order_ui.inc:84 +#: ../sales/includes/ui/sales_order_ui.inc.orig:82 +#: ../sales/includes/ui/sales_order_ui.inc.orig:368 msgid "" "The selected customer account is currently on hold. Please contact the " "credit control personnel to discuss." msgstr "" - #: ../sales/customer_delivery.php:434 -#: sales/customer_delivery.php:426 ++#: ../sales/customer_delivery.php.orig:439 msgid "Delivery Items" msgstr "" - #: ../sales/customer_delivery.php:440 -#: sales/customer_delivery.php:432 ++#: ../sales/customer_delivery.php.orig:445 msgid "Max. delivery" msgstr "" - #: ../sales/customer_delivery.php:440 - #: ../sales/customer_invoice.php:542 - #: ../sales/includes/ui/sales_order_ui.inc:141 -#: sales/customer_delivery.php:432 sales/customer_invoice.php:467 -#: sales/includes/ui/sales_order_ui.inc:141 sales/customer_invoice.php:469 -#: sales/includes/ui/sales_order_ui.inc:145 ++#: ../sales/customer_delivery.php.orig:445 ++#: ../sales/customer_invoice.php:544 +#: ../sales/includes/ui/sales_order_ui.inc.orig:141 msgid "Delivered" msgstr "" - #: ../sales/customer_delivery.php:501 - #: ../sales/customer_invoice.php:631 -#: sales/customer_delivery.php:493 sales/customer_invoice.php:552 -#: sales/customer_invoice.php:554 ++#: ../sales/customer_delivery.php.orig:506 ++#: ../sales/customer_invoice.php:633 msgid "Shipping Cost" msgstr "" - #: ../sales/customer_delivery.php:521 - #: ../sales/includes/ui/sales_order_ui.inc:242 -#: sales/customer_delivery.php:513 sales/includes/ui/sales_order_ui.inc:242 -#: sales/includes/ui/sales_order_ui.inc:246 ++#: ../sales/customer_delivery.php.orig:526 +#: ../sales/includes/ui/sales_order_ui.inc.orig:242 msgid "" "Marked items have insufficient quantities in stock as on day of delivery." msgstr "" - #: ../sales/customer_delivery.php:525 -#: sales/customer_delivery.php:517 ++#: ../sales/customer_delivery.php.orig:530 msgid "Action For Balance" msgstr "" - #: ../sales/customer_delivery.php:532 - #: ../sales/customer_invoice.php:683 -#: sales/customer_delivery.php:524 sales/customer_invoice.php:581 -#: sales/customer_invoice.php:583 ++#: ../sales/customer_delivery.php.orig:537 ++#: ../sales/customer_invoice.php:685 msgid "Refresh document page" msgstr "" - #: ../sales/customer_delivery.php:533 -#: sales/customer_delivery.php:525 ++#: ../sales/customer_delivery.php.orig:538 msgid "Process Dispatch" msgstr "" - #: ../sales/customer_delivery.php:534 - #: ../sales/customer_invoice.php:685 - #: ../sales/sales_order_entry.php:719 -#: sales/customer_delivery.php:526 sales/customer_invoice.php:583 -#: sales/sales_order_entry.php:709 sales/customer_invoice.php:585 -#: sales/sales_order_entry.php:713 sales/sales_order_entry.php:724 -#: sales/sales_order_entry.php.orig:723 ++#: ../sales/customer_delivery.php.orig:539 ++#: ../sales/customer_invoice.php:687 ++#: ../sales/sales_order_entry.php:739 msgid "Check entered data and save document" msgstr "" @@@ -13962,76 -12138,67 +13864,70 @@@ msgstr " msgid "Issue Batch Invoice for Delivery Notes" msgstr "" -#: sales/customer_invoice.php:55 +#: ../sales/customer_invoice.php:45 +msgid "Prepayment or Final Invoice Entry" +msgstr "" + - #: ../sales/customer_invoice.php:57 ++#: ../sales/customer_invoice.php:58 msgid "Selected deliveries has been processed" msgstr "" - #: ../sales/customer_invoice.php:59 - #: ../sales/customer_invoice.php:79 - #: ../sales/sales_order_entry.php:205 -#: sales/customer_invoice.php:57 sales/customer_invoice.php:77 -#: sales/sales_order_entry.php:204 sales/sales_order_entry.php:212 -#: sales/sales_order_entry.php.orig:212 ++#: ../sales/customer_invoice.php:60 ++#: ../sales/customer_invoice.php:80 ++#: ../sales/sales_order_entry.php:218 msgid "&View This Invoice" msgstr "" - #: ../sales/customer_invoice.php:61 - #: ../sales/customer_invoice.php:81 -#: sales/customer_invoice.php:59 sales/customer_invoice.php:79 ++#: ../sales/customer_invoice.php:62 ++#: ../sales/customer_invoice.php:82 msgid "&Print This Invoice" msgstr "" - #: ../sales/customer_invoice.php:62 - #: ../sales/customer_invoice.php:82 -#: sales/customer_invoice.php:60 sales/customer_invoice.php:80 ++#: ../sales/customer_invoice.php:63 ++#: ../sales/customer_invoice.php:83 msgid "&Email This Invoice" msgstr "" - #: ../sales/customer_invoice.php:64 - #: ../sales/sales_order_entry.php:218 -#: sales/customer_invoice.php:62 sales/sales_order_entry.php:217 -#: sales/sales_order_entry.php:225 sales/sales_order_entry.php.orig:225 ++#: ../sales/customer_invoice.php:65 ++#: ../sales/sales_order_entry.php:231 msgid "View the GL &Journal Entries for this Invoice" msgstr "" - #: ../sales/customer_invoice.php:66 -#: sales/customer_invoice.php:64 ++#: ../sales/customer_invoice.php:67 msgid "Select Another &Delivery For Invoicing" msgstr "" - #: ../sales/customer_invoice.php:77 -#: sales/customer_invoice.php:75 ++#: ../sales/customer_invoice.php:78 #, php-format msgid "Sales Invoice # %d has been updated." msgstr "" - #: ../sales/customer_invoice.php:84 -#: sales/customer_invoice.php:82 ++#: ../sales/customer_invoice.php:85 msgid "Select Another &Invoice to Modify" msgstr "" - #: ../sales/customer_invoice.php:123 -#: sales/customer_invoice.php:121 ++#: ../sales/customer_invoice.php:124 msgid "Select a different delivery to invoice" msgstr "" - #: ../sales/customer_invoice.php:124 -#: sales/customer_invoice.php:122 ++#: ../sales/customer_invoice.php:125 msgid "" "There are no delivered items with a quantity left to invoice. There is " "nothing left to invoice." msgstr "" -#: sales/customer_invoice.php:131 +#: ../sales/customer_invoice.php:146 msgid "" -"There are no delivery notes for this invoice.
\n" -"\t\tMost likely this invoice was created in Front Accounting version prior " -"to 2.0\n" -"\t\tand therefore can not be modified." +"All quantities on this invoice has been credited. There is nothing to modify " +"on this invoice" msgstr "" - #: ../sales/customer_invoice.php:152 - msgid "" - "You have to set Deferred Income Account in GL Setup to entry prepayment " - "invoices." - msgstr "" - -#: sales/customer_invoice.php:140 +#: ../sales/customer_invoice.php:160 msgid "" -"All quantities on this invoice has been credited. There is nothing to modify " -"on this invoice" +"Please select correct Sales Order Prepayment to be invoiced and try again." msgstr "" -#: sales/customer_invoice.php:146 +#: ../sales/customer_invoice.php:191 msgid "" "This page can only be opened after delivery selection. Please select " "delivery to invoicing first." @@@ -14041,8 -12208,8 +13937,8 @@@ msgstr " msgid "Select Delivery to Invoice" msgstr "" -#: sales/customer_invoice.php:153 sales/customer_invoice.php:308 -#: sales/customer_invoice.php:302 +#: ../sales/customer_invoice.php:198 - #: ../sales/customer_invoice.php:362 ++#: ../sales/customer_invoice.php:356 msgid "" "Selected quantity cannot be less than quantity credited nor more than " "quantity not invoiced yet." @@@ -14056,58 -12227,37 +13952,58 @@@ msgstr " msgid "The entered invoice due date is invalid." msgstr "" - #: ../sales/customer_invoice.php:357 -#: sales/customer_invoice.php:303 sales/customer_invoice.php:297 ++#: ../sales/customer_invoice.php:351 msgid "There are no item quantities on this invoice." msgstr "" - #: ../sales/customer_invoice.php:367 -#: sales/customer_invoice.php:383 sales/customer_invoice.php:385 ++#: ../sales/customer_invoice.php:361 +msgid "" +"There is no non-invoiced payments for this order. If you want to issue final " +"invoice, select delayed or cash payment terms." +msgstr "" + - #: ../sales/customer_invoice.php:449 ++#: ../sales/customer_invoice.php:451 msgid "Payment terms:" msgstr "" - #: ../sales/customer_invoice.php:534 - #: ../sales/sales_order_entry.php:695 -#: sales/customer_invoice.php:386 sales/includes/ui/sales_order_ui.inc:405 -#: sales/includes/ui/sales_order_ui.inc:409 sales/customer_invoice.php:388 -#: sales/includes/ui/sales_order_ui.inc:413 -msgid "Payment:" ++#: ../sales/customer_invoice.php:536 ++#: ../sales/sales_order_entry.php:715 +msgid "Sales Order Items" msgstr "" - #: ../sales/customer_invoice.php:534 -#: sales/customer_invoice.php:463 sales/customer_invoice.php:465 ++#: ../sales/customer_invoice.php:536 msgid "Invoice Items" msgstr "" - #: ../sales/customer_invoice.php:543 -#: sales/customer_invoice.php:468 sales/customer_invoice.php:470 ++#: ../sales/customer_invoice.php:545 msgid "This Invoice" msgstr "" - #: ../sales/customer_invoice.php:550 -#: sales/customer_invoice.php:476 sales/customer_invoice.php:478 ++#: ../sales/customer_invoice.php:552 msgid "Credited" msgstr "" - #: ../sales/customer_invoice.php:652 -#: sales/customer_invoice.php:570 sales/customer_invoice.php:572 ++#: ../sales/customer_invoice.php:654 msgid "Invoice Total" msgstr "" - #: ../sales/customer_invoice.php:661 -#: sales/customer_payments.php:33 sales/customer_payments.php.orig:33 ++#: ../sales/customer_invoice.php:663 +msgid "Sales order:" +msgstr "" + - #: ../sales/customer_invoice.php:673 ++#: ../sales/customer_invoice.php:675 +msgid "Payments received:" +msgstr "" + - #: ../sales/customer_invoice.php:674 ++#: ../sales/customer_invoice.php:676 +msgid "Invoiced here:" +msgstr "" + - #: ../sales/customer_invoice.php:675 ++#: ../sales/customer_invoice.php:677 +msgid "Left to be invoiced:" +msgstr "" + +#: ../sales/customer_payments.php:33 msgid "Customer Payment Entry" msgstr "" @@@ -14142,13 -12292,15 +14038,13 @@@ msgstr " msgid "The customer payment has been successfully updated." msgstr "" -#: sales/customer_payments.php:128 sales/sales_order_entry.php:327 -#: sales/customer_payments.php.orig:128 sales/sales_order_entry.php:336 -#: sales/sales_order_entry.php.orig:335 +#: ../sales/customer_payments.php:128 - #: ../sales/sales_order_entry.php:332 ++#: ../sales/sales_order_entry.php:346 msgid "There is no customer selected." msgstr "" -#: sales/customer_payments.php:135 sales/sales_order_entry.php:334 -#: sales/customer_payments.php.orig:135 sales/sales_order_entry.php:343 -#: sales/sales_order_entry.php.orig:342 +#: ../sales/customer_payments.php:135 - #: ../sales/sales_order_entry.php:339 ++#: ../sales/sales_order_entry.php:353 msgid "This customer has no branch defined." msgstr "" @@@ -14171,343 -12323,422 +14067,343 @@@ msgid " "valid amounts." msgstr "" - #: ../sales/customer_payments.php:341 - #: ../sales/customer_payments.php:343 -#: sales/customer_payments.php:341 sales/customer_payments.php:343 -#: sales/customer_payments.php:338 sales/customer_payments.php:340 -#: sales/customer_payments.php.orig:343 sales/customer_payments.php.orig:345 ++#: ../sales/customer_payments.php:338 ++#: ../sales/customer_payments.php:340 msgid "From Customer:" msgstr "" - #: ../sales/customer_payments.php:378 -#: sales/customer_payments.php:378 sales/customer_payments.php:381 -#: sales/customer_payments.php.orig:380 ++#: ../sales/customer_payments.php:381 msgid "Into Bank Account:" msgstr "" - #: ../sales/customer_payments.php:383 -#: sales/customer_payments.php:384 sales/customer_payments.php:387 -#: sales/customer_payments.php.orig:386 ++#: ../sales/customer_payments.php:386 msgid "Date of Deposit:" msgstr "" - #: ../sales/customer_payments.php:405 -#: sales/customer_payments.php:406 sales/customer_payments.php:409 -#: sales/customer_payments.php.orig:408 ++#: ../sales/customer_payments.php:408 msgid "Customer prompt payment discount :" msgstr "" - #: ../sales/customer_payments.php:414 -#: sales/customer_payments.php:415 sales/customer_payments.php:418 -#: sales/customer_payments.php.orig:417 ++#: ../sales/customer_payments.php:417 msgid "Amount and discount are in customer's currency." msgstr "" - #: ../sales/customer_payments.php:419 -#: sales/customer_payments.php:420 sales/customer_payments.php:423 -#: sales/customer_payments.php.orig:422 ++#: ../sales/customer_payments.php:422 msgid "Update Payment" msgstr "" - #: ../sales/customer_payments.php:421 -#: sales/customer_payments.php:422 sales/customer_payments.php:425 -#: sales/customer_payments.php.orig:424 ++#: ../sales/customer_payments.php:424 msgid "Add Payment" msgstr "" - #: ../sales/sales_order_entry.php:56 -#: sales/sales_order_entry.php:56 sales/sales_order_entry.php:64 -#: sales/sales_order_entry.php.orig:64 ++#: ../sales/sales_order_entry.php:64 msgid "Direct Sales Delivery" msgstr "" - #: ../sales/sales_order_entry.php:61 -#: sales/sales_order_entry.php:61 sales/sales_order_entry.php:69 -#: sales/sales_order_entry.php.orig:69 ++#: ../sales/sales_order_entry.php:69 msgid "Direct Sales Invoice" msgstr "" - #: ../sales/sales_order_entry.php:67 -#: sales/sales_order_entry.php:67 sales/sales_order_entry.php:75 -#: sales/sales_order_entry.php.orig:75 ++#: ../sales/sales_order_entry.php:75 #, php-format msgid "Modifying Sales Order # %d" msgstr "" - #: ../sales/sales_order_entry.php:73 -#: sales/sales_order_entry.php:73 sales/sales_order_entry.php:81 -#: sales/sales_order_entry.php.orig:81 ++#: ../sales/sales_order_entry.php:81 #, php-format msgid "Modifying Sales Quotation # %d" msgstr "" - #: ../sales/sales_order_entry.php:78 -#: sales/sales_order_entry.php:78 sales/sales_order_entry.php:86 -#: sales/sales_order_entry.php.orig:86 ++#: ../sales/sales_order_entry.php:86 msgid "New Sales Order Entry" msgstr "" - #: ../sales/sales_order_entry.php:82 -#: sales/sales_order_entry.php:82 sales/sales_order_entry.php:90 -#: sales/sales_order_entry.php.orig:90 ++#: ../sales/sales_order_entry.php:90 msgid "New Sales Quotation Entry" msgstr "" - #: ../sales/sales_order_entry.php:85 -#: sales/sales_order_entry.php:85 sales/sales_order_entry.php:93 -#: sales/sales_order_entry.php.orig:93 ++#: ../sales/sales_order_entry.php:93 msgid "Sales Order Entry" msgstr "" - #: ../sales/sales_order_entry.php:102 -#: sales/sales_order_entry.php:101 sales/sales_order_entry.php:109 -#: sales/sales_order_entry.php.orig:109 ++#: ../sales/sales_order_entry.php:115 #, php-format msgid "Order # %d has been entered." msgstr "" - #: ../sales/sales_order_entry.php:104 - #: ../sales/sales_order_entry.php:124 -#: sales/sales_order_entry.php:103 sales/sales_order_entry.php:123 -#: sales/sales_order_entry.php:111 sales/sales_order_entry.php:131 -#: sales/sales_order_entry.php.orig:111 sales/sales_order_entry.php.orig:131 ++#: ../sales/sales_order_entry.php:117 ++#: ../sales/sales_order_entry.php:137 msgid "&View This Order" msgstr "" - #: ../sales/sales_order_entry.php:110 -#: sales/sales_order_entry.php:109 sales/sales_order_entry.php:117 -#: sales/sales_order_entry.php.orig:117 ++#: ../sales/sales_order_entry.php:123 msgid "Make &Delivery Against This Order" msgstr "" - #: ../sales/sales_order_entry.php:115 -#: sales/sales_order_entry.php:114 sales/sales_order_entry.php:122 -#: sales/sales_order_entry.php.orig:122 ++#: ../sales/sales_order_entry.php:128 msgid "Enter a &New Order" msgstr "" - #: ../sales/sales_order_entry.php:122 -#: sales/sales_order_entry.php:121 sales/sales_order_entry.php:129 -#: sales/sales_order_entry.php.orig:129 ++#: ../sales/sales_order_entry.php:135 #, php-format msgid "Order # %d has been updated." msgstr "" - #: ../sales/sales_order_entry.php:130 -#: sales/sales_order_entry.php:129 sales/sales_order_entry.php:137 -#: sales/sales_order_entry.php.orig:137 ++#: ../sales/sales_order_entry.php:143 msgid "Confirm Order Quantities and Make &Delivery" msgstr "" - #: ../sales/sales_order_entry.php:133 -#: sales/sales_order_entry.php:132 sales/sales_order_entry.php:140 -#: sales/sales_order_entry.php.orig:140 ++#: ../sales/sales_order_entry.php:146 msgid "Select A Different &Order" msgstr "" - #: ../sales/sales_order_entry.php:140 -#: sales/sales_order_entry.php:139 sales/sales_order_entry.php:147 -#: sales/sales_order_entry.php.orig:147 ++#: ../sales/sales_order_entry.php:153 #, php-format msgid "Quotation # %d has been entered." msgstr "" - #: ../sales/sales_order_entry.php:142 - #: ../sales/sales_order_entry.php:160 -#: sales/sales_order_entry.php:141 sales/sales_order_entry.php:159 -#: sales/sales_order_entry.php:149 sales/sales_order_entry.php:167 -#: sales/sales_order_entry.php.orig:149 sales/sales_order_entry.php.orig:167 ++#: ../sales/sales_order_entry.php:155 ++#: ../sales/sales_order_entry.php:173 msgid "&View This Quotation" msgstr "" - #: ../sales/sales_order_entry.php:144 - #: ../sales/sales_order_entry.php:162 -#: sales/sales_order_entry.php:143 sales/sales_order_entry.php:161 -#: sales/sales_order_entry.php:151 sales/sales_order_entry.php:169 -#: sales/sales_order_entry.php.orig:151 sales/sales_order_entry.php.orig:169 ++#: ../sales/sales_order_entry.php:157 ++#: ../sales/sales_order_entry.php:175 msgid "&Print This Quotation" msgstr "" - #: ../sales/sales_order_entry.php:145 - #: ../sales/sales_order_entry.php:163 -#: sales/sales_order_entry.php:144 sales/sales_order_entry.php:162 -#: sales/sales_order_entry.php:152 sales/sales_order_entry.php:170 -#: sales/sales_order_entry.php.orig:152 sales/sales_order_entry.php.orig:170 ++#: ../sales/sales_order_entry.php:158 ++#: ../sales/sales_order_entry.php:176 msgid "&Email This Quotation" msgstr "" - #: ../sales/sales_order_entry.php:148 - #: ../sales/sales_order_entry.php:166 -#: sales/sales_order_entry.php:147 sales/sales_order_entry.php:165 -#: sales/sales_order_entry.php:155 sales/sales_order_entry.php:173 -#: sales/sales_order_entry.php.orig:155 sales/sales_order_entry.php.orig:173 ++#: ../sales/sales_order_entry.php:161 ++#: ../sales/sales_order_entry.php:179 msgid "Make &Sales Order Against This Quotation" msgstr "" - #: ../sales/sales_order_entry.php:151 -#: sales/sales_order_entry.php:150 sales/sales_order_entry.php:158 -#: sales/sales_order_entry.php.orig:158 ++#: ../sales/sales_order_entry.php:164 msgid "Enter a New &Quotation" msgstr "" - #: ../sales/sales_order_entry.php:158 -#: sales/sales_order_entry.php:157 sales/sales_order_entry.php:165 -#: sales/sales_order_entry.php.orig:165 ++#: ../sales/sales_order_entry.php:171 #, php-format msgid "Quotation # %d has been updated." msgstr "" - #: ../sales/sales_order_entry.php:169 -#: sales/sales_order_entry.php:168 sales/sales_order_entry.php:176 -#: sales/sales_order_entry.php.orig:176 ++#: ../sales/sales_order_entry.php:182 msgid "Select A Different &Quotation" msgstr "" - #: ../sales/sales_order_entry.php:188 -#: sales/sales_order_entry.php:187 sales/sales_order_entry.php:195 -#: sales/sales_order_entry.php.orig:195 ++#: ../sales/sales_order_entry.php:201 msgid "Make &Invoice Against This Delivery" msgstr "" - #: ../sales/sales_order_entry.php:192 -#: sales/sales_order_entry.php:191 sales/sales_order_entry.php:199 -#: sales/sales_order_entry.php.orig:199 ++#: ../sales/sales_order_entry.php:205 msgid "Enter a New Template &Delivery" msgstr "" - #: ../sales/sales_order_entry.php:195 -#: sales/sales_order_entry.php:194 sales/sales_order_entry.php:202 -#: sales/sales_order_entry.php.orig:202 ++#: ../sales/sales_order_entry.php:208 msgid "Enter a &New Delivery" msgstr "" - #: ../sales/sales_order_entry.php:203 -#: sales/sales_order_entry.php:202 sales/sales_order_entry.php:210 -#: sales/sales_order_entry.php.orig:210 ++#: ../sales/sales_order_entry.php:216 #, php-format msgid "Invoice # %d has been entered." msgstr "" - #: ../sales/sales_order_entry.php:207 -#: sales/sales_order_entry.php:206 sales/sales_order_entry.php:214 -#: sales/sales_order_entry.php.orig:214 ++#: ../sales/sales_order_entry.php:220 msgid "&Print Sales Invoice" msgstr "" - #: ../sales/sales_order_entry.php:208 -#: sales/sales_order_entry.php:207 sales/sales_order_entry.php:215 -#: sales/sales_order_entry.php.orig:215 ++#: ../sales/sales_order_entry.php:221 msgid "&Email Sales Invoice" msgstr "" - #: ../sales/sales_order_entry.php:216 -#: sales/sales_order_entry.php:215 sales/sales_order_entry.php:223 -#: sales/sales_order_entry.php.orig:223 ++#: ../sales/sales_order_entry.php:229 msgid "Print &Receipt" msgstr "" - #: ../sales/sales_order_entry.php:221 -#: sales/sales_order_entry.php:220 sales/sales_order_entry.php:228 -#: sales/sales_order_entry.php.orig:228 ++#: ../sales/sales_order_entry.php:234 msgid "Enter a &New Template Invoice" msgstr "" - #: ../sales/sales_order_entry.php:224 -#: sales/sales_order_entry.php:223 sales/sales_order_entry.php:231 -#: sales/sales_order_entry.php.orig:231 ++#: ../sales/sales_order_entry.php:237 msgid "Enter a &New Direct Invoice" msgstr "" - #: ../sales/sales_order_entry.php:362 -#: sales/sales_order_entry.php:356 sales/sales_order_entry.php:365 -#: sales/sales_order_entry.php.orig:364 ++#: ../sales/sales_order_entry.php:376 +msgid "Pre-payment required have to be positive and less than total amount." +msgstr "" + - #: ../sales/sales_order_entry.php:367 ++#: ../sales/sales_order_entry.php:381 msgid "" "You must enter the person or company to whom delivery should be made to." msgstr "" - #: ../sales/sales_order_entry.php:374 -#: sales/sales_order_entry.php:363 sales/sales_order_entry.php:372 -#: sales/sales_order_entry.php.orig:371 ++#: ../sales/sales_order_entry.php:388 msgid "" "You should enter the street address in the box provided. Orders cannot be " "accepted without a valid street address." msgstr "" - #: ../sales/sales_order_entry.php:383 -#: sales/sales_order_entry.php:372 sales/sales_order_entry.php:381 -#: sales/sales_order_entry.php.orig:380 ++#: ../sales/sales_order_entry.php:397 msgid "The shipping cost entered is expected to be numeric." msgstr "" - #: ../sales/sales_order_entry.php:389 -#: sales/sales_order_entry.php:378 sales/sales_order_entry.php:387 -#: sales/sales_order_entry.php.orig:386 ++#: ../sales/sales_order_entry.php:403 msgid "The Valid date is invalid." msgstr "" - #: ../sales/sales_order_entry.php:391 -#: sales/sales_order_entry.php:380 sales/sales_order_entry.php:389 -#: sales/sales_order_entry.php.orig:388 ++#: ../sales/sales_order_entry.php:405 msgid "The delivery date is invalid." msgstr "" - #: ../sales/sales_order_entry.php:398 -#: sales/sales_order_entry.php:387 sales/sales_order_entry.php:396 -#: sales/sales_order_entry.php.orig:395 ++#: ../sales/sales_order_entry.php:412 msgid "The requested valid date is before the date of the quotation." msgstr "" - #: ../sales/sales_order_entry.php:400 -#: sales/sales_order_entry.php:389 sales/sales_order_entry.php:398 -#: sales/sales_order_entry.php.orig:397 ++#: ../sales/sales_order_entry.php:414 msgid "The requested delivery date is before the date of the order." msgstr "" - #: ../sales/sales_order_entry.php:409 -#: sales/sales_order_entry.php:398 sales/sales_order_entry.php:407 -#: sales/sales_order_entry.php.orig:406 ++#: ../sales/sales_order_entry.php:423 msgid "You need to define a cash account for your Sales Point." msgstr "" - #: ../sales/sales_order_entry.php:480 -#: sales/sales_order_entry.php:469 sales/sales_order_entry.php:473 -#: sales/sales_order_entry.php:484 sales/sales_order_entry.php.orig:483 ++#: ../sales/sales_order_entry.php:500 msgid "" "The item could not be updated because you are attempting to set the quantity " "ordered to less than 0, or the discount percent to more than 100." msgstr "" - #: ../sales/sales_order_entry.php:484 -#: sales/sales_order_entry.php:473 sales/sales_order_entry.php:477 -#: sales/sales_order_entry.php:488 sales/sales_order_entry.php.orig:487 ++#: ../sales/sales_order_entry.php:504 msgid "Price for inventory item must be entered and can not be less than 0" msgstr "" - #: ../sales/sales_order_entry.php:491 -#: sales/sales_order_entry.php:480 sales/sales_order_entry.php:484 -#: sales/sales_order_entry.php:495 sales/sales_order_entry.php.orig:494 ++#: ../sales/sales_order_entry.php:511 msgid "" "You attempting to make the quantity ordered a quantity less than has already " "been delivered. The quantity delivered cannot be modified retrospectively." msgstr "" - #: ../sales/sales_order_entry.php:522 -#: sales/sales_order_entry.php:511 sales/sales_order_entry.php:515 -#: sales/sales_order_entry.php:526 sales/sales_order_entry.php.orig:525 ++#: ../sales/sales_order_entry.php:542 #, php-format msgid "Price %s is below Standard Cost %s" msgstr "" - #: ../sales/sales_order_entry.php:547 -#: sales/sales_order_entry.php:536 sales/sales_order_entry.php:540 -#: sales/sales_order_entry.php:551 sales/sales_order_entry.php.orig:550 ++#: ../sales/sales_order_entry.php:567 msgid "" "This item cannot be deleted because some of it has already been delivered." msgstr "" - #: ../sales/sales_order_entry.php:576 -#: sales/sales_order_entry.php:565 sales/sales_order_entry.php:569 -#: sales/sales_order_entry.php:580 sales/sales_order_entry.php.orig:579 ++#: ../sales/sales_order_entry.php:596 msgid "Direct delivery entry has been cancelled as requested." msgstr "" - #: ../sales/sales_order_entry.php:577 -#: sales/sales_order_entry.php:566 sales/sales_order_entry.php:570 -#: sales/sales_order_entry.php:581 sales/sales_order_entry.php.orig:580 ++#: ../sales/sales_order_entry.php:597 msgid "Enter a New Sales Delivery" msgstr "" - #: ../sales/sales_order_entry.php:580 -#: sales/sales_order_entry.php:569 sales/sales_order_entry.php:573 -#: sales/sales_order_entry.php:584 sales/sales_order_entry.php.orig:583 ++#: ../sales/sales_order_entry.php:600 msgid "Direct invoice entry has been cancelled as requested." msgstr "" - #: ../sales/sales_order_entry.php:581 -#: sales/sales_order_entry.php:570 sales/sales_order_entry.php:574 -#: sales/sales_order_entry.php:585 sales/sales_order_entry.php.orig:584 ++#: ../sales/sales_order_entry.php:601 msgid "Enter a New Sales Invoice" msgstr "" - #: ../sales/sales_order_entry.php:586 -#: sales/sales_order_entry.php:575 sales/sales_order_entry.php:579 -#: sales/sales_order_entry.php:590 sales/sales_order_entry.php.orig:589 ++#: ../sales/sales_order_entry.php:606 msgid "" "This order cannot be cancelled because some of it has already been invoiced " "or dispatched. However, the line item quantities may be modified." msgstr "" - #: ../sales/sales_order_entry.php:591 -#: sales/sales_order_entry.php:580 sales/sales_order_entry.php:584 -#: sales/sales_order_entry.php:595 sales/sales_order_entry.php.orig:594 ++#: ../sales/sales_order_entry.php:611 msgid "This sales quotation has been cancelled as requested." msgstr "" - #: ../sales/sales_order_entry.php:592 -#: sales/sales_order_entry.php:581 sales/sales_order_entry.php:585 -#: sales/sales_order_entry.php:596 sales/sales_order_entry.php.orig:595 ++#: ../sales/sales_order_entry.php:612 msgid "Enter a New Sales Quotation" msgstr "" - #: ../sales/sales_order_entry.php:596 -#: sales/sales_order_entry.php:585 sales/sales_order_entry.php:589 -#: sales/sales_order_entry.php:600 sales/sales_order_entry.php.orig:599 ++#: ../sales/sales_order_entry.php:616 msgid "This sales order has been cancelled as requested." msgstr "" - #: ../sales/sales_order_entry.php:597 -#: sales/sales_order_entry.php:586 sales/sales_order_entry.php:590 -#: sales/sales_order_entry.php:601 sales/sales_order_entry.php.orig:600 ++#: ../sales/sales_order_entry.php:617 msgid "Enter a New Sales Order" msgstr "" - #: ../sales/sales_order_entry.php:676 -#: sales/sales_order_entry.php:665 sales/sales_order_entry.php:669 -#: sales/sales_order_entry.php:680 sales/sales_order_entry.php.orig:679 ++#: ../sales/sales_order_entry.php:696 msgid "Sales Invoice Items" msgstr "" - #: ../sales/sales_order_entry.php:677 -#: sales/sales_order_entry.php:666 sales/sales_order_entry.php:670 -#: sales/sales_order_entry.php:681 sales/sales_order_entry.php.orig:680 ++#: ../sales/sales_order_entry.php:697 msgid "Enter Delivery Details and Confirm Invoice" msgstr "" - #: ../sales/sales_order_entry.php:679 -#: sales/sales_order_entry.php:668 sales/sales_order_entry.php:672 -#: sales/sales_order_entry.php:683 sales/sales_order_entry.php.orig:682 ++#: ../sales/sales_order_entry.php:699 msgid "Place Invoice" msgstr "" - #: ../sales/sales_order_entry.php:682 -#: sales/sales_order_entry.php:671 sales/sales_order_entry.php:675 -#: sales/sales_order_entry.php:686 sales/sales_order_entry.php.orig:685 ++#: ../sales/sales_order_entry.php:702 msgid "Delivery Note Items" msgstr "" - #: ../sales/sales_order_entry.php:683 -#: sales/sales_order_entry.php:672 sales/sales_order_entry.php:676 -#: sales/sales_order_entry.php:687 sales/sales_order_entry.php.orig:686 ++#: ../sales/sales_order_entry.php:703 msgid "Enter Delivery Details and Confirm Dispatch" msgstr "" - #: ../sales/sales_order_entry.php:684 -#: sales/sales_order_entry.php:673 sales/sales_order_entry.php:677 -#: sales/sales_order_entry.php:688 sales/sales_order_entry.php.orig:687 ++#: ../sales/sales_order_entry.php:704 msgid "Cancel Delivery" msgstr "" - #: ../sales/sales_order_entry.php:685 -#: sales/sales_order_entry.php:674 sales/sales_order_entry.php:678 -#: sales/sales_order_entry.php:689 sales/sales_order_entry.php.orig:688 ++#: ../sales/sales_order_entry.php:705 msgid "Place Delivery" msgstr "" - #: ../sales/sales_order_entry.php:687 -#: sales/sales_order_entry.php:676 sales/sales_order_entry.php:680 -#: sales/sales_order_entry.php:691 sales/sales_order_entry.php.orig:690 ++#: ../sales/sales_order_entry.php:707 msgid "Quotation Date:" msgstr "" - #: ../sales/sales_order_entry.php:688 -#: sales/sales_order_entry.php:677 sales/sales_order_entry.php:681 -#: sales/sales_order_entry.php:692 sales/sales_order_entry.php.orig:691 ++#: ../sales/sales_order_entry.php:708 msgid "Sales Quotation Items" msgstr "" - #: ../sales/sales_order_entry.php:689 -#: sales/sales_order_entry.php:678 sales/sales_order_entry.php:682 -#: sales/sales_order_entry.php:693 sales/sales_order_entry.php.orig:692 ++#: ../sales/sales_order_entry.php:709 msgid "Enter Delivery Details and Confirm Quotation" msgstr "" - #: ../sales/sales_order_entry.php:690 -#: sales/sales_order_entry.php:679 sales/sales_order_entry.php:683 -#: sales/sales_order_entry.php:694 sales/sales_order_entry.php.orig:693 ++#: ../sales/sales_order_entry.php:710 msgid "Cancel Quotation" msgstr "" - #: ../sales/sales_order_entry.php:691 -#: sales/sales_order_entry.php:680 sales/sales_order_entry.php:684 -#: sales/sales_order_entry.php:695 sales/sales_order_entry.php.orig:694 ++#: ../sales/sales_order_entry.php:711 msgid "Place Quotation" msgstr "" - #: ../sales/sales_order_entry.php:692 -#: sales/sales_order_entry.php:681 sales/sales_order_entry.php:685 -#: sales/sales_order_entry.php:696 sales/sales_order_entry.php.orig:695 ++#: ../sales/sales_order_entry.php:712 msgid "Commit Quotations Changes" msgstr "" - #: ../sales/sales_order_entry.php:696 -#: sales/sales_order_entry.php:684 sales/sales_order_entry.php:688 -#: sales/sales_order_entry.php:699 sales/sales_order_entry.php.orig:698 -msgid "Sales Order Items" -msgstr "" - -#: sales/sales_order_entry.php:685 sales/sales_order_entry.php:689 -#: sales/sales_order_entry.php:700 sales/sales_order_entry.php.orig:699 ++#: ../sales/sales_order_entry.php:716 msgid "Enter Delivery Details and Confirm Order" msgstr "" - #: ../sales/sales_order_entry.php:699 -#: sales/sales_order_entry.php:688 sales/sales_order_entry.php:692 -#: sales/sales_order_entry.php:703 sales/sales_order_entry.php.orig:702 ++#: ../sales/sales_order_entry.php:719 msgid "Commit Order Changes" msgstr "" - #: ../sales/sales_order_entry.php:720 -#: sales/sales_order_entry.php:710 sales/sales_order_entry.php:714 -#: sales/sales_order_entry.php:725 sales/sales_order_entry.php.orig:724 ++#: ../sales/sales_order_entry.php:740 msgid "You are about to void this Document.\\nDo you want to continue?" msgstr "" - #: ../sales/sales_order_entry.php:723 -#: sales/sales_order_entry.php:713 sales/sales_order_entry.php:717 -#: sales/sales_order_entry.php:728 sales/sales_order_entry.php.orig:727 ++#: ../sales/sales_order_entry.php:743 msgid "Validate changes and update document" msgstr "" - #: ../sales/sales_order_entry.php:727 -#: sales/sales_order_entry.php:717 sales/sales_order_entry.php:721 -#: sales/sales_order_entry.php:732 sales/sales_order_entry.php.orig:731 ++#: ../sales/sales_order_entry.php:747 msgid "" "Cancels document entry or removes sales order when editing an old document" msgstr "" @@@ -14525,16 -12756,14 +14421,13 @@@ msgstr " msgid "Customer Allocations" msgstr "" -#: sales/allocations/customer_allocation_main.php:32 -#: sales/manage/customer_branches.php:280 sales/manage/customers.php:322 -#: sales/manage/customers.php.orig:319 -#: sales/inquiry/customer_allocation_inquiry.php:42 -#: sales/inquiry/customer_inquiry.php:48 -#: sales/inquiry/customer_inquiry.php.orig:48 -#: sales/inquiry/sales_orders_view.php:243 -#: sales/inquiry/sales_orders_view.php.orig:241 sales/manage/customers.php:324 +#: ../sales/allocations/customer_allocation_main.php:32 +#: ../sales/manage/customer_branches.php:282 - #: ../sales/manage/customers.php:322 ++#: ../sales/manage/customers.php:324 +#: ../sales/manage/sav.customers.php:322 +#: ../sales/inquiry/customer_allocation_inquiry.php:42 - #: ../sales/inquiry/customer_allocation_inquiry.php.orig:42 +#: ../sales/inquiry/customer_inquiry.php:44 - #: ../sales/inquiry/customer_inquiry.php.orig:45 +#: ../sales/inquiry/sales_orders_view.php:265 - #: ../sales/inquiry/sales_orders_view.php.orig:242 msgid "Select a customer: " msgstr "" @@@ -14656,15 -12885,13 +14549,15 @@@ msgstr " msgid "Branch Short Name:" msgstr "" -#: sales/manage/customer_branches.php:241 sales/manage/customers.php:290 -#: sales/manage/customers.php.orig:287 sales/manage/customers.php:256 +#: ../sales/manage/customer_branches.php:242 - #: ../sales/manage/customers.php:290 ++#: ../sales/manage/customers.php:256 +#: ../sales/manage/sav.customers.php:290 msgid "Sales Person:" msgstr "" -#: sales/manage/customer_branches.php:242 sales/manage/customers.php:291 -#: sales/manage/customers.php.orig:288 sales/manage/customers.php:293 +#: ../sales/manage/customer_branches.php:243 - #: ../sales/manage/customers.php:291 ++#: ../sales/manage/customers.php:293 +#: ../sales/manage/sav.customers.php:291 msgid "Sales Area:" msgstr "" @@@ -14673,11 -12900,11 +14566,13 @@@ msgid "Sales Group:" msgstr "" -#: sales/manage/customer_branches.php:244 sales/manage/customers.php:291 +#: ../sales/manage/customer_branches.php:245 ++#: ../sales/manage/customers.php:291 msgid "Default Inventory Location:" msgstr "" -#: sales/manage/customer_branches.php:245 sales/manage/customers.php:292 +#: ../sales/manage/customer_branches.php:246 ++#: ../sales/manage/customers.php:292 msgid "Default Shipping Company:" msgstr "" @@@ -14697,9 -12924,8 +14592,8 @@@ msgstr " msgid "Disable this Branch:" msgstr "" -#: sales/manage/customer_branches.php:295 -#: sales/inquiry/sales_deliveries_view.php:183 +#: ../sales/manage/customer_branches.php:297 +#: ../sales/inquiry/sales_deliveries_view.php:183 - #: ../sales/inquiry/sales_deliveries_view.php.orig:183 msgid "Contact" msgstr "" @@@ -14719,9 -12945,9 +14613,8 @@@ msgstr " msgid "Tax Group" msgstr "" -#: sales/manage/customer_branches.php:319 -#: sales/includes/ui/sales_order_ui.inc:299 -#: sales/includes/ui/sales_order_ui.inc:303 +#: ../sales/manage/customer_branches.php:321 - #: ../sales/includes/ui/sales_order_ui.inc:299 +#: ../sales/includes/ui/sales_order_ui.inc.orig:299 msgid "" "The selected customer does not have any branches. Please create at least one " "branch." @@@ -14831,80 -13038,80 +14724,80 @@@ msgstr " msgid "Customer status:" msgstr "" - #: ../sales/manage/customers.php:261 -#: sales/manage/customers.php:261 sales/manage/customers.php.orig:258 -#: sales/manage/customers.php:262 ++#: ../sales/manage/customers.php:262 +#: ../sales/manage/sav.customers.php:261 msgid "Discount Percent:" msgstr "" - #: ../sales/manage/customers.php:262 -#: sales/manage/customers.php:262 sales/manage/customers.php.orig:259 -#: sales/manage/customers.php:263 ++#: ../sales/manage/customers.php:263 +#: ../sales/manage/sav.customers.php:262 msgid "Prompt Payment Discount Percent:" msgstr "" - #: ../sales/manage/customers.php:266 -#: sales/manage/customers.php:266 sales/manage/customers.php.orig:263 -#: sales/manage/customers.php:267 ++#: ../sales/manage/customers.php:267 +#: ../sales/manage/sav.customers.php:266 msgid "Credit Status:" msgstr "" - #: ../sales/manage/customers.php:279 -#: sales/manage/customers.php:279 sales/manage/customers.php.orig:276 -#: sales/manage/customers.php:280 ++#: ../sales/manage/customers.php:280 +#: ../sales/manage/sav.customers.php:279 msgid "Customer branches" msgstr "" - #: ../sales/manage/customers.php:281 -#: sales/manage/customers.php:281 sales/manage/customers.php.orig:278 -#: sales/manage/customers.php:282 ++#: ../sales/manage/customers.php:282 +#: ../sales/manage/sav.customers.php:281 msgid "Select or &Add" msgstr "" - #: ../sales/manage/customers.php:281 -#: sales/manage/customers.php:281 sales/manage/customers.php.orig:278 -#: sales/manage/customers.php:282 ++#: ../sales/manage/customers.php:282 +#: ../sales/manage/sav.customers.php:281 msgid "&Add or Edit " msgstr "" - #: ../sales/manage/customers.php:299 -#: sales/manage/customers.php:299 sales/manage/customers.php.orig:296 -#: sales/manage/customers.php:301 ++#: ../sales/manage/customers.php:301 +#: ../sales/manage/sav.customers.php:299 msgid "Add New Customer" msgstr "" - #: ../sales/manage/customers.php:303 -#: sales/manage/customers.php:303 sales/manage/customers.php.orig:300 -#: sales/manage/customers.php:305 ++#: ../sales/manage/customers.php:305 +#: ../sales/manage/sav.customers.php:303 msgid "Update Customer" msgstr "" - #: ../sales/manage/customers.php:304 -#: sales/manage/customers.php:304 sales/manage/customers.php.orig:301 -#: sales/manage/customers.php:306 ++#: ../sales/manage/customers.php:306 +#: ../sales/manage/sav.customers.php:304 msgid "Update customer data" msgstr "" - #: ../sales/manage/customers.php:305 -#: sales/manage/customers.php:305 sales/manage/customers.php.orig:302 -#: sales/manage/customers.php:307 ++#: ../sales/manage/customers.php:307 +#: ../sales/manage/sav.customers.php:305 msgid "Select this customer and return to document entry." msgstr "" - #: ../sales/manage/customers.php:306 -#: sales/manage/customers.php:306 sales/manage/customers.php.orig:303 -#: sales/manage/customers.php:308 ++#: ../sales/manage/customers.php:308 +#: ../sales/manage/sav.customers.php:306 msgid "Delete Customer" msgstr "" - #: ../sales/manage/customers.php:307 -#: sales/manage/customers.php:307 sales/manage/customers.php.orig:304 -#: sales/manage/customers.php:309 ++#: ../sales/manage/customers.php:309 +#: ../sales/manage/sav.customers.php:307 msgid "Delete customer data if have been never used" msgstr "" - #: ../sales/manage/customers.php:314 -#: sales/manage/customers.php:314 sales/manage/customers.php.orig:311 -#: sales/manage/customers.php:316 ++#: ../sales/manage/customers.php:316 +#: ../sales/manage/sav.customers.php:314 msgid "" "There are no sales types defined. Please define at least one sales type " "before adding a customer." msgstr "" - #: ../sales/manage/customers.php:323 -#: sales/manage/customers.php:323 sales/manage/customers.php.orig:320 -#: sales/manage/customers.php:325 ++#: ../sales/manage/customers.php:325 +#: ../sales/manage/sav.customers.php:323 msgid "New customer" msgstr "" - #: ../sales/manage/customers.php:345 -#: sales/manage/customers.php:345 sales/manage/customers.php.orig:342 -#: sales/manage/customers.php:347 ++#: ../sales/manage/customers.php:347 +#: ../sales/manage/sav.customers.php:345 msgid "Sales &Orders" msgstr "" @@@ -15031,7 -13236,13 +14924,13 @@@ msgstr " msgid "New sales person data have been added" msgstr "" -#: sales/manage/sales_people.php:76 ++#: ../sales/manage/sales_people.php:76 + msgid "" + "Cannot delete this sales-person because branches are set up referring to " + "this sales-person - first alter the branches concerned." + msgstr "" + -#: sales/manage/sales_people.php:81 +#: ../sales/manage/sales_people.php:81 msgid "Selected sales person data have been deleted" msgstr "" @@@ -15348,193 -13526,169 +15247,155 @@@ msgstr " msgid "Quantity Delivered" msgstr "" -#: sales/inquiry/customer_allocation_inquiry.php:25 +#: ../sales/inquiry/customer_allocation_inquiry.php:25 - #: ../sales/inquiry/customer_allocation_inquiry.php.orig:25 msgid "Customer Allocation Inquiry" msgstr "" -#: sales/inquiry/customer_allocation_inquiry.php:96 +#: ../sales/inquiry/customer_allocation_inquiry.php:96 - #: ../sales/inquiry/customer_allocation_inquiry.php.orig:96 msgid "Allocation" msgstr "" -#: sales/inquiry/customer_allocation_inquiry.php:116 +#: ../sales/inquiry/customer_allocation_inquiry.php:116 - #: ../sales/inquiry/customer_allocation_inquiry.php.orig:116 msgid "Payment" msgstr "" -#: sales/inquiry/customer_inquiry.php:28 -#: sales/inquiry/customer_inquiry.php.orig:28 +#: ../sales/inquiry/customer_inquiry.php:26 - #: ../sales/inquiry/customer_inquiry.php.orig:27 msgid "Customer Transactions" msgstr "" -#: sales/inquiry/customer_inquiry.php:72 -#: sales/inquiry/customer_inquiry.php.orig:72 +#: ../sales/inquiry/customer_inquiry.php:68 - #: ../sales/inquiry/customer_inquiry.php.orig:69 msgid "CUSTOMER ACCOUNT IS ON HOLD" msgstr "" -#: sales/inquiry/customer_inquiry.php:205 -#: sales/inquiry/customer_inquiry.php.orig:205 +#: ../sales/inquiry/customer_inquiry.php:181 - #: ../sales/inquiry/customer_inquiry.php.orig:205 msgid "Print Receipt" msgstr "" -#: sales/inquiry/customer_inquiry.php:235 -#: sales/inquiry/customer_inquiry.php:248 -#: sales/inquiry/customer_inquiry.php.orig:235 -#: sales/inquiry/customer_inquiry.php.orig:248 +#: ../sales/inquiry/customer_inquiry.php:211 +#: ../sales/inquiry/customer_inquiry.php:224 - #: ../sales/inquiry/customer_inquiry.php.orig:235 - #: ../sales/inquiry/customer_inquiry.php.orig:248 msgid "RB" msgstr "" -#: sales/inquiry/sales_deliveries_view.php:29 +#: ../sales/inquiry/sales_deliveries_view.php:29 - #: ../sales/inquiry/sales_deliveries_view.php.orig:29 msgid "Search Not Invoiced Deliveries" msgstr "" -#: sales/inquiry/sales_deliveries_view.php:34 +#: ../sales/inquiry/sales_deliveries_view.php:34 - #: ../sales/inquiry/sales_deliveries_view.php.orig:34 msgid "Search All Deliveries" msgstr "" -#: sales/inquiry/sales_deliveries_view.php:70 +#: ../sales/inquiry/sales_deliveries_view.php:70 - #: ../sales/inquiry/sales_deliveries_view.php.orig:70 msgid "" "For batch invoicing you should\n" "\t\t select at least one delivery. All items must be dispatched to\n" "\t\t the same customer branch." msgstr "" -#: sales/inquiry/sales_deliveries_view.php:179 +#: ../sales/inquiry/sales_deliveries_view.php:179 - #: ../sales/inquiry/sales_deliveries_view.php.orig:179 msgid "Delivery #" msgstr "" -#: sales/inquiry/sales_deliveries_view.php:185 +#: ../sales/inquiry/sales_deliveries_view.php:185 - #: ../sales/inquiry/sales_deliveries_view.php.orig:185 msgid "Cust Ref" msgstr "" -#: sales/inquiry/sales_deliveries_view.php:187 +#: ../sales/inquiry/sales_deliveries_view.php:187 - #: ../sales/inquiry/sales_deliveries_view.php.orig:187 msgid "Due By" msgstr "" -#: sales/inquiry/sales_deliveries_view.php:188 +#: ../sales/inquiry/sales_deliveries_view.php:188 - #: ../sales/inquiry/sales_deliveries_view.php.orig:188 msgid "Delivery Total" msgstr "" -#: sales/inquiry/sales_deliveries_view.php:190 +#: ../sales/inquiry/sales_deliveries_view.php:190 - #: ../sales/inquiry/sales_deliveries_view.php.orig:190 msgid "Batch" msgstr "" -#: sales/inquiry/sales_deliveries_view.php:190 +#: ../sales/inquiry/sales_deliveries_view.php:190 - #: ../sales/inquiry/sales_deliveries_view.php.orig:190 msgid "Batch Invoicing" msgstr "" -#: sales/inquiry/sales_orders_view.php:40 -#: sales/inquiry/sales_orders_view.php.orig:48 +#: ../sales/inquiry/sales_orders_view.php:44 - #: ../sales/inquiry/sales_orders_view.php.orig:40 msgid "Search Outstanding Sales Orders" msgstr "" -#: sales/inquiry/sales_orders_view.php:45 -#: sales/inquiry/sales_orders_view.php.orig:53 +#: ../sales/inquiry/sales_orders_view.php:49 - #: ../sales/inquiry/sales_orders_view.php.orig:45 msgid "Search Template for Invoicing" msgstr "" -#: sales/inquiry/sales_orders_view.php:50 -#: sales/inquiry/sales_orders_view.php.orig:58 +#: ../sales/inquiry/sales_orders_view.php:54 - #: ../sales/inquiry/sales_orders_view.php.orig:50 msgid "Select Template for Delivery" msgstr "" -#: sales/inquiry/sales_orders_view.php:55 -#: sales/inquiry/sales_orders_view.php.orig:63 +#: ../sales/inquiry/sales_orders_view.php:59 +msgid "Invoicing Prepayment Orders" +msgstr "" + +#: ../sales/inquiry/sales_orders_view.php:64 - #: ../sales/inquiry/sales_orders_view.php.orig:55 msgid "Search All Sales Orders" msgstr "" -#: sales/inquiry/sales_orders_view.php:61 -#: sales/inquiry/sales_orders_view.php.orig:69 +#: ../sales/inquiry/sales_orders_view.php:70 - #: ../sales/inquiry/sales_orders_view.php.orig:61 msgid "Search All Sales Quotations" msgstr "" -#: sales/inquiry/sales_orders_view.php:136 -#: sales/inquiry/sales_orders_view.php.orig:134 +#: ../sales/inquiry/sales_orders_view.php:148 - #: ../sales/inquiry/sales_orders_view.php.orig:135 msgid "Dispatch" msgstr "" -#: sales/inquiry/sales_orders_view.php:178 -#: sales/inquiry/sales_orders_view.php.orig:176 +#: ../sales/inquiry/sales_orders_view.php:191 - #: ../sales/inquiry/sales_orders_view.php.orig:178 msgid "Set this order as a template for direct deliveries/invoices" msgstr "" -#: sales/inquiry/sales_orders_view.php:245 -#: sales/inquiry/sales_orders_view.php.orig:243 +#: ../sales/inquiry/sales_orders_view.php:200 +msgid "Prepayment Invoice" +msgstr "" + +#: ../sales/inquiry/sales_orders_view.php:200 +msgid "Final Invoice" +msgstr "" + +#: ../sales/inquiry/sales_orders_view.php:267 - #: ../sales/inquiry/sales_orders_view.php.orig:244 msgid "Show All:" msgstr "" -#: sales/inquiry/sales_orders_view.php:262 -#: sales/inquiry/sales_orders_view.php.orig:260 +#: ../sales/inquiry/sales_orders_view.php:284 - #: ../sales/inquiry/sales_orders_view.php.orig:261 msgid "Order #" msgstr "" -#: sales/inquiry/sales_orders_view.php:266 -#: sales/inquiry/sales_orders_view.php:280 -#: sales/inquiry/sales_orders_view.php.orig:264 -#: sales/inquiry/sales_orders_view.php.orig:278 +#: ../sales/inquiry/sales_orders_view.php:288 +#: ../sales/inquiry/sales_orders_view.php:302 - #: ../sales/inquiry/sales_orders_view.php.orig:265 - #: ../sales/inquiry/sales_orders_view.php.orig:279 msgid "Cust Order Ref" msgstr "" -#: sales/inquiry/sales_orders_view.php:269 -#: sales/inquiry/sales_orders_view.php:283 -#: sales/inquiry/sales_orders_view.php.orig:267 -#: sales/inquiry/sales_orders_view.php.orig:281 +#: ../sales/inquiry/sales_orders_view.php:291 +#: ../sales/inquiry/sales_orders_view.php:305 - #: ../sales/inquiry/sales_orders_view.php.orig:268 - #: ../sales/inquiry/sales_orders_view.php.orig:282 msgid "Delivery To" msgstr "" -#: sales/inquiry/sales_orders_view.php:276 -#: sales/inquiry/sales_orders_view.php.orig:274 +#: ../sales/inquiry/sales_orders_view.php:298 - #: ../sales/inquiry/sales_orders_view.php.orig:275 msgid "Quote #" msgstr "" -#: sales/inquiry/sales_orders_view.php:281 -#: sales/inquiry/sales_orders_view.php.orig:279 +#: ../sales/inquiry/sales_orders_view.php:303 - #: ../sales/inquiry/sales_orders_view.php.orig:280 msgid "Quote Date" msgstr "" -#: sales/inquiry/sales_orders_view.php:284 -#: sales/inquiry/sales_orders_view.php.orig:282 +#: ../sales/inquiry/sales_orders_view.php:306 - #: ../sales/inquiry/sales_orders_view.php.orig:283 msgid "Quote Total" msgstr "" -#: sales/inquiry/sales_orders_view.php:311 -#: sales/inquiry/sales_orders_view.php.orig:309 +#: ../sales/inquiry/sales_orders_view.php:337 - #: ../sales/inquiry/sales_orders_view.php.orig:310 msgid "Tmpl" msgstr "" - #: ../sales/includes/cart_class.inc:359 -#: sales/includes/cart_class.inc:347 sales/includes/cart_class.inc:352 --msgid "You have to enter valid stock code or nonempty description" --msgstr "" -- -#: sales/includes/sales_ui.inc:50 +#: ../sales/includes/sales_ui.inc:50 msgid "" "This edit session has been abandoned by opening sales document in another " "browser tab. You cannot edit more than one sales document at once." msgstr "" - #: ../sales/includes/db/custalloc_db.inc:350 -#: sales/includes/db/custalloc_db.inc:292 ++#: ../sales/includes/db/custalloc_db.inc:351 msgid "" "Unsuspected overallocation happened due to sparse credit notes exists for " "this invoice.\n" @@@ -15542,44 -13696,53 +15403,55 @@@ "charges." msgstr "" - #: ../sales/includes/db/sales_invoice_db.inc:196 -#: sales/includes/db/sales_invoice_db.inc:173 -#: sales/includes/db/sales_invoice_db.inc.orig:176 -#: sales/includes/db/sales_invoice_db.inc:174 --msgid "Cash invoice" --msgstr "" -- -#: sales/includes/db/sales_order_db.inc:107 -#: sales/includes/db/sales_order_db.inc:259 -#: sales/includes/db/sales_order_db.inc.orig:107 -#: sales/includes/db/sales_order_db.inc.orig:259 ++#: ../sales/includes/db/old.sales_order_db.inc:107 ++#: ../sales/includes/db/old.sales_order_db.inc:259 +#: ../sales/includes/db/sales_order_db.inc:109 +#: ../sales/includes/db/sales_order_db.inc:271 ++#: ../sales/includes/db/sales_order_db.inc.orig:109 ++#: ../sales/includes/db/sales_order_db.inc.orig:271 msgid "Stocks below Re-Order Level at " msgstr "" -#: sales/includes/db/sales_order_db.inc:110 -#: sales/includes/db/sales_order_db.inc:264 -#: sales/includes/db/sales_order_db.inc.orig:110 -#: sales/includes/db/sales_order_db.inc.orig:264 ++#: ../sales/includes/db/old.sales_order_db.inc:110 ++#: ../sales/includes/db/old.sales_order_db.inc:264 +#: ../sales/includes/db/sales_order_db.inc:112 +#: ../sales/includes/db/sales_order_db.inc:276 ++#: ../sales/includes/db/sales_order_db.inc.orig:112 ++#: ../sales/includes/db/sales_order_db.inc.orig:276 msgid "Below" msgstr "" -#: sales/includes/db/sales_order_db.inc:111 -#: sales/includes/db/sales_order_db.inc:265 -#: sales/includes/db/sales_order_db.inc.orig:111 -#: sales/includes/db/sales_order_db.inc.orig:265 ++#: ../sales/includes/db/old.sales_order_db.inc:111 ++#: ../sales/includes/db/old.sales_order_db.inc:265 +#: ../sales/includes/db/sales_order_db.inc:113 +#: ../sales/includes/db/sales_order_db.inc:277 ++#: ../sales/includes/db/sales_order_db.inc.orig:113 ++#: ../sales/includes/db/sales_order_db.inc.orig:277 msgid "Please reorder" msgstr "" -#: sales/includes/db/sales_order_db.inc:139 -#: sales/includes/db/sales_order_db.inc.orig:139 ++#: ../sales/includes/db/old.sales_order_db.inc:139 +#: ../sales/includes/db/sales_order_db.inc:141 ++#: ../sales/includes/db/sales_order_db.inc.orig:141 msgid "Deleted." msgstr "" -#: sales/includes/ui/sales_credit_ui.inc:94 -#: sales/includes/ui/sales_order_ui.inc:379 -#: sales/includes/ui/sales_order_ui.inc:383 ++#: ../sales/includes/db/sales_invoice_db.inc.orig:196 ++msgid "Cash invoice" ++msgstr "" ++ +#: ../sales/includes/ui/sales_credit_ui.inc:94 - #: ../sales/includes/ui/sales_order_ui.inc:379 +#: ../sales/includes/ui/sales_order_ui.inc.orig:379 msgid "Customer Currency:" msgstr "" -#: sales/includes/ui/sales_credit_ui.inc:112 -#: sales/includes/ui/sales_order_ui.inc:639 -#: sales/includes/ui/sales_order_ui.inc:643 +#: ../sales/includes/ui/sales_credit_ui.inc:112 - #: ../sales/includes/ui/sales_order_ui.inc:647 - #: ../sales/includes/ui/sales_order_ui.inc.orig:639 ++#: ../sales/includes/ui/sales_order_ui.inc.orig:647 msgid "Shipping Company:" msgstr "" -#: sales/includes/ui/sales_credit_ui.inc:114 -#: sales/includes/ui/sales_order_ui.inc:386 -#: sales/includes/ui/sales_order_ui.inc:390 +#: ../sales/includes/ui/sales_credit_ui.inc:114 - #: ../sales/includes/ui/sales_order_ui.inc:386 +#: ../sales/includes/ui/sales_order_ui.inc.orig:386 msgid "Customer Discount:" msgstr "" @@@ -15588,130 -13750,130 +15460,105 @@@ msgid "This item is already on this document. You have been warned." msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:104 -#: sales/includes/ui/sales_order_ui.inc:104 -#: sales/includes/ui/sales_order_ui.inc:106 ++#: ../sales/includes/ui/sales_order_ui.inc:106 +#: ../sales/includes/ui/sales_order_ui.inc.orig:104 msgid "" "The selected customer and branch are not valid, or the customer does not " "have any branches." msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:224 -#: sales/includes/ui/sales_order_ui.inc:224 -#: sales/includes/ui/sales_order_ui.inc:228 +#: ../sales/includes/ui/sales_order_ui.inc.orig:224 msgid "Shipping Charge" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:297 -#: sales/includes/ui/sales_order_ui.inc:297 -#: sales/includes/ui/sales_order_ui.inc:301 +#: ../sales/includes/ui/sales_order_ui.inc.orig:297 msgid "No customer found for entered text." msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:323 -#: sales/includes/ui/sales_order_ui.inc:323 -#: sales/includes/ui/sales_order_ui.inc:327 +#: ../sales/includes/ui/sales_order_ui.inc.orig:323 #, php-format msgid "Customer's payment terms '%s' cannot be selected on this POS" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:373 -#: sales/includes/ui/sales_order_ui.inc:373 -#: sales/includes/ui/sales_order_ui.inc:377 +#: ../sales/includes/ui/sales_order_ui.inc.orig:373 msgid "Reference number unique for this document type" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:413 - #: ../sales/includes/ui/sales_order_ui.inc:415 -#: sales/includes/ui/sales_order_ui.inc:413 -#: sales/includes/ui/sales_order_ui.inc:415 -#: sales/includes/ui/sales_order_ui.inc:417 -#: sales/includes/ui/sales_order_ui.inc:419 +#: ../sales/includes/ui/sales_order_ui.inc.orig:413 +#: ../sales/includes/ui/sales_order_ui.inc.orig:415 msgid "Price List:" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:432 -#: sales/includes/ui/sales_order_ui.inc:432 -#: sales/includes/ui/sales_order_ui.inc:436 +#: ../sales/includes/ui/sales_order_ui.inc.orig:432 msgid "Date of order receive" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:582 -#: sales/includes/ui/sales_order_ui.inc:582 -#: sales/includes/ui/sales_order_ui.inc:586 +#: ../sales/includes/ui/sales_order_ui.inc.orig:582 msgid "Cash payment" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:585 - #: ../sales/includes/ui/sales_order_ui.inc:617 -#: sales/includes/ui/sales_order_ui.inc:585 -#: sales/includes/ui/sales_order_ui.inc:617 -#: sales/includes/ui/sales_order_ui.inc:589 -#: sales/includes/ui/sales_order_ui.inc:621 +#: ../sales/includes/ui/sales_order_ui.inc.orig:585 +#: ../sales/includes/ui/sales_order_ui.inc.orig:617 msgid "Deliver from Location:" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:588 -#: sales/includes/ui/sales_order_ui.inc:588 -#: sales/includes/ui/sales_order_ui.inc:592 +#: ../sales/includes/ui/sales_order_ui.inc.orig:588 msgid "Cash account:" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:595 -#: sales/includes/ui/sales_order_ui.inc:595 -#: sales/includes/ui/sales_order_ui.inc:599 +#: ../sales/includes/ui/sales_order_ui.inc.orig:595 msgid "Delivery Details" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:600 -#: sales/includes/ui/sales_order_ui.inc:600 -#: sales/includes/ui/sales_order_ui.inc:604 +#: ../sales/includes/ui/sales_order_ui.inc.orig:600 msgid "Invoice Delivery Details" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:601 -#: sales/includes/ui/sales_order_ui.inc:601 -#: sales/includes/ui/sales_order_ui.inc:605 +#: ../sales/includes/ui/sales_order_ui.inc.orig:601 msgid "Invoice before" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:605 -#: sales/includes/ui/sales_order_ui.inc:605 -#: sales/includes/ui/sales_order_ui.inc:609 +#: ../sales/includes/ui/sales_order_ui.inc.orig:605 msgid "Quotation Delivery Details" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:610 -#: sales/includes/ui/sales_order_ui.inc:610 -#: sales/includes/ui/sales_order_ui.inc:614 +#: ../sales/includes/ui/sales_order_ui.inc.orig:610 msgid "Order Delivery Details" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:631 - #: ../sales/includes/ui/sales_order_ui.inc.orig:623 -#: sales/includes/ui/sales_order_ui.inc:623 -#: sales/includes/ui/sales_order_ui.inc:627 ++#: ../sales/includes/ui/sales_order_ui.inc.orig:631 msgid "Enter requested day of delivery" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:632 - #: ../sales/includes/ui/sales_order_ui.inc.orig:624 -#: sales/includes/ui/sales_order_ui.inc:624 -#: sales/includes/ui/sales_order_ui.inc:628 ++#: ../sales/includes/ui/sales_order_ui.inc.orig:632 msgid "Enter Valid until Date" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:633 - #: ../sales/includes/ui/sales_order_ui.inc.orig:625 -#: sales/includes/ui/sales_order_ui.inc:625 -#: sales/includes/ui/sales_order_ui.inc:629 ++#: ../sales/includes/ui/sales_order_ui.inc.orig:633 msgid "Deliver To:" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:634 - #: ../sales/includes/ui/sales_order_ui.inc.orig:626 -#: sales/includes/ui/sales_order_ui.inc:626 -#: sales/includes/ui/sales_order_ui.inc:630 ++#: ../sales/includes/ui/sales_order_ui.inc.orig:634 msgid "Additional identifier for delivery e.g. name of receiving person" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:637 - #: ../sales/includes/ui/sales_order_ui.inc.orig:629 -#: sales/includes/ui/sales_order_ui.inc:629 -#: sales/includes/ui/sales_order_ui.inc:633 ++#: ../sales/includes/ui/sales_order_ui.inc.orig:637 msgid "Delivery address. Default is address of customer branch" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:641 - #: ../sales/includes/ui/sales_order_ui.inc.orig:633 -#: sales/includes/ui/sales_order_ui.inc:633 -#: sales/includes/ui/sales_order_ui.inc:637 ++#: ../sales/includes/ui/sales_order_ui.inc.orig:641 msgid "Contact Phone Number:" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:642 - #: ../sales/includes/ui/sales_order_ui.inc.orig:634 -#: sales/includes/ui/sales_order_ui.inc:634 -#: sales/includes/ui/sales_order_ui.inc:638 ++#: ../sales/includes/ui/sales_order_ui.inc.orig:642 msgid "Phone number of ordering person. Defaults to branch phone number" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:643 - #: ../sales/includes/ui/sales_order_ui.inc.orig:635 -#: sales/includes/ui/sales_order_ui.inc:635 -#: sales/includes/ui/sales_order_ui.inc:639 ++#: ../sales/includes/ui/sales_order_ui.inc.orig:643 msgid "Customer Reference:" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:644 - #: ../sales/includes/ui/sales_order_ui.inc.orig:636 -#: sales/includes/ui/sales_order_ui.inc:636 -#: sales/includes/ui/sales_order_ui.inc:640 ++#: ../sales/includes/ui/sales_order_ui.inc.orig:644 msgid "Customer reference number for this order (if any)" msgstr "" @@@ -15894,16 -14040,16 +15741,16 @@@ msgstr " msgid "Purchasing GL Account:" msgstr "" - #: ../themes/default/renderer.php:27 -#: themes/default/renderer.php:27 themes/default/renderer.php:28 ++#: ../themes/default/renderer.php:28 msgid "Main Menu" msgstr "" - #: ../themes/default/renderer.php:53 - #: ../themes/default/renderer.php:76 -#: themes/default/renderer.php:53 themes/default/renderer.php:76 -#: themes/default/renderer.php:54 themes/default/renderer.php:80 ++#: ../themes/default/renderer.php:54 ++#: ../themes/default/renderer.php:80 msgid "Help" msgstr "" - #: ../themes/default/renderer.php:71 -#: themes/default/renderer.php:71 themes/default/renderer.php:75 ++#: ../themes/default/renderer.php:75 msgid "Preferences" msgstr "" diff --cc purchasing/supplier_payment.php index b28259e4,aff82825..e40fb8f2 --- a/purchasing/supplier_payment.php +++ b/purchasing/supplier_payment.php @@@ -272,13 -269,19 +269,19 @@@ start_form() supplier_list_row(_("Payment To:"), 'supplier_id', null, false, true); + if (list_updated('supplier_id') || list_updated('bank_account')) { + $_SESSION['alloc']->read(); + $_POST['memo_'] = $_POST['amount'] = ''; + $Ajax->activate('alloc_tbl'); + } + set_global_supplier($_POST['supplier_id']); - + if (!list_updated('bank_account')) $_POST['bank_account'] = get_default_supplier_bank_account($_POST['supplier_id']); - + bank_accounts_list_row(_("From Bank Account:"), 'bank_account', null, true); - + bank_balance_row($_POST['bank_account']); table_section(2); diff --cc sales/customer_delivery.php index 0ccad1c0,eb78f62e..fba45c7b --- a/sales/customer_delivery.php +++ b/sales/customer_delivery.php @@@ -326,14 -307,20 +319,22 @@@ if (isset($_POST['process_delivery']) & copy_to_cart(); if ($newdelivery) new_doc_date($dn->document_date); $delivery_no = $dn->write($bo_policy); - $is_prepaid = $dn->is_prepaid() ? "&prepaid=Yes" : ''; + if ($delivery_no == -1) + { + display_error(_("The entered reference is already in use.")); + set_focus('ref'); + } + else + { ++ $is_prepaid = $dn->is_prepaid() ? "&prepaid=Yes" : ''; + - processing_end(); - if ($newdelivery) { - meta_forward($_SERVER['PHP_SELF'], "AddedID=$delivery_no$is_prepaid"); - } else { - meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$delivery_no$is_prepaid"); + processing_end(); + if ($newdelivery) { - meta_forward($_SERVER['PHP_SELF'], "AddedID=$delivery_no"); ++ meta_forward($_SERVER['PHP_SELF'], "AddedID=$delivery_no$is_prepaid"); + } else { - meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$delivery_no"); ++ meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$delivery_no$is_prepaid"); + } - } + } } if (isset($_POST['Update']) || isset($_POST['_Location_update'])) { diff --cc sales/customer_invoice.php index 1a4959d9,b2499485..155120df --- a/sales/customer_invoice.php +++ b/sales/customer_invoice.php @@@ -333,40 -281,26 +333,34 @@@ function check_data( set_focus('ref'); return false; } - - if (!is_new_reference($_POST['ref'], 10)) { - display_error(_("The entered reference is already in use.")); - set_focus('ref'); - return false; - } } - if ($_POST['ChargeFreightCost'] == "") { - $_POST['ChargeFreightCost'] = price_format(0); - } + if(!$prepaid) + { + if ($_POST['ChargeFreightCost'] == "") { + $_POST['ChargeFreightCost'] = price_format(0); + } - if (!check_num('ChargeFreightCost', 0)) { - display_error(_("The entered shipping value is not numeric.")); - set_focus('ChargeFreightCost'); - return false; - } + if (!check_num('ChargeFreightCost', 0)) { + display_error(_("The entered shipping value is not numeric.")); + set_focus('ChargeFreightCost'); + return false; + } - if ($_SESSION['Items']->has_items_dispatch() == 0 && input_num('ChargeFreightCost') == 0) { - display_error(_("There are no item quantities on this invoice.")); - return false; - } + if ($_SESSION['Items']->has_items_dispatch() == 0 && input_num('ChargeFreightCost') == 0) { + display_error(_("There are no item quantities on this invoice.")); + return false; + } - if (!check_quantities()) { - display_error(_("Selected quantity cannot be less than quantity credited nor more than quantity not invoiced yet.")); - return false; + if (!check_quantities()) { + display_error(_("Selected quantity cannot be less than quantity credited nor more than quantity not invoiced yet.")); + return false; + } + } else { + if (($_SESSION['Items']->payment_terms['days_before_due'] < 0) && !count($_SESSION['Items']->prepayments)) { + display_error(_("There is no non-invoiced payments for this order. If you want to issue final invoice, select delayed or cash payment terms.")); + return false; + } } return true; diff --cc sales/customer_payments.php index 8b4bccec,b81b609c..e1b672c9 --- a/sales/customer_payments.php +++ b/sales/customer_payments.php @@@ -246,14 -248,9 +248,9 @@@ if (isset($_POST['ref']) && $_SESSION[' display_error( _("The entered reference is already in use.")); display_footer_exit(); } -} +} $new = $_SESSION['alloc']->trans_no == 0; - if (list_updated('customer_id') || ($new && list_updated('bank_account'))) { - $_SESSION['alloc']->read(); - $_POST['memo_'] = $_POST['amount'] = $_POST['discount'] = ''; - $Ajax->activate('alloc_tbl'); - } //---------------------------------------------------------------------------------------------- if (isset($_POST['AddPaymentItem'])) { diff --cc sales/includes/cart_class.inc index fe2130d3,40fb2a3f..501ab6a9 --- a/sales/includes/cart_class.inc +++ b/sales/includes/cart_class.inc @@@ -253,9 -241,14 +253,15 @@@ class car // Writing new/modified sales document to database. // Makes parent documents for direct delivery/invoice by recurent call. // $policy - 0 or 1: writeoff/return for IV, back order/cancel for DN - function write($policy=0) { + function write($policy=0) { ++ begin_transaction(); // prevents partial database changes in case of direct delivery/invoice + if ($this->reference != 'auto' && $this->trans_no == 0 && !is_new_reference($this->reference, $this->trans_type)) + { + commit_transaction(); + return -1; - } - if (count($this->src_docs) == 0 && ($this->trans_type == ST_SALESINVOICE || $this->trans_type == ST_CUSTDELIVERY)) { ++ } + if (count($this->src_docs) == 0 && ($this->trans_type == ST_SALESINVOICE || $this->trans_type == ST_CUSTDELIVERY) && !$this->is_prepaid()) { // this is direct document - first add parent $ref = $this->reference; $date = $this->document_date; diff --cc sales/includes/db/sales_order_db.inc index 5c72a6e4,c1e7ad52..9b8bcfd2 --- a/sales/includes/db/sales_order_db.inc +++ b/sales/includes/db/sales_order_db.inc @@@ -295,20 -283,12 +295,22 @@@ function get_sales_order_header($order_ ."stype.sales_type, " ."stype.id AS sales_type_id, " ."stype.tax_included, " - ."ship.shipper_name, " + ."stype.factor, " + ."ship.shipper_name, " ."tax_group.name AS tax_group_name , " ."tax_group.id AS tax_group_id, " - ."cust.tax_id " - ."FROM ".TB_PREF."sales_orders sorder LEFT JOIN ".TB_PREF."shippers ship ON ship.shipper_id = sorder.ship_via," + ."cust.tax_id," + ."sorder.alloc," + ."IFNULL(allocs.ord_allocs, 0)+IFNULL(inv.inv_allocs ,0) AS sum_paid," + ."sorder.prep_amount>0 as prepaid" + ." FROM ".TB_PREF."sales_orders sorder + LEFT JOIN (SELECT trans_no_to, sum(amt) ord_allocs FROM ".TB_PREF."cust_allocations + WHERE trans_type_to=".ST_SALESORDER." AND trans_no_to=".db_escape($order_no)." GROUP BY trans_no_to) + allocs ON sorder.trans_type=".ST_SALESORDER." AND allocs.trans_no_to=sorder.order_no + LEFT JOIN (SELECT order_, sum(alloc) inv_allocs FROM ".TB_PREF."debtor_trans + WHERE type=".ST_SALESINVOICE." AND order_=".db_escape($order_no)." GROUP BY order_) - inv ON sorder.trans_type=".ST_SALESORDER." AND inv.order_=sorder.order_no," ++ inv ON sorder.trans_type=".ST_SALESORDER." AND inv.order_=sorder.order_no ++ LEFT JOIN ".TB_PREF."shippers ship ON ship.shipper_id = sorder.ship_via," .TB_PREF."debtors_master cust," .TB_PREF."sales_types stype, " .TB_PREF."tax_groups tax_group, " diff --cc sales/includes/ui/sales_order_ui.inc index 2170595a,9cb6c363..af675e77 --- a/sales/includes/ui/sales_order_ui.inc +++ b/sales/includes/ui/sales_order_ui.inc @@@ -116,10 -118,12 +118,13 @@@ function get_customer_details_to_order( $order->set_delivery($myrow["default_ship_via"], $myrow["br_name"], $address); - if ($order->trans_type == ST_SALESINVOICE || $order->trans_type == ST_SALESORDER) { + if ($order->trans_type == ST_SALESINVOICE) { $order->due_date = get_invoice_duedate($order->payment, $order->document_date); } - if ($order->payment_terms['cash_sale']) { + elseif ($order->trans_type == ST_SALESORDER) + $order->due_date = add_days($order->document_date, $SysPrefs->default_delivery_required_by()); ++ + if($order->payment_terms['cash_sale']) { $order->set_location($order->pos["pos_location"], $order->pos["location_name"]); } else $order->set_location($myrow["default_location"], $myrow["location_name"]); diff --cc sales/sales_order_entry.php index 0be40be1,23410132..8834127d --- a/sales/sales_order_entry.php +++ b/sales/sales_order_entry.php @@@ -256,9 -259,8 +265,9 @@@ function copy_to_cart( if ($newpayment) { $cart->due_date = $cart->document_date; $cart->phone = $cart->cust_ref = $cart->delivery_address = ''; - $cart->ship_via = 1; + $cart->ship_via = 0; $cart->deliver_to = ''; + $cart->prep_amount = 0; } } else { $cart->due_date = $_POST['delivery_date'];