390d9d69797c94d30ff61768485704717a96a9e3 version_2_3_10
a8b119b77f054c85223eb3a256268a3d5a61b3cb version_2_3_9
b2ead0b2a3e30c13254288eddf587b5d8140d731 version_2_3_8
+06e6f1abb26edd035aa34a5180da99ca72fce5dd version_2_3_11
+05b037ff3c0b294819843e6bc5ca6ee7b6555176 version_2_3_12
/**
* @version $Id$
* @package FrontAccounting
-* @copyright (C) 2005 - 2012 FrontAccounting, LLC
+* @copyright (C) 2005 - 2009 FrontAccounting, LLC
* @license http://www.gnu.org/copyleft/gpl-3.0.html GNU/GPL
* FrontAccounting is Free Software
*/
------------
This is a changelog for FrontAccounting All releases.
+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-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-06-22 16:05 +0200 Janusz Dobrowolski
+(3031) Standard invoicing icon used in prepayment invoicing inquire.
+ sales/inquiry/sales_orders_view.php
+
+2012-06-22 16:03 +0200 Janusz Dobrowolski
+(3030) Small fixes to deliveries sent in prepayment cycle.
+ sales/customer_delivery.php
+
+2012-06-18 21:13 +0200 Janusz Dobrowolski
+(3029) Further fixes to prepayment mode (updated init scripts and sql query in get_sales_order_header)
+ sales/includes/db/sales_order_db.inc
+ sql/en_US-demo.sql
+ sql/en_US-new.sql
+
+2012-06-17 22:18 +0200 Janusz Dobrowolski
+(3028) 0000696: Additional permission level for other user's transactions edition.
+ gl/gl_bank.php
+ gl/gl_journal.php
+ includes/access_levels.inc
+ includes/current_user.inc
+ includes/data_checks.inc
+ purchasing/po_entry_items.php
+ purchasing/supplier_credit.php
+ purchasing/supplier_invoice.php
+ sales/customer_delivery.php
+ sales/customer_invoice.php
+ sales/sales_order_entry.php
+ sql/alter2.4.sql
+ sql/en_US-demo.sql
+ sql/en_US-new.sql
+
+2012-06-16 11:44 +0200 Janusz Dobrowolski
+(3010) 0000593,0001093: Prepayments made against orders implemented.
+ admin/gl_setup.php
+ applications/customers.php
+ applications/suppliers.php
+ gl/includes/db/gl_db_accounts.inc
+ gl/includes/db/gl_db_trans.inc
+ includes/data_checks.inc
+ includes/db/allocations_db.inc
+ includes/db_pager.inc
+ includes/ui/allocation_cart.inc
+ includes/ui/ui_lists.inc
+ includes/ui/ui_view.inc
+ lang/new_language_template/LC_MESSAGES/empty.po
+ purchasing/includes/db/invoice_db.inc
+ purchasing/includes/db/po_db.inc
+ purchasing/includes/db/suppalloc_db.inc
+ purchasing/includes/po_class.inc
+ purchasing/includes/purchasing_db.inc
+ purchasing/includes/ui/po_ui.inc
+ purchasing/po_entry_items.php
+ purchasing/view/view_po.php
+ reporting/includes/doctext.inc
+ reporting/includes/pdf_report.inc
+ reporting/rep107.php
+ reporting/rep109.php
+ reporting/rep112.php
+ reporting/rep210.php
+ sales/customer_delivery.php
+ sales/customer_invoice.php
+ sales/includes/cart_class.inc
+ sales/includes/db/cust_trans_db.inc
+ sales/includes/db/custalloc_db.inc
+ sales/includes/db/sales_delivery_db.inc
+ sales/includes/db/sales_invoice_db.inc
+ sales/includes/db/sales_order_db.inc
+ sales/includes/sales_db.inc
+ sales/includes/ui/sales_order_ui.inc
+ sales/inquiry/customer_allocation_inquiry.php
+ sales/inquiry/sales_orders_view.php
+ sales/sales_order_entry.php
+ sales/view/view_invoice.php
+ sales/view/view_sales_order.php
+ sql/alter2.4.sql
+ sql/en_US-demo.sql
+ sql/en_US-new.sql
+
+2012-06-15 13:36 +0200 Janusz Dobrowolski
+(3009) Fixes in sales reports to use debtor_trans.tax_included field instead of trans_tax_details.included_in_price
+ reporting/rep107.php
+ reporting/rep110.php
+ reporting/rep113.php
+ sql/alter2.4.sql
+
+2012-04-15 14:17 +0200 Janusz Dobrowolski
+(3008) Deny access to error.log via http.
+ .htaccess
+
+2012-04-15 13:43 +0200 Janusz Dobrowolski
+(3007) Cleanups
+ gl/gl_bank.php
+ gl/includes/db/gl_db_accounts.inc
+
+2012-04-15 11:23 +0200 Janusz Dobrowolski
+(3006) Correction in accruals to avoid skipping shorter months.
+ gl/accruals.php
+
+2012-04-15 11:10 +0200 Janusz Dobrowolski
+(3005) Cleanup in bank_account_reconcile.
+ gl/bank_account_reconcile.php
+
+2012-04-09 11:32 +0200 Joe Hunt
+(3004) Changed hardcoded trans days in inquiries (30) to be a user preference.
+ admin/display_prefs.php
+ gl/inquiry/bank_inquiry.php
+ gl/inquiry/gl_account_inquiry.php
+ gl/inquiry/gl_trial_balance.php
+ gl/inquiry/profit_loss.php
+ gl/inquiry/tax_inquiry.php
+ gl/view/accrual_trans.php
+ includes/current_user.inc
+ includes/prefs/userprefs.inc
+ inventory/inquiry/stock_movements.php
+ purchasing/includes/ui/invoice_ui.inc
+ purchasing/inquiry/po_search.php
+ purchasing/inquiry/po_search_completed.php
+ purchasing/inquiry/supplier_allocation_inquiry.php
+ purchasing/inquiry/supplier_inquiry.php
+ sales/inquiry/customer_allocation_inquiry.php
+ sales/inquiry/customer_inquiry.php
+ sales/inquiry/sales_deliveries_view.php
+ sales/inquiry/sales_orders_view.php
+ sql/alter2.4.sql
+ sql/en_US-demo.sql
+ sql/en_US-new.sql
+
+2012-04-09 10:13 +0200 Joe Hunt
+(3003) 0001503: Request - fee account included in bank account table
+ gl/bank_transfer.php
+ gl/includes/db/gl_db_bank_accounts.inc
+ gl/includes/db/gl_db_banking.inc
+ gl/manage/bank_accounts.php
+ purchasing/includes/db/supp_payment_db.inc
+ purchasing/supplier_payment.php
+ sales/customer_payments.php
+ sales/includes/db/payment_db.inc
+ sql/alter2.4.sql
+ sql/en_US-demo.sql
+ sql/en_US-new.sql
+
+2012-03-29 22:58 +0200 Joe Hunt
+(2991) Default Receival Days implemented. Maintained in System and GL Setup.
+ CHANGELOG.txt
+ admin/gl_setup.php
+ includes/prefs/sysprefs.inc
+ purchasing/includes/ui/po_ui.inc
+ sql/alter2.4.php
+ sql/en_US-demo.sql
+ sql/en_US-new.sql
+
2012-03-04 16:52 +0100 Joe Hunt
(2982) Fixed typo in location variable.
purchasing/includes/db/grn_db.inc
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
.htaccess
CHANGELOG.txt
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
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
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
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_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
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
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/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
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
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
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
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
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
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
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
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
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/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/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
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/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/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/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
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/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/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/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/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
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
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
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
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.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
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
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/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
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
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
{
$demo_text = _("Please login here");
}
+
+ if (check_faillog())
+ {
+ $blocked_msg = '<span class=redfg>'._('Too many failed login attempts.<br>Please wait a while or try later.').'</span>';
+
+ $js .= "<script>setTimeout(function() {
+ document.getElementsByName('SubmitUser')[0].disabled=0;
+ document.getElementById('log_msg').innerHTML='$demo_text'}, 1000*$login_delay);</script>";
+ $demo_text = $blocked_msg;
+ }
if (!isset($def_coy))
$def_coy = 0;
$def_theme = "default";
$coy = $_SESSION['wa_current_user']->company;
else
$coy = $def_coy;
- echo "<tr><td>"._("Company")."</td><td><select name='company_login_name'>\n";
- for ($i = 0; $i < count($db_connections); $i++)
- echo "<option value=$i ".($i==$coy ? 'selected':'') .">" . $db_connections[$i]["name"] . "</option>";
- echo "</select>\n";
+ if (!@$text_company_selection) {
+ echo "<tr><td>"._("Company")."</td><td><select name='company_login_name'>\n";
+ for ($i = 0; $i < count($db_connections); $i++)
+ echo "<option value=$i ".($i==$coy ? 'selected':'') .">" . $db_connections[$i]["name"] . "</option>";
+ echo "</select>\n";
+ echo "</td></tr>";
+ } else {
+// $coy = $def_coy;
+ text_row(_("Company"), "company_login_nickname", "", 20, 30);
+ }
start_row();
- label_cell($demo_text, "colspan=2 align='center'");
+ label_cell($demo_text, "colspan=2 align='center' id='log_msg'");
end_row();
};
end_table(1);
echo "<center><input type='submit' value=' "._("Login -->")." ' name='SubmitUser'"
- .($login_timeout ? '':" onclick='set_fullmode();'")." /></center>\n";
+ .($login_timeout ? '':" onclick='set_fullmode();'").(isset($blocked_msg) ? " disabled" : '')." /></center>\n";
foreach($_SESSION['timeout']['post'] as $p => $val) {
// add all request variables to be resend together with login data
$_POST['filterType'] = $_GET['filterType'];
if (isset($_GET['trans_no']))
$_POST['trans_no'] = $_GET['trans_no'];
-
+
if ($Mode == 'ADD_ITEM' || $Mode == 'UPDATE_ITEM')
{
- if (isset($_FILES['filename']) && $_FILES['filename']['size'] > 0)
- {
+ if (!$_POST['trans_no'])
+ display_error(_("No transaction has been selected."));
+ elseif ($Mode == 'ADD_ITEM' && (!isset($_FILES['filename']) || $_FILES['filename']['size'] == 0))
+ display_error(_("Select attachment file."));
+ else {
//$content = base64_encode(file_get_contents($_FILES['filename']['tmp_name']));
$tmpname = $_FILES['filename']['tmp_name'];
$filename = basename($_FILES['filename']['name']);
$filesize = $_FILES['filename']['size'];
$filetype = $_FILES['filename']['type'];
- }
- else
- {
- $unique_name = $filename = $filetype = "";
- $filesize = 0;
- }
- if ($Mode == 'ADD_ITEM')
- {
- add_attachment($_POST['filterType'], $_POST['trans_no'], $_POST['description'],
- $filename, $unique_name, $filesize, $filetype);
- display_notification(_("Attachment has been inserted."));
- }
- else
- {
- update_attachment($selected_id, $_POST['filterType'], $_POST['trans_no'], $_POST['description'],
- $filename, $unique_name, $filesize, $filetype);
- display_notification(_("Attachment has been updated."));
+
+ if ($Mode == 'ADD_ITEM')
+ {
+ add_attachment($_POST['filterType'], $_POST['trans_no'], $_POST['description'],
+ $filename, $unique_name, $filesize, $filetype);
+ display_notification(_("Attachment has been inserted."));
+ }
+ else
+ {
+ update_attachment($selected_id, $_POST['filterType'], $_POST['trans_no'], $_POST['description'],
+ $filename, $unique_name, $filesize, $filetype);
+ display_notification(_("Attachment has been updated."));
+ }
}
$Mode = 'RESET';
-}
+}
if ($Mode == 'Delete')
{
end_table(1);
-submit_add_or_update_center($selected_id == -1, '', 'both');
+submit_add_or_update_center($selected_id == -1, '', 'process');
end_form();
if (!db_import($path_to_root.'/sql/'.get_post('coa'), $conn, $selected_id)) {
display_error(_('Cannot create new company due to bugs in sql file.'));
$error = true;
- } else
- if (isset($_POST['admpassword']) && $_POST['admpassword'] != "")
- update_admin_password($conn, md5($_POST['admpassword']));
+ }
+ else
+ {
+ if (!isset($_POST['admpassword']) || $_POST['admpassword'] == "")
+ $_POST['admpassword'] = "password";
+ update_admin_password($conn, md5($_POST['admpassword']));
+ }
}
set_global_connection();
if ($error) {
end_table();
display_note(_("The marked company is the current company which cannot be deleted."), 0, 0, "class='currentfg'");
+ display_note(_("If no Admin Password is entered, the new Admin Password will be '<b>password</b>' by default "), 1, 0, "class='currentfg'");
}
//---------------------------------------------------------------------------------------------
start_outer_table(TABLESTYLE2);
table_section(1);
-if (get_company_pref('grn_clearing_act') === null) { // available form 2.3.1, can be not defined on pre-2.4 installations
+
+if (get_company_pref('grn_clearing_act') === null) { // available from 2.3.1, can be not defined on pre-2.4 installations
set_company_pref('grn_clearing_act', 'glsetup.purchase', 'varchar', 15, 0);
refresh_sys_prefs();
}
if (($a&~0xffff) && (($a&0xff00)<(99<<8))) {
$sections[] = $a&~0xff; // add extended section for plugins
}
- $areas[] = $a;
+ $areas[] = (int)$a;
}
if (substr($p,0,7) == 'Section')
- $sections[] = substr($p, 7);
+ $sections[] = (int)substr($p, 7);
}
// $areas = sort_areas($areas);
define("ICON_CLOSED", "closed.png");
}
-?>
\ No newline at end of file
+/*
+ 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;
bank_accounts_list_row(_("To Account:"), 'ToBankAccount', null, true);
- date_row(_("Transfer Date:"), 'DatePaid', '', null, 0, 0, 0, null, true);
+ if (!isset($_POST['DatePaid'])) { // init page
+ $_POST['DatePaid'] = new_doc_date();
+ if (!is_date_in_fiscalyear($_POST['DatePaid']))
+ $_POST['DatePaid'] = end_fiscalyear();
+ }
+ date_row(_("Transfer Date:"), 'DatePaid', '', true, 0, 0, 0, null, true);
+
+ ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_BANKTRANSFER));
+
+ table_section(2);
$from_currency = get_bank_account_currency($_POST['FromBankAccount']);
$to_currency = get_bank_account_currency($_POST['ToBankAccount']);
amount_row(_("Bank Charge:"), 'charge');
}
- table_section(2);
-
- ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_BANKTRANSFER));
-
textarea_row(_("Memo:"), 'memo_', null, 40,4);
end_outer_table(1); // outer table
set_focus('ToBankAccount');
return false;
}
+
+ if (!db_has_currency_rates(get_bank_account_currency($_POST['FromBankAccount']), $_POST['DatePaid']))
+ return false;
+
+ if (!db_has_currency_rates(get_bank_account_currency($_POST['ToBankAccount']), $_POST['DatePaid']))
+ return false;
return true;
}
function handle_add_deposit()
{
+ new_doc_date($_POST['DatePaid']);
$trans_no = add_bank_transfer($_POST['FromBankAccount'], $_POST['ToBankAccount'],
$_POST['DatePaid'], input_num('amount'), $_POST['ref'], $_POST['memo_'], input_num('charge'));
set_focus('person_id');
$input_error = 1;
}
+ if (!db_has_currency_rates(get_bank_account_currency($_POST['bank_account']), $_POST['date_'], true))
+ $input_error = 1;
if ($input_error == 1)
unset($_POST['Process']);
* Returns null or transaction in conflict. Running balance is checked on daily basis only, to enable ID change after edition.
* $delta_amount - tested change in bank balance at $date.
**/
-function check_bank_account_history($delta_amount, $bank_account, $date, $user=null)
+function check_bank_account_history($delta_amount, $bank_account, $date=null, $user=null)
{
- if ($delta_amount >= 0)
+ if ($delta_amount >= 0 && isset($date))
return null; // amount increese is always safe
- $balance = get_bank_account_limit($bank_account, $date, $user);
+ $balance = $date ? get_bank_account_limit($bank_account, $date, $user) : 0;
- if (!isset($balance))
+ if (!isset($balance) && isset($date))
return null; // unlimited account
- $date = date2sql($date);
- $balance+= $delta_amount;
+ if ($balance < $delta_amount)
+ return array('amount' => $balance, 'trans_date'=> $date);
- $sql = "SELECT sum(amount) as amount FROM ".TB_PREF."bank_trans WHERE bank_act=".db_escape($bank_account)
- ." AND trans_date >= '$date' GROUP BY trans_date ORDER BY trans_date ASC";
+ $balance += $delta_amount;
+
+ $sql = "SELECT sum(amount) as amount, trans_date FROM ".TB_PREF."bank_trans WHERE bank_act=".db_escape($bank_account);
+ if ($date)
+ {
+ $date = date2sql($date);
+ $sql .= " AND trans_date > '$date'";
+ }
+ $sql .= " GROUP BY trans_date ORDER BY trans_date ASC";
$history = db_query($sql, "cannot retrieve cash account history");
." || (trans_type=".ST_JOURNAL ." AND amount<0)"
." || trans_type=".ST_CUSTCREDIT.", amount*ex_rate,0)) payable,
- SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE.",-1,1)*
+ SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE." || trans_type=".ST_JOURNAL.",-1,1)*
IF(trans_type=".ST_BANKDEPOSIT." || trans_type=".ST_SALESINVOICE
." || (trans_type=".ST_JOURNAL ." AND amount<0)"
." || trans_type=".ST_CUSTCREDIT.", 0, net_amount*ex_rate)) net_input,
- SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE.",-1,1)*
+ SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE." || trans_type=".ST_JOURNAL.",-1,1)*
IF(trans_type=".ST_BANKDEPOSIT." || trans_type=".ST_SALESINVOICE
." || (trans_type=".ST_JOURNAL ." AND amount<0)"
." || trans_type=".ST_CUSTCREDIT.", 0, amount*ex_rate)) collectible,
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;
}
?>
\ No newline at end of file
display_error( _("The account code must be numeric."));
set_focus('account_code');
}
-
if ($input_error != 1)
{
if ($accounts_alpha == 2)
display_notification(_("New account has been added."));
$selected_account = $_POST['AccountList'] = $_POST['account_code'];
}
+ else
+ display_error(_("Account not added, possible duplicate Account Code."));
}
$Ajax->activate('_page_body');
}
class current_user
{
- var $user;
+ var $user = 0;
var $loginname;
var $username;
var $name;
if (!isset($Auth_Result)) // if not used: standard method
$Auth_Result = get_user_auth($loginname, md5($password));
+ write_login_filelog($loginname, $Auth_Result);
+
if ($Auth_Result)
{
$myrow = get_user_by_login($loginname);
}
}
+function db_has_currency_rates($currency, $date_, $msg=false)
+{
+ $date = date2sql($date_);
+
+ if (is_company_currency($currency))
+ return 1;
+ $ret = check_empty_result("SELECT COUNT(*) FROM ".TB_PREF."exchange_rates WHERE curr_code = '$currency' && date_ <= '$date'");
+ if ($ret == 0 && $msg)
+ display_error(sprintf(_("Cannot retrieve exchange rate for currency %s as of %s. Please add exchange rate manually on Exchange Rates page."),
+ $currency, $date_), true);
+ return $ret;
+}
+
function db_has_sales_types()
{
return check_empty_result("SELECT COUNT(*) FROM ".TB_PREF."sales_types");
$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"] . " COLLATE ".get_mysql_collation();
if (!mysql_query($sql) || !mysql_select_db($connection["dbname"], $db))
return 0;
if ($connection["tbpref"] == "")
{
- $sql = "DROP DATABASE " . $connection["dbname"] . "";
+ $sql = "DROP DATABASE IF EXISTS " . $connection["dbname"] . "";
return mysql_query($sql);
}
else
else
$sql .= " ORDER BY contact_id";
- return db_query($sql, "Can't get crm persons");
+ $result = db_query($sql, "Can't get crm persons");
+ // fallback to general contacts
+ if (!db_num_rows($result) && $action && $action != 'general')
+ return get_crm_persons($type, 'general', $entity, $person, $unique);
+ else
+ return $result;
}
function get_crm_person($id)
}
}
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;
if (method_exists($hook, $method)) {
set_ext_domain('modules/'.$ext);
$result = $hook->$method($data, $opts);
+ set_ext_domain();
if (isset($result))
break;
- set_ext_domain();
}
}
return $result;
if (method_exists($hook, $method)) {
set_ext_domain('modules/'.$ext);
$result = $hook->$method($data, $opts);
+ set_ext_domain();
if (isset($result))
break;
- set_ext_domain();
}
}
return $result;
$sig = url_get_contents(REPO_URL.'/Release.sig');
$data = file_get_contents($loclist);
$cert = file_get_contents(PUBKEY_PATH.'/FA.pem');
- if (!openssl_verify($data, $sig, $cert)) {
+ if (openssl_verify($data, $sig, $cert) <= 0) {
if ($refresh) {
if (!@unlink($loclist))
{
"Referer: http://$host\r\n\r\n");
// retrieve the response from the remote server
- $len =0;
+ $unblocked=0;
+
while ($line = fread($fp, 4096)) {
$response .= $line;
- if ($host=='localhost')
+ if ($host=='localhost' && !$unblocked++)
stream_set_blocking($fp, 0); // just after connection switch to nonblocking mode
+ usleep(10);
}
fclose( $fp );
session_name($name);
// Set SSL level
- $https = isset($secure) ? $secure : isset($_SERVER['HTTPS']);
+ $https = isset($secure) ? $secure : (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off');
// Set session cookie options
session_set_cookie_params($limit, $path, $domain, $https, true);
kill_login();
die();
}
+//----------------------------------------------------------------------------------------
+// set to reasonable values if not set in config file (pre-2.3.12 installations)
+
+if (!isset($login_delay))
+{
+ $login_delay = 10;
+ $login_max_attempts = 3;
+}
+
+function check_faillog()
+{
+ global $login_delay, $login_faillog, $login_max_attempts;
+
+ $user = $_SESSION["wa_current_user"]->user;
+
+ if (@$login_delay && ($login_faillog[$user][$_SERVER['REMOTE_ADDR']] >= @$login_max_attempts) && (time() < $login_faillog[$user]['last'] + $login_delay))
+ return true;
+
+ return false;
+}
+/*
+ Simple brute force attack detection is performed before connection to company database is open. Therefore access counters have to be stored in file.
+ Login attempts counter is created for every new user IP, which partialy prevent DOS attacks.
+*/
+function write_login_filelog($login, $result)
+{
+ global $login_faillog, $login_max_attempts, $path_to_root;
+
+ $user = $_SESSION["wa_current_user"]->user;
+
+ $ip = $_SERVER['REMOTE_ADDR'];
+
+ if (!isset($login_faillog[$user][$ip]) || $result) // init or reset on successfull login
+ $login_faillog[$user] = array($ip => 0, 'last' => '');
+
+ if (!$result)
+ {
+ if ($login_faillog[$user][$ip] < @$login_max_attempts) {
+
+ $login_faillog[$user][$ip]++;
+ } else {
+ $login_faillog[$user][$ip] = 0; // comment out to restart counter only after successfull login.
+ error_log(sprintf(_("Brute force attack on account '%s' detected. Access for non-logged users temporarily blocked." ), $login));
+ }
+ $login_faillog[$user]['last'] = time();
+ }
+
+ $msg = "<?php\n";
+ $msg .= "/*\n";
+ $msg .= "Login attempts info.\n";
+ $msg .= "*/\n";
+ $msg .= "\$login_faillog = " .var_export($login_faillog, true). ";\n";
+
+ $filename = $path_to_root."/faillog.php";
+
+ if ((!file_exists($filename) && is_writable($path_to_root)) || is_writable($filename))
+ {
+ file_put_contents($filename, $msg);
+ }
+}
//----------------------------------------------------------------------------------------
include_once($path_to_root . "/admin/db/security_db.inc");
include_once($path_to_root . "/includes/lang/language.php");
include_once($path_to_root . "/config_db.php");
+@include_once($path_to_root . "/faillog.php");
include_once($path_to_root . "/includes/ajax.inc");
include_once($path_to_root . "/includes/ui/ui_msgs.inc");
include_once($path_to_root . "/includes/prefs/sysprefs.inc");
$Ajax->activate('_page_body');
exit;
} else {
-
+ if (isset($_POST["company_login_nickname"]) && !isset($_POST["company_login_name"])) {
+ for ($i = 0; $i < count($db_connections); $i++) {
+ if ($db_connections[$i]["name"] == $_POST["company_login_nickname"]) {
+ $_POST["company_login_name"] = $i;
+ unset($_POST["company_login_nickname"]);
+ break 1; // cannot pass variables to break from PHP v5.4 onwards
+ }
+ }
+ }
$succeed = isset($db_connections[$_POST["company_login_name"]]) &&
$_SESSION["wa_current_user"]->login($_POST["company_login_name"],
$_POST["user_name_entry_field"], $_POST["password"]);
$test['result'] &= $t;
}
+ foreach(array('Release', 'Themes', 'Languages', 'Extensions', 'Charts') as $file) {
+ $fname = $path_to_root."/modules/_cache/".$file.".gz";
+ $t = !file_exists($fname) || is_writable($fname);
+ if (!$t)
+ $test['comments'][] = sprintf(_("'%s' is not writeable"), $fname);
+ $test['result'] &= $t;
+ }
+
if(!$test['result'])
$test['comments'][] = _("Extensions configuration files and directories should be writeable");
+ $fname = $path_to_root."/themes";
$themedir = opendir($fname);
while (false !== ($fname = readdir($themedir)))
{
}
return $numeric ? -1 : null;
}
+
//------------------------------------------------------------------------------
//
// Helper function for simple db table editor pages
}
}
if ($use_date_picker)
+ {
+ $calc_image = (file_exists("$path_to_root/themes/".user_theme()."/images/cal.gif")) ?
+ "$path_to_root/themes/".user_theme()."/images/cal.gif" : "$path_to_root/themes/default/images/cal.gif";
$post_label = "<a tabindex='-1' href=\"javascript:date_picker(document.getElementsByName('$name')[0]);\">"
- . " <img src='$path_to_root/themes/default/images/cal.gif' width='16' height='16' border='0' alt='"._('Click Here to Pick up the date')."'></a>\n";
+ . " <img src='$calc_image' width='16' height='16' border='0' alt='"._('Click Here to Pick up the date')."'></a>\n";
+ }
else
$post_label = "";
echo "<td>";
- $class = $submit_on_change ? 'class="searchbox"' : '';
+ $class = $submit_on_change ? 'date active' : 'date';
$aspect = $check ? 'aspect="cdate"' : '';
if ($check && (get_post($name) != Today()))
$aspect .= ' style="color:#FF0000"';
default_focus($name);
-
- echo "<input type=\"text\" name=\"$name\" $class $aspect size=\"9\" maxlength=\"12\" value=\""
+ echo "<input type=\"text\" name=\"$name\" class=\"$class\" $aspect size=\"10\" maxlength=\"12\" value=\""
. $_POST[$name]. "\""
.($title ? " title='$title'": '')." > $post_label";
echo "</td>\n";
// exclude quotes, orders and dimensions
foreach (array(ST_PURCHORDER, ST_WORKORDER, ST_SALESORDER, ST_DIMENSION,
- ST_SALESQUOTE) as $excl)
+ ST_SALESQUOTE, ST_LOCTRANSFER) as $excl)
unset($items[$excl]);
echo array_selector($name, $value, $items,
label_cell(sql2date($alloc_row['tran_date']));
$alloc_row['Total'] = round2($alloc_row['Total'], user_price_dec());
$alloc_row['amt'] = round2($alloc_row['amt'], user_price_dec());
+ if ($payments && ($alloc_row['type'] == ST_SUPPAYMENT || $alloc_row['type'] == ST_BANKPAYMENT || $alloc_row['type'] == ST_SUPPCREDIT))
+ $alloc_row['Total'] = -$alloc_row['Total'];
amount_cell($alloc_row['Total']);
- //amount_cell($alloc_row['Total'] - $alloc_row['PrevAllocs'] - $alloc_row['amt']);
- amount_cell($alloc_row['Total'] - $alloc_row['amt']);
+ amount_cell($alloc_row['Total'] - $alloc_row['amt']);
amount_cell($alloc_row['amt']);
end_row();
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-09-18 14:11+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"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 ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-08 12:50+0200\n"
+"POT-Creation-Date: 2012-09-18 14:11+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: Janusz Dobrowolski <janusz@iron.from.pl>\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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /tmp/fa_unstable.sav3/devel/../install/index.php:76
msgid "Language"
msgstr "Jêzyk"
-#: /var/www/fa2.3/devel/../install/index.php:156
+#: /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 ""
+
+#: /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
+#: /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
+#: /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
+#: /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."
"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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /tmp/fa_unstable.sav3/devel/../install/index.php:316
msgid "System Diagnostics"
msgstr "Diagnostyka Systemu"
-#: /var/www/fa2.3/devel/../install/index.php:323
+#: /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
+#: /tmp/fa_unstable.sav3/devel/../install/index.php:324
msgid ""
"All application preliminary requirements seems to be correct. Please press "
"Continue button below."
"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
+#: /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."
"Aplikacja nie mo¿e byæ zainstalowana. Usuñ wskazane problemy i kliknij "
"klawisz 'Od¶wie¿'."
-#: /var/www/fa2.3/devel/../install/index.php:333
+#: /tmp/fa_unstable.sav3/devel/../install/index.php:328
msgid "Refresh"
msgstr "Od¶wierz"
-#: /var/www/fa2.3/devel/../install/index.php:343
+#: /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
+#: /tmp/fa_unstable.sav3/devel/../install/index.php:340
msgid "Server Host:"
msgstr "Adres Serwera:"
-#: /var/www/fa2.3/devel/../install/index.php:346
+#: /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
+#: /tmp/fa_unstable.sav3/devel/../install/index.php:342
msgid "Database Password:"
msgstr "Has³o:"
-#: /var/www/fa2.3/devel/../install/index.php:348
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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."
"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
+#: /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
+#: /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
+#: /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
+#: /tmp/fa_unstable.sav3/devel/../install/index.php:379
msgid "Company Settings"
msgstr "Ustawienia Firmy"
-#: /var/www/fa2.3/devel/../install/index.php:381
+#: /tmp/fa_unstable.sav3/devel/../install/index.php:381
msgid "Company Name:"
msgstr "Nazwa Firmy:"
-#: /var/www/fa2.3/devel/../install/index.php:382
+#: /tmp/fa_unstable.sav3/devel/../install/index.php:382
msgid "Admin Login:"
msgstr "Login Administratora:"
-#: /var/www/fa2.3/devel/../install/index.php:383
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:15
msgid "Info"
msgstr "Informacja"
-#: /var/www/fa2.3/devel/../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
+#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:17
msgid "Recommended"
msgstr "Zalecane"
-#: /var/www/fa2.3/devel/../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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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"
-#: /var/www/fa2.3/devel/../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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /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"
"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
+#: /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
+#: /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
+#: /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
+#: /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
+#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:397
msgid ""
"OpenSSL have to be available on your server to use extension repository "
"system."
"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
+#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:420
msgid "Test"
msgstr "Test"
-#: /var/www/fa2.3/devel/../includes/system_tests.inc:414
+#: /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
+#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:420
msgid "Value"
msgstr "Warto¶æ"
-#: /var/www/fa2.3/devel/../includes/system_tests.inc:414
+#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:420
msgid "Comments"
msgstr "Komentarz"
-#: /var/www/fa2.3/devel/../includes/system_tests.inc:438
+#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:444
msgid "Ok"
msgstr "Ok"
+
+#: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:190
+#, php-format
+msgid "No key field '%s' in file '%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."
+
+#: /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."
+
+#: /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."
+
+#: /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."
+
+#: /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."
+
+#: /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."
//first off validate inputs sensible
$_POST['loc_code'] = strtoupper($_POST['loc_code']);
- if (strlen(db_escape($_POST['loc_code'])) > 7) //check length after conversion
+ if ((strlen(db_escape($_POST['loc_code'])) > 7) || empty($_POST['loc_code'])) //check length after conversion
{
$input_error = 1;
display_error( _("The location code must be five characters or less long (including converted special chars)."));
close();
}
+/*
+ Normalize date format using previous input value to guess missing date elements.
+ Helps fast date input field change with only single or double numbers (for day or day-and-month fragments)
+*/
+function fix_date(date, last)
+{
+ var regex = /(\d+)[^\d]*(\d+)*[^\d]*(\d+)*/;
+ var dat = regex.exec(last);
+ var cur = regex.exec(date);
+ var day, month, year;
+
+// TODO: user.date as default?
+// TODO: user.datesys
+ if (!dat || !cur) return date;
+
+ if (cur[3] != undefined) // full date entered
+ dat = cur;
+
+ if (user.datefmt == 0) // set defaults
+ {
+ day = dat[2]; month = dat[1]; year = dat[3];
+ } else if (user.datefmt == 1)
+ {
+ day = dat[1]; month = dat[2]; year = dat[3];
+ } else {
+ day = dat[3]; month = dat[2]; year = dat[1];
+ }
+
+ if (cur[2] == undefined) // only day entred
+ day = cur[1];
+ else // day + month
+ if (cur[2] != undefined)
+ {
+ if (user.datefmt==1)
+ { day = cur[1]; month = cur[2] }
+ else
+ { day = cur[2]; month = cur[1] }
+ }
+
+ if (day<10) day = '0'+parseInt(day, 10);
+ if (month<10) month = '0'+parseInt(month, 10);
+ if (year<100) year = year<60 ? (2000+parseInt(year,10)) : (1900+parseInt(year,10));
+
+// console.info(day,month,year)
+ if (user.datefmt == 0)
+ return month+user.datesep+day+user.datesep+year;
+ if (user.datefmt == 1)
+ return day+user.datesep+month+user.datesep+year;
+ return year+user.datesep+month+user.datesep+day;
+}
+
/*
Behaviour definitions
*/
}
}
},
+ '.date':
+ function(e) {
+ e.setAttribute('_last_val', e.value);
+ e.setAttribute('autocomplete', 'off');
+ e.onblur = function() {
+ var val = this.getAttribute('_last_val');
+ if (val != this.value) {
+ this.value = fix_date(this.value, val);
+ this.setAttribute('_last_val', this.value);
+ if (e.className.match(/\bactive\b/))
+ JsHttpRequest.request('_'+this.name+'_changed', this.form);
+ }
+ }
+ },
'button[aspect*selector], button[aspect*abort], input[aspect*selector]': function(e) {
e.onclick = function() {
passBack(this.getAttribute('rel'));
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-18 14:10+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
#: ../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 ""
msgid "Please login here"
msgstr ""
-#: ../access/login.php:39
-#: ../access/login.php:69
+#: ../access/login.php:36
+msgid "Too many failed login attempts.<br>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:49
+#: ../access/login.php:86
msgid "Login"
msgstr ""
-#: ../access/login.php:76
-#: ../admin/inst_upgrade.php:137
+#: ../access/login.php:86
+#: ../admin/inst_upgrade.php:141
msgid "Version"
msgstr ""
-#: ../access/login.php:79
+#: ../access/login.php:89
msgid "User name"
msgstr ""
-#: ../access/login.php:83
+#: ../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: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:117
msgid "Login -->"
msgstr ""
-#: ../access/login.php:132
+#: ../access/login.php:148
#: ../admin/display_prefs.php:111
-#: ../themes/default/renderer.php:123
+#: ../themes/default/renderer.php:127
msgid "Theme:"
msgstr ""
msgid "Attach Documents"
msgstr ""
-#: ../admin/attachments.php:123
+#: ../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:127
msgid "Attachment has been updated."
msgstr ""
-#: ../admin/attachments.php:141
+#: ../admin/attachments.php:140
msgid "Attachment has been deleted."
msgstr ""
-#: ../admin/attachments.php:159
+#: ../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_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:170
#: ../admin/view_print_transaction.php:126
#: ../admin/void_transaction.php:181
#: ../dimensions/inquiry/search_dimensions.php:127
#: ../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: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
#: ../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
msgid "Description"
msgstr ""
-#: ../admin/attachments.php:171
+#: ../admin/attachments.php:170
#: ../admin/backups.php:63
#: ../admin/backups.php:149
msgid "Filename"
msgstr ""
-#: ../admin/attachments.php:171
+#: ../admin/attachments.php:170
msgid "Size"
msgstr ""
-#: ../admin/attachments.php:171
+#: ../admin/attachments.php:170
msgid "Filetype"
msgstr ""
-#: ../admin/attachments.php:171
+#: ../admin/attachments.php:170
msgid "Date Uploaded"
msgstr ""
-#: ../admin/attachments.php:186
-#: ../admin/create_coy.php:273
+#: ../admin/attachments.php:185
+#: ../admin/create_coy.php:277
#: ../admin/crm_categories.php:106
#: ../admin/fiscalyears.php:164
#: ../admin/inst_lang.php:100
#: ../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
#: ../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/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
msgid "Edit"
msgstr ""
-#: ../admin/attachments.php:187
+#: ../admin/attachments.php:186
#: ../gl/inquiry/journal_inquiry.php:135
msgid "View"
msgstr ""
-#: ../admin/attachments.php:188
+#: ../admin/attachments.php:187
msgid "Download"
msgstr ""
-#: ../admin/attachments.php:189
-#: ../admin/create_coy.php:274
+#: ../admin/attachments.php:188
+#: ../admin/create_coy.php:278
#: ../admin/crm_categories.php:110
#: ../admin/fiscalyears.php:166
#: ../admin/inst_chart.php:80
#: ../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
#: ../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_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
msgid "Delete"
msgstr ""
-#: ../admin/attachments.php:215
-#: ../admin/attachments.php:220
+#: ../admin/attachments.php:214
+#: ../admin/attachments.php:219
msgid "Transaction #"
msgstr ""
-#: ../admin/attachments.php:222
+#: ../admin/attachments.php:221
msgid "Attached File"
msgstr ""
msgstr ""
#: ../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
#: ../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
msgstr ""
#: ../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 ""
#: ../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 ""
#: ../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 ""
#: ../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: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
#: ../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
#: ../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"
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: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: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: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: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:165
msgid "New company has been created."
msgstr ""
-#: ../admin/create_coy.php:161
+#: ../admin/create_coy.php:165
msgid "Company has been updated."
msgstr ""
-#: ../admin/create_coy.php:178
+#: ../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:198
msgid "Cannot rename subdirectory to temporary name."
msgstr ""
-#: ../admin/create_coy.php:200
+#: ../admin/create_coy.php:204
msgid "Cannot rename company subdirectory"
msgstr ""
-#: ../admin/create_coy.php:206
+#: ../admin/create_coy.php:210
msgid "Error removing Database: "
msgstr ""
-#: ../admin/create_coy.php:206
+#: ../admin/create_coy.php:210
msgid ", please remove it manually"
msgstr ""
-#: ../admin/create_coy.php:225
+#: ../admin/create_coy.php:229
msgid "Cannot remove temporary renamed company data directory "
msgstr ""
-#: ../admin/create_coy.php:228
+#: ../admin/create_coy.php:232
msgid "Selected company has been deleted"
msgstr ""
-#: ../admin/create_coy.php:242
+#: ../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:253
msgid "Database Host"
msgstr ""
-#: ../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
msgid "Database User"
msgstr ""
-#: ../admin/create_coy.php:250
-#: ../admin/create_coy.php:338
+#: ../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: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: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:263
#: ../admin/fiscalyears.php:159
#: ../admin/inst_lang.php:85
#: ../admin/inst_lang.php:97
#: ../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
msgid "Yes"
msgstr ""
-#: ../admin/create_coy.php:288
+#: ../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:293
+msgid ""
+"If no Admin Password is entered, the new Admin Password will be "
+"'<b>password</b>' 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:342
msgid "Database Password"
msgstr ""
-#: ../admin/create_coy.php:339
+#: ../admin/create_coy.php:344
#: ../admin/inst_chart.php:68
#: ../admin/inst_chart.php:70
#: ../admin/inst_lang.php:87
#: ../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:355
msgid "Database Script"
msgstr ""
-#: ../admin/create_coy.php:351
+#: ../admin/create_coy.php:356
msgid "New script Admin Password"
msgstr ""
-#: ../admin/create_coy.php:355
+#: ../admin/create_coy.php:360
#: ../gl/gl_budget.php:136
msgid "Save"
msgstr ""
-#: ../admin/create_coy.php:377
+#: ../admin/create_coy.php:382
msgid "Create a new company"
msgstr ""
#: ../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
msgid "The general GL setup has been updated."
msgstr ""
-#: ../admin/gl_setup.php:138
-#: ../admin/gl_setup.php.orig:137
+#: ../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.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.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.orig:142
msgid "Retained Earnings:"
msgstr ""
-#: ../admin/gl_setup.php:144
-#: ../admin/gl_setup.php.orig:143
+#: ../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.orig:146
msgid "Exchange Variances Account:"
msgstr ""
-#: ../admin/gl_setup.php:148
-#: ../admin/gl_setup.php.orig:147
+#: ../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.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.orig:156
msgid "Default Credit Limit:"
msgstr ""
-#: ../admin/gl_setup.php:158
-#: ../admin/gl_setup.php.orig:157
+#: ../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.orig:160
msgid "Legal Text on Invoice:"
msgstr ""
-#: ../admin/gl_setup.php:162
-#: ../admin/gl_setup.php.orig:161
+#: ../admin/gl_setup.php.orig:162
msgid "Shipping Charged Account:"
msgstr ""
-#: ../admin/gl_setup.php:164
+#: ../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.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.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
msgid "Sales Account:"
msgstr ""
-#: ../admin/gl_setup.php:176
-#: ../admin/gl_setup.php.orig:172
+#: ../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.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.orig:180
msgid "Delivery Required By:"
msgstr ""
-#: ../admin/gl_setup.php:186
-#: ../admin/gl_setup.php.orig:182
+#: ../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.orig:188
msgid "Dimension Required By After:"
msgstr ""
-#: ../admin/gl_setup.php:192
-#: ../admin/gl_setup.php.orig:188
+#: ../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.orig:194
msgid "Delivery Over-Receive Allowance:"
msgstr ""
-#: ../admin/gl_setup.php:196
-#: ../admin/gl_setup.php.orig:192
+#: ../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.orig:198
msgid "Suppliers and Purchasing Defaults"
msgstr ""
-#: ../admin/gl_setup.php:200
-#: ../admin/gl_setup.php.orig:196
+#: ../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.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.orig:204
msgid "GRN Clearing Account:"
msgstr ""
-#: ../admin/gl_setup.php:204
-#: ../admin/gl_setup.php.orig:200
+#: ../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.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.orig:210
msgid "Allow Negative Inventory:"
msgstr ""
-#: ../admin/gl_setup.php:211
-#: ../admin/gl_setup.php.orig:207
+#: ../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.orig:213
msgid "Items Defaults"
msgstr ""
-#: ../admin/gl_setup.php:216
-#: ../admin/gl_setup.php.orig:212
+#: ../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.orig:218
#: ../inventory/manage/item_categories.php:196
#: ../inventory/manage/item_categories.php:204
#: ../inventory/manage/items.php:366
msgid "C.O.G.S. Account:"
msgstr ""
-#: ../admin/gl_setup.php:220
-#: ../admin/gl_setup.php.orig:216
+#: ../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.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.orig:226
msgid "Manufacturing Defaults"
msgstr ""
-#: ../admin/gl_setup.php:228
-#: ../admin/gl_setup.php.orig:224
+#: ../admin/gl_setup.php.orig:228
msgid "Work Order Required By After:"
msgstr ""
#: ../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 ""
#: ../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 ""
#: ../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"
msgid "Database upgrade for company '%s' (%s:%s*) started..."
msgstr ""
-#: ../admin/inst_upgrade.php:80
+#: ../admin/inst_upgrade.php:83
msgid "Database upgrade finished."
msgstr ""
-#: ../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:104
msgid "Cannot connect to database for company"
msgstr ""
-#: ../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:120
msgid "You should restore company database from latest backup file"
msgstr ""
-#: ../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:141
msgid "Sql file"
msgstr ""
-#: ../admin/inst_upgrade.php:138
+#: ../admin/inst_upgrade.php:142
msgid "Force upgrade"
msgstr ""
-#: ../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:174
msgid ""
"Database upgrades marked as partially installed cannot be installed "
"automatically.\n"
"upgrade."
msgstr ""
-#: ../admin/inst_upgrade.php:174
+#: ../admin/inst_upgrade.php:178
msgid "Upgrade system"
msgstr ""
-#: ../admin/inst_upgrade.php:174
+#: ../admin/inst_upgrade.php:178
msgid "Save database and perform upgrade"
msgstr ""
#: ../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
#: ../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 ""
msgstr ""
#: ../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 ""
#: ../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 ""
msgstr ""
#: ../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
#: ../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 ""
#: ../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 ""
#: ../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
#: ../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_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 ""
#: ../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
#: ../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
#: ../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.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
-#: ../includes/ui/ui_view.inc.orig:51
msgid "GL"
msgstr ""
#: ../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 ""
#: ../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 ""
#: ../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
#: ../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
msgstr ""
#: ../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
#, 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
msgid "Cannot update system extensions list."
msgstr ""
#: ../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
msgid "Cannot open the languages file - "
msgstr ""
#: ../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
msgid "The language files folder "
msgstr ""
#: ../admin/db/maintenance_db.inc:389
-#: ../admin/db/maintenance_db.inc.orig:386
+msgid ""
+"This is new format backup file which cannot be restored on database not "
+"migrated to utf8."
+msgstr ""
+
+#: ../admin/db/maintenance_db.inc:471
#, php-format
msgid "SQL script execution failed in line %d: %s"
msgstr ""
msgstr ""
#: ../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 ""
msgid "Customer Transaction &Inquiry"
msgstr ""
-#: ../applications/customers.php:57
+#: ../applications/customers.php:56
msgid "Customer Allocation &Inquiry"
msgstr ""
-#: ../applications/customers.php:60
+#: ../applications/customers.php:59
msgid "Customer and Sales &Reports"
msgstr ""
-#: ../applications/customers.php:63
+#: ../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:63
msgid "Add and Manage &Customers"
msgstr ""
-#: ../applications/customers.php:66
+#: ../applications/customers.php:65
msgid "Customer &Branches"
msgstr ""
-#: ../applications/customers.php:68
+#: ../applications/customers.php:67
msgid "Sales &Groups"
msgstr ""
-#: ../applications/customers.php:70
+#: ../applications/customers.php:69
msgid "Recurrent &Invoices"
msgstr ""
-#: ../applications/customers.php:72
+#: ../applications/customers.php:71
msgid "Sales T&ypes"
msgstr ""
-#: ../applications/customers.php:74
+#: ../applications/customers.php:73
msgid "Sales &Persons"
msgstr ""
-#: ../applications/customers.php:76
+#: ../applications/customers.php:75
msgid "Sales &Areas"
msgstr ""
-#: ../applications/customers.php:78
+#: ../applications/customers.php:77
msgid "Credit &Status Setup"
msgstr ""
msgstr ""
#: ../applications/manufacturing.php:19
-#: ../sales/sales_order_entry.php:113
+#: ../sales/sales_order_entry.php:126
msgid "Work &Order Entry"
msgstr ""
msgid "Supplier Transaction &Inquiry"
msgstr ""
-#: ../applications/suppliers.php:44
+#: ../applications/suppliers.php:43
msgid "Supplier Allocation &Inquiry"
msgstr ""
-#: ../applications/suppliers.php:47
+#: ../applications/suppliers.php:46
msgid "Supplier and Purchasing &Reports"
msgstr ""
-#: ../applications/suppliers.php:51
+#: ../applications/suppliers.php:50
msgid "&Suppliers"
msgstr ""
msgstr ""
#: ../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 ""
#: ../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 ""
#: ../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 ""
#: ../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 ""
#: ../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 ""
msgstr ""
#: ../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
#: ../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: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
#: ../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 ""
#: ../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 ""
#: ../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 ""
#: ../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 ""
#: ../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 ""
msgstr ""
#: ../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_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 ""
#: ../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"
#: ../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 ""
#: ../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 ""
#: ../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
msgid "To Account:"
msgstr ""
-#: ../gl/bank_transfer.php:72
+#: ../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: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: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: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: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:133
+#: ../gl/gl_bank.php:228
msgid "The total bank amount cannot be 0."
msgstr ""
-#: ../gl/bank_transfer.php:139
+#: ../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: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: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: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_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:183
msgid "The source and destination bank accouts cannot be the same."
msgstr ""
msgid "Modify Bank Deposit Entry"
msgstr ""
-#: ../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: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: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: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: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:110
#, php-format
msgid "Deposit %d has been entered"
msgstr ""
-#: ../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:114
msgid "Enter Another Deposit"
msgstr ""
-#: ../gl/gl_bank.php:113
+#: ../gl/gl_bank.php:116
msgid "Enter A Payment"
msgstr ""
-#: ../gl/gl_bank.php:122
+#: ../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:129
msgid "Enter Another &Deposit"
msgstr ""
-#: ../gl/gl_bank.php:128
+#: ../gl/gl_bank.php:131
msgid "Enter A &Payment"
msgstr ""
-#: ../gl/gl_bank.php:221
+#: ../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: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:264
msgid "The entered date for the payment is invalid."
msgstr ""
-#: ../gl/gl_bank.php:275
+#: ../gl/gl_bank.php:276
msgid "You have to select customer and customer branch."
msgstr ""
-#: ../gl/gl_bank.php:279
+#: ../gl/gl_bank.php:280
msgid "You have to select supplier."
msgstr ""
-#: ../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:400
msgid "Payment Items"
msgstr ""
-#: ../gl/gl_bank.php:397
+#: ../gl/gl_bank.php:400
msgid "Deposit Items"
msgstr ""
-#: ../gl/gl_bank.php:405
+#: ../gl/gl_bank.php:408
msgid "Process Payment"
msgstr ""
-#: ../gl/gl_bank.php:405
+#: ../gl/gl_bank.php:408
msgid "Process Deposit"
msgstr ""
msgstr ""
#: ../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 ""
#: ../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/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/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_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 ""
msgid "Journal Entry"
msgstr ""
-#: ../gl/gl_journal.php:55
+#: ../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:58
+#: ../gl/gl_journal.php:73
msgid "&View this Journal Entry"
msgstr ""
-#: ../gl/gl_journal.php:60
+#: ../gl/gl_journal.php:61
msgid "Enter &New Journal Entry"
msgstr ""
-#: ../gl/gl_journal.php:70
+#: ../gl/gl_journal.php:71
msgid "Journal entry has been updated"
msgstr ""
-#: ../gl/gl_journal.php:74
+#: ../gl/gl_journal.php:75
msgid "Return to Journal &Inquiry"
msgstr ""
-#: ../gl/gl_journal.php:87
+#: ../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:91
msgid "Entry &New Journal Entry"
msgstr ""
-#: ../gl/gl_journal.php:145
+#: ../gl/gl_journal.php:148
msgid "You must enter at least one journal line."
msgstr ""
-#: ../gl/gl_journal.php:151
+#: ../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:216
+#: ../gl/gl_journal.php:223
msgid "Dimension is closed."
msgstr ""
-#: ../gl/gl_journal.php:227
+#: ../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: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: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: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: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:334
msgid "Rows"
msgstr ""
-#: ../gl/gl_journal.php:337
+#: ../gl/gl_journal.php:340
msgid "Process Journal Entry"
msgstr ""
-#: ../gl/gl_journal.php:338
+#: ../gl/gl_journal.php:341
msgid "Process journal entry only if debits equal to credits"
msgstr ""
#: ../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 ""
#: ../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
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
msgid "Budget"
msgstr ""
msgstr ""
#: ../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
msgid "Inputs"
msgstr ""
msgstr ""
#: ../gl/inquiry/tax_inquiry.php:100
-#: ../reporting/rep709.php:172
+#: ../reporting/rep709.php:176
msgid "Output Tax"
msgstr ""
msgstr ""
#: ../gl/inquiry/tax_inquiry.php:106
-#: ../reporting/rep709.php:172
+#: ../reporting/rep709.php:176
msgid "Input Tax"
msgstr ""
msgstr ""
#: ../gl/inquiry/tax_inquiry.php:119
-#: ../reporting/rep709.php:203
+#: ../reporting/rep709.php:207
msgid "Total payable or refund"
msgstr ""
#: ../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_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 ""
#: ../gl/manage/bank_accounts.php:110
#: ../includes/ui/ui_view.inc:488
-#: ../includes/ui/ui_view.inc.orig:488
msgid "Number"
msgstr ""
#: ../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 ""
msgid "The account code must be numeric."
msgstr ""
-#: ../gl/manage/gl_accounts.php:81
+#: ../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:89
msgid "Account data has been updated."
msgstr ""
-#: ../gl/manage/gl_accounts.php:99
+#: ../gl/manage/gl_accounts.php:98
msgid "New account has been added."
msgstr ""
-#: ../gl/manage/gl_accounts.php:116
+#: ../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: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: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: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: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: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: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
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
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
msgid "Selected account has been deleted"
msgstr ""
-#: ../gl/manage/gl_accounts.php:196
+#: ../gl/manage/gl_accounts.php:197
msgid "New account"
msgstr ""
-#: ../gl/manage/gl_accounts.php:242
+#: ../gl/manage/gl_accounts.php:243
msgid "Account Code 2:"
msgstr ""
-#: ../gl/manage/gl_accounts.php:244
+#: ../gl/manage/gl_accounts.php:245
msgid "Account Name:"
msgstr ""
-#: ../gl/manage/gl_accounts.php:246
+#: ../gl/manage/gl_accounts.php:247
msgid "Account Group:"
msgstr ""
-#: ../gl/manage/gl_accounts.php:248
+#: ../gl/manage/gl_accounts.php:249
msgid "Account Tags:"
msgstr ""
-#: ../gl/manage/gl_accounts.php:250
+#: ../gl/manage/gl_accounts.php:251
msgid "Account status:"
msgstr ""
-#: ../gl/manage/gl_accounts.php:255
+#: ../gl/manage/gl_accounts.php:256
msgid "Add Account"
msgstr ""
-#: ../gl/manage/gl_accounts.php:259
+#: ../gl/manage/gl_accounts.php:260
msgid "Update Account"
msgstr ""
-#: ../gl/manage/gl_accounts.php:260
+#: ../gl/manage/gl_accounts.php:261
msgid "Delete account"
msgstr ""
#: ../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 ""
msgstr ""
#: ../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 ""
#: ../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.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: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
msgid "This customer account is on hold."
msgstr ""
#: ../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 ""
#: ../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 ""
#: ../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 ""
#: ../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 ""
#: ../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 ""
#: ../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 ""
msgid "Password changes"
msgstr ""
+#: ../includes/access_levels.inc:123
+msgid "Edit other users transactions"
+msgstr ""
+
#: ../includes/access_levels.inc:127
msgid "Sales types"
msgstr ""
msgstr ""
#: ../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/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 ""
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"
#: ../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 ""
#: ../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:625
+#: ../sales/sales_order_entry.php:645
msgid "Sales Quotation"
msgstr ""
msgstr ""
#: ../includes/sysnames.inc:54
-#: ../sales/customer_invoice.php:545
+#: ../sales/customer_invoice.php:547
msgid "DN"
msgstr ""
#: ../includes/sysnames.inc:61
#: ../reporting/rep204.php:82
-#: ../reporting/rep305.php:95
+#: ../reporting/rep305.php:98
msgid "GRN"
msgstr ""
#: ../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 ""
#: ../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
#: ../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
#: ../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 ""
msgid "Extensions system"
msgstr ""
-#: ../includes/system_tests.inc:363
+#: ../includes/system_tests.inc:371
msgid "Extensions configuration files and directories should be writeable"
msgstr ""
-#: ../includes/system_tests.inc:375
+#: ../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:394
msgid ""
"OpenSSL PHP extension have to be enabled to use extension repository system."
msgstr ""
-#: ../includes/system_tests.inc:388
+#: ../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:420
msgid "Test"
msgstr ""
-#: ../includes/system_tests.inc:411
+#: ../includes/system_tests.inc:420
msgid "Test type"
msgstr ""
-#: ../includes/system_tests.inc:411
+#: ../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:420
#: ../reporting/reports_main.php:39
#: ../reporting/reports_main.php:49
#: ../reporting/reports_main.php:57
#: ../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:444
msgid "Ok"
msgstr ""
#: ../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 ""
#: ../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"
#: ../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
msgstr ""
#: ../includes/ui/db_pager_view.inc:166
-#: ../includes/ui/ui_input.inc:899
+#: ../includes/ui/ui_input.inc:903
msgid "Show also Inactive"
msgstr ""
msgstr ""
#: ../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/simple_crud_class.inc:229
-#: ../includes/ui/ui_input.inc:208
+#: ../includes/ui/ui_input.inc:209
msgid "Clone"
msgstr ""
#: ../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/simple_crud_class.inc:231
-#: ../includes/ui/ui_input.inc:210
+#: ../includes/ui/ui_input.inc:211
msgid "Cancel edition"
msgstr ""
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/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
msgid "Inactive"
msgstr ""
-#: ../includes/ui/ui_input.inc:921
-#: ../includes/ui/ui_input.inc:933
+#: ../includes/ui/ui_input.inc:925
+#: ../includes/ui/ui_input.inc:937
msgid "Current Credit:"
msgstr ""
-#: ../includes/ui/ui_input.inc:967
+#: ../includes/ui/ui_input.inc:971
msgid "Bank Balance:"
msgstr ""
#: ../includes/ui/ui_lists.inc:17
-#: ../includes/ui/ui_lists.inc.orig:17
msgid "Set filter"
msgstr ""
#: ../includes/ui/ui_lists.inc:100
-#: ../includes/ui/ui_lists.inc.orig:100
msgid "Press Space tab for search pattern entry"
msgstr ""
#: ../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/ui_lists.inc:105
-#: ../includes/ui/ui_lists.inc.orig:105
msgid "Enter description fragment to search or * for all"
msgstr ""
#: ../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/ui_lists.inc:457
-#: ../includes/ui/ui_lists.inc.orig:457
msgid "Press Space tab to filter by name fragment"
msgstr ""
#: ../includes/ui/ui_lists.inc:458
-#: ../includes/ui/ui_lists.inc.orig:458
msgid "Select supplier"
msgstr ""
#: ../includes/ui/ui_lists.inc:505
-#: ../includes/ui/ui_lists.inc.orig:505
msgid "All Customers"
msgstr ""
#: ../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/ui_lists.inc:510
-#: ../includes/ui/ui_lists.inc.orig:510
msgid "Select customer"
msgstr ""
#: ../includes/ui/ui_lists.inc:557
-#: ../includes/ui/ui_lists.inc.orig:557
msgid "All branches"
msgstr ""
#: ../includes/ui/ui_lists.inc:560
-#: ../includes/ui/ui_lists.inc.orig:560
msgid "Select customer branch"
msgstr ""
#: ../includes/ui/ui_lists.inc:600
-#: ../includes/ui/ui_lists.inc.orig:600
msgid "All Locations"
msgstr ""
#: ../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/ui_lists.inc:1293
-#: ../includes/ui/ui_lists.inc.orig:1293
msgid "All Sales Types"
msgstr ""
#: ../includes/ui/ui_lists.inc:1628
-#: ../includes/ui/ui_lists.inc.orig:1626
msgid "Use Item Sales Accounts"
msgstr ""
#: ../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/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"
#: ../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/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/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/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"
#: ../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/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/ui_lists.inc:1975
-#: ../includes/ui/ui_lists.inc.orig:1973
msgid "GRNs"
msgstr ""
#: ../includes/ui/ui_lists.inc:1993
-#: ../includes/ui/ui_lists.inc.orig:1991
msgid "Automatically put balance on back order"
msgstr ""
#: ../includes/ui/ui_lists.inc:1994
-#: ../includes/ui/ui_lists.inc.orig:1992
msgid "Cancel any quantites not delivered"
msgstr ""
#: ../includes/ui/ui_lists.inc:2011
-#: ../includes/ui/ui_lists.inc.orig:2009
msgid "Items Returned to Inventory Location"
msgstr ""
#: ../includes/ui/ui_lists.inc:2012
-#: ../includes/ui/ui_lists.inc.orig:2010
msgid "Items Written Off"
msgstr ""
#: ../includes/ui/ui_lists.inc:2182
-#: ../includes/ui/ui_lists.inc.orig:2180
msgid "New role"
msgstr ""
#: ../includes/ui/ui_lists.inc:2240
-#: ../includes/ui/ui_lists.inc.orig:2238
msgid "No tags defined."
msgstr ""
#: ../includes/ui/ui_lists.inc:2240
-#: ../includes/ui/ui_lists.inc.orig:2238
msgid "No active tags defined."
msgstr ""
#: ../includes/ui/ui_lists.inc:2278
-#: ../includes/ui/ui_lists.inc.orig:2276
#, php-format
msgid "Activated for '%s'"
msgstr ""
#: ../includes/ui/ui_lists.inc:2281
-#: ../includes/ui/ui_lists.inc.orig:2279
msgid "Available and/or installed"
msgstr ""
#: ../includes/ui/ui_lists.inc:2351
-#: ../includes/ui/ui_lists.inc.orig:2349
msgid "Standard new company American COA (4 digit)"
msgstr ""
#: ../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/ui_lists.inc:2374
-#: ../includes/ui/ui_lists.inc.orig:2372
msgid "No payment Link"
msgstr ""
msgstr ""
#: ../includes/ui/ui_view.inc:306
-#: ../includes/ui/ui_view.inc.orig:306
msgid "Date Voided:"
msgstr ""
#: ../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
#: ../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
msgstr ""
#: ../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
msgid "Total Allocated:"
msgstr ""
-#: ../includes/ui/ui_view.inc:517
-#: ../includes/ui/ui_view.inc.orig:516
+#: ../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: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: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: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:842
msgid "January"
msgstr ""
-#: ../includes/ui/ui_view.inc:841
-#: ../includes/ui/ui_view.inc.orig:840
+#: ../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:842
msgid "March"
msgstr ""
-#: ../includes/ui/ui_view.inc:841
-#: ../includes/ui/ui_view.inc.orig:840
+#: ../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:842
msgid "May"
msgstr ""
-#: ../includes/ui/ui_view.inc:841
-#: ../includes/ui/ui_view.inc.orig:840
+#: ../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:842
msgid "July"
msgstr ""
-#: ../includes/ui/ui_view.inc:841
-#: ../includes/ui/ui_view.inc.orig:840
+#: ../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:842
msgid "September"
msgstr ""
-#: ../includes/ui/ui_view.inc:841
-#: ../includes/ui/ui_view.inc.orig:840
+#: ../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:842
msgid "November"
msgstr ""
-#: ../includes/ui/ui_view.inc:841
-#: ../includes/ui/ui_view.inc.orig:840
+#: ../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:843
msgid "Su"
msgstr ""
-#: ../includes/ui/ui_view.inc:842
-#: ../includes/ui/ui_view.inc.orig:841
+#: ../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:843
msgid "Tu"
msgstr ""
-#: ../includes/ui/ui_view.inc:842
-#: ../includes/ui/ui_view.inc.orig:841
+#: ../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:843
msgid "Th"
msgstr ""
-#: ../includes/ui/ui_view.inc:842
-#: ../includes/ui/ui_view.inc.orig:841
+#: ../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:843
msgid "Sa"
msgstr ""
-#: ../includes/ui/ui_view.inc:843
-#: ../includes/ui/ui_view.inc.orig:842
+#: ../includes/ui/ui_view.inc:844
msgid "W"
msgstr ""
#: ../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 ""
#: ../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 ""
#: ../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
#: ../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
#: ../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
#: ../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
#: ../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/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/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: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 ""
#: ../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 ""
#: ../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/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/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
#: ../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 ""
#: ../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 ""
#: ../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 ""
msgstr ""
#: ../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 ""
#: ../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.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 ""
#: ../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 ""
#: ../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 ""
#: ../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 ""
#: ../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 ""
#: ../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"
#: ../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 ""
#: ../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/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"
#: ../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 ""
#: ../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 ""
msgstr ""
#: ../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: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 ""
msgstr ""
#: ../purchasing/includes/ui/invoice_ui.inc:416
-#: ../sales/customer_invoice.php:601
+#: ../sales/customer_invoice.php:603
msgid "Remove"
msgstr ""
#: ../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 ""
#: ../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: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 ""
msgstr ""
#: ../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: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: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: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:197
+#: ../purchasing/includes/ui/po_ui.inc.orig:197
msgid "Due Date:"
msgstr ""
#: ../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:200
+#: ../purchasing/includes/ui/po_ui.inc.orig:200
msgid "Receive Into:"
msgstr ""
#: ../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:229
+#: ../purchasing/includes/ui/po_ui.inc.orig:229
msgid "Deliver to:"
msgstr ""
#: ../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:244
+#: ../purchasing/includes/ui/po_ui.inc.orig:244
#: ../purchasing/po_receive_items.php:62
msgid "Received"
msgstr ""
#: ../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: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:296
+#: ../purchasing/includes/ui/po_ui.inc.orig:296
#: ../purchasing/po_receive_items.php:114
#: ../reporting/rep107.php:217
#: ../reporting/rep109.php:152
#: ../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: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: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/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:46
+#: ../purchasing/po_entry_items.php.orig:43
msgid "Purchase Order Entry"
msgstr ""
-#: ../purchasing/po_entry_items.php:48
+#: ../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: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: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: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: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: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: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: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: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: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: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:104
+#: ../purchasing/po_entry_items.php.orig:101
msgid "&View this GRN"
msgstr ""
-#: ../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: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:118
+#: ../purchasing/po_entry_items.php.orig:115
msgid "Enter &Another GRN"
msgstr ""
-#: ../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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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.orig:564
msgid "Update Order"
msgstr ""
-#: ../purchasing/po_entry_items.php:565
-#: ../sales/sales_order_entry.php:697
+#: ../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.orig:567
msgid "Process GRN"
msgstr ""
-#: ../purchasing/po_entry_items.php:568
+#: ../purchasing/po_entry_items.php.orig:568
msgid "Update GRN"
msgstr ""
-#: ../purchasing/po_entry_items.php:569
+#: ../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.orig:572
+#: ../sales/customer_invoice.php:686
msgid "Process Invoice"
msgstr ""
-#: ../purchasing/po_entry_items.php:573
+#: ../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.orig:574
+#: ../sales/sales_order_entry.php:698
msgid "Cancel Invoice"
msgstr ""
#: ../purchasing/po_receive_items.php:62
#: ../reporting/rep105.php:112
-#: ../sales/customer_delivery.php:440
+#: ../sales/customer_delivery.php.orig:445
msgid "Ordered"
msgstr ""
msgstr ""
#: ../purchasing/po_receive_items.php:63
-#: ../sales/customer_delivery.php:441
+#: ../sales/customer_delivery.php.orig:446
msgid "This Delivery"
msgstr ""
msgstr ""
#: ../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: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."
msgstr ""
#: ../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."
msgid "Enter Credit Note"
msgstr ""
-#: ../purchasing/supplier_invoice.php:46
+#: ../purchasing/supplier_invoice.php:43
msgid "Enter Supplier Invoice"
msgstr ""
-#: ../purchasing/supplier_invoice.php:51
+#: ../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:67
msgid "View this Invoice"
msgstr ""
-#: ../purchasing/supplier_invoice.php:72
+#: ../purchasing/supplier_invoice.php:73
msgid "Enter Another Invoice"
msgstr ""
-#: ../purchasing/supplier_invoice.php:165
+#: ../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:172
msgid "You must enter an invoice reference."
msgstr ""
-#: ../purchasing/supplier_invoice.php:192
+#: ../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:254
msgid "The quantity to invoice must be numeric and greater than zero."
msgstr ""
-#: ../purchasing/supplier_invoice.php:260
+#: ../purchasing/supplier_invoice.php:261
msgid "The price is not numeric."
msgstr ""
-#: ../purchasing/supplier_invoice.php:273
+#: ../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:275
+#: ../purchasing/supplier_invoice.php:288
msgid "The over-charge percentage allowance is :"
msgstr ""
-#: ../purchasing/supplier_invoice.php:286
+#: ../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 "
"necessary."
msgstr ""
-#: ../purchasing/supplier_invoice.php:363
+#: ../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:406
msgid "Enter Invoice"
msgstr ""
msgid "Supplier Payment Entry"
msgstr ""
-#: ../purchasing/supplier_payment.php:90
+#: ../purchasing/supplier_payment.php:85
msgid "Invalid purchase invoice number."
msgstr ""
-#: ../purchasing/supplier_payment.php:96
+#: ../purchasing/supplier_payment.php:91
msgid "Payment has been sucessfully entered"
msgstr ""
-#: ../purchasing/supplier_payment.php:98
+#: ../purchasing/supplier_payment.php:93
msgid "&Print This Remittance"
msgstr ""
-#: ../purchasing/supplier_payment.php:99
+#: ../purchasing/supplier_payment.php:94
msgid "&Email This Remittance"
msgstr ""
-#: ../purchasing/supplier_payment.php:101
+#: ../purchasing/supplier_payment.php:96
msgid "View the GL &Journal Entries for this Payment"
msgstr ""
-#: ../purchasing/supplier_payment.php:105
+#: ../purchasing/supplier_payment.php:100
msgid "Enter another supplier &payment"
msgstr ""
-#: ../purchasing/supplier_payment.php:152
+#: ../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:159
msgid "The entered discount is invalid or less than zero."
msgstr ""
-#: ../purchasing/supplier_payment.php:172
+#: ../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:270
msgid "Payment To:"
msgstr ""
-#: ../purchasing/supplier_payment.php:280
+#: ../purchasing/supplier_payment.php:283
msgid "From Bank Account:"
msgstr ""
-#: ../purchasing/supplier_payment.php:288
+#: ../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:314
+#: ../sales/customer_payments.php:409
msgid "Amount of Discount:"
msgstr ""
-#: ../purchasing/supplier_payment.php:312
+#: ../purchasing/supplier_payment.php:315
msgid "Amount of Payment:"
msgstr ""
-#: ../purchasing/supplier_payment.php:318
+#: ../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:324
msgid "Enter Payment"
msgstr ""
#: ../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 ""
#: ../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 ""
#: ../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 ""
msgstr ""
#: ../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
#: ../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: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 ""
#: ../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 ""
#: ../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 ""
#: ../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 ""
#: ../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.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 ""
#: ../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 ""
#: ../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 ""
#: ../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 ""
#: ../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:73
#: ../purchasing/inquiry/supplier_inquiry.php.orig:73
#: ../sales/inquiry/customer_inquiry.php:76
-#: ../sales/inquiry/customer_inquiry.php.orig:77
msgid "Terms"
msgstr ""
#: ../reporting/rep202.php:128
#: ../reporting/rep202.php:246
#: ../sales/inquiry/customer_inquiry.php:76
-#: ../sales/inquiry/customer_inquiry.php.orig:77
msgid "Current"
msgstr ""
#: ../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:130
#: ../sales/inquiry/customer_inquiry.php:162
-#: ../sales/inquiry/customer_inquiry.php.orig:161
msgid "Credit This"
msgstr ""
#: ../reporting/rep204.php:144
#: ../reporting/rep301.php:176
#: ../reporting/rep304.php:191
-#: ../reporting/rep305.php:181
+#: ../reporting/rep305.php:183
msgid "Grand Total"
msgstr ""
#: ../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: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 ""
msgstr ""
#: ../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 ""
#: ../reporting/rep303.php:109
#: ../reporting/rep303.php:115
-#: ../reporting/rep305.php:95
+#: ../reporting/rep305.php:98
msgid "Stock ID"
msgstr ""
msgstr ""
#: ../reporting/rep304.php:112
-#: ../reporting/rep305.php:95
+#: ../reporting/rep305.php:98
msgid "Qty"
msgstr ""
#: ../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 ""
msgid "Inventory Sales Report"
msgstr ""
-#: ../reporting/rep305.php:95
+#: ../reporting/rep305.php:98
msgid "PO No"
msgstr ""
-#: ../reporting/rep305.php:95
+#: ../reporting/rep305.php:98
msgid "Inv"
msgstr ""
-#: ../reporting/rep305.php:95
+#: ../reporting/rep305.php:98
msgid "Inv Price"
msgstr ""
-#: ../reporting/rep305.php:95
+#: ../reporting/rep305.php:98
msgid "PO Price"
msgstr ""
-#: ../reporting/rep305.php:102
+#: ../reporting/rep305.php:105
msgid "GRN Valuation Report"
msgstr ""
msgid "Rate"
msgstr ""
-#: ../reporting/rep709.php:172
+#: ../reporting/rep709.php:176
msgid "Tax Rate"
msgstr ""
-#: ../reporting/rep709.php:172
+#: ../reporting/rep709.php:176
msgid "Net Tax"
msgstr ""
msgstr ""
#: ../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 ""
#: ../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 ""
msgstr ""
#: ../reporting/includes/doctext.inc:272
-#: ../reporting/includes/pdf_report.inc:1013
+#: ../reporting/includes/pdf_report.inc:1014
msgid "You can pay through"
msgstr ""
msgstr ""
#: ../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
msgid "Generated By"
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
msgid "Page"
msgstr ""
-#: ../reporting/includes/pdf_report.inc:583
+#: ../reporting/includes/pdf_report.inc:584
msgid "Report Period"
msgstr ""
-#: ../reporting/includes/pdf_report.inc:980
+#: ../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:1000
msgid "Dear"
msgstr ""
-#: ../reporting/includes/pdf_report.inc:1000
+#: ../reporting/includes/pdf_report.inc:1001
msgid "Attached you will find "
msgstr ""
-#: ../reporting/includes/pdf_report.inc:1016
+#: ../reporting/includes/pdf_report.inc:1017
msgid "Kindest regards"
msgstr ""
-#: ../reporting/includes/pdf_report.inc:1028
+#: ../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: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:1032
+#: ../reporting/includes/pdf_report.inc:1035
msgid "Email:"
msgstr ""
-#: ../reporting/includes/pdf_report.inc:1034
+#: ../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:1065
msgid "Report has been sent to network printer "
msgstr ""
msgid "No Currency Filter"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:227
+#: ../reporting/includes/reports_classes.inc:231
msgid "PDF/Printer"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:238
+#: ../reporting/includes/reports_classes.inc:242
msgid "No Graphics"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:238
+#: ../reporting/includes/reports_classes.inc:242
msgid "Vertical bars"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:238
+#: ../reporting/includes/reports_classes.inc:242
msgid "Horizontal bars"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:239
+#: ../reporting/includes/reports_classes.inc:243
msgid "Dots"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:239
+#: ../reporting/includes/reports_classes.inc:243
msgid "Lines"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:239
+#: ../reporting/includes/reports_classes.inc:243
msgid "Pie"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:239
+#: ../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:247
+#: ../reporting/includes/reports_classes.inc:250
msgid "No Type Filter"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:256
+#: ../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: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:293
msgid "No Customer Filter"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:297
+#: ../reporting/includes/reports_classes.inc:301
msgid "No Supplier Filter"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:379
+#: ../reporting/includes/reports_classes.inc:383
msgid "No Location Filter"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:382
+#: ../reporting/includes/reports_classes.inc:386
msgid "No Category Filter"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:391
+#: ../reporting/includes/reports_classes.inc:395
msgid "No Sales Folk Filter"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:398
+#: ../reporting/includes/reports_classes.inc:402
msgid "No Users Filter"
msgstr ""
-#: ../sales/create_recurrent_invoices.php:24
+#: ../sales/create_recurrent_invoices.php:26
msgid "Create and Print Recurrent Invoices"
msgstr ""
-#: ../sales/create_recurrent_invoices.php:40
+#: ../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:108
#, php-format
msgid "%s recurrent invoice(s) created, # %s - # %s."
msgstr ""
-#: ../sales/create_recurrent_invoices.php:102
+#: ../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:115
#, php-format
msgid "&Email Recurrent Invoices # %s - # %s"
msgstr ""
-#: ../sales/create_recurrent_invoices.php:115
+#: ../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:132
#: ../sales/manage/recurrent_invoices.php:102
msgid "Begin"
msgstr ""
-#: ../sales/create_recurrent_invoices.php:115
+#: ../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: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:173
msgid "Create Invoices"
msgstr ""
-#: ../sales/create_recurrent_invoices.php:164
+#: ../sales/create_recurrent_invoices.php:181
msgid "Marked items are due."
msgstr ""
-#: ../sales/create_recurrent_invoices.php:166
+#: ../sales/create_recurrent_invoices.php:183
msgid "No recurrent invoices are due."
msgstr ""
msgstr ""
#: ../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."
msgid "Enter Another &Credit Note"
msgstr ""
-#: ../sales/credit_note_entry.php:157
+#: ../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: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: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:197
msgid "The quantity must be greater than zero."
msgstr ""
-#: ../sales/credit_note_entry.php:200
+#: ../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: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:275
msgid "Credit Note Items"
msgstr ""
-#: ../sales/credit_note_entry.php:283
-#: ../sales/customer_credit_invoice.php:384
+#: ../sales/credit_note_entry.php:285
+#: ../sales/customer_credit_invoice.php:382
msgid "Process Credit Note"
msgstr ""
msgid "Credit Note has been updated"
msgstr ""
-#: ../sales/customer_credit_invoice.php:114
+#: ../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: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: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:249
msgid "Crediting Invoice"
msgstr ""
-#: ../sales/customer_credit_invoice.php:272
+#: ../sales/customer_credit_invoice.php:270
msgid "Credit Note Date"
msgstr ""
-#: ../sales/customer_credit_invoice.php:282
+#: ../sales/customer_credit_invoice.php:280
msgid "Invoiced Quantity"
msgstr ""
-#: ../sales/customer_credit_invoice.php:283
+#: ../sales/customer_credit_invoice.php:281
msgid "Credit Quantity"
msgstr ""
-#: ../sales/customer_credit_invoice.php:317
+#: ../sales/customer_credit_invoice.php:315
msgid "Credit Shipping Cost"
msgstr ""
-#: ../sales/customer_credit_invoice.php:350
+#: ../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: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: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:380
msgid "Update credit value for quantities entered"
msgstr ""
#: ../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.orig:41
msgid "Deliver Items for a Sales Order"
msgstr ""
#: ../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: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: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: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: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: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: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:62
+#: ../sales/customer_delivery.php.orig:62
msgid "Invoice This Delivery"
msgstr ""
-#: ../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: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:74
+#: ../sales/customer_delivery.php.orig:74
msgid "View this delivery"
msgstr ""
-#: ../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:84
+#: ../sales/customer_delivery.php.orig:84
msgid "Select A Different Delivery"
msgstr ""
#: ../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: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: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: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: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:135
+#: ../sales/customer_delivery.php.orig:135
msgid "Select a Sales Order to Delivery"
msgstr ""
-#: ../sales/customer_delivery.php:140
+#: ../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: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: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: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: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: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: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.orig:366
msgid "For Sales Order"
msgstr ""
-#: ../sales/customer_delivery.php:370
+#: ../sales/customer_delivery.php.orig:375
msgid "Delivery From"
msgstr ""
-#: ../sales/customer_delivery.php:419
+#: ../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.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 ""
"credit control personnel to discuss."
msgstr ""
-#: ../sales/customer_delivery.php:434
+#: ../sales/customer_delivery.php.orig:439
msgid "Delivery Items"
msgstr ""
-#: ../sales/customer_delivery.php:440
+#: ../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.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.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.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.orig:530
msgid "Action For Balance"
msgstr ""
-#: ../sales/customer_delivery.php:532
-#: ../sales/customer_invoice.php:683
+#: ../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.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.orig:539
+#: ../sales/customer_invoice.php:687
+#: ../sales/sales_order_entry.php:739
msgid "Check entered data and save document"
msgstr ""
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: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: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: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: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:67
msgid "Select Another &Delivery For Invoicing"
msgstr ""
-#: ../sales/customer_invoice.php:77
+#: ../sales/customer_invoice.php:78
#, php-format
msgid "Sales Invoice # %d has been updated."
msgstr ""
-#: ../sales/customer_invoice.php:84
+#: ../sales/customer_invoice.php:85
msgid "Select Another &Invoice to Modify"
msgstr ""
-#: ../sales/customer_invoice.php:123
+#: ../sales/customer_invoice.php:124
msgid "Select a different delivery to invoice"
msgstr ""
-#: ../sales/customer_invoice.php:124
+#: ../sales/customer_invoice.php:125
msgid ""
"There are no delivered items with a quantity left to invoice. There is "
"nothing left to invoice."
"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:160
msgid ""
"Please select correct Sales Order Prepayment to be invoiced and try again."
msgstr ""
#: ../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."
msgid "The entered invoice due date is invalid."
msgstr ""
-#: ../sales/customer_invoice.php:357
+#: ../sales/customer_invoice.php:351
msgid "There are no item quantities on this invoice."
msgstr ""
-#: ../sales/customer_invoice.php:367
+#: ../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:536
+#: ../sales/sales_order_entry.php:715
msgid "Sales Order Items"
msgstr ""
-#: ../sales/customer_invoice.php:534
+#: ../sales/customer_invoice.php:536
msgid "Invoice Items"
msgstr ""
-#: ../sales/customer_invoice.php:543
+#: ../sales/customer_invoice.php:545
msgid "This Invoice"
msgstr ""
-#: ../sales/customer_invoice.php:550
+#: ../sales/customer_invoice.php:552
msgid "Credited"
msgstr ""
-#: ../sales/customer_invoice.php:652
+#: ../sales/customer_invoice.php:654
msgid "Invoice Total"
msgstr ""
-#: ../sales/customer_invoice.php:661
+#: ../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 ""
msgstr ""
#: ../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:339
+#: ../sales/sales_order_entry.php:353
msgid "This customer has no branch defined."
msgstr ""
"valid amounts."
msgstr ""
-#: ../sales/customer_payments.php:341
-#: ../sales/customer_payments.php:343
+#: ../sales/customer_payments.php:338
+#: ../sales/customer_payments.php:340
msgid "From Customer:"
msgstr ""
-#: ../sales/customer_payments.php:378
+#: ../sales/customer_payments.php:381
msgid "Into Bank Account:"
msgstr ""
-#: ../sales/customer_payments.php:383
+#: ../sales/customer_payments.php:386
msgid "Date of Deposit:"
msgstr ""
-#: ../sales/customer_payments.php:405
+#: ../sales/customer_payments.php:408
msgid "Customer prompt payment discount :"
msgstr ""
-#: ../sales/customer_payments.php:414
+#: ../sales/customer_payments.php:417
msgid "Amount and discount are in customer's currency."
msgstr ""
-#: ../sales/customer_payments.php:419
+#: ../sales/customer_payments.php:422
msgid "Update Payment"
msgstr ""
-#: ../sales/customer_payments.php:421
+#: ../sales/customer_payments.php:424
msgid "Add Payment"
msgstr ""
-#: ../sales/sales_order_entry.php:56
+#: ../sales/sales_order_entry.php:64
msgid "Direct Sales Delivery"
msgstr ""
-#: ../sales/sales_order_entry.php:61
+#: ../sales/sales_order_entry.php:69
msgid "Direct Sales Invoice"
msgstr ""
-#: ../sales/sales_order_entry.php:67
+#: ../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:81
#, php-format
msgid "Modifying Sales Quotation # %d"
msgstr ""
-#: ../sales/sales_order_entry.php:78
+#: ../sales/sales_order_entry.php:86
msgid "New Sales Order Entry"
msgstr ""
-#: ../sales/sales_order_entry.php:82
+#: ../sales/sales_order_entry.php:90
msgid "New Sales Quotation Entry"
msgstr ""
-#: ../sales/sales_order_entry.php:85
+#: ../sales/sales_order_entry.php:93
msgid "Sales Order Entry"
msgstr ""
-#: ../sales/sales_order_entry.php:102
+#: ../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:117
+#: ../sales/sales_order_entry.php:137
msgid "&View This Order"
msgstr ""
-#: ../sales/sales_order_entry.php:110
+#: ../sales/sales_order_entry.php:123
msgid "Make &Delivery Against This Order"
msgstr ""
-#: ../sales/sales_order_entry.php:115
+#: ../sales/sales_order_entry.php:128
msgid "Enter a &New Order"
msgstr ""
-#: ../sales/sales_order_entry.php:122
+#: ../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:143
msgid "Confirm Order Quantities and Make &Delivery"
msgstr ""
-#: ../sales/sales_order_entry.php:133
+#: ../sales/sales_order_entry.php:146
msgid "Select A Different &Order"
msgstr ""
-#: ../sales/sales_order_entry.php:140
+#: ../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: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: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: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: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:164
msgid "Enter a New &Quotation"
msgstr ""
-#: ../sales/sales_order_entry.php:158
+#: ../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:182
msgid "Select A Different &Quotation"
msgstr ""
-#: ../sales/sales_order_entry.php:188
+#: ../sales/sales_order_entry.php:201
msgid "Make &Invoice Against This Delivery"
msgstr ""
-#: ../sales/sales_order_entry.php:192
+#: ../sales/sales_order_entry.php:205
msgid "Enter a New Template &Delivery"
msgstr ""
-#: ../sales/sales_order_entry.php:195
+#: ../sales/sales_order_entry.php:208
msgid "Enter a &New Delivery"
msgstr ""
-#: ../sales/sales_order_entry.php:203
+#: ../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:220
msgid "&Print Sales Invoice"
msgstr ""
-#: ../sales/sales_order_entry.php:208
+#: ../sales/sales_order_entry.php:221
msgid "&Email Sales Invoice"
msgstr ""
-#: ../sales/sales_order_entry.php:216
+#: ../sales/sales_order_entry.php:229
msgid "Print &Receipt"
msgstr ""
-#: ../sales/sales_order_entry.php:221
+#: ../sales/sales_order_entry.php:234
msgid "Enter a &New Template Invoice"
msgstr ""
-#: ../sales/sales_order_entry.php:224
+#: ../sales/sales_order_entry.php:237
msgid "Enter a &New Direct Invoice"
msgstr ""
-#: ../sales/sales_order_entry.php:362
+#: ../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: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:397
msgid "The shipping cost entered is expected to be numeric."
msgstr ""
-#: ../sales/sales_order_entry.php:389
+#: ../sales/sales_order_entry.php:403
msgid "The Valid date is invalid."
msgstr ""
-#: ../sales/sales_order_entry.php:391
+#: ../sales/sales_order_entry.php:405
msgid "The delivery date is invalid."
msgstr ""
-#: ../sales/sales_order_entry.php:398
+#: ../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: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: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: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: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: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:542
#, php-format
msgid "Price %s is below Standard Cost %s"
msgstr ""
-#: ../sales/sales_order_entry.php:547
+#: ../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:596
msgid "Direct delivery entry has been cancelled as requested."
msgstr ""
-#: ../sales/sales_order_entry.php:577
+#: ../sales/sales_order_entry.php:597
msgid "Enter a New Sales Delivery"
msgstr ""
-#: ../sales/sales_order_entry.php:580
+#: ../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:601
msgid "Enter a New Sales Invoice"
msgstr ""
-#: ../sales/sales_order_entry.php:586
+#: ../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:611
msgid "This sales quotation has been cancelled as requested."
msgstr ""
-#: ../sales/sales_order_entry.php:592
+#: ../sales/sales_order_entry.php:612
msgid "Enter a New Sales Quotation"
msgstr ""
-#: ../sales/sales_order_entry.php:596
+#: ../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:617
msgid "Enter a New Sales Order"
msgstr ""
-#: ../sales/sales_order_entry.php:676
+#: ../sales/sales_order_entry.php:696
msgid "Sales Invoice Items"
msgstr ""
-#: ../sales/sales_order_entry.php:677
+#: ../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:699
msgid "Place Invoice"
msgstr ""
-#: ../sales/sales_order_entry.php:682
+#: ../sales/sales_order_entry.php:702
msgid "Delivery Note Items"
msgstr ""
-#: ../sales/sales_order_entry.php:683
+#: ../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:704
msgid "Cancel Delivery"
msgstr ""
-#: ../sales/sales_order_entry.php:685
+#: ../sales/sales_order_entry.php:705
msgid "Place Delivery"
msgstr ""
-#: ../sales/sales_order_entry.php:687
+#: ../sales/sales_order_entry.php:707
msgid "Quotation Date:"
msgstr ""
-#: ../sales/sales_order_entry.php:688
+#: ../sales/sales_order_entry.php:708
msgid "Sales Quotation Items"
msgstr ""
-#: ../sales/sales_order_entry.php:689
+#: ../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:710
msgid "Cancel Quotation"
msgstr ""
-#: ../sales/sales_order_entry.php:691
+#: ../sales/sales_order_entry.php:711
msgid "Place Quotation"
msgstr ""
-#: ../sales/sales_order_entry.php:692
+#: ../sales/sales_order_entry.php:712
msgid "Commit Quotations Changes"
msgstr ""
-#: ../sales/sales_order_entry.php:696
+#: ../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:719
msgid "Commit Order Changes"
msgstr ""
-#: ../sales/sales_order_entry.php:720
+#: ../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:743
msgid "Validate changes and update document"
msgstr ""
-#: ../sales/sales_order_entry.php:727
+#: ../sales/sales_order_entry.php:747
msgid ""
"Cancels document entry or removes sales order when editing an old document"
msgstr ""
#: ../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 ""
msgstr ""
#: ../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:243
-#: ../sales/manage/customers.php:291
+#: ../sales/manage/customers.php:293
#: ../sales/manage/sav.customers.php:291
msgid "Sales Area:"
msgstr ""
msgstr ""
#: ../sales/manage/customer_branches.php:245
+#: ../sales/manage/customers.php:291
msgid "Default Inventory Location:"
msgstr ""
#: ../sales/manage/customer_branches.php:246
+#: ../sales/manage/customers.php:292
msgid "Default Shipping Company:"
msgstr ""
#: ../sales/manage/customer_branches.php:297
#: ../sales/inquiry/sales_deliveries_view.php:183
-#: ../sales/inquiry/sales_deliveries_view.php.orig:183
msgid "Contact"
msgstr ""
msgstr ""
#: ../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 "
msgid "Customer status:"
msgstr ""
-#: ../sales/manage/customers.php:261
+#: ../sales/manage/customers.php:262
#: ../sales/manage/sav.customers.php:261
msgid "Discount Percent:"
msgstr ""
-#: ../sales/manage/customers.php:262
+#: ../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:267
#: ../sales/manage/sav.customers.php:266
msgid "Credit Status:"
msgstr ""
-#: ../sales/manage/customers.php:279
+#: ../sales/manage/customers.php:280
#: ../sales/manage/sav.customers.php:279
msgid "Customer branches"
msgstr ""
-#: ../sales/manage/customers.php:281
+#: ../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:282
#: ../sales/manage/sav.customers.php:281
msgid "&Add or Edit "
msgstr ""
-#: ../sales/manage/customers.php:299
+#: ../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:305
#: ../sales/manage/sav.customers.php:303
msgid "Update Customer"
msgstr ""
-#: ../sales/manage/customers.php:304
+#: ../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: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:308
#: ../sales/manage/sav.customers.php:306
msgid "Delete Customer"
msgstr ""
-#: ../sales/manage/customers.php:307
+#: ../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: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:325
#: ../sales/manage/sav.customers.php:323
msgid "New customer"
msgstr ""
-#: ../sales/manage/customers.php:345
+#: ../sales/manage/customers.php:347
#: ../sales/manage/sav.customers.php:345
msgid "Sales &Orders"
msgstr ""
msgid "New sales person data have been added"
msgstr ""
+#: ../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
msgid "Selected sales person data have been deleted"
msgstr ""
msgstr ""
#: ../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.orig:96
msgid "Allocation"
msgstr ""
#: ../sales/inquiry/customer_allocation_inquiry.php:116
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:116
msgid "Payment"
msgstr ""
#: ../sales/inquiry/customer_inquiry.php:26
-#: ../sales/inquiry/customer_inquiry.php.orig:27
msgid "Customer Transactions"
msgstr ""
#: ../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:181
-#: ../sales/inquiry/customer_inquiry.php.orig:205
msgid "Print Receipt"
msgstr ""
#: ../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.orig:29
msgid "Search Not Invoiced Deliveries"
msgstr ""
#: ../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.orig:70
msgid ""
"For batch invoicing you should\n"
"\t\t select at least one delivery. All items must be dispatched to\n"
msgstr ""
#: ../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.orig:185
msgid "Cust Ref"
msgstr ""
#: ../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.orig:188
msgid "Delivery Total"
msgstr ""
#: ../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.orig:190
msgid "Batch Invoicing"
msgstr ""
#: ../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:49
-#: ../sales/inquiry/sales_orders_view.php.orig:45
msgid "Search Template for Invoicing"
msgstr ""
#: ../sales/inquiry/sales_orders_view.php:54
-#: ../sales/inquiry/sales_orders_view.php.orig:50
msgid "Select Template for Delivery"
msgstr ""
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:70
-#: ../sales/inquiry/sales_orders_view.php.orig:61
msgid "Search All Sales Quotations"
msgstr ""
#: ../sales/inquiry/sales_orders_view.php:148
-#: ../sales/inquiry/sales_orders_view.php.orig:135
msgid "Dispatch"
msgstr ""
#: ../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 ""
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:284
-#: ../sales/inquiry/sales_orders_view.php.orig:261
msgid "Order #"
msgstr ""
#: ../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: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:298
-#: ../sales/inquiry/sales_orders_view.php.orig:275
msgid "Quote #"
msgstr ""
#: ../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:306
-#: ../sales/inquiry/sales_orders_view.php.orig:283
msgid "Quote Total"
msgstr ""
#: ../sales/inquiry/sales_orders_view.php:337
-#: ../sales/inquiry/sales_orders_view.php.orig:310
msgid "Tmpl"
msgstr ""
-#: ../sales/includes/cart_class.inc:359
-msgid "You have to enter valid stock code or nonempty description"
-msgstr ""
-
#: ../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:351
msgid ""
"Unsuspected overallocation happened due to sparse credit notes exists for "
"this invoice.\n"
"charges."
msgstr ""
-#: ../sales/includes/db/sales_invoice_db.inc:196
-msgid "Cash invoice"
-msgstr ""
-
+#: ../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/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/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/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/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: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.orig:386
msgid "Customer Discount:"
msgstr ""
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: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.orig:224
msgid "Shipping Charge"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:297
#: ../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.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.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.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.orig:432
msgid "Date of order receive"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:582
#: ../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.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.orig:588
msgid "Cash account:"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:595
#: ../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.orig:600
msgid "Invoice Delivery Details"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:601
#: ../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.orig:605
msgid "Quotation Delivery Details"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:610
#: ../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.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.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.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.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.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.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.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.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.orig:644
msgid "Customer reference number for this order (if any)"
msgstr ""
msgid "Purchasing GL Account:"
msgstr ""
-#: ../themes/default/renderer.php:27
+#: ../themes/default/renderer.php:28
msgid "Main Menu"
msgstr ""
-#: ../themes/default/renderer.php:53
-#: ../themes/default/renderer.php:76
+#: ../themes/default/renderer.php:54
+#: ../themes/default/renderer.php:80
msgid "Help"
msgstr ""
-#: ../themes/default/renderer.php:71
+#: ../themes/default/renderer.php:75
msgid "Preferences"
msgstr ""
ST_SUPPINVOICE => 'SA_SUPPLIERINVOICE'),
array( 'NewOrder' => 'SA_PURCHASEORDER',
'ModifyOrderNumber' => 'SA_PURCHASEORDER',
+ 'AddedID' => 'SA_PURCHASEORDER',
'NewGRN' => 'SA_GRN',
- 'NewInvoice' => 'SA_SUPPLIERINVOICE')
+ 'AddedGRN' => 'SA_GRN',
+ 'NewInvoice' => 'SA_SUPPLIERINVOICE',
+ 'AddedPI' => 'SA_SUPPLIERINVOICE')
);
$js = '';
set_focus('StkLocation');
return false;
}
-
+ if (!db_has_currency_rates($_SESSION['PO']->curr_code, $_POST['OrderDate']))
+ return false;
if ($_SESSION['PO']->order_has_items() == false)
{
display_error (_("The order cannot be placed because there are no lines entered on this order."));
if (is_inventory_item($item->item_code))
{
$qoh = get_qoh_on_date($item->item_code, null, $_SESSION['supp_trans']->tran_date);
- if ($item->qty_recd > $qoh)
+ if ($item->this_quantity_inv > $qoh)
{
$stock = get_item($item->item_code);
display_error(_("The return cannot be processed because there is an insufficient quantity for item:") .
$Ajax->activate('_ex_rate');
}
-if (list_updated('supplier_id') || list_updated('bank_account')) {
- $_SESSION['alloc']->read();
- $_POST['memo_'] = $_POST['amount'] = '';
- $Ajax->activate('alloc_tbl');
-}
//----------------------------------------------------------------------------------------
if (!isset($_POST['bank_account'])) { // first page call
return false;
}
+ if (!db_has_currency_rates(get_supplier_currency($_POST['supplier_id']), $_POST['DatePaid'], true))
+ return false;
$_SESSION['alloc']->amount = -input_num('amount');
if (isset($_POST["TotalNumberOfAllocs"]))
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'))
$doctype = $this->formData['doctype'];
$header2type = true;
- $this->SetLang(@$this->formData['rep_lang'] ? $this->formData['rep_lang'] : $dflt_lang);
+ $this->SetLang(@$this->formData['rep_lang'] ? $this->formData['rep_lang']
+ : ($_SESSION["wa_current_user"]->prefs->language ? $_SESSION["wa_current_user"]->prefs->language : $dflt_lang));
// leave layout files names without path to enable including
// modified versions from company/x/reporting directory
// if($ret) return $ret;
//Open a new connection to send the control file and data.
- $stream = fsockopen("tcp://".$this->host, $this->port, $errNo, $errStr, $this->timeout);
+ $stream = @fsockopen("tcp://".$this->host, $this->port, $errNo, $errStr, $this->timeout);
if(!$stream){
- return _('Cannot open connection to printer');
+ return _('Cannot open connection to printer').":<br>$errStr";
}
if (!isset($_SESSION['_print_job'])) {
$_SESSION['print_job'] = 0;
// Print all waiting jobs on remote printer queue.
//
function flush_queue($queue){
- $stream = fsockopen("tcp://".$this->host, $this->port,$errNo, $errStr, $this->timeout);
+ $stream = @fsockopen("tcp://".$this->host, $this->port,$errNo, $errStr, $this->timeout);
if (!$stream){
- return _('Cannot flush printing queue');
+ return _('Cannot flush printing queue').":<br>$errStr";
// .':<br>' . $errNo." (".$errStr.")"; return 0 (success) even on failure
} else {
//Print any waiting jobs
$date = $_POST[$name];
$st = "<input type='text' name='$name' value='$date'>";
if ($use_date_picker)
+ {
+ $calc_image = (file_exists("$path_to_root/themes/".user_theme()."/images/cal.gif")) ?
+ "$path_to_root/themes/".user_theme()."/images/cal.gif" : "$path_to_root/themes/default/images/cal.gif";
$st .= "<a href=\"javascript:date_picker(document.forms[0].$name);\">"
- . " <img src='$path_to_root/themes/default/images/cal.gif' width='16' height='16' border='0' alt='"._('Click Here to Pick up the date')."'></a>\n";
+ . " <img src='$calc_image' width='16' height='16' border='0' alt='"._('Click Here to Pick up the date')."'></a>\n";
+ }
return $st;
break;
AND ".TB_PREF."stock_moves.trans_no=".TB_PREF."debtor_trans.trans_no
AND ".TB_PREF."stock_moves.tran_date>='$from'
AND ".TB_PREF."stock_moves.tran_date<='$to'
- AND ((".TB_PREF."debtor_trans.type=".ST_CUSTDELIVERY." AND ".TB_PREF."debtor_trans.version=1) OR ".TB_PREF."stock_moves.type=".ST_CUSTCREDIT.")
+ AND (".TB_PREF."debtor_trans.type=".ST_CUSTDELIVERY." OR ".TB_PREF."stock_moves.type=".ST_CUSTCREDIT.")
AND (".TB_PREF."stock_master.mb_flag='B' OR ".TB_PREF."stock_master.mb_flag='M')";
if ($category != 0)
$sql .= " AND ".TB_PREF."stock_master.category_id = ".db_escape($category);
$sql = "SELECT
".TB_PREF."supp_invoice_items.supp_trans_no inv_no,
".TB_PREF."supp_invoice_items.quantity inv_qty,
- ".TB_PREF."supp_invoice_items.unit_price inv_price
- FROM ".TB_PREF."grn_items, ".TB_PREF."supp_invoice_items
+ IF (".TB_PREF."supp_trans.tax_included = 1, ".TB_PREF."supp_invoice_items.unit_price - ".TB_PREF."supp_invoice_items.unit_tax, ".TB_PREF."supp_invoice_items.unit_price) inv_price
+ FROM ".TB_PREF."grn_items, ".TB_PREF."supp_trans, ".TB_PREF."supp_invoice_items
WHERE ".TB_PREF."grn_items.id = ".TB_PREF."supp_invoice_items.grn_item_id
AND ".TB_PREF."grn_items.po_detail_item = ".TB_PREF."supp_invoice_items.po_detail_item_id
AND ".TB_PREF."grn_items.item_code = ".TB_PREF."supp_invoice_items.stock_id
+ AND ".TB_PREF."supp_trans.type = ".TB_PREF."supp_invoice_items.supp_trans_type
+ AND ".TB_PREF."supp_trans.trans_no = ".TB_PREF."supp_invoice_items.supp_trans_no
+ AND ".TB_PREF."supp_invoice_items.supp_trans_type = 20
AND ".TB_PREF."supp_invoice_items.grn_item_id = ".$grn_item_id."
ORDER BY ".TB_PREF."supp_invoice_items.id asc";
}
$curr = get_supplier_currency($trans['supplier_id']);
$rate = get_exchange_rate_from_home_currency($curr, sql2date($trans['delivery_date']));
- $trans['unit_price'] *= $rate;
- $trans['act_price'] *= $rate;
+ $trans['std_cost_unit'] *= $rate;
$rep->NewLine();
$rep->TextCol(0, 1, $trans['item_code']);
$rep->TextCol(4, 5, $inv['inv_no']);
$rep->AmountCol(5, 6, $inv['inv_qty'], $qdec);
$rep->AmountCol(6, 7, $inv['inv_price'], $dec);
- $rep->AmountCol(7, 8, $trans['unit_price'], $dec);
+ $rep->AmountCol(7, 8, $trans['std_cost_unit'], $dec);
$amt = round2($inv['inv_qty'] * $inv['inv_price'], $dec);
$rep->AmountCol(8, 9, $amt, $dec);
$rep->NewLine();
else
$rep->title = _('WORK ORDER');
- $contact[] = array('email' =>$myrow['email'],'lang' => $dflt_lang,
+ $contact = array('email' =>$myrow['email'],'lang' => $dflt_lang, // ???
'name' => $myrow['contact'], 'name2' => '', 'contact');
$rep->SetCommonData($myrow, null, null, '', 26, $contact);
else
$coms .= " / ".$memo;
}
- $rep->TextCol(3, 6, $coms);
- $rep->NewLine(2);
+ $rep->TextColLines(3, 6, $coms);
+ $rep->NewLine();
}
$rep->TextCol(0, 1, $myrow['account']);
$rep->TextCol(1, 2, $myrow['account_name']);
while ($trans=db_fetch($transactions))
{
- if (in_array($trans['trans_type'], array(ST_CUSTCREDIT,ST_SUPPINVOICE))) {
+ if (in_array($trans['trans_type'], array(ST_CUSTCREDIT,ST_SUPPINVOICE,ST_JOURNAL))) {
$trans['net_amount'] *= -1;
$trans['amount'] *= -1;
}
}
}
if ($trans['trans_type']==ST_JOURNAL && $trans['amount']<0) {
- $taxes[$trans['tax_type_id']]['taxout'] -= $trans['amount'];
- $taxes[$trans['tax_type_id']]['out'] -= $trans['net_amount'];
+ $taxes[$trans['tax_type_id']]['taxin'] += $trans['amount'];
+ $taxes[$trans['tax_type_id']]['in'] += $trans['net_amount'];
+ }
+ elseif ($trans['trans_type']==ST_JOURNAL && $trans['amount']>=0) {
+ $taxes[$trans['tax_type_id']]['taxout'] += $trans['amount'];
+ $taxes[$trans['tax_type_id']]['out'] += $trans['net_amount'];
}
elseif (in_array($trans['trans_type'], array(ST_BANKDEPOSIT,ST_SALESINVOICE,ST_CUSTCREDIT))) {
$taxes[$trans['tax_type_id']]['taxout'] += $trans['amount'];
$js = "";
if ($use_popup_windows)
$js .= get_js_open_window(900, 600);
+if ($use_date_picker)
+ $js .= get_js_date_picker();
page(_($help_context = "Create and Print Recurrent Invoices"), false, false, "", $js);
$cart->trans_type = ST_SALESINVOICE;
$cart->reference = $Refs->get_next($cart->trans_type);
$invno = $cart->write(1);
+ if ($invno == -1)
+ {
+ display_error(_("The entered reference is already in use."));
+ display_footer_exit();
+ }
update_last_sent_recurrent_invoice($tmpl_no, $to);
return $invno;
}
return $from;
}
+if (!isset($_POST['date'])) {
+ $_POST['date'] = Today();
+}
+
$id = find_submit("create");
if ($id != -1)
{
$Ajax->activate('_page_body');
- $date = Today();
+ $date = $_POST['date'];
if (is_date_in_fiscalyear($date))
{
$invs = array();
$result = get_recurrent_invoices();
start_form();
+start_table(TABLESTYLE_NOBORDER);
+start_row();
+date_cells(_("Invoice date:"), 'date', '');
+end_row();
+end_table();
+
start_table(TABLESTYLE, "width=70%");
$th = array(_("Description"), _("Template No"),_("Customer"),_("Branch")."/"._("Group"),_("Days"),_("Monthly"),_("Begin"),_("End"),_("Last Created"),"");
table_header($th);
$k = 0;
-$today = add_days(Today(), 1);
+$today = add_days($_POST['date'], 1);
$due = false;
while ($myrow = db_fetch($result))
{
return false;
if($_SESSION['Items']->trans_no == 0) {
if (!$Refs->is_valid($_POST['ref'])) {
- display_error( _("You must enter a reference."));
- set_focus('ref');
- $input_error = 1;
- } elseif (!is_new_reference($_POST['ref'], ST_CUSTCREDIT)) {
- display_error( _("The entered reference is already in use."));
- set_focus('ref');
- $input_error = 1;
- }
+ display_error( _("You must enter a reference."));
+ set_focus('ref');
+ $input_error = 1;
+ }
}
if (!is_date($_POST['OrderDate'])) {
display_error(_("The entered date for the credit note is invalid."));
display_note(_("For credit notes created to write off the stock, a general ledger account is required to be selected."), 1, 0);
display_note(_("Please select an account to write the cost of the stock off to, then click on Process again."), 1, 0);
exit;
-
}
if (!isset($_POST['WriteOffGLCode'])) {
$_POST['WriteOffGLCode'] = 0;
}
copy_to_cn();
$credit_no = $_SESSION['Items']->write($_POST['WriteOffGLCode']);
- new_doc_date($_SESSION['Items']->document_date);
- processing_end();
- meta_forward($_SERVER['PHP_SELF'], "AddedID=$credit_no");
-
+ if ($credit_no == -1)
+ {
+ display_error(_("The entered reference is already in use."));
+ set_focus('ref');
+ }
+ else
+ {
+ new_doc_date($_SESSION['Items']->document_date);
+ processing_end();
+ meta_forward($_SERVER['PHP_SELF'], "AddedID=$credit_no");
+ }
} /*end of process credit note */
//-----------------------------------------------------------------------------
return false;
}
- if (!is_new_reference($_POST['ref'], ST_CUSTCREDIT)) {
- display_error(_("The entered reference is already in use."));;
- set_focus('ref');
- return false;
- }
}
if (!check_num('ChargeFreightCost', 0)) {
display_error(_("The entered shipping cost is invalid or less than zero."));;
//-----------------------------------------------------------------------------
if (isset($_POST['ProcessCredit']) && can_process()) {
+ $new_credit = ($_SESSION['Items']->trans_no == 0);
- $new_credit = ($_SESSION['Items']->trans_no == 0);
-
- if (!isset($_POST['WriteOffGLCode']))
+ if (!isset($_POST['WriteOffGLCode']))
$_POST['WriteOffGLCode'] = 0;
copy_to_cart();
- if ($new_credit) new_doc_date($_SESSION['Items']->document_date);
- $credit_no = $_SESSION['Items']->write($_POST['WriteOffGLCode']);
-
- if($credit_no) {
+ if ($new_credit)
+ new_doc_date($_SESSION['Items']->document_date);
+ $credit_no = $_SESSION['Items']->write($_POST['WriteOffGLCode']);
+ if ($credit_no == -1)
+ {
+ display_error(_("The entered reference is already in use."));
+ set_focus('ref');
+ } elseif($credit_no) {
processing_end();
if ($new_credit) {
- meta_forward($_SERVER['PHP_SELF'], "AddedID=$credit_no");
+ meta_forward($_SERVER['PHP_SELF'], "AddedID=$credit_no");
} else {
- meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$credit_no");
+ meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$credit_no");
}
}
}
set_focus('ref');
return false;
}
-
- if ($_SESSION['Items']->trans_no==0 && !is_new_reference($_POST['ref'], ST_CUSTDELIVERY)) {
- display_error(_("The entered reference is already in use."));
- set_focus('ref');
- return false;
- }
}
if ($_POST['ChargeFreightCost'] == "") {
$_POST['ChargeFreightCost'] = price_format(0);
//------------------------------------------------------------------------------
if (isset($_POST['process_delivery']) && check_data() && check_qoh()) {
-
$dn = &$_SESSION['Items'];
if ($_POST['bo_policy']) {
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$is_prepaid");
+ } else {
+ meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$delivery_no$is_prepaid");
+ }
}
}
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(!$prepaid)
//-----------------------------------------------------------------------------
if (isset($_POST['process_invoice']) && check_data()) {
-
$newinvoice= $_SESSION['Items']->trans_no == 0;
copy_to_cart();
- if ($newinvoice) new_doc_date($_SESSION['Items']->document_date);
+ if ($newinvoice)
+ new_doc_date($_SESSION['Items']->document_date);
$invoice_no = $_SESSION['Items']->write();
- processing_end();
-
- if ($newinvoice) {
- meta_forward($_SERVER['PHP_SELF'], "AddedID=$invoice_no");
- } else {
- meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$invoice_no");
+ if ($invoice_no == -1)
+ {
+ display_error(_("The entered reference is already in use."));
+ set_focus('ref');
}
+ else
+ {
+ processing_end();
+
+ if ($newinvoice) {
+ meta_forward($_SERVER['PHP_SELF'], "AddedID=$invoice_no");
+ } else {
+ meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$invoice_no");
+ }
+ }
}
if(list_updated('payment')) {
set_focus('discount');
return false;
}
+ if (!db_has_currency_rates(get_customer_currency($_POST['customer_id']), $_POST['DateBanked'], true))
+ return false;
$_SESSION['alloc']->amount = input_num('amount');
}
$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'])) {
hidden('customer_id', $_POST['customer_id']);
}
+ 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['charge'])) // first page call
{
//Prepare allocation cart
// 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) {
+
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) && !$this->is_prepaid()) {
// this is direct document - first add parent
$ref = $this->reference;
.TB_PREF."tax_groups.id AS tax_group_id ";
}
- $sql .= " FROM ".TB_PREF."debtor_trans trans, ".TB_PREF."debtors_master cust";
+ $sql .= " FROM ".TB_PREF."debtor_trans trans LEFT JOIN ".TB_PREF."comments com ON trans.type=com.type AND trans.trans_no=com.id
+ LEFT JOIN ".TB_PREF."shippers ON ".TB_PREF."shippers.shipper_id=trans.ship_via,
+ ".TB_PREF."debtors_master cust";
if ($trans_type == ST_CUSTPAYMENT) {
// it's a payment so also get the bank account
if ($trans_type == ST_SALESINVOICE || $trans_type == ST_CUSTCREDIT || $trans_type == ST_CUSTDELIVERY) {
// it's an invoice so also get the shipper, salestypes
- $sql .= ", ".TB_PREF."shippers, "
- .TB_PREF."sales_types, "
+ $sql .= ", ".TB_PREF."sales_types, "
.TB_PREF."cust_branch branch, "
.TB_PREF."tax_groups ";
}
}
if ($trans_type == ST_SALESINVOICE || $trans_type == ST_CUSTCREDIT || $trans_type == ST_CUSTDELIVERY) {
// it's an invoice so also get the shipper
- $sql .= " AND ".TB_PREF."shippers.shipper_id=trans.ship_via
- AND ".TB_PREF."sales_types.id = trans.tpe
+ $sql .= " AND ".TB_PREF."sales_types.id = trans.tpe
AND branch.branch_code = trans.branch_code
AND branch.tax_group_id = ".TB_PREF."tax_groups.id ";
}
$results = array();
$res = get_crm_persons('customer', $action, $customer_id);
while($contact = db_fetch($res))
+ {
+ if ($contact['lang'] == 'C') // Fix for improper lang in demo sql files.
+ $contact['lang'] = '';
$results[] = $contact;
-
+ }
return $results;
}
."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,"
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, "
.TB_PREF."cust_branch branch,"
- .TB_PREF."locations loc, "
- .TB_PREF."shippers ship
+ .TB_PREF."locations loc
WHERE sorder.order_type=stype.id
AND branch.branch_code = sorder.branch_code
AND branch.tax_group_id = tax_group.id
AND sorder.debtor_no = cust.debtor_no
AND loc.loc_code = sorder.from_stk_loc
- AND ship.shipper_id = sorder.ship_via
AND sorder.trans_type = " . db_escape($trans_type) ."
AND sorder.order_no = " . db_escape($order_no );
$myrow["tax_group_name"], $myrow["contact_phone"]);
$order->set_sales_type($myrow["sales_type_id"], $myrow["sales_type"],
- $myrow["tax_included"], 0); // no default price calculations on edit
+ $myrow["tax_included"], $myrow["factor"]); // no default price calculations on edit
$order->set_location($myrow["from_stk_loc"], $myrow["location_name"]);
function get_customer_details_to_order(&$order, $customer_id, $branch_id)
{
+ global $SysPrefs;
+
$ret_error = "";
$myrow = get_customer_to_order($customer_id);
$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"]);
add_branch($selected_id, $_POST['CustName'], $_POST['cust_ref'],
$_POST['address'], $_POST['salesman'], $_POST['area'], $_POST['tax_group_id'], '',
get_company_pref('default_sales_discount_act'), get_company_pref('debtors_act'), get_company_pref('default_prompt_payment_act'),
- get_company_pref('default location'), $_POST['address'], 0, 0, get_company_pref('default_ship_via'), $_POST['notes']);
+ $_POST['location'], $_POST['address'], 0, 0, $_POST['ship_via'], $_POST['notes']);
$selected_branch = db_insert_id();
text_row(_("Secondary Phone Number:"), 'phone2', null, 32, 30);
text_row(_("Fax Number:"), 'fax', null, 32, 30);
email_row(_("E-mail:"), 'email', null, 35, 55);
+ sales_persons_list_row( _("Sales Person:"), 'salesman', null);
}
table_section(2);
if (!$selected_id && isset($auto_create_branch) && $auto_create_branch == 1)
{
table_section_title(_("Branch"));
- sales_persons_list_row( _("Sales Person:"), 'salesman', null);
+ locations_list_row(_("Default Inventory Location:"), 'location');
+ shippers_list_row(_("Default Shipping Company:"), 'ship_via');
sales_areas_list_row( _("Sales Area:"), 'area', null);
tax_groups_list_row(_("Tax Group:"), 'tax_group_id', null);
}
if (key_in_foreign_table($selected_id, 'cust_branch', 'salesman'))
{
- display_error("Cannot delete this sales-person because branches are set up referring to this sales-person - first alter the branches concerned.");
+ display_error(_("Cannot delete this sales-person because branches are set up referring to this sales-person - first alter the branches concerned."));
}
else
{
ST_CUSTDELIVERY => 'SA_SALESDELIVERY',
ST_SALESINVOICE => 'SA_SALESINVOICE'),
array( 'NewOrder' => 'SA_SALESORDER',
- 'ModifySalesOrder' => 'SA_SALESORDER',
+ 'ModifyOrderNumber' => 'SA_SALESORDER',
+ 'AddedID' => 'SA_SALESORDER',
+ 'UpdatedID' => 'SA_SALESORDER',
'NewQuotation' => 'SA_SALESQUOTE',
'ModifyQuotationNumber' => 'SA_SALESQUOTE',
+ 'NewQuoteToSalesOrder' => 'SA_SALESQUOTE',
+ 'AddedQU' => 'SA_SALESQUOTE',
+ 'UpdatedQU' => 'SA_SALESQUOTE',
'NewDelivery' => 'SA_SALESDELIVERY',
- 'NewInvoice' => 'SA_SALESINVOICE')
+ 'AddedDN' => 'SA_SALESDELIVERY',
+ 'NewInvoice' => 'SA_SALESINVOICE',
+ 'AddedDI' => 'SA_SALESINVOICE'
+ )
);
$js = '';
if (isset($_GET['NewDelivery']) && is_numeric($_GET['NewDelivery'])) {
$_SESSION['page_title'] = _($help_context = "Direct Sales Delivery");
- create_cart(ST_CUSTDELIVERY, $_GET['NewDelivery']);
+ create_cart(ST_CUSTDELIVERY, 0);
} elseif (isset($_GET['NewInvoice']) && is_numeric($_GET['NewInvoice'])) {
$_SESSION['page_title'] = _($help_context = "Direct Sales Invoice");
- create_cart(ST_SALESINVOICE, $_GET['NewInvoice']);
+ create_cart(ST_SALESINVOICE, 0);
} elseif (isset($_GET['ModifyOrderNumber']) && is_numeric($_GET['ModifyOrderNumber'])) {
$cart->document_date = $_POST['OrderDate'];
$newpayment = false;
+
if (isset($_POST['payment']) && ($cart->payment != $_POST['payment'])) {
$cart->payment = $_POST['payment'];
$cart->payment_terms = get_payment_terms($_POST['payment']);
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;
}
set_focus('ref');
return false;
}
- if ($_SESSION['Items']->trans_no==0 && !is_new_reference($_POST['ref'],
- $_SESSION['Items']->trans_type)) {
- display_error(_("The entered reference is already in use."));
- set_focus('ref');
- return false;
- } elseif ($_SESSION['Items']->get_items_total() < 0) {
+ if (!db_has_currency_rates($_SESSION['Items']->customer_currency, $_POST['OrderDate']))
+ return false;
+
+ if ($_SESSION['Items']->get_items_total() < 0) {
display_error("Invoice total amount cannot be less than zero.");
return false;
}
copy_to_cart();
$modified = ($_SESSION['Items']->trans_no != 0);
$so_type = $_SESSION['Items']->so_type;
-
- $_SESSION['Items']->write(1);
- if (count($messages)) { // abort on failure or error messages are lost
- $Ajax->activate('_page_body');
- display_footer_exit();
- }
- $trans_no = key($_SESSION['Items']->trans_no);
- $trans_type = $_SESSION['Items']->trans_type;
- new_doc_date($_SESSION['Items']->document_date);
- processing_end();
- if ($modified) {
- if ($trans_type == ST_SALESQUOTE)
- meta_forward($_SERVER['PHP_SELF'], "UpdatedQU=$trans_no");
- else
- meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$trans_no");
- } elseif ($trans_type == ST_SALESORDER) {
- meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no");
- } elseif ($trans_type == ST_SALESQUOTE) {
- meta_forward($_SERVER['PHP_SELF'], "AddedQU=$trans_no");
- } elseif ($trans_type == ST_SALESINVOICE) {
- meta_forward($_SERVER['PHP_SELF'], "AddedDI=$trans_no&Type=$so_type");
- } else {
- meta_forward($_SERVER['PHP_SELF'], "AddedDN=$trans_no&Type=$so_type");
+
+ $ret = $_SESSION['Items']->write(1);
+ if ($ret == -1)
+ {
+ display_error(_("The entered reference is already in use."));
+ set_focus('ref');
}
+ else
+ {
+ if (count($messages)) { // abort on failure or error messages are lost
+ $Ajax->activate('_page_body');
+ display_footer_exit();
+ }
+ $trans_no = key($_SESSION['Items']->trans_no);
+ $trans_type = $_SESSION['Items']->trans_type;
+ new_doc_date($_SESSION['Items']->document_date);
+ processing_end();
+ if ($modified) {
+ if ($trans_type == ST_SALESQUOTE)
+ meta_forward($_SERVER['PHP_SELF'], "UpdatedQU=$trans_no");
+ else
+ meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$trans_no");
+ } elseif ($trans_type == ST_SALESORDER) {
+ meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no");
+ } elseif ($trans_type == ST_SALESQUOTE) {
+ meta_forward($_SERVER['PHP_SELF'], "AddedQU=$trans_no");
+ } elseif ($trans_type == ST_SALESINVOICE) {
+ meta_forward($_SERVER['PHP_SELF'], "AddedDI=$trans_no&Type=$so_type");
+ } else {
+ meta_forward($_SERVER['PHP_SELF'], "AddedDN=$trans_no&Type=$so_type");
+ }
+ }
}
//--------------------------------------------------------------------------------
} else {
display_error($customer_error);
}
+
end_form();
end_page();
?>
\ No newline at end of file
-- Dumping data for table `0_crm_persons`
--
-INSERT INTO `0_crm_persons` VALUES(1, 'Beefeater', '', NULL, NULL, NULL, NULL, NULL, '', 'C', '', 0);
+INSERT INTO `0_crm_persons` VALUES(1, 'Beefeater', '', NULL, NULL, NULL, NULL, NULL, '', '', '', 0);
INSERT INTO `0_crm_persons` VALUES(2, 'Ghostbusters', '', NULL, NULL, NULL, NULL, NULL, '', NULL, '', 0);
-INSERT INTO `0_crm_persons` VALUES(3, 'Brezan', '', NULL, NULL, NULL, NULL, NULL, '', 'C', '', 0);
+INSERT INTO `0_crm_persons` VALUES(3, 'Brezan', '', NULL, NULL, NULL, NULL, NULL, '', '', '', 0);
INSERT INTO `0_crm_persons` VALUES(4, 'Beefeater', 'Main Branch', NULL, '', '', '', '', '', NULL, '', 0);
INSERT INTO `0_crm_persons` VALUES(5, 'Ghostbusters', 'Main Branch', NULL, 'Address 1\nAddress 2\nAddress 3', '', '', '', '', NULL, '', 0);
INSERT INTO `0_crm_persons` VALUES(6, 'Brezan', 'Main Branch', NULL, 'Address 1\nAddress 2\nAddress 3', '', '', '', '', NULL, '', 0);
-INSERT INTO `0_crm_persons` VALUES(7, 'Junk Beer', 'Contact', NULL, 'Address 1\nAddress 2\nAddress 3', '+45 55667788', '', '', '', 'C', '', 0);
+INSERT INTO `0_crm_persons` VALUES(7, 'Junk Beer', 'Contact', NULL, 'Address 1\nAddress 2\nAddress 3', '+45 55667788', '', '', '', '', '', 0);
INSERT INTO `0_crm_persons` VALUES(8, 'Lucky Luke', 'Luke', NULL, 'Address 1\nAddress 2\nAddress 3', '(111) 222.333.444', '', '', '', NULL, '', 0);
-INSERT INTO `0_crm_persons` VALUES(9, 'Money Makers', 'Makers', NULL, 'Address 1\nAddress 2\nAddress 3', '+44 444 555 666', '', '', '', 'C', '', 0);
+INSERT INTO `0_crm_persons` VALUES(9, 'Money Makers', 'Makers', NULL, 'Address 1\nAddress 2\nAddress 3', '+44 444 555 666', '', '', '', '', '', 0);
-- --------------------------------------------------------
echo "<div class=tabs>";
foreach($applications as $app)
{
- $acc = access_string($app->name);
- echo "<a class='".($sel_app == $app->id ? 'selected' : 'menu_tab')
- ."' href='$local_path_to_root/index.php?application=".$app->id
- ."'$acc[1]>" .$acc[0] . "</a>";
+ if ($this->check_application_access($app))
+ {
+ $acc = access_string($app->name);
+ echo "<a class='".($sel_app == $app->id ? 'selected' : 'menu_tab')
+ ."' href='$local_path_to_root/index.php?application=".$app->id
+ ."'$acc[1]>" .$acc[0] . "</a>";
+ }
}
echo "</div>";
global $path_to_root;
$selected_app = $waapp->get_selected_application();
+ if (!$this->check_application_access($selected_app))
+ return;
foreach ($selected_app->modules as $module)
{
+ if (!$this->check_module_access($module))
+ continue;
// image
echo "<tr>";
// values
{
echo $img.menu_link($appfunction->link, $appfunction->label)."<br>\n";
}
- else
+ elseif (!$this->hide_inaccessible_menu_items())
{
echo $img.'<span class="inactive">'
.access_string($appfunction->label, true)
{
echo $img.menu_link($appfunction->link, $appfunction->label)."<br>\n";
}
- else
+ elseif (!$this->hide_inaccessible_menu_items())
{
echo $img.'<span class="inactive">'
.access_string($appfunction->label, true)
echo "</table>";
}
+
+ function check_application_access($waapp)
+ {
+ if (!$this->hide_inaccessible_menu_items())
+ {
+ return true;
+ }
+
+ foreach ($waapp->modules as $module)
+ {
+ if ($this->check_module_access($module))
+ {
+ return true;
+ }
+ }
+
+ return false;
+
+ }
+
+ function check_module_access($module)
+ {
+
+ if (!$this->hide_inaccessible_menu_items())
+ {
+ return true;
+ }
+
+ if (sizeof($module->lappfunctions) > 0)
+ {
+ foreach ($module->lappfunctions as $appfunction)
+ {
+ if ($appfunction->label != "" && $_SESSION["wa_current_user"]->can_access_page($appfunction->access))
+ {
+ return true;
+ }
+ }
+ }
+
+ if (sizeof($module->rappfunctions) > 0)
+ {
+ foreach ($module->rappfunctions as $appfunction)
+ {
+ if ($appfunction->label != "" && $_SESSION["wa_current_user"]->can_access_page($appfunction->access))
+ {
+ return true;
+ }
+ }
+ }
+
+ return false;
+
+ }
+
+ function hide_inaccessible_menu_items()
+ {
+ global $hide_inaccessible_menu_items;
+
+ if (!isset($hide_inaccessible_menu_items) || $hide_inaccessible_menu_items == 0)
+ {
+ return false;
+ }
+
+ else
+ {
+ return true;
+ }
+ }
}
?>
\ No newline at end of file
echo "<div class=tabs>";
foreach($applications as $app)
{
- $acc = access_string($app->name);
- echo "<a class='".($sel_app == $app->id ? 'selected' : 'menu_tab')
- ."' href='$local_path_to_root/index.php?application=".$app->id
- ."'$acc[1]>" .$acc[0] . "</a>";
+ if ($this->check_application_access($app))
+ {
+ $acc = access_string($app->name);
+ echo "<a class='".($sel_app == $app->id ? 'selected' : 'menu_tab')
+ ."' href='$local_path_to_root/index.php?application=".$app->id
+ ."'$acc[1]>" .$acc[0] . "</a>";
+ }
}
echo "</div>";
{
global $path_to_root;
$selected_app = $waapp->get_selected_application();
+ if (!$this->check_application_access($selected_app))
+ return;
foreach ($selected_app->modules as $module)
{
+ if (!$this->check_module_access($module))
+ continue;
// image
echo "<tr>";
// values
{
echo $img.menu_link($appfunction->link, $appfunction->label)."<br>\n";
}
- else
+ elseif (!$this->hide_inaccessible_menu_items())
{
echo $img.'<span class="inactive">'
.access_string($appfunction->label, true)
{
echo $img.menu_link($appfunction->link, $appfunction->label)."<br>\n";
}
- else
+ elseif (!$this->hide_inaccessible_menu_items())
{
echo $img.'<span class="inactive">'
.access_string($appfunction->label, true)
echo "</table>";
}
+
+ function check_application_access($waapp)
+ {
+ if (!$this->hide_inaccessible_menu_items())
+ {
+ return true;
+ }
+
+ foreach ($waapp->modules as $module)
+ {
+ if ($this->check_module_access($module))
+ {
+ return true;
+ }
+ }
+
+ return false;
+
+ }
+
+ function check_module_access($module)
+ {
+
+ if (!$this->hide_inaccessible_menu_items())
+ {
+ return true;
+ }
+
+ if (sizeof($module->lappfunctions) > 0)
+ {
+ foreach ($module->lappfunctions as $appfunction)
+ {
+ if ($appfunction->label != "" && $_SESSION["wa_current_user"]->can_access_page($appfunction->access))
+ {
+ return true;
+ }
+ }
+ }
+
+ if (sizeof($module->rappfunctions) > 0)
+ {
+ foreach ($module->rappfunctions as $appfunction)
+ {
+ if ($appfunction->label != "" && $_SESSION["wa_current_user"]->can_access_page($appfunction->access))
+ {
+ return true;
+ }
+ }
+ }
+
+ return false;
+
+ }
+
+ function hide_inaccessible_menu_items()
+ {
+ global $hide_inaccessible_menu_items;
+
+ if (!isset($hide_inaccessible_menu_items) || $hide_inaccessible_menu_items == 0)
+ {
+ return false;
+ }
+
+ else
+ {
+ return true;
+ }
+ }
}
?>
\ No newline at end of file
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
+
class renderer
{
function get_icon($category)
function menu_header($title, $no_menu, $is_index)
{
- global $path_to_root, $help_base_url, $db_connections;
+ global $path_to_root, $help_base_url, $db_connections, $show_inaccessible_menu_items;
echo "<table class='callout_main' border='0' cellpadding='0' cellspacing='0'>\n";
echo "<tr>\n";
echo "<td colspan='2' rowspan='2'>\n";
echo "<div class=tabs>";
foreach($applications as $app)
{
- $acc = access_string($app->name);
- echo "<a class='".($sel_app == $app->id ? 'selected' : 'menu_tab')
- ."' href='$local_path_to_root/index.php?application=".$app->id
- ."'$acc[1]>" .$acc[0] . "</a>";
+ if ($this->check_application_access($app))
+ {
+ $acc = access_string($app->name);
+ echo "<a class='".($sel_app == $app->id ? 'selected' : 'menu_tab')
+ ."' href='$local_path_to_root/index.php?application=".$app->id
+ ."'$acc[1]>" .$acc[0] . "</a>";
+ }
}
echo "</div>";
echo "</td></tr></table>";
global $path_to_root;
$selected_app = $waapp->get_selected_application();
-
+ if (!$this->check_application_access($selected_app))
+ return;
foreach ($selected_app->modules as $module)
{
+ if (!$this->check_module_access($module))
+ continue;
// image
echo "<tr>";
// values
{
echo $img.menu_link($appfunction->link, $appfunction->label)."<br>\n";
}
- else
+ elseif (!$this->hide_inaccessible_menu_items())
{
echo $img.'<span class="inactive">'
.access_string($appfunction->label, true)
{
echo $img.menu_link($appfunction->link, $appfunction->label)."<br>\n";
}
- else
+ elseif (!$this->hide_inaccessible_menu_items())
{
echo $img.'<span class="inactive">'
.access_string($appfunction->label, true)
}
echo "</tr></table></td></tr>";
- }
-
+ }
echo "</table>";
}
- }
+
+ function check_application_access($waapp)
+ {
+ if (!$this->hide_inaccessible_menu_items())
+ {
+ return true;
+ }
+
+ foreach ($waapp->modules as $module)
+ {
+ if ($this->check_module_access($module))
+ {
+ return true;
+ }
+ }
+
+ return false;
+
+ }
+
+ function check_module_access($module)
+ {
+
+ if (!$this->hide_inaccessible_menu_items())
+ {
+ return true;
+ }
+
+ if (sizeof($module->lappfunctions) > 0)
+ {
+ foreach ($module->lappfunctions as $appfunction)
+ {
+ if ($appfunction->label != "" && $_SESSION["wa_current_user"]->can_access_page($appfunction->access))
+ {
+ return true;
+ }
+ }
+ }
+
+ if (sizeof($module->rappfunctions) > 0)
+ {
+ foreach ($module->rappfunctions as $appfunction)
+ {
+ if ($appfunction->label != "" && $_SESSION["wa_current_user"]->can_access_page($appfunction->access))
+ {
+ return true;
+ }
+ }
+ }
+
+ return false;
+
+ }
+
+ function hide_inaccessible_menu_items()
+ {
+ global $hide_inaccessible_menu_items;
+
+ if (!isset($hide_inaccessible_menu_items) || $hide_inaccessible_menu_items == 0)
+ {
+ return false;
+ }
+
+ else
+ {
+ return true;
+ }
+ }
+ }
+
+
?>
\ No newline at end of file
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head>
- <meta http-equiv="CONTENT-TYPE" content="text/html; charset=iso-8859-2">
-
- <title>FrontAccounting Update</title><meta name="GENERATOR" content="OpenOffice.org 2.4 (Linux)">
- <meta name="CREATED" content="0;0">
- <meta name="CHANGED" content="20100902;19041400"></head>
-<body dir="ltr" lang="en-US">
-<p style="margin-bottom: 0cm;"><strong><font color="#cc6600"><font style="font-size: 20pt;" size="5"><i>Front</i></font></font></strong><strong><font style="font-size: 20pt;" size="5">Accounting
-Update</font></strong></p>
-<h2>Important Notes for release 2.3.5.</h2>Change in the behaviour of <span style="font-weight: bold; font-style: italic;">Recurrent Invoices</span>.<br><ul><li>Now
-the Last Sent day is stamped with the former Last Sent (or Begin date
-the first time) + months + days. Before the Last Sent day was stamped
-with tthe creation date (today). The Invoice date is still todays date.
-</li><li>If you for some reason want to make a pause in the recurrent
-invoices, you can now edit the Last Sent day in the Management section
-of Sales tab.</li><li>Before the days value, together with a month
-value, decided which day in the month the invoice was due.. This
-does not work now. You can change the day in the month you
-want the recurrency to happen by setting the Last Sent day with the new
-day in the Management section. </li><li>If you create a new Recurrent Invoice the Beginning date can be set to the day in the month you want the recurrencies to be due.</li></ul>
-<h2>Important Notes</h2>
-<p>Upgrade process can be done only by administrator of the first
-company created during FrontAccounting installation. This person is
-considered as a site admin who have granted access to potentially
-dangerous setup options, like Setup/Software Upgrade.</p>
-<p>In the following description sections related to older FA versions are
-prefixed with <span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;">[color tags]</span><span style="background: transparent none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;">
-. Y</span>ou can skip tagged fragment safely if currently FA
-application is newer than the version in tag.</p>
-<p>Upgrade process consists of up to four stages, some of them are
-optional:</p>
-<ol>
- <li><p>Application source files update
- </p>
- </li><li><p>Database upgrade – this step is needed only during
- upgrade which involves change in major application version number
- (e.g. from 2.2.x to 2.3.x), and sometimes during upgrade from beta
- release to stable version. Otherwise this step can be skipped.</p>
- </li><li><p>Final cleanup – is needed when some old source files,
- obsoleted by new release should be removed.</p>
- </li><li><p>New features configuration – this is optional step
- needed for most major releases and some minor ones.
- </p>
-</li></ol>
-<p style="margin-bottom: 0cm;">Before starting upgrade ensure nobody
-is using the application and make database backup for all companies.
-To be on safe side backup also old source files, especially those
-locally customized (if any).</p>
-<p>Log into admin account of first company.<strong> </strong><strong><span style="">If
-you use a theme other than the standard 3 (aqua, cool or default),
-switch to one of these before going further.</span></strong></p>
-<h2><strong><b>1. Application files update</b></strong></h2>
-<p style="margin-top: 0.42cm; page-break-after: avoid;"><font face="Liberation Sans, sans-serif"><font size="4"><strong><span style="">a. Source
-files update</span></strong></font></font></p>
-<p><strong><span style="">Extract distribution
-zip/tar.gz file in empty directory, and copy all the files to your
-FrontAccounting directory overwriting old files. If it is major
-release upgrade you can skip next step and go directly to cleanup.</span></strong></p>
-<p style="margin-top: 0.42cm; page-break-after: avoid;"><strong><font face="Liberation Sans, sans-serif"><font size="4"><span style="">b. Configuration
-files update</span></font></font></strong></p>
-<p><strong><span style="">Compare new
-</span></strong><strong><i><b>config.default.php</b></i></strong><strong>
-</strong><strong><span style="">file with the old
-</span></strong><strong><i><b>config.php </b></i></strong><strong><span style="font-style: normal;"><span style="">and
-add all n</span></span></strong><strong><span style="">ew
-settings (if any). </span></strong>
-</p>
-<p><strong><span style=""><span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;">[<FA
-2.2beta]</span></span></strong></p>
-<p><strong> <span style="">$show_users_online = 0;</span></strong></p>
-<p><strong> <span style="">$def_print_destination
-= 0;</span></strong></p>
-<p><strong><span style="">$dflt_date_fmt=0;</span></strong></p>
-<p><strong><span style="">$dflt_date_sep=0;</span></strong></p>
-<p><strong><span style="">$table_style,table_style2
-changed</span></strong></p>
-<p><strong><span style=""><span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;">[<FA
-2.3beta]</span></span></strong></p>
-<p><strong> <span style="">$alternative_tax_include_on_doc=0;</span></strong></p>
-<p><strong><span style="">$suppress_tax_rates = 0;</span></strong></p>
-<p><strong><span style=""><span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;">[<FA
-2.3RC1]</span></span></strong><strong> </strong>
-</p>
-<p><strong><span style="">Application version
-information and a couple of other private FA variables are stored in
-</span></strong><strong><i><b>version.php</b></i></strong><strong>
-</strong><strong><span style="">file. The
-application version displayed in footer is defined in $version
-variable unless this is set in config.php file. If you want current
-release version to be displayed on every FA update just remove or
-comment out $version variable in </span></strong><strong><span style="font-style: normal;"><span style="">config.php</span></span></strong><strong><span style="">.</span></strong></p>
-<p><strong><span style=""><span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;">[<FA
-2.3RC2]</span></span></strong></p>
-<p><strong> <span style="">$save_report_selections = 0; // A value > 0 means days to save the report selections.</span></strong></p><p><strong><span style=""><span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;">[<FA
-2.3]</span></span></strong></p><p><strong> <span style="">$save_po_item_codes = 0; // show item codes on purchase order </span></strong></p><p><strong><span style="">$def_print_destination = 0; // default print destination. 0 = PDF/Printer, 1 = Excel</span></strong></p><p><strong><span style="">$alternative_tax_include_on_docs = 0; // 1 = print Subtotal tax excluded, tax and Total tax included</span></strong></p><p><strong><span style="">$suppress_tax_rates = 0; // suppress tax rates on documents. 0 = no, 1 = yes.</span></strong></p><strong><span style=""><span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;"></span></span></strong>
-
-<strong><span style=""><span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;"></span></span></strong><h2><strong><b>2. Database upgrade</b></strong></h2>
-<p><strong><span style="">This step can be skipped
-for small version updates i.e. when you have already installed
-FrontAccounting version 2.3.1 or later. Before database upgrade is
-done on all company databases backup file is created automatically to
-enable database restore after failure.</span></strong></p>
-<p><strong><span style="">After major version
-upgrade overwriting files in first step makes the system unaccessible
-for all users but site admin, who have to run upgrade procedures to
-update all company databases to the new version provided with the
-release. After logging to administrator account of first installed
-company go directly to Setup/Software Upgrade screen, mark all
-subsequent 'Install' checkboxes and press 'Upgrade System'.</span></strong></p>
-<p style="">If something goes wrong during
-upgrade, you can eventually try forced upgrade option. Forced upgrade
-ignores some smaller errors which can arise during upgrade due to
-some exotic database configuration. This is depreciated option, so
-first read error messages if any, try to fix signalized problems,
-restore databases from backup and retry normal installation. To run
-upgrade in forced mode check box 'Force Upgrade', and press 'Upgrade
-System' again.</p>
-<h2>3. Final cleanup</h2>
-<p>Remove or rename install folder in main FrontAccounting directory.
-</p>
-<p>After upgrade is installed you can remove files obsoleted by new
-FrontAccounting version. Also old, unused settings <span style="font-style: normal;"><span style="">can
-be removed from </span></span><i><b>config.php</b></i><span style="font-style: normal;"><span style="">
-file.</span></span></p>
-<p style="margin-top: 0.42cm; page-break-after: avoid;"><font face="Liberation Sans, sans-serif"><font size="4">a.
-Source files cleanup</font></font></p>
-<p><strong><span style=""><span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;">[<FA
-2.2beta]</span></span></strong></p>
-<p><strong><span style=""><span style="background: transparent none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;">/includes/reserved.inc
-– removed.</span></span></strong></p>
-<p><strong><span style=""><span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;">[<FA
-2.1]</span></span></strong><strong> </strong>
-</p>
-<p><strong><span style="">/admin/db/v_banktrans.inc
-- removed</span></strong></p>
-<p style="margin-top: 0.42cm; page-break-after: avoid;"><font face="Liberation Sans, sans-serif"><font size="4"><span style="font-style: normal;"><span style="">b.
-Config.php cleanup </span></span></font></font>
-</p>
-<p><strong><span style=""><span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;">[<FA
-2.2RC1]</span></span></strong><strong> </strong>
-</p>
-<p><strong><span style="">$security_headings,
-$security_groups arrays – moved to database (see Access Setup)
-</span></strong>
-</p>
-<p><strong><span style="">$def_app – moved
-to user configuration in database.</span></strong></p>
-<p><strong><span style="font-style: normal;"><span style="">$version
-– moved to </span></span></strong><strong><i><b>version.php</b></i></strong><strong><span style="font-style: normal;"><span style="">
-file. Remove</span></span></strong></p>
-<h2>4. New features configuration</h2>
-<p>During upgrade process new features are initialized to default
-status, and sometimes old settings are also changed to conform with
-new security policy. This automatic process is designed to be as
-neutral for end users as possible, however sometimes site or company
-admin intervention can be necessary to set thing after changes to
-their best state. Below you will find description of new settings
-available after upgrade.</p>
-<p><br><br>
-</p>
-<p>----------------------</p>
-<ul></ul>
+<html><head>\r
+ <meta http-equiv="CONTENT-TYPE" content="text/html; charset=iso-8859-2">\r
+ \r
+ <title>FrontAccounting Update</title><meta name="GENERATOR" content="OpenOffice.org 2.4 (Linux)">\r
+ <meta name="CREATED" content="0;0">\r
+ <meta name="CHANGED" content="20100902;19041400"></head>\r
+<body dir="ltr" lang="en-US">\r
+<h4><strong><font color="#cc6600"><font style="font-size: 20pt;" size="5"><i>Front</i></font></font></strong><strong><font style="font-size: 20pt;" size="5">Accounting\r
+Update</font></strong></h4><h2>Important Notes for release 2.3.12.</h2><h4>New global flags in config.php (config-default.php):</h4>/* <br> Display a dropdown select box for choosing Company to login if false.<br> Show a blank editbox only if true where the Company NickName<br> will have to be manually entered. This is when privacy is needed.<br>*/<br> <span style="font-weight: bold;">$text_company_selection</span> = false;<br><br>/* Should FA hide menu items (Applications, Modules, and Actions) from the user if they don't have access to them? <br> 0 for no 1 for yes<br>*/<br><br> <span style="font-weight: bold;">$hide_inaccessible_menu_items</span> = 0;<br><br>/*<br> Brute force prevention.<br> $login_delay seconds delay is required between login attempts after $login_max_attemps failed logins.<br> Set $login_delay to 0 to disable the feature (not recommended)<br>*/<br> <span style="font-weight: bold;">$login_delay</span> = 30;<br> <span style="font-weight: bold;">$login_max_attempts</span> = 10;<h2><strong></strong>Important Notes for release 2.3.5.</h2>\r
+Change in the behaviour of <span style="font-weight: bold; font-style: italic;">Recurrent Invoices</span>.<br><ul><li>Now\r
+the Last Sent day is stamped with the former Last Sent (or Begin date\r
+the first time) + months + days. Before the Last Sent day was stamped\r
+with tthe creation date (today). The Invoice date is still todays date.\r
+</li><li>If you for some reason want to make a pause in the recurrent\r
+invoices, you can now edit the Last Sent day in the Management section\r
+of Sales tab.</li><li>Before the days value, together with a month\r
+value, decided which day in the month the invoice was due.. This\r
+does not work now. You can change the day in the month you\r
+want the recurrency to happen by setting the Last Sent day with the new\r
+day in the Management section. </li><li>If you create a new Recurrent Invoice the Beginning date can be set to the day in the month you want the recurrencies to be due.</li></ul>\r
+<h2>Important Notes</h2>\r
+<p>Upgrade process can be done only by administrator of the first\r
+company created during FrontAccounting installation. This person is\r
+considered as a site admin who have granted access to potentially\r
+dangerous setup options, like Setup/Software Upgrade.</p>\r
+<p>In the following description sections related to older FA versions are\r
+prefixed with <span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;">[color tags]</span><span style="background: transparent none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;">\r
+. Y</span>ou can skip tagged fragment safely if currently FA\r
+application is newer than the version in tag.</p>\r
+<p>Upgrade process consists of up to four stages, some of them are\r
+optional:</p>\r
+<ol>\r
+ <li><p>Application source files update \r
+ </p>\r
+ </li><li><p>Database upgrade – this step is needed only during\r
+ upgrade which involves change in major application version number\r
+ (e.g. from 2.2.x to 2.3.x), and sometimes during upgrade from beta\r
+ release to stable version. Otherwise this step can be skipped.</p>\r
+ </li><li><p>Final cleanup – is needed when some old source files,\r
+ obsoleted by new release should be removed.</p>\r
+ </li><li><p>New features configuration – this is optional step\r
+ needed for most major releases and some minor ones. \r
+ </p>\r
+</li></ol>\r
+<p style="margin-bottom: 0cm;">Before starting upgrade ensure nobody\r
+is using the application and make database backup for all companies.\r
+To be on safe side backup also old source files, especially those\r
+locally customized (if any).</p>\r
+<p>Log into admin account of first company.<strong> </strong><strong><span style="">If\r
+you use a theme other than the standard 3 (aqua, cool or default),\r
+switch to one of these before going further.</span></strong></p>\r
+<h2><strong><b>1. Application files update</b></strong></h2>\r
+<p style="margin-top: 0.42cm; page-break-after: avoid;"><font face="Liberation Sans, sans-serif"><font size="4"><strong><span style="">a. Source\r
+files update</span></strong></font></font></p>\r
+<p><strong><span style="">Extract distribution\r
+zip/tar.gz file in empty directory, and copy all the files to your\r
+FrontAccounting directory overwriting old files. If it is major\r
+release upgrade you can skip next step and go directly to cleanup.</span></strong></p>\r
+<p style="margin-top: 0.42cm; page-break-after: avoid;"><strong><font face="Liberation Sans, sans-serif"><font size="4"><span style="">b. Configuration\r
+files update</span></font></font></strong></p>\r
+<p><strong><span style="">Compare new\r
+</span></strong><strong><i><b>config.default.php</b></i></strong><strong>\r
+</strong><strong><span style="">file with the old\r
+</span></strong><strong><i><b>config.php </b></i></strong><strong><span style="font-style: normal;"><span style="">and\r
+add all n</span></span></strong><strong><span style="">ew\r
+settings (if any). </span></strong>\r
+</p>\r
+<p><strong><span style=""><span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;">[<FA\r
+2.2beta]</span></span></strong></p>\r
+<p><strong> <span style="">$show_users_online = 0;</span></strong></p>\r
+<p><strong> <span style="">$def_print_destination\r
+= 0;</span></strong></p>\r
+<p><strong><span style="">$dflt_date_fmt=0;</span></strong></p>\r
+<p><strong><span style="">$dflt_date_sep=0;</span></strong></p>\r
+<p><strong><span style="">$table_style,table_style2\r
+changed</span></strong></p>\r
+<p><strong><span style=""><span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;">[<FA\r
+2.3beta]</span></span></strong></p>\r
+<p><strong> <span style="">$alternative_tax_include_on_doc=0;</span></strong></p>\r
+<p><strong><span style="">$suppress_tax_rates = 0;</span></strong></p>\r
+<p><strong><span style=""><span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;">[<FA\r
+2.3RC1]</span></span></strong><strong> </strong>\r
+</p>\r
+<p><strong><span style="">Application version\r
+information and a couple of other private FA variables are stored in\r
+</span></strong><strong><i><b>version.php</b></i></strong><strong>\r
+</strong><strong><span style="">file. The\r
+application version displayed in footer is defined in $version\r
+variable unless this is set in config.php file. If you want current\r
+release version to be displayed on every FA update just remove or\r
+comment out $version variable in </span></strong><strong><span style="font-style: normal;"><span style="">config.php</span></span></strong><strong><span style="">.</span></strong></p>\r
+<p><strong><span style=""><span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;">[<FA\r
+2.3RC2]</span></span></strong></p>\r
+<p><strong> <span style="">$save_report_selections = 0; // A value > 0 means days to save the report selections.</span></strong></p><p><strong><span style=""><span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;">[<FA\r
+2.3]</span></span></strong></p><p><strong> <span style="">$save_po_item_codes = 0; // show item codes on purchase order </span></strong></p><p><strong><span style="">$def_print_destination = 0; // default print destination. 0 = PDF/Printer, 1 = Excel</span></strong></p><p><strong><span style="">$alternative_tax_include_on_docs = 0; // 1 = print Subtotal tax excluded, tax and Total tax included</span></strong></p><p><strong><span style="">$suppress_tax_rates = 0; // suppress tax rates on documents. 0 = no, 1 = yes.</span></strong></p><strong><span style=""><span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;"></span></span></strong>\r
+\r
+<strong><span style=""><span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;"></span></span></strong><h2><strong><b>2. Database upgrade</b></strong></h2>\r
+<p><strong><span style="">This step can be skipped\r
+for small version updates i.e. when you have already installed\r
+FrontAccounting version 2.3.1 or later. Before database upgrade is\r
+done on all company databases backup file is created automatically to\r
+enable database restore after failure.</span></strong></p>\r
+<p><strong><span style="">After major version\r
+upgrade overwriting files in first step makes the system unaccessible\r
+for all users but site admin, who have to run upgrade procedures to\r
+update all company databases to the new version provided with the\r
+release. After logging to administrator account of first installed\r
+company go directly to Setup/Software Upgrade screen, mark all\r
+subsequent 'Install' checkboxes and press 'Upgrade System'.</span></strong></p>\r
+<p style="">If something goes wrong during\r
+upgrade, you can eventually try forced upgrade option. Forced upgrade\r
+ignores some smaller errors which can arise during upgrade due to\r
+some exotic database configuration. This is depreciated option, so\r
+first read error messages if any, try to fix signalized problems,\r
+restore databases from backup and retry normal installation. To run\r
+upgrade in forced mode check box 'Force Upgrade', and press 'Upgrade\r
+System' again.</p>\r
+<h2>3. Final cleanup</h2>\r
+<p>Remove or rename install folder in main FrontAccounting directory.\r
+</p>\r
+<p>After upgrade is installed you can remove files obsoleted by new\r
+FrontAccounting version. Also old, unused settings <span style="font-style: normal;"><span style="">can\r
+be removed from </span></span><i><b>config.php</b></i><span style="font-style: normal;"><span style="">\r
+file.</span></span></p>\r
+<p style="margin-top: 0.42cm; page-break-after: avoid;"><font face="Liberation Sans, sans-serif"><font size="4">a.\r
+Source files cleanup</font></font></p>\r
+<p><strong><span style=""><span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;">[<FA\r
+2.2beta]</span></span></strong></p>\r
+<p><strong><span style=""><span style="background: transparent none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;">/includes/reserved.inc\r
+– removed.</span></span></strong></p>\r
+<p><strong><span style=""><span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;">[<FA\r
+2.1]</span></span></strong><strong> </strong>\r
+</p>\r
+<p><strong><span style="">/admin/db/v_banktrans.inc\r
+- removed</span></strong></p>\r
+<p style="margin-top: 0.42cm; page-break-after: avoid;"><font face="Liberation Sans, sans-serif"><font size="4"><span style="font-style: normal;"><span style="">b.\r
+Config.php cleanup </span></span></font></font>\r
+</p>\r
+<p><strong><span style=""><span style="background: rgb(235, 97, 61) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;">[<FA\r
+2.2RC1]</span></span></strong><strong> </strong>\r
+</p>\r
+<p><strong><span style="">$security_headings,\r
+$security_groups arrays – moved to database (see Access Setup) \r
+</span></strong>\r
+</p>\r
+<p><strong><span style="">$def_app – moved\r
+to user configuration in database.</span></strong></p>\r
+<p><strong><span style="font-style: normal;"><span style="">$version\r
+– moved to </span></span></strong><strong><i><b>version.php</b></i></strong><strong><span style="font-style: normal;"><span style="">\r
+file. Remove</span></span></strong></p>\r
+<h2>4. New features configuration</h2>\r
+<p>During upgrade process new features are initialized to default\r
+status, and sometimes old settings are also changed to conform with\r
+new security policy. This automatic process is designed to be as\r
+neutral for end users as possible, however sometimes site or company\r
+admin intervention can be necessary to set thing after changes to\r
+their best state. Below you will find description of new settings\r
+available after upgrade.</p>\r
+<p><br><br>\r
+</p>\r
+<p>----------------------</p>\r
+<ul></ul>\r
</body></html>
\ No newline at end of file
projects / fa-stable.git / commitdiff