From ebc600101ceab69c06eac4b1bd4d1782af45de05 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Thu, 19 Nov 2009 15:36:35 +0000 Subject: [PATCH] Update from usntable branch. --- .htaccess | 2 + CHANGELOG.txt | 2409 ++++- access/login.php | 210 +- access/logout.php | 41 +- admin/attachments.php | 8 +- admin/backups.php | 22 +- admin/change_current_user_password.php | 23 +- admin/company_preferences.php | 134 +- admin/create_coy.php | 10 +- admin/db/company_db.inc | 42 +- admin/db/maintenance_db.inc | 213 +- admin/db/printers_db.inc | 2 +- admin/db/users_db.inc | 132 +- admin/db/voiding_db.inc | 43 +- admin/display_prefs.php | 18 +- admin/fiscalyears.php | 309 +- admin/forms_setup.php | 12 +- admin/gl_setup.php | 35 +- admin/inst_lang.php | 117 +- admin/inst_module.php | 484 +- admin/inst_upgrade.php | 53 +- admin/payment_terms.php | 20 +- admin/print_profiles.php | 12 +- admin/printers.php | 6 +- admin/shipping_companies.php | 37 +- admin/users.php | 74 +- admin/view_print_transaction.php | 16 +- admin/void_transaction.php | 63 +- applications/application.php | 13 +- applications/customers.php | 119 +- applications/dimensions.php | 54 +- applications/generalledger.php | 96 +- applications/inventory.php | 83 +- applications/manufacturing.php | 54 +- applications/setup.php | 99 +- applications/suppliers.php | 77 +- dimensions/dimension_entry.php | 76 +- dimensions/includes/dimensions_db.inc | 17 +- dimensions/inquiry/search_dimensions.php | 27 +- dimensions/view/view_dimension.php | 12 +- doc/2.1_Beta.txt | 6 +- doc/attachments.txt | 7 +- doc/dim_on_invoice.txt | 21 +- doc/extensions.txt | 9 +- doc/quick_entries.txt | 26 +- doc/recurrent_invoice.txt | 45 +- frontaccounting.php | 35 +- gl/bank_account_reconcile.php | 32 +- gl/bank_transfer.php | 53 +- gl/gl_bank.php | 72 +- gl/gl_budget.php | 8 +- gl/gl_journal.php | 133 +- gl/includes/db/gl_db_account_types.inc | 32 +- gl/includes/db/gl_db_accounts.inc | 12 +- gl/includes/db/gl_db_bank_accounts.inc | 50 +- gl/includes/db/gl_db_banking.inc | 57 +- gl/includes/db/gl_db_currencies.inc | 24 +- gl/includes/db/gl_db_rates.inc | 14 +- gl/includes/db/gl_db_trans.inc | 144 +- gl/includes/ui/gl_bank_ui.inc | 59 +- gl/includes/ui/gl_journal_ui.inc | 36 +- gl/inquiry/bank_inquiry.php | 10 +- gl/inquiry/gl_account_inquiry.php | 141 +- gl/inquiry/gl_trial_balance.php | 8 +- gl/inquiry/tax_inquiry.php | 6 +- gl/manage/bank_accounts.php | 48 +- gl/manage/currencies.php | 47 +- gl/manage/exchange_rates.php | 21 +- gl/manage/gl_account_classes.php | 48 +- gl/manage/gl_account_types.php | 43 +- gl/manage/gl_accounts.php | 135 +- gl/manage/gl_quick_entries.php | 10 +- gl/view/bank_transfer_view.php | 15 +- gl/view/gl_deposit_view.php | 40 +- gl/view/gl_payment_view.php | 42 +- gl/view/gl_trans_view.php | 30 +- includes/JsHttpRequest.php | 6 +- includes/banking.inc | 10 +- includes/current_user.inc | 139 +- includes/data_checks.inc | 22 +- includes/date_functions.inc | 25 +- includes/db/comments_db.inc | 13 +- includes/db/connect_db.inc | 25 +- includes/db/inventory_db.inc | 52 +- includes/db/manufacturing_db.inc | 46 +- includes/db/references_db.inc | 28 +- includes/db/sql_functions.inc | 16 +- includes/db_pager.inc | 93 +- includes/errors.inc | 75 +- includes/lang/gettext.php | 191 +- includes/lang/language.php | 31 +- includes/main.inc | 29 +- includes/page/footer.inc | 15 +- includes/page/header.inc | 51 +- includes/prefs/sysprefs.inc | 5 +- includes/prefs/userprefs.inc | 33 +- includes/references.inc | 13 +- includes/session.inc | 165 +- includes/systypes.inc | 47 +- includes/types.inc | 456 +- includes/ui/allocation_cart.inc | 255 +- includes/ui/db_pager_view.inc | 24 +- includes/ui/items_cart.inc | 14 +- includes/ui/ui_controls.inc | 116 +- includes/ui/ui_globals.inc | 8 +- includes/ui/ui_input.inc | 292 +- includes/ui/ui_lists.inc | 760 +- includes/ui/ui_view.inc | 372 +- index.php | 7 +- install.html | 97 +- install/index.php | 41 +- install/save.php | 81 +- inventory/adjustments.php | 24 +- inventory/cost_update.php | 14 +- inventory/includes/db/items_adjust_db.inc | 21 +- inventory/includes/db/items_category_db.inc | 52 +- inventory/includes/db/items_db.inc | 31 +- inventory/includes/db/items_locations_db.inc | 15 +- inventory/includes/db/items_trans_db.inc | 17 +- inventory/includes/db/items_transfer_db.inc | 17 +- inventory/includes/db/items_units_db.inc | 6 +- inventory/includes/db/movement_types_db.inc | 3 +- inventory/includes/item_adjustments_ui.inc | 8 +- inventory/includes/stock_transfers_ui.inc | 6 +- inventory/inquiry/stock_movements.php | 22 +- inventory/inquiry/stock_status.php | 12 +- inventory/manage/item_categories.php | 138 +- inventory/manage/item_codes.php | 12 +- inventory/manage/item_units.php | 26 +- inventory/manage/items.php | 234 +- inventory/manage/locations.php | 47 +- inventory/manage/movement_types.php | 25 +- inventory/manage/sales_kits.php | 12 +- inventory/prices.php | 21 +- inventory/purchasing_data.php | 22 +- inventory/reorder_level.php | 12 +- inventory/transfers.php | 23 +- inventory/view/view_adjustment.php | 12 +- inventory/view/view_transfer.php | 14 +- js/inserts.js | 184 +- js/utils.js | 126 +- lang/en_US/LC_MESSAGES/en_US.mo | Bin 901 -> 901 bytes .../LC_MESSAGES/empty.po | 7786 ++++++++++------- manufacturing/includes/db/work_centres_db.inc | 3 +- .../includes/db/work_order_issues_db.inc | 13 +- .../db/work_order_produce_items_db.inc | 13 +- manufacturing/includes/db/work_orders_db.inc | 26 +- .../includes/db/work_orders_quick_db.inc | 46 +- manufacturing/includes/manufacturing_ui.inc | 24 +- .../includes/work_order_issue_ui.inc | 4 +- manufacturing/inquiry/bom_cost_inquiry.php | 6 +- manufacturing/inquiry/where_used_inquiry.php | 11 +- manufacturing/manage/bom_edit.php | 14 +- manufacturing/manage/work_centres.php | 21 +- manufacturing/search_work_orders.php | 31 +- manufacturing/view/wo_issue_view.php | 10 +- manufacturing/view/wo_production_view.php | 14 +- manufacturing/view/work_order_view.php | 14 +- manufacturing/work_order_add_finished.php | 20 +- manufacturing/work_order_costs.php | 22 +- manufacturing/work_order_entry.php | 51 +- manufacturing/work_order_issue.php | 16 +- manufacturing/work_order_release.php | 10 +- purchasing/allocations/supplier_allocate.php | 238 +- .../allocations/supplier_allocation_main.php | 35 +- purchasing/includes/db/grn_db.inc | 20 +- purchasing/includes/db/invoice_db.inc | 49 +- purchasing/includes/db/po_db.inc | 9 +- purchasing/includes/db/supp_payment_db.inc | 23 +- purchasing/includes/db/supp_trans_db.inc | 13 +- purchasing/includes/db/suppalloc_db.inc | 6 +- purchasing/includes/db/suppliers_db.inc | 2 +- purchasing/includes/purchasing_db.inc | 2 +- purchasing/includes/ui/grn_ui.inc | 10 +- purchasing/includes/ui/invoice_ui.inc | 34 +- purchasing/includes/ui/po_ui.inc | 22 +- purchasing/inquiry/po_search.php | 24 +- purchasing/inquiry/po_search_completed.php | 20 +- .../inquiry/supplier_allocation_inquiry.php | 41 +- purchasing/inquiry/supplier_inquiry.php | 41 +- purchasing/manage/suppliers.php | 64 +- purchasing/po_entry_items.php | 63 +- purchasing/po_receive_items.php | 30 +- purchasing/supplier_credit.php | 33 +- purchasing/supplier_invoice.php | 52 +- purchasing/supplier_payment.php | 185 +- purchasing/view/view_grn.php | 8 +- purchasing/view/view_po.php | 10 +- purchasing/view/view_supp_credit.php | 16 +- purchasing/view/view_supp_invoice.php | 14 +- purchasing/view/view_supp_payment.php | 16 +- reporting/includes/class.graphic.inc | 2 +- reporting/includes/doctext.inc | 55 +- reporting/includes/doctext2.inc | 51 +- reporting/includes/excel_report.inc | 11 +- reporting/includes/header2.inc | 99 +- reporting/includes/pdf_report.inc | 20 +- reporting/includes/reporting.inc | 74 +- reporting/includes/reports_classes.inc | 472 +- reporting/prn_redirect.php | 39 +- reporting/rep101.php | 132 +- reporting/rep102.php | 30 +- reporting/rep103.php | 18 +- reporting/rep104.php | 8 +- reporting/rep105.php | 10 +- reporting/rep106.php | 6 +- reporting/rep107.php | 35 +- reporting/rep108.php | 38 +- reporting/rep109.php | 22 +- reporting/rep110.php | 104 +- reporting/rep201.php | 115 +- reporting/rep202.php | 28 +- reporting/rep203.php | 25 +- reporting/rep204.php | 7 +- reporting/rep209.php | 15 +- reporting/rep301.php | 10 +- reporting/rep302.php | 6 +- reporting/rep303.php | 6 +- reporting/rep304.php | 16 +- reporting/rep401.php | 2 +- reporting/rep501.php | 2 +- reporting/rep601.php | 8 +- reporting/rep701.php | 2 +- reporting/rep702.php | 16 +- reporting/rep704.php | 10 +- reporting/rep705.php | 27 +- reporting/rep706.php | 2 +- reporting/rep707.php | 3 +- reporting/rep708.php | 2 +- reporting/rep709.php | 31 +- reporting/reports_main.php | 499 +- sales/allocations/customer_allocate.php | 205 +- .../allocations/customer_allocation_main.php | 34 +- sales/create_recurrent_invoices.php | 26 +- sales/credit_note_entry.php | 40 +- sales/customer_credit_invoice.php | 54 +- sales/customer_delivery.php | 76 +- sales/customer_invoice.php | 60 +- sales/customer_payments.php | 147 +- sales/includes/cart_class.inc | 53 +- sales/includes/db/credit_status_db.inc | 5 +- sales/includes/db/cust_trans_db.inc | 33 +- sales/includes/db/custalloc_db.inc | 12 +- sales/includes/db/payment_db.inc | 41 +- sales/includes/db/sales_credit_db.inc | 62 +- sales/includes/db/sales_delivery_db.inc | 36 +- sales/includes/db/sales_invoice_db.inc | 43 +- sales/includes/db/sales_order_db.inc | 73 +- sales/includes/db/sales_points_db.inc | 3 +- sales/includes/db/sales_types_db.inc | 4 +- sales/includes/sales_db.inc | 102 +- sales/includes/ui/sales_credit_ui.inc | 29 +- sales/includes/ui/sales_order_ui.inc | 89 +- sales/inquiry/customer_allocation_inquiry.php | 50 +- sales/inquiry/customer_inquiry.php | 85 +- sales/inquiry/sales_deliveries_view.php | 29 +- sales/inquiry/sales_orders_view.php | 188 +- sales/manage/credit_status.php | 18 +- sales/manage/customer_branches.php | 184 +- sales/manage/customers.php | 83 +- sales/manage/recurrent_invoices.php | 10 +- sales/manage/sales_areas.php | 25 +- sales/manage/sales_groups.php | 23 +- sales/manage/sales_people.php | 19 +- sales/manage/sales_points.php | 21 +- sales/manage/sales_types.php | 19 +- sales/sales_order_entry.php | 304 +- sales/view/view_credit.php | 20 +- sales/view/view_dispatch.php | 20 +- sales/view/view_invoice.php | 24 +- sales/view/view_receipt.php | 16 +- sales/view/view_sales_order.php | 181 +- sql/alter2.1.php | 21 +- sql/en_US-demo.sql | 351 +- sql/en_US-new.sql | 288 +- taxes/db/tax_groups_db.inc | 3 +- taxes/db/tax_types_db.inc | 3 +- taxes/item_tax_types.php | 22 +- taxes/tax_groups.php | 51 +- taxes/tax_types.php | 23 +- themes/aqua/default.css | 52 +- themes/aqua/renderer.php | 66 +- themes/cool/default.css | 52 +- themes/cool/renderer.php | 64 +- themes/default/default.css | 52 +- themes/default/images/escape.png | Bin 414 -> 907 bytes themes/default/login.css | 93 +- themes/default/renderer.php | 71 +- update.html | 72 +- 289 files changed, 16407 insertions(+), 10318 deletions(-) diff --git a/.htaccess b/.htaccess index de47e678..c80aa26e 100644 --- a/.htaccess +++ b/.htaccess @@ -5,10 +5,12 @@ php_flag magic_quotes_gpc Off php_flag register_globals Off + php_flag session.use_trans_sid Off php_flag magic_quotes_gpc Off php_flag register_globals Off + php_flag session.use_trans_sid Off #Sometimes neccessary to add those diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 7f6e1c96..26aeb4b5 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,180 +19,2293 @@ Legend: ! -> Note $ -> Affected files -18-Oct-2009 Janusz Dobrowolski -# [0000175] Fixed double escaping gl account name on add/update. +------------------------------- Release 2.2 ---------------------------------- +18-Nov-2009 +! Release 2.2 +$ config.default.php +# Allow null references in trans to show up in gl_trans_view +$ /gl/view/gl_trans_view.php +# Fixed side bug after last sql update. +$ /gl/bank_account_reconcile.php + +17-Nov-2009 Joe Hunt/Tom Hallman +! Moved payment terms in documents for better view. Increased + space for legal text. +$ /reporting/includes/header2.inc + /reporting/includes/pdf_report.inc +! Changed sorting in get_gl_transactions to sort by tran_date, counter + Changed period in Journal Entries to one month instead of one year. +$ /gl/includes/db/gl_db_trans.inc + /gl/inquiry/journal_inquiry.php +! Changed rep705 to show fiscal year instead of year +$ /reporting/rep705.php + /reporting/includes/reports_classes.inc +! updated fles +$ update.html + /lang/new_language_template/LC_MESSAGES/empty.po + +15-Nov-2009 Janusz Dobrowolski ++ Added integration of custom and extended reports into reporting module; optimizations. +$ /reporting/prn_redirect.php + /reporting/reports_main.php + /reporting/includes/reports_classes.inc +! All *_list() helper functions now return html code, while *_list_cells/*_list_row() display the controls directly. +$ /includes/ui/ui_lists.inc + /admin/backups.php + /admin/inst_module.php + /admin/print_profiles.php + /gl/includes/ui/gl_bank_ui.inc + /gl/includes/ui/gl_journal_ui.inc + /gl/manage/exchange_rates.php + /includes/ui/ui_input.inc + /inventory/cost_update.php + /inventory/prices.php + /inventory/purchasing_data.php + /inventory/reorder_level.php + /inventory/inquiry/stock_status.php + /inventory/manage/item_codes.php + /inventory/manage/items.php + /inventory/manage/sales_kits.php + /manufacturing/inquiry/where_used_inquiry.php + /manufacturing/manage/bom_edit.php + /purchasing/allocations/supplier_allocation_main.php + /purchasing/includes/ui/invoice_ui.inc + /purchasing/includes/ui/po_ui.inc + /sales/allocations/customer_allocation_main.php + /sales/manage/customer_branches.php + +13-Nov-2009 Tom Hallman/Joe Hunt +! Allow editing account when editing a row in GL Bank and GL Journal Entry +$ /gl/gl_bank.php + /gl/gl_journal.php + /gl/includes/ui/gl_bank_ui.inc + /gl/includes/ui/gl_journal_ui.inc + /includes/ui/items_cart.inc +# Transaction bug in void_journal_trans() +$ /gl/includes/db/gl_db_trans.inc + +12-Nov-2009 Tom Hallman/Joe Hunt +! Cleaning the CHANGELOG.txt file +! Changed to allow change of reference in GL modifying +$ /gl/includes/db/gl_db_trans.inc + /gl/gl_journal.php + /gl/includes/ui/bl_journal_ui.inc + /gl/view/gl_trans_view.php + /includes/references.inc + /includes/db/references_db.inc + +12-Nov-2009 Tom Hallman/Janusz Dobrowolski ++ Added amount range in gl inquires. +$ /gl/includes/db/gl_db_trans.inc + /gl/inquiry/gl_account_inquiry.php +! Changed menu option text for GL inquiry +$ /applications/generalledger.php +# Fixed typo +$ /doc/access_levels.txt +# Fixed maximal memo line length. +$ /gl/includes/ui/gl_bank_ui.inc + /gl/includes/ui/gl_journal_ui.inc + +12-Nov-2009 Tom Hallman/Joe Hunt +! Changed Journal Inquiries so it shows the Bank Deposit/Payment amount + instead of sum of positive transaction. +$ /gl/inquiry/journal_inquiry.php + +10-Nov-2009 Janusz Dobrowolski +# Fixed value for SA_SUPPBULKREP access area. +$ /includes/access_levels.inc + /sql/en_US-demo.sql + /sql/en_US-new.sql + +10-Nov-2009 Joe Hunt +# disallow bank accounts in accounts list in Bank Deposits/Payments. + It produces double records in bank inquiry otherwise.. +$ /gl/includes/ui/gl_bank_ui.inc +# disallow bank accounts in accounts list when type is Bank Deposits + or Payments. See above. +$ /gl/manage/gl_quick_entries.php +# type warning in dimension tags +$ /admin/tags.php + +09-Nov-2009 Janusz Dobrowolski +! Fixed help link to provide ctxhelp switch and clean the page context string. +$ /includes/page/header.inc + +08-Nov-2009 Joe Hunt +# Bug in adding freight cost to sales order/quotation +$ /sales/inquiry/sales_orders_view.php +! Additional improvements on layout display +$ /purchasing/includes/ui/invoice_ui.inc + /purchasing/view/view_po.php + /sales/view/view_sales_order.php +! Changed the Running Balance column in Customer Transaction + to only show when the type is selected. The order is not + good before sorting in date order +$ /sales/inquiry/customer_inquiry.php + +07-Nov-2009 Janusz Dobrowolski +# Added missing help_context +$ /sales/inquiry/sales_orders_view.php + +07-Nov-2009 Joe Hunt +! More improvements on layout display. +$ /purchases/includes/ui/po_ui.inc + /inventory/includes/item_adjustments_ui.inc + +06-Nov-2009 Janusz Dobrowolski +# Include sequence fixed. +$ /admin/tags.php + +06-Nov-2009 Joe Hunt +! Improved layout in the new tax info display. Also old ones. +$ /sales/credit_invoice.php + /sales/customer_delivery.php + /sales/customer_invoice.php + /sales/includes/ui/sales_credit_ui.inc + /sales/includes/ui/sales_order_ui.inc + +05-Nov-2009 Joe Hunt +! Display tax info in Sales Quotation, Order, Direct Delivery and Invoice. +$ /sales/includes/ui/sales_order_ui.inc + /sales/sales_order_entry.php +! Include freight_cost in Sales Quotations, Orders in inquiries. +$ /sales/inquiry/sales_orders_view.php +# Bug on line 215 in /sales/customer_delivery.php +$ /sales/customer_delivery.php + +04-Nov-2009 Tom Hallman/Joe Hunt +! Included dimension(s) in Bank Deposit/Payment View and correct signs. +$ /gl/view/gl_deposit_view.php + /gl/view/gl_payment_view.php + +04-Nov-2009 Janusz Dobrowolski +# Fixed bug introduced during security update and merged from main trunk. +$ /admin/db/printers_db.inc + +03-Nov-2009 Janusz Dobrowolski +! Added optional parameter to add_bank_transaction +$ /gl/includes/db/gl_db_banking.inc +# Fixed missing default price_dec. +$ /includes/prefs/userprefs.inc + +03-Nov-2009 Joe Hunt +# Bad debit account when debiting service items. +$ /purchasing/includes/db/invoice_db.inc +# Removed unneeded reference to $result in db_num_rows. Gave warnings. +$ /includes/db/connect_db.inc +! Better formatting of update.html +$ update.html +# Wrong presentation on reference and order in Customer Allocation Inquiry +$ /sales/inquiry/customer_allocation_inquiry.php +! Changed so reference no in QUOTE/SO/INV/CRE/PO is printed instead of trans_no + if global variable in config.php, $print_invoice_no = 0 (default). +$ /reporting/includes/header2.inc + /reporting/includes/reports_classes.inc + +02-Nov-2009 Janusz Dobrowolski +# Bad default value retrieved for service COGS account. +$ /inventory/manage/items.php + +01-Nov-2009 Joe Hunt +! Changed $date_system value of 3 to be traditional, but non-workday is Friday + and start of week is Saturday. For DatePicker. +$ config.default.php + /includes/date_functions.inc + /includes/ui/ui_view.inc +# Bugs in function show_users_online in users_db.inc +$ /admin/db/users_db.inc + +01-Nov-2009 Janusz Dobrowolski ++ Added default date format and date separator used before login. +$ /config.default.php + /includes/prefs/userprefs.inc + +30-Oct-2009 Janusz Dobrowolski +# Fixed non-default company selection bug on login. +$ /includes/session.inc +! Code cleanup. +$ /includes/db/connect_db.inc + +30-Oct-2009 Joe Hunt +! Changed name on folder for global help url to fawiki. +$ /config.default.php + +29-Oct-2009 Janusz Dobrowolski +! Changed context help organization to enable use of central multilanguage wiki. +$ /config.default.php + /admin/*.php + /applications/*.php + /dimensions/dimension_entry.php + /dimensions/inquiry/search_dimensions.php + /dimensions/view/view_dimension.php + /gl/*.php + /gl/inquiry/*.php + /gl/manage/*.php + /gl/view/*.php + /includes/page/header.inc + /inventory/*.php + /inventory/inquiry/*.php + /inventory/manage/*.php + /inventory/view/*.php + /manufacturing/*.php + /manufacturing/inquiry/*.php + /manufacturing/manage/*.php + /manufacturing/view/*.php + /purchasing/*.php + /purchasing/allocations/*.php + /purchasing/inquiry/*.php + /purchasing/manage/suppliers.php + /purchasing/view/*.php + /reporting/reports_main.php + /sales/*.php + /sales/allocations/*.php + /sales/inquiry/*.php + /sales/manage/*.php + /sales/view/*.php + /taxes/item_tax_types.php + /taxes/tax_groups.php + /taxes/tax_types.php + /themes/aqua/renderer.php + /themes/cool/renderer.php + /themes/default/renderer.php + +28-Oct-2009 Joe Hunt +! Changed report Annual Expense Breakdown to follow the fiscal year instead of + calendar year. The year selector selects the start of the fiscal year. + Only the last 12 months are shown. +$ /reporting/rep705.php + +27-Oct-2009 Joe Hunt +# Database error when updating item. +$ /inventory/includes/db/items_db.inc +# Removed unneeded double forms in scripts with db_pager. Missing $_POST variables. +$ /dimensions/inquiry/search_dimensions.php + /manufacturing/search_work_orders.php + /purchasing/allocations/supplier_allocation_main.php + /purchasing/inquiry/po_search_completed.php + /purchasing/inquiry/po_search.php + /purchasing/inquiry/supplier_inquiry.php + /purchasing/inquiry/supplier_allocation_inquiry.php + /sales/inquiry/customer_allocation_inquiry.php + /sales/inquiry/sales_deliveries_view.php + /sales/inquiry/sales_orders_view.php + /sales/inquiry/customer_inquiry.php + +26-Oct-2009 Janusz Dobrowolski +# [0000177] Fixed error during gl class update. +$ /gl/includes/db/gl_db_account_types.inc + +26-Oct-2009 Joe Hunt +# Fixed another compatibility issue with MySQL 3.xx (DATE) +$ /reporting/rep710.php +! Late changes in empty.po and en_US.mo +$ /lang/new_language_template/LC_MESSAGES/empty.po + /lang/en_US/LC_MESSAGES/en_US.mo + +24-Oct-2009 Janusz Dobrowolski +# Fixed compatibility issue with MySQL 3.xx +$ /admin/db/tags_db.inc + +24-Oct-2009 Janusz Dobrowolski ++ Default add/update button, ajax update. +$ /dimensions/dimension_entry.php + /gl/manage/gl_accounts.php +! Removed obsolete $tabs global array (tab ids retrieved from $_SESSION['App']) +$ /includes/types.inc + /includes/ui/ui_lists.inc + /admin/inst_module.php + /includes/page/header.inc +# Fixed ajax support for multiply selects. +$ /js/utils.js +# Fixed buggy php behaviour when foreach is used on global array. +$ /frontaccounting.php + +------------------------------- Release 2.2 RC ---------------------------------- +24-Oct-2009 Joe Hunt +! Changed so -1 as parameters to dimensions in get_transactions db routines only + fetches NO dimensions. +$ /gl/includes/db/gl_db_trans.inc + /reporting/rep705.php + /reporting/includes/reports_classes.inc + +24-Oct-2009 Janusz Dobrowolski +# Added text fields sanitiozation during upgrade to 2.2. +$ /sql/alter2.2.php +# Fixed error log warning (missing installed_extensions()) during upgrade . +$ /includes/session.inc +# CVS folders exluded from flush_dir to avoid unwanted warnings in error log on devel boxes. +$ /includes/main.inc + +23-Oct-2009 Janusz Dobrowolski +# Fixed 2.2 upgrade pre_check +$ /sql/alter2.2.php +# Fixed check_table() to avoid sparse messages in error log +$ /admin/inst_update.php +# Fixed module update and deletion. +$ /admin/inst_module.php + +22-Oct-2009 Tom Hallman ++ Added generic tags support and tags for dimensions/gl accounts. +$ /applications/dimensions.php + /applications/generalledger.php + /dimensions/dimension_entry.php + /gl/manage/gl_accounts.php + /includes/data_checks.inc + /includes/ui/ui_lists.inc + /admin/tags.php (new) + /admin/db/tags_db.inc (new) + +22-Oct-2009 Janusz Dobrowolski +# Fixed bug in setting default value in array_selector, fixed default fo systypes selector. +$ /includes/ui/ui_lists.inc +# Fixed double escaping during add/update. +$ /dimensions/includes/dimensions_db.inc +# More security fixes in sql statements. +$ /gl/manage/bank_accounts.php + /gl/manage/currencies.php + /gl/manage/exchange_rates.php + /gl/manage/gl_account_types.php + /gl/manage/gl_accounts.php + /includes/db/audit_trail_db.inc + /includes/db/comments_db.inc + /includes/db/inventory_db.inc + /includes/db/manufacturing_db.inc + /includes/db/references_db.inc +# Initial value for $next_extension_id added. +$ /admin/db/maintenance_db.inc +# Added fixing special chars in refs table during upgrade +$ /sql/alter2.2.php + +21-Oct-2009 Joe Hunt +! Changed install.html, update.html and empty.po files +$ install.html + update.html + /lang/new_language_template/LC_MESSAGES/empty.po +! Enabled a global flag in config.default.php (config.php), $show_users_online = 0. + If this flag is set to 1 FA will show discretely the users online in the footer. +$ config.default.php + /admin/db/users_db.inc + +21-Oct-2009 Janusz Dobrowolski +! Upgrade scripts modified to be used with 2.1 or 2.2beta +$ /sql/alter2.1.php + /sql/alter2.2.php + /sql/alter2.2rc.sql (new) + /admin/inst_upgrade.php +# Fixed help link. +$ /includes/page/header.inc +# Fixed upgrade of reference table to avoid duplicate record error. +$ /sql/alter2.2.php +# Fixed bug in array_selector +$ /includes/ui/ui_lists.inc + +20-Oct-2009 Janusz Dobrowolski +! Conditional config files generation - prevents overwrite during upgrade. +$ /config.php (removed) + /installed_extensions.php (removed) + /company/0/installed_extensions.php (removed) + /config.default.php (new initial default) + /config_db.php (removed initial version) + /admin/db/maintenance_db.inc + /includes/session.inc + /install/index.php + /install/save.php + /lang/installed_languages.inc (removed initial version) +! Moving control to install wizard when config file does not exists. +$ /index.php +# Fixed db error message +$ /dimensions/includes/db/dimension_db.inc + +18-Oct-2009 Janusz Dobrowolski (merged changes for 2.1.7 from main branch) +! Added html_entity_decode() in db_escape() for correct INSERT>SELECT>INSERT sequences. +$ /includes/db/connect_db.inc +# Fixed warnings on first page display +$ /admin/company_preferences.php +# Fixed erroneous message +$ /gl/manage/gl_account_types.php +# Security sql statements update against sql injection attacks. +$ /admin/attachments.php + /admin/payment_terms.php + /admin/print_profiles.php + /admin/printers.php + /admin/shipping_companies.php + /admin/view_print_transaction.php + /admin/db/company_db.inc + /admin/db/printers_db.inc + /admin/db/voiding_db.inc + /admin/db/users_db.inc + /dimensions/includes/dimensions_db.inc + /dimensions/inquiry/search_dimensions.php + /gl/bank_account_reconcile.php + /gl/gl_budget.php + /gl/includes/db/gl_db_account_types.inc + /gl/includes/db/gl_db_accounts.inc + /gl/includes/db/gl_db_bank_accounts.inc + /gl/includes/db/gl_db_bank_trans.inc + /gl/includes/db/gl_db_banking.inc + /gl/includes/db/gl_db_currencies.inc + /gl/includes/db/gl_db_rates.inc + /gl/includes/db/gl_db_trans.inc + /gl/inquiry/bank_inquiry.php + /gl/view/bank_transfer_view.php + /gl/view/gl_trans_view.php + /inventory/cost_update.php + /inventory/purchasing_data.php + /inventory/includes/db/items_category_db.inc + /inventory/includes/db/items_codes_db.inc + /inventory/includes/db/items_db.inc + /inventory/includes/db/items_locations_db.inc + /inventory/includes/db/items_prices_db.inc + /inventory/includes/db/items_trans_db.inc + /inventory/includes/db/items_units_db.inc + /inventory/includes/db/movement_types_db.inc + /inventory/inquiry/stock_movements.php + /inventory/manage/item_categories.php + /inventory/manage/item_units.php + /inventory/manage/items.php + /inventory/manage/locations.php + /inventory/manage/movement_types.php + /manufacturing/search_work_orders.php + /manufacturing/includes/db/work_centres_db.inc + /manufacturing/includes/db/work_order_issues_db.inc + /manufacturing/includes/db/work_order_produce_items_db.inc + /manufacturing/includes/db/work_order_requirements_db.inc + /manufacturing/includes/db/work_orders_db.inc + /manufacturing/includes/db/work_orders_quick_db.inc + /manufacturing/inquiry/where_used_inquiry.php + /manufacturing/manage/bom_edit.php + /manufacturing/manage/work_centres.php + /purchasing/po_entry_items.php + /purchasing/po_receive_items.php + /purchasing/supplier_credit.php + /purchasing/supplier_invoice.php + /purchasing/includes/purchasing_db.inc + /purchasing/includes/db/grn_db.inc + /purchasing/includes/db/invoice_db.inc + /purchasing/includes/db/invoice_items_db.inc + /purchasing/includes/db/po_db.inc + /purchasing/includes/db/supp_trans_db.inc + /purchasing/includes/db/suppalloc_db.inc + /purchasing/includes/db/suppliers_db.inc + /purchasing/inquiry/po_search.php + /purchasing/inquiry/po_search_completed.php + /purchasing/inquiry/supplier_allocation_inquiry.php + /purchasing/inquiry/supplier_inquiry.php + /purchasing/manage/suppliers.php + +12-Oct-2009 Janusz Dobrowolski (merged) +# Fixed sql injection vulnerability on some php/mysql configurations +$ /admin/db/users_db.inc +! Single quotes also encoded before database data insert +$ /admin/db/maintenance_db.inc + /includes/db/connect_db.inc + /reporting/includes/tcpdf.php + /sales/includes/cart_class.inc + +16-Oct-2009 Janusz Dobrowolski ++ Access control system description. +$ /doc/access_levels.txt (new) + +14-Oct-2009 Janusz Dobrowolski +# [0000173] Missing global systypes_array declaration. +$ /purchasing/allocations/supplier_allocate.php + +14-Oct-2009 Joe Hunt +# [0000172] Difference between Customer Balances and Print Statements +$ /reporting/rep108.pp + +13-Oct-2009 Janusz Dobrowolski +# Fixed default page access. +$ /sales/inquiry/sales_orders_view.php + +13-Oct-2009 Joe Hunt ++ Added discrete users online in footer (from Wish List Forum) (New rerun) +$ /admin/db/users_db.inc + /sql/alter2.2.sql + /sql/en_US-new.sql + /sql/en_US-demo.sql + /themes/aqua/renderer.php + /themes/cool/renderer.php + /themes/default/renderer.php +! Changed Tag types in reports_classes to be the same as defined in types.inc. Suitable height=5 +$ /reporting/includes/reports_classes.inc +! Code cleanup (old code removed) +$ /includes/ui_view.inc + +12-Oct-2009 Janusz Dobrowolski +# Fixed sql injection vulnerability on some php/mysql configurations +$ /admin/db/users_db.inc +# Fixed broken table editor page layout on duplicate record. +$ /gl/includes/db/gl_db_account_types.inc + /gl/includes/db/gl_db_accounts.inc + /gl/manage/gl_account_classes.php + /gl/manage/gl_account_types.php + /gl/manage/gl_accounts.php +# [0000169],[0000174] Removed sparse session var unset firing error. + /sales/allocations/customer_allocation_main.php + /purchasing/allocations/supplier_allocation_main.php + +11-Oct-2000 Joe Hunt +# [0000168] Undefined variable: paylink in file rep110.php +$ /reporting/rep110.php + /reporting/includes/pdf_report.inc + +11-Oct-2009 Janusz Dobrowolski ++ Added security area for sales quotes entry +$ /applications/customers.php + /includes/access_levels.inc + /sql/alter2.2.php + /sql/en_US-demo.sql + /sql/en_US-new.sql ++ Standard SA_DENIED access level added. +$ /includes/current_user.inc ++ Added helper function for setting page_security level depending on GET content and/or expression value +$ /includes/session.inc +# Fixed security areas sort order +$ /admin/security_roles.php +# Fixed page_security for various usage types. +$ /sales/sales_order_entry.php + /sales/inquiry/sales_orders_view.php + +10-Oct-2009 Janusz Dobrowolski +! Changed access control extensions support for modules/plugins to use unique extension ids +$ /admin/inst_module.php + /admin/security_roles.php + /admin/db/maintenance_db.inc + /includes/access_levels.inc + /includes/current_user.inc + /installed_extensions.php + /index.php +# Enabled error handling for extensions +$ /frontaccounting.php +# Page code rewrite +$ /admin/inst_module.php +# Fixed missing parameters in update_user_display_prefs call +$ /admin/users.php +! Non-accesable menu options displayed as text instead of link +$ /applications/customers.php + /applications/dimensions.php + /applications/generalledger.php + /applications/inventory.php + /applications/manufacturing.php + /applications/setup.php + /applications/suppliers.php +# Fixed error handling for duplicate table records +$ /includes/errors.inc +# Fixed php 5.3 function name conflict +$ /includes/main.inc + /sales/inquiry/sales_orders_view.php +# Fixed delivery note edition bug (introduced during systypes rewrite) +$ /sales/includes/cart_class.inc +! Changed page_security to SASALESINVOICE +$ /sales/inquiry/sales_deliveries_view.php + +09-Oct-2009 Joe Hunt ++ Added option to print delivery notes as packing slip in reports and links. +$ /includes/ui/ui_controls.inc + /reporting/rep110.php + /reporting/reports_main.php + /reporting/includes/doctext.inc + /reporting/includes/doctext2.inc + /reporting/includes/header2.inc + /reporting/includes/pdf_report.inc + /reporting/includes/reporting.inc + /sales/customer_delivery.php + /sales/sales_order_entry.php + +08-Oct-2009 Joe Hunt ++ Prepared the Report Engine for Tags handling. +! Changed report::getDisplay() to use combo_input from ui_lists.inc insted of local function + dup_simple_codeandname_list(). +$ /reporting/includes/reports_classes.inc +! Changed a parameter in report 301.php to be Summary Only instead of Detailed report. +$ /reporting/reports_main.php + /reporting/rep301.php + +06-Oct-2009 Tom Hallman +# moved commit_transaction and added a default use_transaction param in write_journal_entries +$ /gl/includes/db/gl_db_trans.inc +# Show Journal Entries from 2.1 as closed in Journal Inquiries. +$ /gl/inquiry/journal_inquiry.php + +03-Oct-2009 Janusz Dobrowolski +# Fixed false upgrade related error displayed in some situations on logout. +$ /access/logout.php +# Missing old_db declaration fixed. +$ /includes/current_user.inc +# Fixed combo_input and array_selector to accept array of selected items from POST. +$ /includes/ui/ui_lists.inc +! Changed structure of tag_associations table. +$ /sql/alter2.sql + /sql/en_US-new.sql + /sql/en_US-demo.sql + +03-Oct-2009 Joe Hunt +# Bad conversion of timestamp value in report audit trail. +$ /reporting/rep710.php + +01-Oct-2009 Janusz Dobrowolski +! Added comment on add_access_extensions usage. +$ /includes/access_levels.inc +# Removed sparse add_access_extensions() call. +$ /includes/session.inc ++ Added support for multiply select options in combo_input. +$ /includes/ui/ui_lists.inc +! Unaccesable menu options are now displayed as grey text. +$ /themes/aqua/default.css + /themes/aqua/renderer.php + /themes/cool/default.css + /themes/cool/renderer.php + /themes/default/default.css + /themes/default/renderer.php + +------------------------------- Release 2.2 Beta ---------------------------------- +30-Sep-2009 Joe Hunt +! Release 2.2 Beta +$ config.php + update.html +# Errors in the 2 last user variables in userprefs and parse error in alter2.2.php +$ /includes/prefs/userprefs.inc + /sql/alter2.2.php +# Trivial errors in not set bank charge account, retained earnings or profit/loss year account +$ /admin/fiscalyears.php + /purchasing/supplier_payment.php + /sales/customer_payments.php +# Parse error in view_supp_payment.php +$ /purchasing/view/view_supp_payment.php + +30-Sep-2009 Janusz Dobrowolski +! Single quotes also encoded before database data insert +$ /admin/db/maintenance_db.inc + /includes/db/connect_db.inc + /reporting/includes/tcpdf.php + /sales/includes/cart_class.inc +# Included missing dimension configuration section. +$ /includes/access_levels.inc +! Changed tag types array name +$ /includes/types.inc +# Message typo +$ /sql/alter2.2.php +# Fixed false error on payment without allocation. +$ /purchasing/supplier_payment.php + /sales/customer_payments.php +# Fixed access to payments when deposits are disabled. +$ /gl/gl_bank.php +! Access level checking moved to page() function to make session start + and page access checks independent. +$ /includes/main.inc + /includes/session.inc +# Back link on upgrade help page + /includes/current_user.inc + +29-Sep-2009 Tom Hallman +! Changes in tags table structure, tags related security areas +$ /includes/access_levels.inc + /includes/types.inc + /sql/alter2.2.php + /sql/alter2.2.sql + /sql/en_US-demo.sql + /sql/en_US-new.sql + +29-Sep-2009 Janusz Dobrowolski +# Fixed sql error during sales order line update with line cancelation. +$ /sales/includes/db/sales_order_db.inc + +29-Sep-2009 Joe Hunt +! Improved layout on documents etc and new empty language file. +$ /doc/*.txt + update.html + /lang/new_language_template/LC_MESSAGES/empty.po + +28-Sep-2009 Janusz Dobrowolski ++ Rewritten extensions system to enable per company module/plugin activation. +$ /frontaccounting.php + /installed_extensions.php + /admin/create_coy.php + /admin/inst_module.php + /admin/inst_lang.php + /admin/db/maintenance_db.inc + /applications/customers.php + /applications/dimensions.php + /applications/generalledger.php + /applications/inventory.php + /applications/manufacturing.php + /applications/setup.php + /applications/suppliers.php + /includes/access_levels.inc + /includes/current_user.inc + /includes/main.inc + /includes/session.inc + /includes/ui/ui_lists.inc + /sql/alter2.2.php + /modules/installed_modules.php (Removed) +# Prevented switching off access to security role editor for current role. +$ /admin/security_roles.php + +25-Sep-2009 Joe Hunt +# Wrong presentation of qty decimals when trans_no != 0 (delivered) +$ /sales/includes/ui/sales_order_ui.inc +! Improved layout of login screen +$ /addess/login.php + /themes/default/login.css + +24-Sep-2009 Janusz Dobrowolski ++ Additional fields for secondary phone and/or general notes in customers, + cust_branches, shippers, locations and suppliers tables. +$ /admin/shipping_companies.php + /inventory/includes/db/items_locations_db.inc + /inventory/manage/locations.php + /purchasing/manage/suppliers.php + /sales/manage/customer_branches.php + /sales/manage/customers.php + /sql/alter2.2.sql + /sql/en_US-demo.sql + /sql/en_US-new.sql + +24-Sep-2009 Joe Hunt +# Parse error +$ /sales/inquiry/customer_inquiry.php + +23-Sep-2009 Janusz Dobrowolski +# Fixed crash for all transaction types report +$ /reporting/rep702.php + +23-Sep-2009 Joe Hunt +# Cleaning from javascript errors. +$ /access/login.php + /admin/fiscalyears.php +# missing unset of post variable (DayNumber). +$ /admin/payment_terms.php +! Changed login to be dependent only by login.css +$ /themes/default/login.css + +22-Sep-2009 Joe Hunt +! Changed copyright notice in installer files to credit the original copyrighter. GPLv3. +$ /install/index.php + /install/save.php +! Updated the install.html and created a doc txt file, about sales quotations. +$ install.html + /doc/2.2_Beta.txt + /doc/sales_quotations.txt +! Changed login.php and logout.php to be neutral and tried to use our own api. +$ /access/login.php + /access/logout.php +# parse error in login_fail +$ /includes/session.inc + +21-Sep-2009 Janusz Dobrowolski/Tom Hallman +! Added info on timeout and default bank accounts. +$ /doc/2.2_Beta.txt +! Tags support related changes in database +$ /sql/alter2.2.sql + /sql/en_US-demo.sql + /sql/en_US-new.sql + +20-Sep-2009 Joe Hunt +! Removed editable rate field in tax_group_items. +$ /taxes/tax_groups.php +# Fixed report layout +$ /reporting/rep704.php + +20-Sep-2009 Janusz Dobrowolski ++ Optional demo data checkbox on install page. +$ /install/index.php + /install/save.php +# Fixed previous interface mode after timeout. +$ /access/login.php ++ Optional additional security roles includable from modules/extensions +$ /admin/inst_module.php + /admin/security_roles.php + /includes/access_levels.inc + /installed_extensions.php +! Bug with rates display fixed in single form layout. +$ /taxes/tax_groups.php +# Fixed 'bad password' info screen to be usable also in non-js mode. +$ /includes/session.inc +# Fixed debtors_master name size. +$ /sql/en_US-new.sql + /sql/en_US-demow.sql + +19-Sep-2009 Janusz Dobrowolski ++ Support for inactive record control added, optimizations. +$ /includes/db_pager.inc + /includes/ui/db_pager_view.inc +! db_pager instead of simple table used for table of branches +$ /sales/manage/customer_branches.php +! Cleanup after db_pager optimization +$ /admin/view_print_transaction.php + /dimensions/inquiry/search_dimensions.php + /gl/bank_account_reconcile.php + /gl/inquiry/journal_inquiry.php + /gl/manage/exchange_rates.php + /manufacturing/search_work_orders.php + /manufacturing/inquiry/where_used_inquiry.php + /purchasing/allocations/supplier_allocation_main.php + /purchasing/inquiry/po_search.php + /purchasing/inquiry/po_search_completed.php + /purchasing/inquiry/supplier_allocation_inquiry.php + /purchasing/inquiry/supplier_inquiry.php + /sales/allocations/customer_allocation_main.php + /sales/inquiry/customer_allocation_inquiry.php + /sales/inquiry/customer_inquiry.php + /sales/inquiry/sales_deliveries_view.php + /sales/inquiry/sales_orders_view.php +# Additional fix after removal of bank account report parameter +$ /sales/create_recurrent_invoices.php + /reporting/rep107.php + +19-Sep-2009 Joe Hunt +# Eliminate PT_WORKORDER from payment_person_types_list +$ /includes/ui/ui_lists.inc +! Error msg in Bank Transfer if no Bank Charge Account set. +$ /gl/bank_transfer.php + +18-Sep-2009 Janusz Dobrowolski ++ Added currency default bank accounts used in reporting instead of manual account selector. +$ /gl/includes/db/gl_db_bank_accounts.inc + /gl/manage/bank_accounts.php + /reporting/rep107.php + /reporting/rep108.php + /reporting/rep109.php + /reporting/rep111.php + /reporting/rep209.php + /reporting/reports_main.php + /reporting/includes/reporting.inc + /sql/alter2.2.sql + /sql/en_US-demo.sql + /sql/en_US-new.sql + +17-Sep-2009 Joe Hunt ++ Added release note file for 2.2. +$ /doc/2.2-Beta.txt + +16-Sep-2009 Joe Hunt +! Clean ups in default themes. +$ config.php + /admin/display_prefs.php + /themes/default/default.css + /themes/aqua/default.css + /themes/cool/default.css +# Removing php5 date warnings +$ /includes/date_functions.inc + +15-Sep-2009 Janusz Dobrowolski/Joe Hunt +# Fixed journal entry type and systype selectors +# Restore of the 4 include files in types.inc +$ /includes/types.inc +! Cleanup +$ /includes/ui/ui_lists.inc + /reporting/includes/reports_classes.inc +! Changed security roles in default COAs. +$ /sql/en_US-demo.sql + /sql/en_US-new.sql +# Fixed GET call continuation after timeout and logout page access without authorization +$ /access/login.php + /includes/session.inc + /includes/prefs/userprefs.inc + +14-Sep-2009 Joe Hunt +! Changed all numeric constants to the new defined constants. A huge task. +$ /admin/fiscalyears.php + /admin/forms_setup.php + /admin/view_print_transaction.php + /admin/void_transaction.php + /gl/includes/db/gl_db_banking.inc + /gl_includes/db/gl_db_trans.inc + /gl/inquiry/journal_inquiry.php + /includes/systypes.inc + /includes/ui/allocation_cart.inc + /includes/ui/ui_view.inc + /inventory/inquiry/stock_movements.php + /manufacturing/includes/db/work_order_issues_db.inc + /manufacturing/includes/db/work_order_produce_items.inc + /manufacturing/view/wo_production_view.php + /purchasing/po_receive_items.php + /purchasing/supplier_credit.php + /purchasing/supplier_invoice.php + /purchasing/supplier_payment.php + /purchasing/allocations/supplier_allocation_main.php + /purchasing/includes/db/grn_db.inc + /purchasing/includes/db/invoice_db.inc + /purchasing/includes/db/suballoc_db.inc + /purchasing/includes/db/suppliers_db.inc + /purchasing/includes/db/supp_payment_db.inc + /purchasing/includes/db/supp_trans_db.inc + /purchasing/includes/ui/grn_ui.inc + /purchasing/includes/ui/invoice_ui.inc + /purchasing/inquiry/supplier_allocation_inquiry.php + /purchasing/inquiry/supplier_inquiry.php + /purchasing/view/view_grn.php + /purchasing/view/view_po.php + /purchasing/view/view_supp_credit.php + /purchasing/view/view_supp_invoice.php + /purchasing/view/view_supp_payment.php + /reporting/rep101.php + /reporting/rep102.php + /reporting/rep103.php + /reporting/rep105.php + /reporting/rep106.php + /reporting/rep107.php + /reporting/rep108.php + /reporting/rep109.php + /reporting/rep110.php + /reporting/rep111.php + /reporting/rep201.php + /reporting/rep202.php + /reporting/rep203.php + /reporting/rep304.php + /reporting/rep409.php + /reporting/rep709.php + /reporting/includes/reporting.inc + /reporting/includes/reports_classes.inc + /sales/create_recurrent_invoices.php + /sales/credit_note_entry.php + /sales/customer_credit_invoice.php + /sales/customer_delivery.php + /sales/customer_invoice.php + /sales/customer_payments.php + /sales/sales_order_entry.php + /sales/includes/cart_class.inc + /sales/includes/sales_db.inc + /sales/includes/db/custalloc_db.inc + /sales/includes/db/cust_trans_db.inc + /sales/includes/db/payment_db.inc + /sales/includes/db/sales_credit_db.inc + /sales/includes/db/sales_delivery_db.inc + /sales/includes/db/sales_invoice_db.inc + /sales/includes/db/sales_order_db.inc + /sales/includes/ui/sales_order_ui.inc + /sales/inquiry/customer_allocation_inquiry.php + /sales/inquiry/customer_inquiry.php + /sales/inquiry/sales_deliveries_view.php + /sales/inquiry/sales_orders_view.php + /sales/manage/recurrent_invoices.php + /sales/view/view_credit.php + /sales/view/view_dispatch.php + /sales/view/view_invoice.php + /sales/view/view_sales_order.php + +13-Sep-2009 Janusz Dobrowolski +! Eliminated non-static method calls and some more fixes to avoid log warnings on both php 4 and 5: + Classes systypes, bank_account_types, payment_person_types, wo_types, reserved replaced by +simple arrays and defines, removed wrapper get_text class, static method calls replaced by +calls to singleton variables or defines. Suppressed warnings generated by html_entity_decode() +and htmlspecialchars() for unsupported encodings. +$ /frontaccounting.php + /admin/display_prefs.php + /admin/fiscalyears.php + /admin/forms_setup.php + /admin/view_print_transaction.php + /admin/void_transaction.php + /admin/db/voiding_db.inc + /dimensions/dimension_entry.php + /dimensions/includes/dimensions_db.inc + /dimensions/inquiry/search_dimensions.php + /dimensions/view/view_dimension.php + /gl/bank_account_reconcile.php + /gl/bank_transfer.php + /gl/gl_bank.php + /gl/gl_journal.php + /gl/includes/db/gl_db_banking.inc + /gl/includes/db/gl_db_trans.inc + /gl/includes/ui/gl_bank_ui.inc + /gl/inquiry/bank_inquiry.php + /gl/inquiry/gl_account_inquiry.php + /gl/inquiry/journal_inquiry.php + /gl/manage/bank_accounts.php + /gl/manage/gl_account_types.php + /gl/view/bank_transfer_view.php + /gl/view/gl_deposit_view.php + /gl/view/gl_payment_view.php + /gl/view/gl_trans_view.php + /includes/reserved.inc (Removed) + /includes/JsHttpRequest.php + /includes/banking.inc + /includes/errors.inc + /includes/main.inc + /includes/references.inc + /includes/session.inc + /includes/types.inc + /includes/lang/gettext.php + /includes/lang/language.php + /includes/page/footer.inc + /includes/prefs/sysprefs.inc + /includes/prefs/userprefs.inc + /includes/ui/allocation_cart.inc + /includes/ui/items_cart.inc + /includes/ui/ui_globals.inc + /includes/ui/ui_lists.inc + /includes/ui/ui_view.inc + /inventory/adjustments.php + /inventory/cost_update.php + /inventory/transfers.php + /inventory/includes/item_adjustments_ui.inc + /inventory/includes/stock_transfers_ui.inc + /inventory/includes/db/items_adjust_db.inc + /inventory/includes/db/items_trans_db.inc + /inventory/includes/db/items_transfer_db.inc + /inventory/inquiry/stock_movements.php + /inventory/manage/movement_types.php + /inventory/view/view_adjustment.php + /inventory/view/view_transfer.php + /manufacturing/search_work_orders.php + /manufacturing/work_order_add_finished.php + /manufacturing/work_order_costs.php + /manufacturing/work_order_entry.php + /manufacturing/work_order_issue.php + /manufacturing/work_order_release.php + /manufacturing/includes/manufacturing_ui.inc + /manufacturing/includes/work_order_issue_ui.inc + /manufacturing/includes/db/work_order_issues_db.inc + /manufacturing/includes/db/work_order_produce_items_db.inc + /manufacturing/includes/db/work_orders_db.inc + /manufacturing/includes/db/work_orders_quick_db.inc + /manufacturing/view/wo_issue_view.php + /manufacturing/view/wo_production_view.php + /manufacturing/view/work_order_view.php + /purchasing/po_entry_items.php + /purchasing/po_receive_items.php + /purchasing/supplier_credit.php + /purchasing/supplier_invoice.php + /purchasing/supplier_payment.php + /purchasing/allocations/supplier_allocate.php + /purchasing/allocations/supplier_allocation_main.php + /purchasing/includes/purchasing_db.inc + /purchasing/includes/db/grn_db.inc + /purchasing/includes/db/invoice_db.inc + /purchasing/includes/db/po_db.inc + /purchasing/includes/db/supp_payment_db.inc + /purchasing/includes/db/suppalloc_db.inc + /purchasing/includes/ui/grn_ui.inc + /purchasing/includes/ui/invoice_ui.inc + /purchasing/includes/ui/po_ui.inc + /purchasing/inquiry/po_search.php + /purchasing/inquiry/po_search_completed.php + /purchasing/inquiry/supplier_allocation_inquiry.php + /purchasing/inquiry/supplier_inquiry.php + /purchasing/view/view_supp_credit.php + /purchasing/view/view_supp_payment.php + /reporting/rep101.php + /reporting/rep102.php + /reporting/rep103.php + /reporting/rep104.php + /reporting/rep105.php + /reporting/rep108.php + /reporting/rep201.php + /reporting/rep202.php + /reporting/rep203.php + /reporting/rep204.php + /reporting/rep301.php + /reporting/rep302.php + /reporting/rep303.php + /reporting/rep304.php + /reporting/rep409.php + /reporting/rep601.php + /reporting/rep702.php + /reporting/rep704.php + /reporting/rep709.php + /reporting/rep710.php + /reporting/includes/header2.inc + /reporting/includes/reporting.inc + /reporting/includes/reports_classes.inc + /sales/create_recurrent_invoices.php + /sales/credit_note_entry.php + /sales/customer_credit_invoice.php + /sales/customer_delivery.php + /sales/customer_invoice.php + /sales/customer_payments.php + /sales/sales_order_entry.php + /sales/allocations/customer_allocate.php + /sales/allocations/customer_allocation_main.php + /sales/includes/cart_class.inc + /sales/includes/sales_db.inc + /sales/includes/db/cust_trans_db.inc + /sales/includes/db/custalloc_db.inc + /sales/includes/db/payment_db.inc + /sales/includes/db/sales_credit_db.inc + /sales/includes/db/sales_delivery_db.inc + /sales/includes/db/sales_invoice_db.inc + /sales/includes/db/sales_order_db.inc + /sales/includes/ui/sales_credit_ui.inc + /sales/includes/ui/sales_order_ui.inc + /sales/inquiry/customer_allocation_inquiry.php + /sales/inquiry/customer_inquiry.php + /sales/inquiry/sales_deliveries_view.php + /sales/inquiry/sales_orders_view.php + /sales/manage/customers.php + /sales/view/view_credit.php + /sales/view/view_dispatch.php + /sales/view/view_invoice.php + /sales/view/view_receipt.php + /taxes/tax_groups.php + +11-Sep-2009 Joe Hunt +! Changed so deleting of fiscal year also handles sales quotations +! Check that new closing accounts have been set before closure. +$ /admin/fiscalyears.php +! Check that new bank charge account have been set before adding bank charge. +$ /sales/customer_payments.php + /purchasing/supplier_payment.php + +10-Sep-2009 Joe Hunt +! By changing a simple sentence in allocation_cart.inc, the customer/supplier payments works with prompt payment discounts +$ /includes/ui/allocation_cart.inc +# Small typo error in types.inc +/includes/types.inc + +09-Sep-2009 Janusz Dobrowolski +# Added two special access areas for bank gl postings and grn removal. +$ /gl/gl_journal.php + /gl/includes/ui/gl_journal_ui.inc + /includes/access_levels.inc + /purchasing/supplier_invoice.php + /purchasing/includes/ui/invoice_ui.inc + /sql/alter2.2.php +! Added generic access level checking function can_access(). +$ /includes/current_user.inc +! Code cleanup +$ /admin/users.php +# Activated javascript confirm dialogs +$ /js/inserts.js +# Fixed dialogs containing newlines. +$ /includes/ui/ui_input.inc ++ Added js confirm dialogs for deleting and restoring backup files. +$ /admin/backups.php + +08-Sep-2009 Joe Hunt +! Changed so voiding and view/print is working with the new Sales Order/Sales Quotation +$ /admin/view_print_transaction.php + /admin/void_transaction.php + /admin/db/voiding_db.inc + /sales/includes/db/sales_order_db.inc + /sales/view/view_sales_order.php + +08-Sep-2009 Janusz Dobrowolski ++ Added detection of partial db upgrade. +$ /admin/inst_upgrade.php + /sql/alter2.1.php + /sql/alter2.2.php +# Small fixes to db upgrade for quotations +$ /sql/alter2.2.php + /sql/alter2.2.sql +# Added missing sys info for quotations, fixed reference for SO +$ /includes/systypes.inc +# Removed obsolete field in sys_types +$ /sql/en_US-demo.sql + /sql/en_US-new.sql +# date_diff function name changed to date_diff2 for php5.3 compatibility +$ /dimensions/inquiry/search_dimensions.php + /includes/date_functions.inc + /manufacturing/search_work_orders.php + /manufacturing/work_order_add_finished.php + /manufacturing/work_order_costs.php + /sales/sales_order_entry.php + /sales/includes/cart_class.inc + /sales/includes/ui/sales_order_ui.inc + +08-Sep-2009 Joe Hunt ++ Added Sales Quotations, inquiry and report +$ /applications/customers.php + /includes/types.inc + /includes/ui/ui_view.inc + /reporting/rep105.php + /reporting/rep107.php + /reporting/rep109.php + /reporting/rep110.php + /reporting/rep111.php (new file) + /reporting/reports_main.php + /reporting/includes/doctext.php + /reporting/includes/doctext2.php + /reporting/includes/header2.inc + /reporting/includes/reporting.inc + /reporting/includes/reports_classes.inc + /sales/customer_delivery.php + /sales/customer_invoice.php + /sales/sales_order_entry.php + /sales/includes/cart_class.inc + /sales/includes/db/sales_delivery_db.inc + /sales/includes/db/sales_order_db.inc + /sales/includes/ui/sales_order_ui.inc + /sales/inquiry/sales_orders_view.php + /sales/view/view_dispatch.php + /sales/view/view_invoice.php + /sales/view/view_sales_order.php + /sql/alter2.2.sql + /sql/en_US-demo.sql + /sql/en_US-new.sql +! Allow re-opening of Dimensions +$ /dimensions/dimension_entry.php + /dimensions/includes/dimensions_db.inc + /dimensions/inquiry/search_dimensions.php + +01-Sep-2009 Janusz Dobrowolski +# Fixed security sections db update. +$ /admin/security_roles.php +# Fixed ui behaviour during FA ugrade. +$ /includes/current_user.inc + /includes/session.inc + /access/login.php +# Company directory where not deleted during company removal. +$ /admin/create_coy.php + /includes/main.inc +# Fixed old security settings import. + /sql/alter2.2.php + /sql/alter2.2.sql + +31-Aug-2009 Janusz Dobrowolski +! gl accounts selector ordered by account class id +$ /includes/ui/ui_lists.inc +! Changed security modules to sections +$ /admin/security_roles.php + /admin/db/security_db.inc +! Fine tuned security sections/areas. +$ /includes/access_levels.inc ++ Optimized js compressor (up to 5 times faster) +$ /includes/main.inc +! Changed order of gl account selector, added security roles list. +$ /includes/ui/ui_lists.inc +! Switch to new access levels system +$ /config.php + /index.php + /access/logout.php + /access/timeout.php + /admin/*.php + /admin/db/users_db.inc + /applications/application.php + /applications/setup.php + /dimensions/dimension_entry.php + /dimensions/inquiry/search_dimensions.php + /dimensions/view/view_dimension.php + /gl/*.php + /gl/inquiry/*.php + /gl/manage/*.php + /gl/view/*.php + /includes/current_user.inc + /includes/session.inc + /inventory/*.php + /inventory/inquiry/*.php + /inventory/manage/*.php + /inventory/view/*.php + /manufacturing/*.php + /manufacturing/inquiry/*.php + /manufacturing/manage/*.php + /manufacturing/view/*.php + /purchasing/*.php + /purchasing/allocations/*.php + /purchasing/inquiry/*.php + /purchasing/manage/suppliers.php + /purchasing/view/*.php + /reporting/prn_redirect.php + /reporting/rep*.php + /reporting/reports_main.php + /reporting/includes/pdf_report.inc + /sales/*.php + /sales/allocations/*.php + /sales/inquiry/*.php + /sales/manage/*.php + /sales/view/*.php + /sql/alter2.2.php + /sql/alter2.2.sql + /sql/en_US-demo.sql + /sql/en_US-new.sql + /taxes/*.php + +28-Aug-2009 Joe Hunt +# The reference for deposits and payments didn't show up in Tax Report +$ /reporting/rep709.php +# Minor bug in Quick Entries display +$ /includes/ui/ui_view.inc + +27-Aug-2009 Joe Hunt +# bank_trans_type_id removed from bank_trans in en_US-demo.sql and en_US-new.sql. +$ /sql/en_US-demo.sql + /sql/en_US-new.sql + +26-Aug-2009 Janusz Dobrowolski +! Merged changes from main trunk 2.1.4-2.1.5 (see below) + +$ /config.php + /includes/ui/ui_view.inc + /includes/current_user.inc + /includes/ui/ui_input.inc + /inventory/purchasing_data.php + /install/save.php + /gl/manage/gl_accounts.php + /gl/includes/gl_db_accounts.inc + /gl/includes/db/gl_db_bank_accounts.inc + /gl/manage/gl_quick_entries.php + /gl/manage/gl_account_classes.php + /gl/includes/db/gl_db_bank_trans.inc + /purchasing/includes/db/invoice_db.inc + /purchasing/includes/ui/invoice_ui.inc + /purchasing/includes/ui/po_ui.inc + /purchasing/includes/supp_trans_class.inc + /purchasing/po_receive_items.php + /purchasing/view/view_grn.php + /purchasing/view/view_po.php + /purchasing/supplier_payment.php + /purchasing/includes/purchasing_db.inc + /purchasing/includes/db/invoice_db.inc + /reporting/reports_main.php + /reporting/includes/header2.inc + /reporting/rep209.php + /reporting/rep109.php + /reporting/rep702.php + /sales/customer_payments.php + /sales/customer_credit_invoice.php + /sales/customer_delivery.php + /sales/customer_invoice.php + /sales/includes/db/payments_db.inc + /sales/includes/db/sales_order_db.inc + /sales/manage/sales_points.php + /taxes/tax_calc.inc + +26-Aug-2009 Joe Hunt +# Changed the text Manifactoring => Manifacturing +$ /reporting/reports_main.php + +25-Aug-2009 Joe Hunt ++ Added reference number in report List of Journal Entries. +$ /reporting/rep702.php +! Changed default startup_up app to be in user preferences. Default 'Sales'. + Moved tab_list_row to ui_lists.inc and changed the global $tabs to be in types.inc +$ config.php + /admin/display_prefs.php + /admin/inst_module.php + /admin/db/users_db.inc + /includes/current_user.inc + /includes/types.inc + /includes/page/header.inc + /includes/prefs/userprefs.inc + /includes/ui/ui_lists.inc + /sql/alter2.2.sql + /sql/en_US-demo.sql + /sql/en_US-new.sql + + +24-Aug-2009 Janusz Dobrowolski +# Fixed warning displayed before db upgrade. +$ /includes/current_user.inc +# Small final page layout fix +$ /purchasing/po_entry_items.php ++ Additional links to next document on final pages. +$ /purchasing/po_receive_items.php + /purchasing/supplier_invoice.php +# Fixed focus issues on hyperlinks +$ /includes/ui/ui_controls.inc + +23-Aug-2009 Janusz Dobrowolski ++ Implemented customizable authentication timeout. +$ /access/timeout.php (new) + /access/login.php + /admin/company_preferences.php + /admin/db/company_db.inc + /includes/current_user.inc + /includes/session.inc + /includes/ui/ui_input.inc + /sql/alter2.2.php + /sql/alter2.2.sql + /sql/en_US-demo.sql + /sql/en_US-new.sql +! Reorganized access control structures for easier customizing. +$ /includes/access_levels.inc + /admin/security_roles.php + +20-Aug-2009 Janusz Dobrowolski +! Tax Item Types moved to Setup module +$ /applications/inventory.php + /applications/setup.php ++ Partial changes for new access control. +$ /admin/security_roles.php (new) + /admin/db/security_db.inc (new) + /includes/access_levels.inc + /includes/ui/ui_lists.inc + /sql/alter2.2.sql + /sql/en_US-demo.sql + +04-Aug-2009 Joe Hunt ++ Added email links after creating documents +$ /includes/ui/ui_controls.inc + /manufacturing/work_order_entry.php + /purchasing/po_entry_items.php + /reporting/reports_main.php + /reporting/includes/reporting.inc + /sales/create_recurrent_invoices.php + /sales/credit_note_entry.php + /sales/customer_delivery.php + /sales/customer_invoice.php + /sales/sales_order_entry.php +! Added new access levels +$ /includes/access_levels.inc (new file) + +03-Aug-2009 Janusz Dobrowolski ++ Clone record option added. +$ /includes/ui/ui_input.inc + /inventory/manage/item_categories.php + /inventory/manage/items.php +# Fixed default focus for some controls +$ /includes/ui/ui_input.inc +# Fixed popup top placement on FF2 +$ /js/inserts.js +! Default submit changed +$ /purchasing/po_receive_items.php + ++ Customer/branch/supplier selectable by additional short name instead of full name. +$ /purchasing/manage/suppliers.php + /sales/manage/customer_branches.php + /sales/manage/customers.php + /includes/ui/ui_lists.inc + /sql/alter2.2.sql + /sql/en_US-demo.sql + /sql/en_US-new.sql + +01-Aug-2009 Joe Hunt +! Reduced size of the icons to 12 pix. +$ /includes/ui/ui_input.inc + +31-Jul-2009 Janusz Dobrowolski +! Merged changes from main trunk 2.1.3-2.1.4 (see below) +$ /admin/attachments.php + /inventory/purchasing_data.php + /includes/db/manufacturing.inc + /gl/manage/bank_accounts.php + /gl/includes/db/gl_db_banking.inc + /gl/includes/db/gl_db_trans.inc + /purchasing/includes/purchasing_db.inc + /purchasing/manage/suppliers.php + /purchasing/view/view_grn.php + /purchasing/includes/db/invoice_db.inc + /purchasing/view/view_supp_payment.php + /reporting/reports_main.php + /reporting/includes/doctext.inc + /reporting/includes/doctext2.inc + /reporting/includes/header2.inc + /reporting/includes/pdf_report.inc + /reporting/rep101.php + /reporting/rep109.php + /reporting/rep201.php + /reporting/rep304.php + /reporting/rep709.php + /sales/includes/db/cust_trans_db.inc + /sales/create_recurrent_invoices.php + /sales/sales_order_entry.php + /sales/view/view_receipt.php + +27-Jul-2009 Janusz Dobrowolski +# Fixed default selection in popup +$ /js/inserts.js +# Fixed branch selection by url +$ /sales/manage/customer_branches.php +# Fixed print links's default class. +$ /reporting/includes/reporting.inc + +25-Jul-2009 Janusz Dobrowolski +! Popup editor now available as option for some list selectors. +$ /includes/ui/ui_lists.inc + /gl/gl_bank.php + /gl/includes/ui/gl_bank_ui.inc + /includes/session.inc + /includes/page/footer.inc + /includes/ui/ui_controls.inc + /inventory/purchasing_data.php + /js/inserts.js + /purchasing/po_entry_items.php + /purchasing/supplier_credit.php + /purchasing/supplier_invoice.php + /purchasing/supplier_payment.php + /purchasing/allocations/supplier_allocation_main.php + /purchasing/includes/ui/po_ui.inc + /sales/credit_note_entry.php + /sales/customer_payments.php + /sales/sales_order_entry.php + /sales/allocations/customer_allocation_main.php + /sales/includes/ui/sales_credit_ui.inc + /sales/includes/ui/sales_order_ui.inc + /themes/aqua/default.css + /themes/aqua/renderer.php + /themes/cool/default.css + /themes/cool/renderer.php + /themes/default/default.css + /themes/default/renderer.php + +21-Jul-2009 Janusz Dobrowolski +! Asynchronous customer/supplier/item selection now use popup window. +$ /index.php + /gl/gl_bank.php + /includes/session.inc + /includes/page/footer.inc + /includes/ui/ui_controls.inc + /includes/ui/ui_input.inc + /includes/ui/ui_lists.inc + /inventory/purchasing_data.php + /inventory/manage/items.php + /js/inserts.js + /js/utils.js + /purchasing/po_entry_items.php + /purchasing/supplier_credit.php + /purchasing/supplier_invoice.php + /purchasing/supplier_payment.php + /purchasing/allocations/supplier_allocation_main.php + /purchasing/manage/suppliers.php + /sales/credit_note_entry.php + /sales/customer_payments.php + /sales/sales_order_entry.php + /sales/allocations/customer_allocation_main.php + /sales/manage/customer_branches.php + /sales/manage/customers.php + +15-Jul-2009 Joe Hunt +! Replaced sys_types names from table to systypes::name in reports + Now the English names in table are never used in inquiries or reports +$ /reporting/rep101.php + /reporting/rep102.php + /reporting/rep108.php + /reporting/rep201.php + /reporting/rep202.php + /reporting/rep203.php + /reporting/rep709.php + /sql/alter2.2.sql +! Audit-Trail report (systypes selector should include all systypes, extra parameter to function dup_systypes_list. +$ /reporting/rep710.php + /reporting/reports_main.php + /reporting/includes/reports_classes.inc +# Removed warning from COA report $ /gl/includes/db/gl_db_accounts.inc -# [0000176] Missing closing tag in button helper + /includes/date_functions.inc + /reporting/rep701.php + +13-Jul-2009 Joe Hunt ++ Added Audit Trail Report +$ /reporting/rep710.php (new file) +$ /reporting/reports_main.php +! Changed so $page_security works with reports (displays an error message on top) +$ /reporting/includes/pdf_report.inc + /reporting/includes/excel_report.inc + +10-Jul-2009 Janusz Dobrowolski ++ Added direct allocations in payments. +$ /purchasing/supplier_payment.php + /sales/customer_payments.php +! Allocations related code reuse. +$ /includes/ui/allocation_cart.inc + /purchasing/allocations/supplier_allocate.php + /sales/allocations/customer_allocate.php + +02-Jul-2009 Joe Hunt +! Always show 0.00 in debit column when using display_debit_or_credit +$ /includes/ui/ui_view.inc + +01-Jul-2009 Joe Hunt +! Small adjustment in /inventory/prices.php to see the calculated prices if they are set. +$ /inventory/prices.php +# Small bug/layout fixes +$ /inventory/manage/item_categories.php + /inventory/manage/locations.php + /sql/en_US-demo.sql + /sql/en_US-new.sql + +30-Jun-2009 Joe Hunt +# Small annoying bug-fixes in items.php and items_trans_db.inc +$ /inventory/manage/items.php + /inventory/includes/db/items_trans_db.inc + +30-Jun-2009 Joe Hunt ++ Implemented automatic price calculation of items from std. cost. +$ /admin/company_preferences.php + /admin/db/company_db.inc + /doc/calculate_price.txt (new file) + /sales/includes/sales_db.inc + /sql/alter2.2.sql + /sql/en_US-demo.sql + /sql/en_US-new.sql + +29-Jun-2009 Joe Hunt +! Small layout improments in Customer Payments +$ /sales/customer_payments.php + +28-Jun-2009 Joe Hunt +# Fixed link bugs in sales order entry and optimized a couple of functions in ui_controls.inc +$ /includes/ui/ui_controls.inc + /sales/sales_order_entry.php + +27-Jun-2009 Joe Hunt +# Corrections to default COAs. +$ /sql/alter2.2.sql + /sql/en_US-new.sql + /sql/en_US-demo.sql + +26-Jun-2009 Joe Hunt ++ Added Print of Work Order and GRN Valuation Report +# Small bug in company preferences +$ /admin/company_preferences.php + /manufacturing/includes/db/work_orders_db.inc + /manufacturing/work_order_entry.php + /reporting/rep305.php (new file) + /reporting/rep409.php (new file) + /reporting/reports_main.php + /reporting/includes/doctext.inc + /reporting/includes/doctext2.inc + /reporting/includes/header2.inc + /reporting/includes/pdf_report.inc + /reporting/includes/reports_classes.inc + +26-Jun-2009 Joe Hunt ++ Added Bank Charge field to Customer Payment, Supplier Payment and Bank Transfer and a new default bank charge account in gl_setup. +$ /admin/gl_setup.php + /admin/db/company_db.inc + /gl/bank_transfer.php + /gl/includes/db/gl_db_banking.inc + /purchasing/supplier_payment.php + /purchasing/includes/db/supp_payment_db.inc + /sales/customer_payment.php + /sales/includes/db/payment_db.inc + /sql/alter2.2.sql + /sql/en_US-demo.sql + /sql/en_US-new.sql + +25-Jun-2009 Joe Hunt +! Changed balance_sheet field in account class to ctype and fixed class editing. +# Parse error in ui_lists.inc. Masked include_once(/validation.inc) in main.inc. +$ /admin/fiscalyears.php + /gl/includes/db/gl_db_accounts.inc + /gl/includes/db/gl_db_account_types.inc + /gl/includes/db/gl_db_trans.inc + /gl/manage/gl_account_classes.php + /includes/main.inc + /includes/ui/ui_lists.inc + /sql/en_US-demo.sql + /sql/en_US-new.sql + /sql/alter2.2.sql + +25-Jun-2009 Janusz Dobrowolski +! Merged changes from main trunk 2.1.2-2.1.3 (see below) +$ /admin/backups.php + /admin/company_preferences.php + /admin/view_print_transaction.php + /applications/setup.php + /config.php + /dimensions/inquiry/search_dimensions.php + /gl/gl_journal.php + /gl/includes/db/gl_db_accounts.inc + /gl/includes/db/gl_db_account_types.inc + /gl/includes/db/gl_db_trans.inc + /gl/includes/ui/gl_bank_ui.inc + /gl/inquiry/gl_trial_balance.php + /gl/inquiry/tax_inquiry.php + /gl/manage/gl_account_classes.php + /includes/data_checks.inc + /includes/db/manufacturing_db.inc + /includes/errors.inc + /includes/main.inc + /includes/references.inc + /includes/session.inc + /includes/types.inc + /includes/ui/db_pager_view.inc + /includes/ui/ui_lists.inc + /includes/ui/ui_view.inc + /inventory/inquiry/stock_status.php + /inventory/manage/items.php + /inventory/manage/locations.php + /inventory/manage/sales_kits.php + /inventory/prices.php + /inventory/purchasing_data.php + /lang/new_language_template/LC_MESSAGES/empty.po + /manufacturing/includes/db/work_orders_db.inc + /manufacturing/includes/db/work_orders_produce_items_db.inc + /manufacturing/includes/db/work_orders_quick_db.inc + /manufacturing/includes/manufacturing_ui.inc + /manufacturing/inquiry/bom_cost_inquiry.php + /manufacturing/manage/bom_edit.php + /manufacturing/search_work_orders.php + /manufacturing/view/work_order_view.php + /manufacturing/work_order_add_finished.php + /manufacturing/work_order_costs.php (new file) + /manufacturing/work_order_entry.php + /manufacturing/work_order_issue.php + /manufacturing/work_order_release.php + /purchase/po_receive_items.php + /purchasing/allocations/supplier_allocation_main.php + /purchasing/includes/db/grn_db.inc + /purchasing/includes/db/invoice_db.inc + /purchasing/includes/db/po_db.inc + /purchasing/includes/purchasing_db.inc + /purchasing/includes/ui/po_ui.inc + /purchasing/inquiry/po_search_completed.php + /purchasing/inquiry/supplier_inquiry.php + /purchasing/supplier_credit.php + /purchasing/supplier_invoice.php + /reporting/includes/class.mail.inc + /reporting/includes/pdf.report.inc + /reporting/includes/reports_classes.inc + /reporting/rep109.php + /reporting/rep209.php + /reporting/rep302.php + /reporting/rep302.php + /reporting/rep303.php + /reporting/rep303.php + /reporting/rep701.php + /reporting/rep705.php + /reporting/rep706.php + /reporting/rep707.php + /reporting/rep708.php + /reporting/reports_main.php + /sales/create_recurrent_invoices.php + /sales/customer_delivery.php + /sales/includes/db/sales_order_db.inc + /sales/includessales_order_ui.inc + /sales/inquiry/sales_orders_view.php + /sales/manage/customer_branches.php + /sql/en_US-demo.sql + /sql/en_US-new.sql + /taxes/db/tax_types_db.inc + /taxes/tax_types.php + +17-Jun-2009 Janusz Dobrowolski +# Fixed supplier payment view link +$ /includes/ui/ui_view.inc + +03-Jun-2009 Janusz Dobrowolski +! Delete buttons prepared for js confirmation. +$ /admin/fiscalyears.php + +02-Jun-2009 Joe Hunt +! Fiscal Year delete . now removes all transactions and convert into relevant open balances. +$ /admin/fiscalyear.php +! Created a function db_backup in /admin/db/maintenence_db.inc +$ /admin/db/maintenance_db.inc + /admin/backups.php + /admin/inst_upgrade.php + +22-May-2009 Janusz Dobrowolski +# Defualt hyperlink href set to PHP_SELF +$ /includes/ui/ui_controls.inc + +21-May-2009 Janusz Dobrowolski ++ Added reset_focus helper function. +$ /includes/ui/ui_view.inc +# Fixed link on and focus on final page. +$ /gl/gl_journal.php + +19-May-2009 Janusz Dobrowolski ++ Automatic update currency option added. +$ /gl/includes/db/gl_db_currencies.inc + /includes/ui/ui_view.inc + /gl/manage/currencies.php + /sql/alter2.2.sql + /sql/en_US-demo.sql + /sql/en_US-new.sql ++ Added hook support for localized functions +$ /gl/includes/db/gl_db_rates.inc + /gl/manage/exchange_rates.php + /includes/session.inc +! Fixed hook for optional TaxFunction +$ /reporting/rep709.php +! Removed obsolete has_locale helper. +$ /includes/lang/language.php + +17-May-2009 Janusz Dobrowolski ++ Added excluding item/category from sales. +$ /includes/ui/ui_lists.inc + /inventory/includes/db/items_category_db.inc + /inventory/includes/db/items_db.inc + /inventory/manage/item_categories.php + /inventory/manage/items.php + /sql/alter2.2.sql + /sql/alter2.2.php + +15-May-2009 Joe Hunt +# Bad link to view dimension +$ /includes/ui/ui_view.inc +! Improved layout. +$ /purchasing/includes/ui/invoice_ui.inc + +14-May-2009 Joe Hunt ++ Added user_id to Journal Inquiry +$ /gl/inquiry/journal_inquiry.php + +13-May-2009 Janusz Dobrowolski +# Excluding closed transactions from edition/voiding. +$ /includes/db/audit_trail_db.inc + /admin/void_transaction.php + /sales/inquiry/customer_inquiry.php + /gl/inquiry/journal_inquiry.php +# Fixed error during category adding. +$ /inventory/includes/db/items_category_db.inc ++ Units and item type is editable until item not used. +$ /inventory/includes/db/items_db.inc + /inventory/manage/items.php + +11-May-2009 Joe Hunt +! Changed creating of fiscal year so gap is not allowed. Cannot close year if open years before. +$ /admin/fiscalyers.php + +10-May-2009 Janusz Dobrowolski +! Support for periodic journal trans closing/indexing +$ /includes/db/audit_trail_db.inc + /admin/fiscalyears.php + /gl/includes/db/gl_db_trans.inc + /gl/inquiry/journal_inquiry.php + +! Restored support for reversed transactions +$ /gl/gl_journal.php + /gl/includes/ui/gl_journal_ui.inc + +08-May-2009 Janusz Dobrowolski ++ Added journal entry edition, removed reverse transaction option. +$ /gl/includes/ui/gl_journal_ui.inc + /gl/includes/db/gl_db_trans.inc ++ Added journal entry transaction edition/view +$ /gl/gl_journal.php + /includes/ui/ui_view.inc ++ Added journal inquiry +$ /gl/inquiry/journal_inquiry.php (new) + /includes/ui/ui_lists.inc + /applications/generalledger.php +! Document references saved also in refs table for easy access. +$ /dimensions/includes/dimensions_db.inc + /includes/references.inc + /gl/includes/db/gl_db_banking.inc + /inventory/includes/db/items_adjust_db.inc + /inventory/includes/db/items_transfer_db.inc + /manufacturing/includes/db/work_order_issues_db.inc + /manufacturing/includes/db/work_order_produce_items_db.inc + /manufacturing/includes/db/work_orders_db.inc + /manufacturing/includes/db/work_orders_quick_db.inc + /purchasing/includes/db/grn_db.inc + /purchasing/includes/db/invoice_db.inc + /purchasing/includes/db/po_db.inc + /purchasing/includes/db/supp_payment_db.inc + /sales/includes/db/payment_db.inc + /sales/includes/db/sales_credit_db.inc + /sales/includes/db/sales_delivery_db.inc + /sales/includes/db/sales_invoice_db.inc + /sql/alter2.2.php +! Small fixes needed for pending client-side validation support +$ /includes/current_user.inc + /includes/main.inc + /includes/session.inc + /includes/page/header.inc + /includes/page/footer.inc + /includes/errors.inc + /js/inserts.js + /js/utils.js + /themes/aqua/default.css + /themes/cool/default.css + /themes/default/default.css + /themes/aqua/renderer.php + /themes/cool/renderer.php + /themes/default/renderer.php +! Function get_reference return string instead of mysql resource. +$ /includes/db/references_db.inc +! Added reference var +$ /includes/ui/items_cart.inc +# Small bugfix in invoice view +$ /sales/includes/db/sales_invoice_db.inc +# Last document date bug fixed +$ /sales/customer_delivery.php +# Fixed false warning during upgrade process in debug mode. +$ /admin/inst_upgrade.php + +03-May-2009 Janusz Dobrowolski ++ Audit trail added. +$ /includes/db/audit_trail_db.inc (new) + /admin/db/voiding_db.inc + /gl/includes/db/gl_db_banking.inc + /gl/includes/db/gl_db_trans.inc + /includes/main.inc + /inventory/includes/db/items_adjust_db.inc + /inventory/includes/db/items_trans_db.inc + /inventory/includes/db/items_transfer_db.inc + /manufacturing/includes/db/work_order_issues_db.inc + /manufacturing/includes/db/work_order_produce_items_db.inc + /manufacturing/includes/db/work_orders_db.inc + /manufacturing/includes/db/work_orders_quick_db.inc + /purchasing/includes/db/grn_db.inc + /purchasing/includes/db/po_db.inc + /purchasing/includes/db/supp_trans_db.inc + /sales/includes/db/cust_trans_db.inc + /sales/includes/db/sales_order_db.inc + /sql/alter2.2.php + /sql/alter2.2.sql + /sql/en_US-demo.sql + /sql/en_US-new.sql +! Changed primary key in users table +$ /admin/change_current_user_password.php + /admin/inst_upgrade.php + /admin/users.php + /admin/db/users_db.inc + /includes/current_user.inc +! Enabled drop table queries during non-forced upgrade +$ /admin/db/maintenance_db.inc +# Small optimization + /sales/includes/sales_db.inc +# Fixed default date handling. +$ /sales/customer_invoice.php +# Fixed error handling in debug mode +$ /includes/errors.inc + /includes/db/connect_db.inc + +02-May-2009 Joe Hunt +# Minor bug Profit & Loss Statement +$ /reporting/rep707.php + +02-May-2009 Joe Hunt +! Company setup option for printing server Time Zone on Reports Print-Out. +! Company setup version_id for stamping the version id. Can be used for check for update. +$ /admin/company_preferences.php + /admin/db/company_db.inc + /reporting/includes/pdf_report.inc + /sql/alter2.2.sql + /sql/en_US-demo.sql + /sql/en_US-new.sql + +01-May-2009 Joe Hunt +! Changed Customer Balance and Supplier Balance to period select with Open Balance +$ /reporting/reports_main.php + /reporting/rep101.php + /reporting/rep201.php + +30-Apr-2009 Janusz Dobrowolski +! Merged changes from main trunk 2.1.1-2.1.2 (see below) + +30-Apr-2009 Janusz Dobrowolski +# Small layout fixes +$ /includes/errors.inc + /themes/aqua/renderer.php + /themes/cool/renderer.php + /themes/default/renderer.php + +29-Apr-2009 Janusz Dobrowolski +! Messages styles moved default.css +$ /includes/errors.inc + /themes/aqua/default.css + /themes/cool/default.css + /themes/default/default.css + +28-Apr-2009 Joe Hunt +! Changed so the close of fiscal years also closes the balances and brings forward retained earnings. +$ /admin/gl_setup.ph + /admin/fiscalyears.php + /admin/db/company_db.inc + /sql/en_US-new.sql + /sql/en_US-demo.sql + /sql/alter2.2.sql + +25-Apr-2009 Janusz Dobrowolski +# Fixed ambigous sql +$ /inventory/manage/item_categories.php + +25-Apr-2009 Joe Hunt +! Removed obsolete field 'included_in_price' from table 'Tax_group_items' in en_US-demo.sql. +$ /sql/en_US-demo.sql + /sql/alter2.2.sql + +24-Apr-2009 Janusz Dobrowolski ++ Added inactive records support. +$ /admin/payment_terms.php + /admin/shipping_companies.php + /gl/includes/db/gl_db_account_types.inc + /gl/includes/db/gl_db_currencies.inc + /gl/manage/bank_accounts.php + /gl/manage/currencies.php + /gl/manage/gl_account_classes.php + /gl/manage/gl_account_types.php + /gl/manage/gl_accounts.php + /includes/ui/ui_lists.inc + /inventory/includes/db/items_units_db.inc + /inventory/includes/db/movement_types_db.inc + /inventory/manage/item_categories.php + /inventory/manage/item_units.php + /inventory/manage/items.php + /inventory/manage/locations.php + /inventory/manage/movement_types.php + /manufacturing/includes/db/work_centres_db.inc + /manufacturing/manage/work_centres.php + /purchasing/manage/suppliers.php + /sales/includes/db/sales_points_db.inc + /sales/manage/sales_points.php + /sql/alter2.2.sql + /sql/en_US-demo.sql + /sql/en_US-new.sql + /taxes/item_tax_types.php + /taxes/tax_groups.php + /taxes/tax_types.php + /taxes/db/tax_groups_db.inc + /taxes/db/tax_types_db.inc +# Edit buttons center alignment. $ /includes/ui/ui_input.inc +# Fixed ajax request using element name on multi-part forms. +$ /js/utils.js -------------------------------- Release 2.1.7 ---------------------------------- -! Seccurity release 2.1.7. We strongly encourage to update to this release. -16-Oct-2009 Joe Hunt -$ config.php +24-Apr-2009 Joe Hunt +! Added option to select how to present Balance Sheet and P&L Statement +$ /gl/manage/gl_account_classes.php + /gl/includes/db/gl_db_account_types.inc + /reporting/rep706.php + /reporting/rep707.php + /sql/alter2.2.sql -15-Oct-2009 Joe Hunt -# Security sql statements update against sql injection attacks. -$ /reporting/rep101.php - /reporting/rep102.php - /reporting/rep103.php +22-Apr-2009 Janusz Dobrowolski ++ Added inactive records support. +$ /sales/includes/db/credit_status_db.inc + /sales/includes/db/sales_types_db.inc + /sales/manage/credit_status.php + /sales/manage/customer_branches.php + /includes/data_checks.inc + /sales/manage/sales_groups.php + /sales/manage/sales_people.php + /sales/manage/sales_types.php +# Slightly changed inactive record support +$ /includes/ui/ui_input.inc + /includes/ui/ui_lists.inc + /sales/manage/customers.php + /sales/manage/sales_areas.php +! Display all db_query errors in debug mode +$ /includes/db/connect_db.inc +# Hide empty/disabled tabs +$ /frontaccounting.php + /applications/dimensions.php +# Small typo fixed +$ /applications/application.php + +21-Apr-2009 Janusz Dobrowolski ++ Support for inactive records. +$ /includes/ui/ui_lists.inc + /includes/ui/ui_input.inc + /includes/db/sql_functions.inc + /themes/aqua/default.css + /themes/cool/default.css + /themes/default/default.css ++ Added inactive field in cust_branches +$ /sql/alter2.2.sql + /sql/en_US-demo.sql + /sql/en_US-new.sql ++ Added inactive records edition. +$ /sales/manage/customers.php + /sales/manage/sales_areas.php + +08-Apr-2009 Janusz Dobrowolski +# Fix for hotkeys on multi form pages. +$ /js/inserts.js +! Customer name max. length 80 +$ /sales/manage/customers.php + /sql/alter2.2.php + /sql/alter2.2.sql + /sql/en_US-demo.sql + /sql/en_US-new.sql + +30-Mar-2009 Janusz Dobrowolski +! Merged changes from main trunk for versions 2.1RC-2.1.1 (see below) +$ /admin/db/v_banktrans.inc (removed) + /applications/manufacturing.php + /gl/include/db/gl_db_banking.inc + /gl/includes/ui/gl_bank_ui.inc + /gl/includes/ui/gl_journal_ui.inc + /gl/manage/exchange_rates.php + /.htaccess + /includes/banking.inc + /includes/data_checks.inc + /includes/ui/items_cart.inc + /includes/ui/ui_inputs.inc + /includes/ui/ui_lists.inc + /install.html + /install/index.php + /install/save.php + /inventory/includes/inventory_db.inc + /inventory/manage/items.php + /inventory/manage/sales_kits.php + /js/inserts.js + /lang/new_language_template/LC_MASSAGES/empty.po + /manufacturing/inquiry/bom_cost_inquiry.php + /purchasing/allocations/supplier_allocate.php + /purchasing/manage/suppliers.php + /reporting/includes/doctext2.inc + /reporting/includes/doctext.inc + /reporting/including/excel_report.inc /reporting/rep104.php - /reporting/rep105.php /reporting/rep106.php - /reporting/rep201.php - /reporting/rep202.php - /reporting/rep203.php - /reporting/rep204.php - /reporting/rep209.php - /reporting/rep301.php - /reporting/rep302.php /reporting/rep303.php - /reporting/rep304.php - /reporting/rep401.php - /reporting/rep501.php - /reporting/rep705.php - /sales/create_recurrent_invoices.php + /reporting/rep702.php + /sales/allocations/customer_allocate.php + /sales/includes/db/sales_credit_db.inc + /sales/includes/db/sales_points_db.inc + /sales/includes/ui/sales_credit_ui.inc + /sales/includes/ui/sales_order_ui.inc + /sales/manage/sales_points.php + /sales/sales_order_entry.php + /sql/alter2.1.sql + /taxes/tax_types.php + /themes/aqua/default.css + /themes/cool/default.css + /themes/default/default.css + +29-Mar-2009 Janusz Dobrowolski +! Added cancel button +$ /inventory/manage/items.php +! Element id generation speedup +$ /includes/ui/ui_view.inc +# Fixed hotkeys behaviour in report module +$ /js/inserts.js + /reporting/includes/reports_classes.inc + +21-Mar-2009 Janusz Dobrowolski ++ Option to use last document date on subsequent new documents. +$ /admin/display_prefs.php + /admin/db/users_db.inc + /includes/current_user.inc + /includes/prefs/userprefs.inc + /sql/alter2.2.php + /sql/alter2.2.sql + /sql/en_US-demo.sql + /sql/en_US-new.sql ++ Optional check for current date in date_cells()/date_row() +$ /includes/ui/ui_input.inc +! Save/retrieve last document date. +$ /gl/bank_account_reconcile.php + /gl/gl_bank.php + /gl/gl_journal.php + /gl/includes/ui/gl_bank_ui.inc + /gl/includes/ui/gl_journal_ui.inc + /includes/date_functions.inc + /includes/ui/ui_view.inc + /inventory/adjustments.php + /inventory/transfers.php + /inventory/includes/item_adjustments_ui.inc + /inventory/includes/stock_transfers_ui.inc + /manufacturing/work_order_entry.php + /purchasing/po_entry_items.php + /purchasing/po_receive_items.php + /purchasing/supplier_payment.php + /purchasing/includes/ui/grn_ui.inc + /purchasing/includes/ui/invoice_ui.inc + /purchasing/includes/ui/po_ui.inc + /sales/credit_note_entry.php + /sales/customer_credit_invoice.php + /sales/customer_delivery.php + /sales/customer_invoice.php /sales/customer_payments.php + /sales/sales_order_entry.php + /sales/includes/cart_class.inc /sales/includes/sales_db.inc - /sales/includes/db/branches_db.inc - /sales/includes/db/credit_status_db.inc - /sales/includes/db/custalloc_db.inc - /sales/includes/db/customers_db.inc - /sales/includes/db/cust_trans_db.inc - /sales/includes/db/cust_trans_details_db.inc /sales/includes/db/sales_order_db.inc - /sales/includes/db/sales_points_db.inc - /sales/includes/db/sales_types_db.inc - /sales/inquiry/customer_allocation_inquiry.php - /sales/inquiry/customer_inquiry.php - /sales/inquiry/sales_deliveries_view.php - /sales/inquiry/sales_orders_view.php - /sales/manage/credit_status.php - /sales/manage/customers.php - /sales/manage/customer_branches.php - /sales/manage/recurrent_invoices.php - /sales/manage/sales_areas.php - /sales/manage/sales_groups.php - /sales/manage/sales_people.php - /sales/manage/sales_types.php - /sales/view/view_sales_order.php - /taxes/item_tax_types.php - /taxes/tax_groups.php - /taxes/tax_types.php - /taxes/tax_calc.php - /taxes/db/item_tax_types_db.inc - /taxes/db/tax_groups_db.inc - /taxes/db/tax_types_db.inc + /sales/includes/ui/sales_credit_ui.inc + /sales/includes/ui/sales_order_ui.inc -15-Oct-2009 Janusz Dobrowolski -! Added html_entity_decode() in db_escape() for correct INSERT>SELECT>INSERT sequences. -$ /includes/db/connect_db.inc -# Fixed warnings on first page display +18-Mar-2009 Janusz Dobrowolski ++ Additional option for submit_add_or_update_x() helpers +$ /includes/ui/ui_input.inc ++ Icon for default escape button +$ /themes/aqua/images/escape.png (new) + /themes/cool/images/escape.png (new) ++ Arrow navigation also in report menus +$ /js/utils.js + /js/inserts.js ++ Added default keys for form submition/cancelling when apprioprate. +$ All form entry files. + +17-Mar-2009 Joe Hunt +! Changed so company domicile is printed on invoices and statements if filled out. +$ /reporting/includes/header2.inc + +17-Mar-2009 Janusz Dobrowolski ++ Added default delivery_required_by parameter, removed custom company fields/names. $ /admin/company_preferences.php -# Fixed erroneous message -$ /gl/manage/gl_account_types.php -# Security sql statements update against sql injection attacks. -$ /admin/attachments.php - /admin/payment_terms.php - /admin/print_profiles.php - /admin/printers.php - /admin/shipping_companies.php - /admin/view_print_transaction.php + /admin/gl_setup.php /admin/db/company_db.inc - /admin/db/printers_db.inc - /admin/db/voiding_db.inc - /admin/db/users_db.inc - /dimensions/includes/dimensions_db.inc + /includes/prefs/sysprefs.inc + /sql/alter2.2.php (new) + /sql/alter2.2.sql (new) + /sql/en_US-demo.sql + /sql/en_US-new.sql ++ Item category now contains default parameters for new items. +$ /inventory/includes/db/items_category_db.inc + /inventory/manage/item_categories.php + /inventory/manage/items.php + /sql/alter2.2.php + /sql/alter2.2.sql + /sql/en_US-demo.sql + /sql/en_US-new.sql +! Updated FA version string. +$ /config.php +! Stock item types moved to types.inc +$ /includes/types.inc + /includes/ui/ui_lists.inc +! Focus js code optimization +$ /js/inserts.js + /js/utils.js + +16-Mar-2009 Janusz Dobrowolski ++ Support for default buttons with Ctrl-Enter/Escape hotkeys, + arrow navigation in menus +$ /includes/ui/ui_input.inc + /includes/ui/ui_controls.inc + /includes/ui/ui_view.inc + /includes/page/footer.inc + /config.php + /js/inserts.js + /js/utils.js + /reporting/includes/reporting.inc + /themes/default/images/escape.png + /themes/aqua/default.css + /themes/aqua/renderer.php + /themes/cool/default.css + /themes/cool/renderer.php + /themes/default/default.css + /themes/default/renderer.php + /themes/default/images/escape.png + /sales/sales_order_entry.php + +! SID & start_form() cleanup +$ /.htaccess + /access/logout.php + /admin/attachments.php + /admin/backups.php + /admin/create_coy.php + /admin/inst_lang.php + /admin/inst_module.php + /admin/view_print_transaction.php + /admin/void_transaction.php /dimensions/inquiry/search_dimensions.php - /gl/bank_account_reconcile.php - /gl/gl_budget.php - /gl/includes/db/gl_db_account_types.inc - /gl/includes/db/gl_db_accounts.inc - /gl/includes/db/gl_db_bank_accounts.inc - /gl/includes/db/gl_db_bank_trans.inc - /gl/includes/db/gl_db_banking.inc - /gl/includes/db/gl_db_currencies.inc - /gl/includes/db/gl_db_rates.inc - /gl/includes/db/gl_db_trans.inc - /gl/inquiry/bank_inquiry.php - /gl/view/bank_transfer_view.php - /gl/view/gl_trans_view.php + /gl/bank_transfer.php + /gl/gl_bank.php + /gl/inquiry/gl_trial_balance.php + /gl/manage/exchange_rates.php + /inventory/adjustments.php /inventory/cost_update.php + /inventory/prices.php /inventory/purchasing_data.php - /inventory/includes/db/items_category_db.inc - /inventory/includes/db/items_codes_db.inc - /inventory/includes/db/items_db.inc - /inventory/includes/db/items_locations_db.inc - /inventory/includes/db/items_prices_db.inc - /inventory/includes/db/items_trans_db.inc - /inventory/includes/db/items_units_db.inc - /inventory/includes/db/movement_types_db.inc + /inventory/reorder_level.php + /inventory/transfers.php /inventory/inquiry/stock_movements.php - /inventory/manage/item_categories.php - /inventory/manage/item_units.php - /inventory/manage/items.php - /inventory/manage/locations.php - /inventory/manage/movement_types.php + /inventory/inquiry/stock_status.php + /inventory/manage/item_codes.php + /inventory/manage/sales_kits.php /manufacturing/search_work_orders.php - /manufacturing/includes/db/work_centres_db.inc - /manufacturing/includes/db/work_order_issues_db.inc - /manufacturing/includes/db/work_order_produce_items_db.inc - /manufacturing/includes/db/work_order_requirements_db.inc - /manufacturing/includes/db/work_orders_db.inc - /manufacturing/includes/db/work_orders_quick_db.inc - /manufacturing/inquiry/where_used_inquiry.php + /manufacturing/work_order_issue.php + /manufacturing/inquiry/bom_cost_inquiry.php /manufacturing/manage/bom_edit.php - /manufacturing/manage/work_centres.php /purchasing/po_entry_items.php /purchasing/po_receive_items.php /purchasing/supplier_credit.php /purchasing/supplier_invoice.php - /purchasing/includes/purchasing_db.inc - /purchasing/includes/db/grn_db.inc - /purchasing/includes/db/invoice_db.inc - /purchasing/includes/db/invoice_items_db.inc - /purchasing/includes/db/po_db.inc - /purchasing/includes/db/supp_trans_db.inc - /purchasing/includes/db/suppalloc_db.inc - /purchasing/includes/db/suppliers_db.inc + /purchasing/supplier_payment.php + /purchasing/allocations/supplier_allocate.php /purchasing/inquiry/po_search.php /purchasing/inquiry/po_search_completed.php /purchasing/inquiry/supplier_allocation_inquiry.php /purchasing/inquiry/supplier_inquiry.php - /purchasing/manage/suppliers.php - -12-Oct-2009 Janusz Dobrowolski -# Fixed sql injection vulnerability on some php/mysql configurations -$ /admin/db/users_db.inc -! Single quotes also encoded before database data insert -$ /admin/db/maintenance_db.inc - /includes/db/connect_db.inc - /reporting/includes/tcpdf.php - /sales/includes/cart_class.inc - -------------------------------- Release 2.1.6 ---------------------------------- -! Final Final release of the 2.1. series. -$ config.php - -16-Sep-2009 Joe Hunt -# Missing freight tax in Customer Balances Report -$ /reporting/rep101.php - -14-Sep-2009 Joe Hunt -# A couple of minor bugs in tax report when displaying supplier credit notes -$ /purchasing/includes/db/invoice_db.inc - -05-Sep-2009 Joe Hunt -# Changed Class Type to Class Name in GL Account groups -$ /gl/manage/gl_account_types.php -# Changed so total in bank payments/deposits shows correctly if negative amount are entered. -$ /gl/includes/ui/gl_bank_ui.inc - -30-Aug-2009 Janusz Dobrowolski -# Fixed sql error during sales order line update with line cancelation. -$ /sales/includes/db/sales_order_db.inc + /sales/credit_note_entry.php + /sales/customer_credit_invoice.php + /sales/customer_delivery.php + /sales/customer_invoice.php + /sales/allocations/customer_allocate.php + /sales/includes/ui/sales_credit_ui.inc + /sales/inquiry/customer_allocation_inquiry.php + /sales/inquiry/sales_deliveries_view.php + /sales/inquiry/sales_orders_view.php ------------------------------- Release 2.1.5 ---------------------------------- -26-Aug-2009 Joe Hunt +26-Aug-2009 Joe Hung ! Release 2.1.5 $ config.php # If no dimensions in system, then there were 2 destination selectors in report Balance Sheet @@ -643,6 +2756,7 @@ $ /inventory/manage/sales_kits.php # Purchase Order document shows wrong purch data conversion if purch data $ /reporting/rep209.php + ------------------------------- Release 2.1.2 ---------------------------------- 30-Apr-2009 Joe Hunt ! Release 2.1.2 @@ -5078,8 +7192,3 @@ $ /admin/gl_setup.php -------------------- 1.0 Stable Released ---------------------- 10-Apr-2007 Joe Hunt ! Release 1.0 established on SourceForge. - -2. Copyright and disclaimer ---------------------------- -This application is opensource software released under the GPL. Please -see source code and the LICENSE file \ No newline at end of file diff --git a/access/login.php b/access/login.php index faad0806..efdd276d 100644 --- a/access/login.php +++ b/access/login.php @@ -11,7 +11,21 @@ ***********************************************************************/ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_to_root'])) die(_("Restricted access")); - include_once($path_to_root . "/includes/ui/ui_view.inc"); + include_once($path_to_root . "/includes/ui.inc"); + + $js = ""; + $js2 = ""; // Display demo user name and password within login form if "$allow_demo_mode" is true if ($allow_demo_mode == true) @@ -24,130 +38,104 @@ } if (!isset($def_coy)) $def_coy = 0; - $def_theme = $path_to_root . '/themes/default'; -?> - - -'.get_js_png_fix().''; ?> - - <?php echo $app_title . " " . $version;?> - - - - - - - - - + $def_theme = "default"; - - - - - - - - - - - - - - - - - - - - - -
FrontAccounting
+ $login_timeout = $_SESSION["wa_current_user"]->last_act; - - - - \n"; + end_row(); + echo "\n"; + if (!$login_timeout) + table_section_title(_("Version")." $version Build $build_version - "._("Login")); + $value = $login_timeout ? $_SESSION['wa_current_user']->loginname : ($allow_demo_mode ? "demouser":""); - + text_row(_("User name"), "user_name_entry_field", $value, 20, 30); - - - - - - - -


- - - - - + $title = $login_timeout ? _('Authorization timeout') : $app_title." ".$version." - "._("Login"); + $encoding = isset($_SESSION['language']->encoding) ? $_SESSION['language']->encoding : "iso-8859-1"; + $rtl = isset($_SESSION['language']->dir) ? $_SESSION['language']->dir : "ltr"; + $onload = !$login_timeout ? "onload='defaultCompany()'" : ""; - + echo "\n"; + echo "\n"; + echo "$title\n"; + echo "\n"; + echo " \n"; + echo $js2; + if (!$login_timeout) + { + echo $js; + } + echo "\n"; - + echo "\n"; + echo "
$title
\n"; + + br();br(); + start_form(false, false, $_SESSION['timeout']['uri'], "loginform"); + start_table($table_style2); + start_row(); + echo "		"; + if (!$login_timeout) { // FA logo + echo "FrontAccounting"; + } else { + echo ""._('Authorization timeout').""; + } + echo "
-
 
  
+ if ($login_timeout) { + hidden('company_login_name', $_SESSION["wa_current_user"]->company); + } else { + if (isset($_SESSION['wa_current_user']->company)) + $coy = $_SESSION['wa_current_user']->company; + else + $coy = $def_coy; + echo ""._("Company")."\n"; + start_row(); + label_cell($demo_text, "colspan=2 align='center'"); + end_row(); + }; + end_table(1); + echo "
\n"; + end_form(1); - - - - - - + "; + echo "\n"; + echo ""; + if (isset($_SESSION['wa_current_user'])) + $date = Today() . " | " . Now(); + else + $date = date("m/d/Y") . " | " . date("h.i am"); + echo "\n"; + echo "
$date
\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "
$app_title $version - " . _("Theme:") . " " . $def_theme . "
$power_by


\n"; + echo "\n"; + +?> \ No newline at end of file diff --git a/access/logout.php b/access/logout.php index 716bbfe1..762fcd0e 100644 --- a/access/logout.php +++ b/access/logout.php @@ -9,48 +9,41 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 1; +$page_security = 'SA_OPEN'; $path_to_root=".."; include($path_to_root . "/includes/session.inc"); -include_once($path_to_root . "/includes/ui/ui_view.inc"); -page(_("Logout"), true, false, "", get_js_png_fix()); +include($path_to_root . "/includes/page/header.inc"); +page_header(_("Logout"), true, false, '', get_js_png_fix()); -?> - - +echo "
- + - +echo "$app_title $version"; + +echo " - +
" alt="FrontAccounting" width="250" height="50" onload="fixPNG(this)">FrontAccounting
 
-
"; +echo _("Thank you for using") . " "; - echo "$app_title $version"; -?> -
 
- " . _("Click here to Login Again.") . ""; -?> -
-
-\n"; +end_page(false, true); +session_unset(); +session_destroy(); ?> diff --git a/admin/attachments.php b/admin/attachments.php index 0e1b4e28..dafa3e02 100644 --- a/admin/attachments.php +++ b/admin/attachments.php @@ -10,7 +10,7 @@ See the License here . ***********************************************************************/ $path_to_root=".."; -$page_security = 8; +$page_security = 'SA_ATTACHDOCUMENT'; include_once($path_to_root . "/includes/session.inc"); @@ -68,7 +68,7 @@ if ($download_id != -1) $js = ""; if ($use_popup_windows) $js .= get_js_open_window(800, 500); -page(_("Attach Documents"), false, false, "", $js); +page(_($help_context = "Attach Documents"), false, false, "", $js); simple_page_mode(true); //---------------------------------------------------------------------------------------- @@ -160,7 +160,7 @@ if ($Mode == 'RESET') function viewing_controls() { - start_form(false, true); + start_form(); start_table("class='tablestyle_noborder'"); @@ -256,7 +256,7 @@ end_table(1); if (isset($_POST['filterType'])) hidden('filterType', $_POST['filterType']); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); diff --git a/admin/backups.php b/admin/backups.php index 728d3f29..efa78619 100644 --- a/admin/backups.php +++ b/admin/backups.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 15; +$page_security = 'SA_BACKUP'; $path_to_root=".."; include_once($path_to_root . "/includes/session.inc"); @@ -34,7 +34,7 @@ if (get_post('download')) { exit; } -page(_("Backup and Restore Database"), false, false, '', ''); +page(_($help_context = "Backup and Restore Database"), false, false, '', ''); check_paths(); @@ -51,12 +51,7 @@ function check_paths() function generate_backup($conn, $ext='no', $comm='') { - if ($conn['tbpref'] != "") - $filename = $conn['dbname'] . "_" . $conn['tbpref'] . date("Ymd_Hi") . ".sql"; - else - $filename = $conn['dbname'] . "_" . date("Ymd_Hi") . ".sql"; - - $filename = db_export($conn, $filename, $ext, $comm); + $filename = db_backup($conn, $ext, $comm); if ($filename) display_notification(_("Backup successfully generated."). ' ' . _("Filename") . ": " . $filename); @@ -102,7 +97,7 @@ function compress_list_row($label, $name, $value=null) $ar_comps['gzip'] = "gzip"; echo "$label"; - array_selector('comp', $value, $ar_comps); + echo array_selector('comp', $value, $ar_comps); echo ""; } @@ -177,13 +172,10 @@ table_section_title(_("Backup scripts maintenance")); submit_row('view',_("View Backup"), false, '', '', true); submit_row('download',_("Download Backup"), false, '', '', false); submit_row('restore',_("Restore Backup"), false, '','', 'process'); + submit_js_confirm('restore',_("You are about to restore database from backup file.\nDo you want to continue?")); - $js = "if(confirm(\"" - .sprintf(_('You are about to remove %s backup file.
Do you want to continue ?'), - get_post('cmb_backups')) - ."\")) { JsHttpRequest.request(\"delete\"); }"; - - submit_row('delete', _("Delete Backup"), false, '','', 'dialog'); + submit_row('delete', _("Delete Backup"), false, '','', true); + submit_js_confirm('delete', sprintf(_("You are about to remove selected backup file.\nDo you want to continue ?"))); end_table(); echo ""; end_row(); diff --git a/admin/change_current_user_password.php b/admin/change_current_user_password.php index d38f96cd..bb7c9cb0 100644 --- a/admin/change_current_user_password.php +++ b/admin/change_current_user_password.php @@ -9,20 +9,17 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security=1; +$page_security = 'SA_CHGPASSWD'; $path_to_root=".."; include_once($path_to_root . "/includes/session.inc"); -page(_("Change password")); +page(_($help_context = "Change password")); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); include_once($path_to_root . "/admin/db/users_db.inc"); -$selected_id = $_SESSION["wa_current_user"]->username; - - function can_process() { @@ -33,7 +30,7 @@ function can_process() return false; } - if (strstr($_POST['password'], $_POST['user_id']) != false) + if (strstr($_POST['password'], $_SESSION["wa_current_user"]->username) != false) { display_error( _("The password cannot contain the user login.")); set_focus('password'); @@ -58,7 +55,9 @@ if (isset($_POST['UPDATE_ITEM'])) if ($allow_demo_mode) { display_warning(_("Password cannot be changed in demo mode.")); } else { - update_user_password($_POST['user_id'], md5($_POST['password'])); + update_user_password($_SESSION["wa_current_user"]->user, + $_SESSION["wa_current_user"]->username, + md5($_POST['password'])); display_notification(_("Your password has been updated.")); } $Ajax->activate('_page_body'); @@ -69,13 +68,9 @@ start_form(); start_table($table_style); -$myrow = get_user($selected_id); - -$_POST['user_id'] = $myrow["user_id"]; -hidden('selected_id', $selected_id); -hidden('user_id', $_POST['user_id']); +$myrow = get_user($_SESSION["wa_current_user"]->user); -label_row(_("User login:"), $_POST['user_id']); +label_row(_("User login:"), $myrow['user_id']); $_POST['password'] = ""; $_POST['passwordConfirm'] = ""; @@ -94,7 +89,7 @@ table_section_title(_("Enter your new password in the fields.")); end_table(1); -submit_center( 'UPDATE_ITEM', _('Change password'), true, '', true); +submit_center( 'UPDATE_ITEM', _('Change password'), true, '', 'default'); end_form(); end_page(); ?> diff --git a/admin/company_preferences.php b/admin/company_preferences.php index 833204c6..366fc852 100644 --- a/admin/company_preferences.php +++ b/admin/company_preferences.php @@ -9,11 +9,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security =10; -$path_to_root=".."; +$page_security = 'SA_SETUPCOMPANY'; +$path_to_root = ".."; include($path_to_root . "/includes/session.inc"); -page(_("Company Setup")); +page(_($help_context = "Company Setup")); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); @@ -26,6 +26,12 @@ if (isset($_POST['update']) && $_POST['update'] != "") $input_error = 0; + if (!check_num('login_tout', 10)) + { + display_error(_("Login timeout must be positive number not less than 10.")); + set_focus('login_tout'); + $input_error = 1; + } if (strlen($_POST['coy_name'])==0) { $input_error = 1; @@ -94,15 +100,20 @@ if (isset($_POST['update']) && $_POST['update'] != "") $_POST['coy_logo'] = ""; } } + if ($_POST['add_pct'] == "") + $_POST['add_pct'] = -1; if ($input_error != 1) { - update_company_setup($_POST['coy_name'], $_POST['coy_no'], $_POST['gst_no'], $_POST['tax_prd'], $_POST['tax_last'], - $_POST['postal_address'], $_POST['phone'], $_POST['fax'], $_POST['email'], $_POST['coy_logo'], $_POST['domicile'], - $_POST['use_dimension'], $_POST['custom1_name'], $_POST['custom2_name'], $_POST['custom3_name'], - $_POST['custom1_value'], $_POST['custom2_value'], $_POST['custom3_value'], - $_POST['curr_default'], $_POST['f_year'], check_value('no_item_list'), check_value('no_customer_list'), - check_value('no_supplier_list'), $_POST['base_sales']); - + update_company_setup($_POST['coy_name'], $_POST['coy_no'], + $_POST['gst_no'], $_POST['tax_prd'], $_POST['tax_last'], + $_POST['postal_address'], $_POST['phone'], $_POST['fax'], + $_POST['email'], $_POST['coy_logo'], $_POST['domicile'], + $_POST['use_dimension'], $_POST['curr_default'], $_POST['f_year'], + check_value('no_item_list'), check_value('no_customer_list'), + check_value('no_supplier_list'), $_POST['base_sales'], + check_value('time_zone'), $_POST['add_pct'], $_POST['round_to'], + $_POST['login_tout']); + $_SESSION['wa_current_user']->timeout = $_POST['login_tout']; display_notification_centered(_("Company setup has been updated.")); } set_focus('coy_name'); @@ -113,34 +124,33 @@ if (isset($_POST['update']) && $_POST['update'] != "") start_form(true); -if (!isset($_POST['coy_name'])) { - $myrow = get_company_prefs(); - - $_POST['coy_name'] = $myrow["coy_name"]; - $_POST['gst_no'] = $myrow["gst_no"]; - $_POST['tax_prd'] = $myrow["tax_prd"]; - $_POST['tax_last'] = $myrow["tax_last"]; - $_POST['coy_no'] = $myrow["coy_no"]; - $_POST['postal_address'] = $myrow["postal_address"]; - $_POST['phone'] = $myrow["phone"]; - $_POST['fax'] = $myrow["fax"]; - $_POST['email'] = $myrow["email"]; - $_POST['coy_logo'] = $myrow["coy_logo"]; - $_POST['domicile'] = $myrow["domicile"]; - $_POST['use_dimension'] = $myrow["use_dimension"]; - $_POST['base_sales'] = $myrow["base_sales"]; - $_POST['no_item_list'] = $myrow["no_item_list"]; - $_POST['no_customer_list'] = $myrow["no_customer_list"]; - $_POST['no_supplier_list'] = $myrow["no_supplier_list"]; - $_POST['custom1_name'] = $myrow["custom1_name"]; - $_POST['custom2_name'] = $myrow["custom2_name"]; - $_POST['custom3_name'] = $myrow["custom3_name"]; - $_POST['custom1_value'] = $myrow["custom1_value"]; - $_POST['custom2_value'] = $myrow["custom2_value"]; - $_POST['custom3_value'] = $myrow["custom3_value"]; - $_POST['curr_default'] = $myrow["curr_default"]; - $_POST['f_year'] = $myrow["f_year"]; -} +$myrow = get_company_prefs(); + +$_POST['coy_name'] = $myrow["coy_name"]; +$_POST['gst_no'] = $myrow["gst_no"]; +$_POST['tax_prd'] = $myrow["tax_prd"]; +$_POST['tax_last'] = $myrow["tax_last"]; +$_POST['coy_no'] = $myrow["coy_no"]; +$_POST['postal_address'] = $myrow["postal_address"]; +$_POST['phone'] = $myrow["phone"]; +$_POST['fax'] = $myrow["fax"]; +$_POST['email'] = $myrow["email"]; +$_POST['coy_logo'] = $myrow["coy_logo"]; +$_POST['domicile'] = $myrow["domicile"]; +$_POST['use_dimension'] = $myrow["use_dimension"]; +$_POST['base_sales'] = $myrow["base_sales"]; +$_POST['no_item_list'] = $myrow["no_item_list"]; +$_POST['no_customer_list'] = $myrow["no_customer_list"]; +$_POST['no_supplier_list'] = $myrow["no_supplier_list"]; +$_POST['curr_default'] = $myrow["curr_default"]; +$_POST['f_year'] = $myrow["f_year"]; +$_POST['time_zone'] = $myrow["time_zone"]; +$_POST['version_id'] = $myrow["version_id"]; +$_POST['add_pct'] = $myrow['add_pct']; +$_POST['login_tout'] = $myrow['login_tout']; +if ($_POST['add_pct'] == -1) + $_POST['add_pct'] = ""; +$_POST['round_to'] = $myrow['round_to']; $_POST['del_coy_logo'] = 0; start_outer_table($table_style2); @@ -148,7 +158,8 @@ start_outer_table($table_style2); table_section(1); text_row_ex(_("Name (to appear on reports):"), 'coy_name', 42, 50); -textarea_row(_("Address:"), 'postal_address', $_POST['postal_address'], 35, 5); +textarea_row(_("Address:"), 'postal_address', $_POST['postal_address'], 35, 6); +text_row_ex(_("Domicile:"), 'domicile', 25, 55); text_row_ex(_("Phone Number:"), 'phone', 25, 55); text_row_ex(_("Fax Number:"), 'fax', 25); @@ -157,50 +168,37 @@ email_row_ex(_("Email Address:"), 'email', 25, 55); text_row_ex(_("Official Company Number:"), 'coy_no', 25); text_row_ex(_("GSTNo:"), 'gst_no', 25); -text_row_ex(_("Tax Periods:"), 'tax_prd', 10, 10, '', null, null, _('Months.')); -text_row_ex(_("Tax Last Period:"), 'tax_last', 10, 10, '', null, null, _('Months back.')); - currencies_list_row(_("Home Currency:"), 'curr_default', $_POST['curr_default']); +fiscalyears_list_row(_("Fiscal Year:"), 'f_year', $_POST['f_year']); table_section(2); -fiscalyears_list_row(_("Fiscal Year:"), 'f_year', $_POST['f_year']); +text_row_ex(_("Tax Periods:"), 'tax_prd', 10, 10, '', null, null, _('Months.')); +text_row_ex(_("Tax Last Period:"), 'tax_last', 10, 10, '', null, null, _('Months back.')); + label_row(_("Company Logo:"), $_POST['coy_logo']); label_row(_("New Company Logo (.jpg)") . ":", ""); check_row(_("Delete Company Logo:"), 'del_coy_logo', $_POST['del_coy_logo']); -text_row_ex(_("Domicile:"), 'domicile', 25, 55); number_list_row(_("Use Dimensions:"), 'use_dimension', null, 0, 2); sales_types_list_row(_("Base for auto price calculations:"), 'base_sales', $_POST['base_sales'], false, _('No base price list') ); - -check_row(_("Search Item List"), 'no_item_list', get_post('no_item_list')); -check_row(_("Search Customer List"), 'no_customer_list', get_post('no_customer_list')); -check_row(_("Search Supplier List"), 'no_supplier_list', get_post('no_supplier_list')); - -start_row(); -end_row(); -label_row(_("Custom Field Name"), _("Custom Field Value")); - -start_row(); -text_cells(null, 'custom1_name', $_POST['custom1_name'], 25, 25); -text_cells(null, 'custom1_value', $_POST['custom1_value'], 30, 30); -end_row(); - -start_row(); -text_cells(null, 'custom2_name', $_POST['custom2_name'], 25, 25); -text_cells(null, 'custom2_value', $_POST['custom2_value'], 30, 30); -end_row(); - -start_row(); -text_cells(null, 'custom3_name', $_POST['custom3_name'], 25, 25); -text_cells(null, 'custom3_value', $_POST['custom3_value'], 30, 30); -end_row(); +text_row_ex(_("Add Price from Std Cost:"), 'add_pct', 10, 10, '', null, null, "%"); +$curr = get_currency($_POST['curr_default']); +text_row_ex(_("Round to nearest:"), 'round_to', 10, 10, '', null, null, $curr['hundreds_name']); + +check_row(_("Search Item List"), 'no_item_list', null); +check_row(_("Search Customer List"), 'no_customer_list', null); +check_row(_("Search Supplier List"), 'no_supplier_list', null); +label_row("", " "); +check_row(_("Time Zone on Reports"), 'time_zone', $_POST['time_zone']); +text_row_ex(_("Login Timeout:"), 'login_tout', 10, 10, '', null, null, _('seconds')); +label_row(_("Version Id"), $_POST['version_id']); end_outer_table(1); hidden('coy_logo', $_POST['coy_logo']); -submit_center('update', _("Update"), true, '', true); +submit_center('update', _("Update"), true, '', 'default'); end_form(2); //------------------------------------------------------------------------------------------------- diff --git a/admin/create_coy.php b/admin/create_coy.php index 8ec0fc4a..e1b2882f 100644 --- a/admin/create_coy.php +++ b/admin/create_coy.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 20; +$page_security = 'SA_CREATECOMPANY'; $path_to_root=".."; include_once($path_to_root . "/includes/session.inc"); @@ -18,7 +18,7 @@ include_once($path_to_root . "/admin/db/company_db.inc"); include_once($path_to_root . "/admin/db/maintenance_db.inc"); include_once($path_to_root . "/includes/ui.inc"); -page(_("Create/Update Company")); +page(_($help_context = "Create/Update Company")); $comp_subdirs = array('images', 'pdf_files', 'backup','js_cache', 'reporting', 'attachments'); @@ -151,6 +151,8 @@ function handle_submit() { create_comp_dirs("$comp_path/$id", $comp_subdirs); } + $exts = get_company_extensions(); + write_extensions($exts, $id); return true; } @@ -163,7 +165,7 @@ function handle_delete() $id = $_GET['id']; $cdir = $comp_path.'/'.$id; - @flush_dir($cdir); + @flush_dir($cdir, true); if (!rmdir($cdir)) { display_error(_("Cannot remove company data directory ") . $cdir); @@ -264,7 +266,7 @@ function display_company_edit($selected_id) else $n = count($db_connections); - start_form(true, true); + start_form(true); echo " "; + global $table_style; + start_table($table_style); - $th = array(_("Tab"), _("Name"), _("Folder"), _("Filename"), "", ""); + $th = array(_("Name"),_("Tab"), _("Link text"), _("Folder"), _("Filename"), + _("Access extensions"),"", ""); table_header($th); $k = 0; - $mods = $installed_modules; - $n = count($mods); - for ($i = 0; $i < $n; $i++) + $mods = get_company_extensions(); + $mods = array_natsort($mods, null, 'name'); + + foreach($mods as $i => $mod) { + $is_mod = $mod['type'] == 'module'; alt_table_row_color($k); - - label_cell(get_tab_title($mods[$i]['tab'])); - label_cell($mods[$i]['name']); - label_cell($mods[$i]['path']); - label_cell($mods[$i]['filename']); - $edit = _("Edit"); - $delete = _("Delete"); - if (user_graphic_links()) + label_cell($mod['name']); + label_cell( $is_mod ? + $mod['title'] : access_string($_SESSION['App']->applications[$mod['tab']]->name, true)); + $ttl = access_string($mod['title']); + label_cell($ttl[0]); + label_cell($mod['path']); + label_cell($mod['filename']); + label_cell(@$mod['acc_file']); + if ($is_mod) { - $edit = set_icon(ICON_EDIT, $edit); - $delete = set_icon(ICON_DELETE, $delete); + label_cell(''); // not implemented (yet) } - label_cell("$edit"); - label_cell("$delete"); + else + { + edit_button_cell("Edit".$i, _("Edit")); + } + delete_button_cell("Delete".$i, _("Delete")); + submit_js_confirm('Delete'.$i, _('You are about to delete this extension\nDo you want to continue?')); end_row(); } - end_table(); + end_table(1); +} + +function company_extensions($id) +{ + global $table_style; + + start_table($table_style); + + $th = array(_("Name"),_("Tab"), _("Link text"), _("Active")); + + // get all available extensions and display + // with current status stored in company directory. + + $mods = get_company_extensions(); + $exts = get_company_extensions($id); + foreach($mods as $key => $ins) { + foreach($exts as $ext) + if ($ext['name'] == $ins['name']) { + $mods[$key]['active'] = @$ext['active']; + continue 2; + } + } + $mods = array_natsort($mods, null, 'name'); + table_header($th); + $k = 0; + foreach($mods as $i => $mod) + { + alt_table_row_color($k); + label_cell($mod['name']); + label_cell( $mod['type'] == 'module' ? + $mod['title'] : access_string($_SESSION['App']->applications[$mod['tab']]->name, true)); + $ttl = access_string($mod['title']); + label_cell($ttl[0]); + check_cells(null, 'Active'.$i, @$mod['active'] ? 1:0, + false, false, "align='center'"); + end_row(); + } + + end_table(1); + submit_center('Update', _('Update'), true, false, 'default'); } //--------------------------------------------------------------------------------------------- -function display_module_edit($selected_id) +function display_ext_edit($selected_id) { - global $installed_modules, $table_style2; + global $table_style2, $Mode; - if ($selected_id != -1) - $n = $selected_id; - else - $n = count($installed_modules); - start_form(true, true); - - echo " - "; + $extensions = get_company_extensions(); start_table($table_style2); - if ($selected_id != -1) + if ($selected_id != -1 && $extensions[$selected_id]['type'] == 'plugin') { - $mod = $installed_modules[$selected_id]; - $_POST['tab'] = $mod['tab']; - $_POST['name'] = $mod['name']; - $_POST['path'] = $mod['path']; - $_POST['filename'] = $mod['filename']; + if ($Mode == 'Edit') { + $mod = $extensions[$selected_id]; + $_POST['tab'] = $mod['tab']; + $_POST['name'] = $mod['name']; + $_POST['title'] = $mod['title']; + $_POST['path'] = $mod['path']; + $_POST['filename'] = $mod['filename']; + $_POST['acc_file'] = @$mod['acc_file']; + hidden('filename', $_POST['filename']); + hidden('acc_file', $_POST['acc_file']); + } hidden('selected_id', $selected_id); - hidden('filename', $_POST['filename']); } - tab_list_row(_("Menu Tab"), 'tab', null); text_row_ex(_("Name"), 'name', 30); text_row_ex(_("Folder"), 'path', 20); + tab_list_row(_("Menu Tab"), 'tab', null, true); + text_row_ex(_("Menu Link Text"), 'title', 30); + + record_status_list_row(_("Default status"), 'active'); + label_row(_("Module File"), ""); + label_row(_("Access Levels Extensions"), ""); label_row(_("SQL File"), ""); end_table(0); display_note(_("Select your module PHP file from your local harddisk."), 0, 1); - echo "
"; - - - end_form(); + submit_add_or_update_center($selected_id == -1, '', 'both'); } - //--------------------------------------------------------------------------------------------- - -if (isset($_GET['c'])) +if ($Mode=='ADD_ITEM' || $Mode == 'UPDATE_ITEM') { + if(handle_submit()) { + if ($selected_id != -1) + display_notification(_("Extension data has been updated.")); + else + display_notification(_("Extension has been installed.")); + $Mode = 'RESET'; + } +} +if ($Mode == 'Delete') { - if ($_GET['c'] == 'df') - { - handle_delete(); + handle_delete(); + $Mode = 'RESET'; +} +if (get_post('Update')) { + $exts = get_company_extensions(); + foreach($exts as $i => $ext) { + $exts[$i]['active'] = check_value('Active'.$i); } + write_extensions($exts, get_post('extset')); + if (get_post('extset') == user_company()) + $installed_extensions = $exts; + display_notification(_('Current active extensions set has been saved.')); +} - if ($_GET['c'] == 'u') - { - if (handle_submit()) - { - //meta_forward($_SERVER['PHP_SELF']); - } - } +if ($Mode == 'RESET') +{ + $selected_id = -1; + unset($_POST); } //--------------------------------------------------------------------------------------------- +start_form(true); +if (list_updated('extset')) + $Ajax->activate('_page_body'); -display_modules(); - -hyperlink_no_params($_SERVER['PHP_SELF'], _("Create a new module")); +echo "
" . _('Extensions:') . "  "; +echo extset_list('extset', null, true); +echo "

"; -display_module_edit($selected_id); +$set = get_post('extset', -1); +if ($set == -1) { + display_extensions(); + display_ext_edit($selected_id); +} else { + company_extensions($set); +} //--------------------------------------------------------------------------------------------- +end_form(); end_page(); diff --git a/admin/inst_upgrade.php b/admin/inst_upgrade.php index 4a5106b9..1d646af2 100644 --- a/admin/inst_upgrade.php +++ b/admin/inst_upgrade.php @@ -9,11 +9,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 20; +$page_security = 'SA_SOFTWAREUPGRADE'; $path_to_root=".."; include_once($path_to_root . "/includes/session.inc"); -page(_("Software Upgrade")); +page(_($help_context = "Software Upgrade")); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/admin/db/company_db.inc"); @@ -29,10 +29,11 @@ include_once($path_to_root . "/includes/ui.inc"); // function check_table($pref, $table, $field=null, $properties=null) { - $fields = db_query("SHOW COLUMNS FROM ".$pref.$table); - if (!$fields) + $tables = @db_query("SHOW TABLES LIKE '".$pref.$table."'"); + if (!db_num_rows($tables)) return 1; // no such table or error + $fields = @db_query("SHOW COLUMNS FROM ".$pref.$table); if (!isset($field)) return 0; // table exists @@ -89,22 +90,27 @@ function upgrade_step($index, $conn) global $path_to_root, $installers; $inst = $installers[$index]; - $sql = $inst->sql; $pref = $conn['tbpref']; $ret = true; $force = get_post('force_'.$index); if ($force || get_post('install_'.$index)) { - if (!$inst->installed($pref) || $force) + $state = $inst->installed($pref); + if (!$state || $force) { - if (!$inst->pre_check($pref)) return false; + if (!$inst->pre_check($pref, $force)) return false; + $sql = $inst->sql; if ($sql != '') $ret &= db_import($path_to_root.'/sql/'.$sql, $conn, $force); $ret &= $inst->install($pref, $force); - } + } else + if ($state!==true) { + display_error(_("Upgrade cannot be done because database has been already partially upgraded. Please downgrade database to clean previous version or try forced upgrade.")); + $ret = false; + } } return $ret; } @@ -134,13 +140,8 @@ if (get_post('Upgrade')) ." '".$conn['name']."'"); continue; } - // create security backup - if ($conn['tbpref'] != "") - $filename = $conn['dbname'] . "_" . $conn['tbpref'] . date("Ymd_Hi") . ".sql"; - else - $filename = $conn['dbname'] . "_" . date("Ymd_Hi") . ".sql"; - - db_export($conn, $filename, 'no', 'Security backup before upgrade', $conn['tbpref']); + // create security backup + db_backup($conn, 'no', 'Security backup before upgrade', $conn['tbpref']); // apply all upgrade data foreach ($installers as $i => $inst) { @@ -159,7 +160,7 @@ if (get_post('Upgrade')) { // re-read the prefs global $path_to_root; include_once($path_to_root . "/admin/db/users_db.inc"); - $user = get_user($_SESSION["wa_current_user"]->username); + $user = get_user_by_login($_SESSION["wa_current_user"]->username); $_SESSION["wa_current_user"]->prefs = new user_prefs($user); display_notification(_('All companies data has been successfully updated')); } @@ -173,6 +174,7 @@ $th = array(_("Version"), _("Description"), _("Sql file"), _("Install"), table_header($th); $k = 0; //row colour counter +$partial = 0; foreach($installers as $i => $inst) { alt_table_row_color($k); @@ -183,14 +185,27 @@ foreach($installers as $i => $inst) // this is checked only for first (site admin) company, // but in fact we should always upgrade all data sets after // source upgrade. - if ($inst->installed(TB_PREF)) + $check = $inst->installed(TB_PREF); + if ($check === true) label_cell(_("Installed")); - else - check_cells(null,'install_'.$i, 0); + else + if (!$check) + check_cells(null,'install_'.$i, 0); + else { + label_cell("" + . sprintf(_("Partially installed (%s)"), $check) . ""); + $partial++; + } + check_cells(null,'force_'.$i, 0); end_row(); } end_table(1); +if ($partial!=0) { + display_note(_("Database upgrades marked as partially installed cannot be installed automatically. +You have to clean database manually to enable them, or try to perform forced upgrade.")); + br(); +} submit_center('Upgrade', _('Upgrade system'), true, _('Save database and perform upgrade'), 'process'); end_form(); diff --git a/admin/payment_terms.php b/admin/payment_terms.php index 3a4daf1f..1e0f8c65 100644 --- a/admin/payment_terms.php +++ b/admin/payment_terms.php @@ -9,11 +9,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 10; +$page_security = 'SA_PAYTERMS'; $path_to_root=".."; include($path_to_root . "/includes/session.inc"); -page(_("Payment Terms")); +page(_($help_context = "Payment Terms")); include($path_to_root . "/includes/ui.inc"); @@ -135,15 +135,20 @@ if ($Mode == 'Delete') if ($Mode == 'RESET') { $selected_id = -1; + $sav = get_post('show_inactive'); unset($_POST); + $_POST['show_inactive'] = $sav; } //------------------------------------------------------------------------------------------------- $sql = "SELECT * FROM ".TB_PREF."payment_terms"; +if (!check_value('show_inactive')) $sql .= " WHERE !inactive"; $result = db_query($sql,"could not get payment terms"); + start_form(); start_table($table_style); $th = array(_("Description"), _("Following Month On"), _("Due After (Days)"), "", ""); +inactive_control_column($th); table_header($th); $k = 0; //row colour counter @@ -172,6 +177,7 @@ while ($myrow = db_fetch($result)) label_cell($myrow["terms"]); label_cell($full_text); label_cell($after_text); + inactive_control_cell($myrow["terms_indicator"], $myrow["inactive"], 'payment_terms', "terms_indicator"); edit_button_cell("Edit".$myrow["terms_indicator"], _("Edit")); delete_button_cell("Delete".$myrow["terms_indicator"], _("Delete")); end_row(); @@ -179,14 +185,11 @@ while ($myrow = db_fetch($result)) } //END WHILE LIST LOOP -end_table(); -end_form(); -echo '
'; +inactive_control_row($th); +end_table(1); //------------------------------------------------------------------------------------------------- -start_form(); - start_table($table_style2); $day_in_following_month = $days_before_due = 0; @@ -203,6 +206,7 @@ if ($selected_id != -1) $_POST['terms'] = $myrow["terms"]; $days_before_due = $myrow["days_before_due"]; $day_in_following_month = $myrow["day_in_following_month"]; + unset($_POST['DayNumber']); } hidden('selected_id', $selected_id); } @@ -222,7 +226,7 @@ text_row_ex(_("Days (Or Day In Following Month):"), 'DayNumber', 3); end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); diff --git a/admin/print_profiles.php b/admin/print_profiles.php index 2cdb011b..5b387534 100644 --- a/admin/print_profiles.php +++ b/admin/print_profiles.php @@ -9,13 +9,13 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 15; -$path_to_root=".."; +$page_security = 'SA_PRINTPROFILE'; +$path_to_root = ".."; include($path_to_root . "/includes/session.inc"); include($path_to_root . "/admin/db/printers_db.inc"); include($path_to_root . "/includes/ui.inc"); -page(_("Printing Profiles")); +page(_($help_context = "Printing Profiles")); $selected_id = get_post('profile_id',''); @@ -160,7 +160,7 @@ foreach(get_reports() as $rep => $descr) label_cell($descr == '' ? '???1)' : _($descr)); $_POST['Prn'.$rep] = isset($prints[$rep]) ? $prints[$rep] : ''; echo ''; - printers_list('Prn'.$rep, null, + echo printers_list('Prn'.$rep, null, $rep == '' ? _('Browser support') : _('Default')); echo ''; if ($descr == '') $unkn = 1; @@ -174,10 +174,10 @@ else div_start('controls'); if (get_post('profile_id') == '') { - submit_center('submit', _("Add New Profile"), true, '', true); + submit_center('submit', _("Add New Profile"), true, '', 'default'); } else { submit_center_first('submit', _("Update Profile"), - _('Update printer profile'), true); + _('Update printer profile'), 'default'); submit_center_last('delete', _("Delete Profile"), _('Delete printer profile (only if not used by any user)'), true); } diff --git a/admin/printers.php b/admin/printers.php index 9958d8a9..d46afeeb 100644 --- a/admin/printers.php +++ b/admin/printers.php @@ -9,11 +9,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 15; +$page_security = 'SA_PRINTERS'; $path_to_root=".."; include($path_to_root . "/includes/session.inc"); -page(_("Printer Locations")); +page(_($help_context = "Printer Locations")); include($path_to_root . "/admin/db/printers_db.inc"); include($path_to_root . "/includes/ui.inc"); @@ -142,7 +142,7 @@ text_row(_("Timeout").':', 'tout', null, 5, 5); end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); diff --git a/admin/shipping_companies.php b/admin/shipping_companies.php index 646e7b11..19f034b7 100644 --- a/admin/shipping_companies.php +++ b/admin/shipping_companies.php @@ -9,10 +9,10 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 14; +$page_security = 'SA_SHIPPING'; $path_to_root=".."; include($path_to_root . "/includes/session.inc"); -page(_("Shipping Company")); +page(_($help_context = "Shipping Company")); include($path_to_root . "/includes/ui.inc"); simple_page_mode(true); @@ -33,10 +33,11 @@ function can_process() if ($Mode=='ADD_ITEM' && can_process()) { - $sql = "INSERT INTO ".TB_PREF."shippers (shipper_name, contact, phone, address) + $sql = "INSERT INTO ".TB_PREF."shippers (shipper_name, contact, phone, phone2, address) VALUES (" . db_escape($_POST['shipper_name']) . ", " . db_escape($_POST['contact']). ", " . db_escape($_POST['phone']). ", " . + db_escape($_POST['phone2']). ", " . db_escape($_POST['address']) . ")"; db_query($sql,"The Shipping Company could not be added"); @@ -52,6 +53,7 @@ if ($Mode=='UPDATE_ITEM' && can_process()) $sql = "UPDATE ".TB_PREF."shippers SET shipper_name=" . db_escape($_POST['shipper_name']). " , contact =" . db_escape($_POST['contact']). " , phone =" . db_escape($_POST['phone']). " , + phone2 =" . db_escape($_POST['phone2']). " , address =" . db_escape($_POST['address']). " WHERE shipper_id = ".db_escape($selected_id); @@ -99,16 +101,21 @@ if ($Mode == 'Delete') if ($Mode == 'RESET') { $selected_id = -1; + $sav = get_post('show_inactive'); unset($_POST); + $_POST['show_inactive'] = $sav; } //---------------------------------------------------------------------------------------------- -$sql = "SELECT * FROM ".TB_PREF."shippers ORDER BY shipper_id"; +$sql = "SELECT * FROM ".TB_PREF."shippers"; +if (!check_value('show_inactive')) $sql .= " WHERE !inactive"; +$sql .= " ORDER BY shipper_id"; $result = db_query($sql,"could not get shippers"); start_form(); start_table($table_style); -$th = array(_("Name"), _("Contact Person"), _("Phone Number"), _("Address"), "", ""); +$th = array(_("Name"), _("Contact Person"), _("Phone Number"), _("Secondary Phone"), _("Address"), "", ""); +inactive_control_column($th); table_header($th); $k = 0; //row colour counter @@ -119,20 +126,19 @@ while ($myrow = db_fetch($result)) label_cell($myrow["shipper_name"]); label_cell($myrow["contact"]); label_cell($myrow["phone"]); + label_cell($myrow["phone2"]); label_cell($myrow["address"]); - edit_button_cell("Edit".$myrow[0], _("Edit")); - delete_button_cell("Delete".$myrow[0], _("Delete")); + inactive_control_cell($myrow["shipper_id"], $myrow["inactive"], 'shippers', 'shipper_id'); + edit_button_cell("Edit".$myrow["shipper_id"], _("Edit")); + delete_button_cell("Delete".$myrow["shipper_id"], _("Delete")); end_row(); } -end_table(); -end_form(); -echo '
'; +inactive_control_row($th); +end_table(1); //---------------------------------------------------------------------------------------------- -start_form(); - start_table($table_style2); if ($selected_id != -1) @@ -148,6 +154,7 @@ if ($selected_id != -1) $_POST['shipper_name'] = $myrow["shipper_name"]; $_POST['contact'] = $myrow["contact"]; $_POST['phone'] = $myrow["phone"]; + $_POST['phone2'] = $myrow["phone2"]; $_POST['address'] = $myrow["address"]; } hidden('selected_id', $selected_id); @@ -157,13 +164,15 @@ text_row_ex(_("Name:"), 'shipper_name', 40); text_row_ex(_("Contact Person:"), 'contact', 30); -text_row_ex(_("Phone Number:"), 'phone', 20); +text_row_ex(_("Phone Number:"), 'phone', 32, 30); + +text_row_ex(_("Secondary Phone Number:"), 'phone2', 32, 30); text_row_ex(_("Address:"), 'address', 50); end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); end_page(); diff --git a/admin/users.php b/admin/users.php index 71db09ce..52058b29 100644 --- a/admin/users.php +++ b/admin/users.php @@ -9,18 +9,18 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security=15; -$path_to_root=".."; +$page_security = 'SA_USERS'; +$path_to_root = ".."; include_once($path_to_root . "/includes/session.inc"); -page(_("Users")); +page(_($help_context = "Users")); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); include_once($path_to_root . "/admin/db/users_db.inc"); -simple_page_mode(false); +simple_page_mode(true); //------------------------------------------------------------------------------------------------- function can_process() @@ -60,14 +60,14 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') if (can_process()) { - if ($selected_id != '') + if ($selected_id != -1) { - update_user($_POST['user_id'], $_POST['real_name'], $_POST['phone'], + update_user($selected_id, $_POST['user_id'], $_POST['real_name'], $_POST['phone'], $_POST['email'], $_POST['Access'], $_POST['language'], $_POST['profile'], check_value('rep_popup'), $_POST['pos']); if ($_POST['password'] != "") - update_user_password($_POST['user_id'], md5($_POST['password'])); + update_user_password($selected_id, $_POST['user_id'], md5($_POST['password'])); display_notification_centered(_("The selected user has been updated.")); } @@ -76,15 +76,14 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') add_user($_POST['user_id'], $_POST['real_name'], md5($_POST['password']), $_POST['phone'], $_POST['email'], $_POST['Access'], $_POST['language'], $_POST['profile'], check_value('rep_popup'), $_POST['pos']); - + $id = db_insert_id(); // use current user display preferences as start point for new user - update_user_display_prefs($_POST['user_id'], - user_price_dec(), user_qty_dec(), user_exrate_dec(), + update_user_display_prefs($id, user_price_dec(), user_qty_dec(), user_exrate_dec(), user_percent_dec(), user_show_gl_info(), user_show_codes(), user_date_format(), user_date_sep(), user_tho_sep(), user_dec_sep(), user_theme(), user_pagesize(), user_hints(), $_POST['profile'], check_value('rep_popup'), user_query_size(), - user_graphic_links(), $_POST['language']); + user_graphic_links(), $_POST['language'], sticky_doc_date(), user_startup_tab()); display_notification_centered(_("A new user has been added.")); } @@ -104,20 +103,20 @@ if ($Mode == 'Delete') //------------------------------------------------------------------------------------------------- if ($Mode == 'RESET') { - $selected_id = ''; - unset($_POST); // clean all input fields + $selected_id = -1; + $sav = get_post('show_inactive'); + unset($_POST); // clean all input fields + $_POST['show_inactive'] = $sav; } -$result = get_users(); +$result = get_users(check_value('show_inactive')); start_form(); start_table($table_style); -if ($_SESSION["wa_current_user"]->access == 2) - $th = array(_("User login"), _("Full Name"), _("Phone"), - _("E-mail"), _("Last Visit"), _("Access Level"), "", ""); -else - $th = array(_("User login"), _("Full Name"), _("Phone"), - _("E-mail"), _("Last Visit"), _("Access Level"), ""); +$th = array(_("User login"), _("Full Name"), _("Phone"), + _("E-mail"), _("Last Visit"), _("Access Level"), "", ""); + +inactive_control_column($th); table_header($th); $k = 0; //row colour counter @@ -130,44 +129,47 @@ while ($myrow = db_fetch($result)) $last_visit_date = sql2date($myrow["last_visit_date"]); /*The security_headings array is defined in config.php */ + $not_me = strcasecmp($myrow["user_id"], $_SESSION["wa_current_user"]->username); label_cell($myrow["user_id"]); label_cell($myrow["real_name"]); label_cell($myrow["phone"]); email_cell($myrow["email"]); label_cell($last_visit_date, "nowrap"); - label_cell($security_headings[$myrow["full_access"]]); - edit_button_cell("Edit".$myrow["user_id"], _("Edit")); - if (strcasecmp($myrow["user_id"], $_SESSION["wa_current_user"]->username) && - $_SESSION["wa_current_user"]->access == 2) - delete_button_cell("Delete".$myrow["user_id"], _("Delete")); + label_cell($myrow["role"]); + + if ($not_me) + inactive_control_cell($myrow["id"], $myrow["inactive"], 'users', 'id'); + elseif (check_value('show_inactive')) + label_cell(''); + + edit_button_cell("Edit".$myrow["id"], _("Edit")); + if ($not_me) + delete_button_cell("Delete".$myrow["id"], _("Delete")); else label_cell(''); end_row(); } //END WHILE LIST LOOP -end_table(); -end_form(); -echo '
'; - +inactive_control_row($th); +end_table(1); //------------------------------------------------------------------------------------------------- -start_form(); - start_table($table_style2); $_POST['email'] = ""; -if ($selected_id != '') +if ($selected_id != -1) { if ($Mode == 'Edit') { //editing an existing User $myrow = get_user($selected_id); + $_POST['id'] = $myrow["id"]; $_POST['user_id'] = $myrow["user_id"]; $_POST['real_name'] = $myrow["real_name"]; $_POST['phone'] = $myrow["phone"]; $_POST['email'] = $myrow["email"]; - $_POST['Access'] = $myrow["full_access"]; + $_POST['Access'] = $myrow["role_id"]; $_POST['language'] = $myrow["language"]; $_POST['profile'] = $myrow["print_profile"]; $_POST['rep_popup'] = $myrow["rep_popup"]; @@ -193,7 +195,7 @@ label_cell(_("Password:")); label_cell(""); end_row(); -if ($selected_id != '') +if ($selected_id != -1) { table_section_title(_("Enter a new password to change, leave empty to keep current.")); } @@ -204,7 +206,7 @@ text_row_ex(_("Telephone No.:"), 'phone', 30); email_row_ex(_("Email Address:"), 'email', 50); -security_headings_list_row(_("Access Level:"), 'Access', null); +security_roles_list_row(_("Access Level:"), 'Access', null); languages_list_row(_("Language:"), 'language', null); @@ -218,7 +220,7 @@ check_row(_("Use popup window for reports:"), 'rep_popup', $_POST['rep_popup'], end_table(1); -submit_add_or_update_center($selected_id == '', '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); end_page(); diff --git a/admin/view_print_transaction.php b/admin/view_print_transaction.php index 99f2be1d..b3e35f62 100644 --- a/admin/view_print_transaction.php +++ b/admin/view_print_transaction.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$path_to_root=".."; -$page_security = 5; +$page_security = 'SA_VIEWPRINTTRANSACTION'; +$path_to_root = ".."; include($path_to_root . "/includes/db_pager.inc"); include_once($path_to_root . "/includes/session.inc"); @@ -23,7 +23,7 @@ include_once($path_to_root . "/reporting/includes/reporting.inc"); $js = ""; if ($use_popup_windows) $js .= get_js_open_window(800, 500); -page(_("View or Print Transactions"), false, false, "", $js); +page(_($help_context = "View or Print Transactions"), false, false, "", $js); //---------------------------------------------------------------------------------------- function view_link($trans) @@ -33,7 +33,7 @@ function view_link($trans) function prt_link($row) { - if ($row['type'] != 12 && $row['type'] != 2) // customer payment or bank deposit printout not defined yet. + if ($row['type'] != ST_CUSTPAYMENT && $row['type'] != ST_BANKDEPOSIT) // customer payment or bank deposit printout not defined yet. return print_document_link($row['trans_no'], _("Print"), true, $row['type'], ICON_PRINT); } @@ -119,8 +119,8 @@ function handle_search() $print_type = $_POST['filterType']; - $print_out = ($print_type == 10 || $print_type == 11 || $print_type == systypes::cust_dispatch() || - $print_type == systypes::po() || $print_type == systypes::sales_order()); + $print_out = ($print_type == ST_SALESINVOICE || $print_type == ST_CUSTCREDIT || $print_type == ST_CUSTDELIVERY || + $print_type == ST_PURCHORDER || $print_type == ST_SALESORDER || $print_type == ST_SALESQUOTE); $cols = array( _("#"), @@ -137,10 +137,6 @@ function handle_search() } $table =& new_db_pager('transactions', $sql, $cols); - if (list_updated('filterType') || get_post('ProcessSearch')) { - $table->set_sql($sql); - $table->set_columns($cols); - } $table->width = "40%"; display_db_pager($table); } diff --git a/admin/void_transaction.php b/admin/void_transaction.php index 3d967ec2..9fd0184b 100644 --- a/admin/void_transaction.php +++ b/admin/void_transaction.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$path_to_root=".."; -$page_security = 14; +$page_security = 'SA_VOIDTRANSACTION'; +$path_to_root = ".."; include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/includes/date_functions.inc"); @@ -24,7 +24,7 @@ if ($use_date_picker) if ($use_popup_windows) $js .= get_js_open_window(800, 500); -page(_("Void a Transaction"), false, false, "", $js); +page(_($help_context = "Void a Transaction"), false, false, "", $js); //---------------------------------------------------------------------------------------- function exist_transaction($type, $type_no) @@ -36,61 +36,65 @@ function exist_transaction($type, $type_no) switch ($type) { - case 0 : // it's a journal entry + case ST_JOURNAL : // it's a journal entry if (!exists_gl_trans($type, $type_no)) return false; break; - case 1 : // it's a payment - case 2 : // it's a deposit - case 4 : // it's a transfer + case ST_BANKPAYMENT : // it's a payment + case ST_BANKDEPOSIT : // it's a deposit + case ST_BANKTRANSFER : // it's a transfer if (!exists_bank_trans($type, $type_no)) return false; break; - case 10 : // it's a customer invoice - case 11 : // it's a customer credit note - case 12 : // it's a customer payment - case 13 : // it's a customer dispatch + case ST_SALESINVOICE : // it's a customer invoice + case ST_CUSTCREDIT : // it's a customer credit note + case ST_CUSTPAYMENT : // it's a customer payment + case ST_CUSTDELIVERY : // it's a customer dispatch if (!exists_customer_trans($type, $type_no)) return false; break; - case systypes::location_transfer() : // it's a stock transfer + case ST_LOCTRANSFER : // it's a stock transfer if (get_stock_transfer_items($type_no) == null) return false; break; - case systypes::inventory_adjustment() : // it's a stock adjustment + case ST_INVADJUST : // it's a stock adjustment if (get_stock_adjustment_items($type_no) == null) return false; break; - case 25 : // it's a GRN + case ST_PURCHORDER : // it's a PO + case ST_SUPPRECEIVE : // it's a GRN return false; - case 20 : // it's a suppler invoice - case 21 : // it's a supplier credit note - case 22 : // it's a supplier payment + case ST_SUPPINVOICE : // it's a suppler invoice + case ST_SUPPCREDIT : // it's a supplier credit note + case ST_SUPPAYMENT : // it's a supplier payment if (!exists_supp_trans($type, $type_no)) return false; break; - case systypes::work_order() : // it's a work order + case ST_WORKORDER : // it's a work order if (!get_work_order($type_no, true)) return false; break; - case 28 : // it's a work order issue + case ST_MANUISSUE : // it's a work order issue if (!exists_work_order_issue($type_no)) return false; break; - case 29 : // it's a work order production + case ST_MANURECEIVE : // it's a work order production if (!exists_work_order_produce($type_no)) return false; break; - case systypes::cost_update() : // it's a stock cost update + case ST_SALESORDER: // it's a sales order + case ST_SALESQUOTE: // it's a sales quotation + return false; + case ST_COSTUPDATE : // it's a stock cost update return false; break; } @@ -102,7 +106,7 @@ function voiding_controls() { global $table_style2; - start_form(false, true); + start_form(); start_table($table_style2); @@ -117,7 +121,7 @@ function voiding_controls() end_table(1); if (!isset($_POST['ProcessVoiding'])) - submit_center('ProcessVoiding', _("Void Transaction"), true, '', true); + submit_center('ProcessVoiding', _("Void Transaction"), true, '', 'default'); else { if (!exist_transaction($_POST['filterType'],$_POST['trans_no'])) @@ -126,19 +130,19 @@ function voiding_controls() unset($_POST['trans_no']); unset($_POST['memo_']); unset($_POST['date_']); - submit_center('ProcessVoiding', _("Void Transaction"), true, '', true); + submit_center('ProcessVoiding', _("Void Transaction"), true, '', 'default'); } else { display_warning(_("Are you sure you want to void this transaction ? This action cannot be undone."), 0, 1); - if ($_POST['filterType'] == 0) // GL transaction are not included in get_trans_view_str + if ($_POST['filterType'] == ST_JOURNAL) // GL transaction are not included in get_trans_view_str $view_str = get_gl_view_str($_POST['filterType'],$_POST['trans_no'], _("View Transaction")); else $view_str = get_trans_view_str($_POST['filterType'],$_POST['trans_no'], _("View Transaction")); display_note($view_str); br(); submit_center_first('ConfirmVoiding', _("Proceed"), '', true); - submit_center_last('CancelVoiding', _("Cancel"), '', true); + submit_center_last('CancelVoiding', _("Cancel"), '', 'cancel'); } } @@ -149,6 +153,12 @@ function voiding_controls() function check_valid_entries() { + if (is_closed_trans($_POST['filterType'],$_POST['trans_no'])) + { + display_error(_("The selected transaction was closed for edition and cannot be voided.")); + set_focus('trans_no'); + return; + } if (!is_date($_POST['date_'])) { display_error(_("The entered date is invalid.")); @@ -178,7 +188,6 @@ function handle_void_transaction() { if (check_valid_entries()==true) { - $void_entry = get_voided_entry($_POST['filterType'], $_POST['trans_no']); if ($void_entry != null) { diff --git a/applications/application.php b/applications/application.php index a7c47964..cf8c7c39 100644 --- a/applications/application.php +++ b/applications/application.php @@ -47,7 +47,7 @@ var $link; var $access; - function app_function($label,$link,$access=1) + function app_function($label,$link,$access='SA_OPEN') { $this->label = $label; $this->link = $link; @@ -70,7 +70,7 @@ $this->rappfunctions = array(); } - function add_lapp_function($label,$link="",$access=1) + function add_lapp_function($label,$link="",$access='SA_OPEN') { $appfunction = new app_function($label,$link,$access); //array_push($this->lappfunctions,$appfunction); @@ -78,7 +78,7 @@ return $appfunction; } - function add_rapp_function($label,$link="",$access=1) + function add_rapp_function($label,$link="",$access='SA_OPEN') { $appfunction = new app_function($label,$link,$access); //array_push($this->rappfunctions,$appfunction); @@ -93,6 +93,7 @@ { var $id; var $name; + var $help_context; var $modules; var $enabled; @@ -100,7 +101,7 @@ { $this->id = $id; $this->name = $name; - $this->enables = $enabled; + $this->enabled = $enabled; $this->modules = array(); } @@ -112,12 +113,12 @@ return $module; } - function add_lapp_function($level, $label,$link="",$access=1) + function add_lapp_function($level, $label,$link="",$access='SA_OPEN') { $this->modules[$level]->lappfunctions[] = new app_function($label, $link, $access); } - function add_rapp_function($level, $label,$link="",$access=1) + function add_rapp_function($level, $label,$link="",$access='SA_OPEN') { $this->modules[$level]->rappfunctions[] = new app_function($label, $link, $access); } diff --git a/applications/customers.php b/applications/customers.php index 78e49e54..1a385b9e 100644 --- a/applications/customers.php +++ b/applications/customers.php @@ -9,56 +9,85 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ - class customers_app extends application +class customers_app extends application +{ + function customers_app() { - function customers_app() - { - global $installed_modules; - $this->application("orders",_("&Sales")); - - $this->add_module(_("Transactions")); - $this->add_lapp_function(0, _("Sales &Order Entry"),"sales/sales_order_entry.php?NewOrder=Yes"); - $this->add_lapp_function(0, _("Direct &Delivery"),"sales/sales_order_entry.php?NewDelivery=0"); - $this->add_lapp_function(0, _("Direct &Invoice"),"sales/sales_order_entry.php?NewInvoice=0"); - $this->add_lapp_function(0, "",""); - $this->add_lapp_function(0, _("&Delivery Against Sales Orders"),"sales/inquiry/sales_orders_view.php?OutstandingOnly=1"); - $this->add_lapp_function(0, _("&Invoice Against Sales Delivery"),"sales/inquiry/sales_deliveries_view.php?OutstandingOnly=1"); + global $installed_extensions; + $this->application("orders", _($this->help_context = "&Sales")); + + $this->add_module(_("Transactions")); + $this->add_lapp_function(0, _("Sales &Quotation Entry"), + "sales/sales_order_entry.php?NewQuotation=Yes", 'SA_SALESQUOTE'); + $this->add_lapp_function(0, _("Sales &Order Entry"), + "sales/sales_order_entry.php?NewOrder=Yes", 'SA_SALESORDER'); + $this->add_lapp_function(0, _("Direct &Delivery"), + "sales/sales_order_entry.php?NewDelivery=0", 'SA_SALESDELIVERY'); + $this->add_lapp_function(0, _("Direct &Invoice"), + "sales/sales_order_entry.php?NewInvoice=0", 'SA_SALESINVOICE'); + $this->add_lapp_function(0, "",""); + $this->add_lapp_function(0, _("&Delivery Against Sales Orders"), + "sales/inquiry/sales_orders_view.php?OutstandingOnly=1", 'SA_SALESDELIVERY'); + $this->add_lapp_function(0, _("&Invoice Against Sales Delivery"), + "sales/inquiry/sales_deliveries_view.php?OutstandingOnly=1", 'SA_SALESINVOICE'); + + $this->add_rapp_function(0, _("&Template Delivery"), + "sales/inquiry/sales_orders_view.php?DeliveryTemplates=Yes", 'SA_SALESDELIVERY'); + $this->add_rapp_function(0, _("&Template Invoice"), + "sales/inquiry/sales_orders_view.php?InvoiceTemplates=Yes", 'SA_SALESINVOICE'); + $this->add_rapp_function(0, _("&Create and Print Recurrent Invoices"), + "sales/create_recurrent_invoices.php?", 'SA_SALESINVOICE'); + $this->add_rapp_function(0, "",""); + $this->add_rapp_function(0, _("Customer &Payments"), + "sales/customer_payments.php?", 'SA_SALESPAYMNT'); + $this->add_rapp_function(0, _("Customer &Credit Notes"), + "sales/credit_note_entry.php?NewCredit=Yes", 'SA_SALESCREDIT'); + $this->add_rapp_function(0, _("&Allocate Customer Payments or Credit Notes"), + "sales/allocations/customer_allocation_main.php?", 'SA_SALESALLOC'); + + $this->add_module(_("Inquiries and Reports")); + $this->add_lapp_function(1, _("Sales Quotation I&nquiry"), + "sales/inquiry/sales_orders_view.php?type=32", 'SA_SALESTRANSVIEW'); + $this->add_lapp_function(1, _("Sales Order &Inquiry"), + "sales/inquiry/sales_orders_view.php?type=30", 'SA_SALESTRANSVIEW'); + $this->add_lapp_function(1, _("Customer Transaction &Inquiry"), + "sales/inquiry/customer_inquiry.php?", 'SA_SALESTRANSVIEW'); + $this->add_lapp_function(1, "",""); + $this->add_lapp_function(1, _("Customer Allocation &Inquiry"), + "sales/inquiry/customer_allocation_inquiry.php?", 'SA_SALESALLOC'); - $this->add_rapp_function(0, _("&Template Delivery"),"sales/inquiry/sales_orders_view.php?DeliveryTemplates=Yes"); - $this->add_rapp_function(0, _("&Template Invoice"),"sales/inquiry/sales_orders_view.php?InvoiceTemplates=Yes"); - $this->add_rapp_function(0, _("&Create and Print Recurrent Invoices"),"sales/create_recurrent_invoices.php?"); - $this->add_rapp_function(0, "",""); - $this->add_rapp_function(0, _("Customer &Payments"),"sales/customer_payments.php?"); - $this->add_rapp_function(0, _("Customer &Credit Notes"),"sales/credit_note_entry.php?NewCredit=Yes"); - $this->add_rapp_function(0, _("&Allocate Customer Payments or Credit Notes"),"sales/allocations/customer_allocation_main.php?"); + $this->add_rapp_function(1, _("Customer and Sales &Reports"), + "reporting/reports_main.php?Class=0", 'SA_SALESTRANSVIEW'); - $this->add_module(_("Inquiries and Reports")); - $this->add_lapp_function(1, _("Sales Order &Inquiry"),"sales/inquiry/sales_orders_view.php?"); - $this->add_lapp_function(1, _("Customer Transaction &Inquiry"),"sales/inquiry/customer_inquiry.php?"); - $this->add_lapp_function(1, "",""); - $this->add_lapp_function(1, _("Customer Allocation &Inquiry"),"sales/inquiry/customer_allocation_inquiry.php?"); - - $this->add_rapp_function(1, _("Customer and Sales &Reports"),"reporting/reports_main.php?Class=0"); - - $this->add_module(_("Maintenance")); - $this->add_lapp_function(2, _("Add and Manage &Customers"),"sales/manage/customers.php?"); - $this->add_lapp_function(2, _("Customer &Branches"),"sales/manage/customer_branches.php?"); - $this->add_lapp_function(2, _("Sales &Groups"),"sales/manage/sales_groups.php?"); - $this->add_lapp_function(2, _("Recurrent &Invoices"),"sales/manage/recurrent_invoices.php?"); - $this->add_rapp_function(2, _("Sales T&ypes"),"sales/manage/sales_types.php?"); - $this->add_rapp_function(2, _("Sales &Persons"),"sales/manage/sales_people.php?"); - $this->add_rapp_function(2, _("Sales &Areas"),"sales/manage/sales_areas.php?"); - $this->add_rapp_function(2, _("Credit &Status Setup"),"sales/manage/credit_status.php?"); - if (count($installed_modules) > 0) + $this->add_module(_("Maintenance")); + $this->add_lapp_function(2, _("Add and Manage &Customers"), + "sales/manage/customers.php?", 'SA_CUSTOMER'); + $this->add_lapp_function(2, _("Customer &Branches"), + "sales/manage/customer_branches.php?", 'SA_CUSTOMER'); + $this->add_lapp_function(2, _("Sales &Groups"), + "sales/manage/sales_groups.php?", 'SA_SALESGROUP'); + $this->add_lapp_function(2, _("Recurrent &Invoices"), + "sales/manage/recurrent_invoices.php?", 'SA_SRECURRENT'); + $this->add_rapp_function(2, _("Sales T&ypes"), + "sales/manage/sales_types.php?", 'SA_SALESTYPES'); + $this->add_rapp_function(2, _("Sales &Persons"), + "sales/manage/sales_people.php?", 'SA_SALESMAN'); + $this->add_rapp_function(2, _("Sales &Areas"), + "sales/manage/sales_areas.php?", 'SA_SALESAREA'); + $this->add_rapp_function(2, _("Credit &Status Setup"), + "sales/manage/credit_status.php?", 'SA_CRSTATUS'); + if (count($installed_extensions) > 0) + { + foreach ($installed_extensions as $mod) { - foreach ($installed_modules as $mod) - { - if ($mod["tab"] == "orders") - $this->add_rapp_function(2, $mod["name"], "modules/".$mod["path"]."/".$mod["filename"]."?"); - } - } + if (@$mod['active'] && $mod['type'] == 'plugin' && $mod["tab"] == "orders") + $this->add_rapp_function(2, $mod["title"], + "modules/".$mod["path"]."/".$mod["filename"]."?", + isset($mod["access"]) ? $mod["access"] : 'SA_OPEN' ); + } } } - +} + ?> \ No newline at end of file diff --git a/applications/dimensions.php b/applications/dimensions.php index 4bd23fae..bf46ef8d 100644 --- a/applications/dimensions.php +++ b/applications/dimensions.php @@ -9,40 +9,48 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ - class dimensions_app extends application +class dimensions_app extends application +{ + function dimensions_app() { - function dimensions_app() - { - global $installed_modules; - $dim = get_company_pref('use_dimension'); - $this->application("proj",_("&Dimensions")); + global $installed_extensions; + $dim = get_company_pref('use_dimension'); + $this->application("proj", _($this->help_context = "&Dimensions"), $dim); - if ($dim > 0) - { - $this->add_module(_("Transactions")); - $this->add_lapp_function(0, _("Dimension &Entry"),"dimensions/dimension_entry.php?"); - $this->add_lapp_function(0, _("&Outstanding Dimensions"),"dimensions/inquiry/search_dimensions.php?outstanding_only=1"); + if ($dim > 0) + { + $this->add_module(_("Transactions")); + $this->add_lapp_function(0, _("Dimension &Entry"), + "dimensions/dimension_entry.php?", 'SA_DIMENSION'); + $this->add_lapp_function(0, _("&Outstanding Dimensions"), + "dimensions/inquiry/search_dimensions.php?outstanding_only=1", 'SA_DIMTRANSVIEW'); - $this->add_module(_("Inquiries and Reports")); - $this->add_lapp_function(1, _("Dimension &Inquiry"),"dimensions/inquiry/search_dimensions.php?"); + $this->add_module(_("Inquiries and Reports")); + $this->add_lapp_function(1, _("Dimension &Inquiry"), + "dimensions/inquiry/search_dimensions.php?", 'SA_DIMTRANSVIEW'); - $this->add_rapp_function(1, _("Dimension &Reports"),"reporting/reports_main.php?Class=4"); - if (count($installed_modules) > 0) + $this->add_rapp_function(1, _("Dimension &Reports"), + "reporting/reports_main.php?Class=4", 'SA_DIMENSIONREP'); + + $this->add_module(_("Maintenance")); + $this->add_lapp_function(2, _("Dimension &Tags"), + "admin/tags.php?type=dimension", 'SA_DIMTAGS'); + + if (count($installed_extensions) > 0) + { + foreach ($installed_extensions as $mod) { - $i = 0; - foreach ($installed_modules as $mod) + if (@$mod['active'] && $mod['type'] == 'plugin' && $mod["tab"] == "proj") { - if ($mod["tab"] == "proj") - { - if ($i++ == 0) - $this->add_module(_("Maintenance")); - $this->add_rapp_function(2, $mod["name"], "modules/".$mod["path"]."/".$mod["filename"]."?"); - } + $this->add_rapp_function(2, $mod["title"], + "modules/".$mod["path"]."/".$mod["filename"]."?", + isset($mod["access"]) ? $mod["access"] : 'SA_OPEN' ); } } } } } +} ?> \ No newline at end of file diff --git a/applications/generalledger.php b/applications/generalledger.php index 8c0e11fb..676d3b10 100644 --- a/applications/generalledger.php +++ b/applications/generalledger.php @@ -9,49 +9,75 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ - class general_ledger_app extends application +class general_ledger_app extends application +{ + function general_ledger_app() { - function general_ledger_app() - { - global $installed_modules; - $this->application("GL",_("&Banking and General Ledger")); + global $installed_extensions; + $this->application("GL", _($this->help_context = "&Banking and General Ledger")); - $this->add_module(_("Transactions")); - $this->add_lapp_function(0, _("&Payments"),"gl/gl_bank.php?NewPayment=Yes"); - $this->add_lapp_function(0, _("&Deposits"),"gl/gl_bank.php?NewDeposit=Yes"); - $this->add_lapp_function(0, _("Bank Account &Transfers"),"gl/bank_transfer.php?"); - $this->add_rapp_function(0, _("&Journal Entry"),"gl/gl_journal.php?NewJournal=Yes"); - $this->add_rapp_function(0, _("&Budget Entry"),"gl/gl_budget.php?"); - $this->add_rapp_function(0, _("&Reconcile Bank Account"),"gl/bank_account_reconcile.php?"); - $this->add_module(_("Inquiries and Reports")); - $this->add_lapp_function(1, _("Bank Account &Inquiry"),"gl/inquiry/bank_inquiry.php?"); - $this->add_lapp_function(1, _("GL Account &Inquiry"),"gl/inquiry/gl_account_inquiry.php?"); - $this->add_lapp_function(1, _("Trial &Balance"),"gl/inquiry/gl_trial_balance.php?"); - $this->add_lapp_function(1, _("Ta&x Inquiry"),"gl/inquiry/tax_inquiry.php?"); + $this->add_module(_("Transactions")); + $this->add_lapp_function(0, _("&Payments"), + "gl/gl_bank.php?NewPayment=Yes", 'SA_PAYMENT'); + $this->add_lapp_function(0, _("&Deposits"), + "gl/gl_bank.php?NewDeposit=Yes", 'SA_DEPOSIT'); + $this->add_lapp_function(0, _("Bank Account &Transfers"), + "gl/bank_transfer.php?", 'SA_BANKTRANSFER'); + $this->add_rapp_function(0, _("&Journal Entry"), + "gl/gl_journal.php?NewJournal=Yes", 'SA_JOURNALENTRY'); + $this->add_rapp_function(0, _("&Budget Entry"), + "gl/gl_budget.php?", 'SA_BUDGETENTRY'); + $this->add_rapp_function(0, _("&Reconcile Bank Account"), + "gl/bank_account_reconcile.php?", 'SA_RECONCILE'); + + $this->add_module(_("Inquiries and Reports")); + $this->add_lapp_function(1, _("&Journal Inquiry"), + "gl/inquiry/journal_inquiry.php?", 'SA_GLANALYTIC'); + $this->add_lapp_function(1, _("GL &Inquiry"), + "gl/inquiry/gl_account_inquiry.php?", 'SA_GLTRANSVIEW'); + $this->add_lapp_function(1, _("Bank Account &Inquiry"), + "gl/inquiry/bank_inquiry.php?", 'SA_BANKTRANSVIEW'); + $this->add_lapp_function(1, _("Ta&x Inquiry"), + "gl/inquiry/tax_inquiry.php?", 'SA_TAXREP'); - $this->add_rapp_function(1, _("Banking &Reports"),"reporting/reports_main.php?Class=5"); - $this->add_rapp_function(1, _("General Ledger &Reports"),"reporting/reports_main.php?Class=6"); + $this->add_rapp_function(1, _("Trial &Balance"), + "gl/inquiry/gl_trial_balance.php?", 'SA_GLANALYTIC'); + $this->add_rapp_function(1, _("Banking &Reports"), + "reporting/reports_main.php?Class=5", 'SA_BANKREP'); + $this->add_rapp_function(1, _("General Ledger &Reports"), + "reporting/reports_main.php?Class=6", 'SA_GLREP'); - $this->add_module(_("Maintenance")); - $this->add_lapp_function(2, _("Bank &Accounts"),"gl/manage/bank_accounts.php?"); - $this->add_lapp_function(2, _("&Quick Entries"),"gl/manage/gl_quick_entries.php?"); - $this->add_lapp_function(2, "",""); - $this->add_lapp_function(2, _("&Currencies"),"gl/manage/currencies.php?"); - $this->add_lapp_function(2, _("&Exchange Rates"),"gl/manage/exchange_rates.php?"); + $this->add_module(_("Maintenance")); + $this->add_lapp_function(2, _("Bank &Accounts"), + "gl/manage/bank_accounts.php?", 'SA_BANKACCOUNT'); + $this->add_lapp_function(2, _("&Quick Entries"), + "gl/manage/gl_quick_entries.php?", 'SA_QUICKENTRY'); + $this->add_lapp_function(2, _("Account &Tags"), + "admin/tags.php?type=account", 'SA_GLACCOUNTTAGS'); + $this->add_lapp_function(2, "",""); + $this->add_lapp_function(2, _("&Currencies"), + "gl/manage/currencies.php?", 'SA_CURRENCY'); + $this->add_lapp_function(2, _("&Exchange Rates"), + "gl/manage/exchange_rates.php?", 'SA_EXCHANGERATE'); - $this->add_rapp_function(2, _("&GL Accounts"),"gl/manage/gl_accounts.php?"); - $this->add_rapp_function(2, _("GL Account &Groups"),"gl/manage/gl_account_types.php?"); - $this->add_rapp_function(2, _("GL Account &Classes"),"gl/manage/gl_account_classes.php?"); - if (count($installed_modules) > 0) + $this->add_rapp_function(2, _("&GL Accounts"), + "gl/manage/gl_accounts.php?", 'SA_GLACCOUNT'); + $this->add_rapp_function(2, _("GL Account &Groups"), + "gl/manage/gl_account_types.php?", 'SA_GLACCOUNTGROUP'); + $this->add_rapp_function(2, _("GL Account &Classes"), + "gl/manage/gl_account_classes.php?", 'SA_GLACCOUNTCLASS'); + if (count($installed_extensions) > 0) + { + foreach ($installed_extensions as $mod) { - foreach ($installed_modules as $mod) - { - if ($mod["tab"] == "GL") - $this->add_rapp_function(2, $mod["name"], "modules/".$mod["path"]."/".$mod["filename"]."?"); - } - } + if (@$mod['active'] && $mod['type'] == 'plugin' && $mod["tab"] == "GL") + $this->add_rapp_function(2, $mod["title"], + "modules/".$mod["path"]."/".$mod["filename"]."?", + isset($mod["access"]) ? $mod["access"] : 'SA_OPEN' ); + } } } +} ?> \ No newline at end of file diff --git a/applications/inventory.php b/applications/inventory.php index 022ad67b..feb820ba 100644 --- a/applications/inventory.php +++ b/applications/inventory.php @@ -9,47 +9,64 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ - class inventory_app extends application +class inventory_app extends application +{ + function inventory_app() { - function inventory_app() - { - global $installed_modules; - $this->application("stock",_("&Items and Inventory")); + global $installed_extensions; + $this->application("stock", _($this->help_context = "&Items and Inventory")); - $this->add_module(_("Transactions")); - $this->add_lapp_function(0, _("Inventory Location &Transfers"),"inventory/transfers.php?NewTransfer=1"); - $this->add_lapp_function(0, _("Inventory &Adjustments"),"inventory/adjustments.php?NewAdjustment=1"); + $this->add_module(_("Transactions")); + $this->add_lapp_function(0, _("Inventory Location &Transfers"), + "inventory/transfers.php?NewTransfer=1", 'SA_LOCATIONTRANSFER'); + $this->add_lapp_function(0, _("Inventory &Adjustments"), + "inventory/adjustments.php?NewAdjustment=1", 'SA_INVENTORYADJUSTMENT'); - $this->add_module(_("Inquiries and Reports")); - $this->add_lapp_function(1, _("Inventory Item &Movements"),"inventory/inquiry/stock_movements.php?"); - $this->add_lapp_function(1, _("Inventory Item &Status"),"inventory/inquiry/stock_status.php?"); - $this->add_rapp_function(1, _("Inventory &Reports"),"reporting/reports_main.php?Class=2"); + $this->add_module(_("Inquiries and Reports")); + $this->add_lapp_function(1, _("Inventory Item &Movements"), + "inventory/inquiry/stock_movements.php?", 'SA_ITEMSTRANSVIEW'); + $this->add_lapp_function(1, _("Inventory Item &Status"), + "inventory/inquiry/stock_status.php?", 'SA_ITEMSSTATVIEW'); + $this->add_rapp_function(1, _("Inventory &Reports"), + "reporting/reports_main.php?Class=2", 'SA_ITEMSTRANSVIEW'); - $this->add_module(_("Maintenance")); - $this->add_lapp_function(2, _("&Items"),"inventory/manage/items.php?"); - $this->add_lapp_function(2, _("&Foreign Item Codes"),"inventory/manage/item_codes.php?"); - $this->add_lapp_function(2, _("Sales &Kits"),"inventory/manage/sales_kits.php?"); - $this->add_lapp_function(2, _("Item &Categories"),"inventory/manage/item_categories.php?"); - $this->add_lapp_function(2, _("Inventory &Locations"),"inventory/manage/locations.php?"); - $this->add_rapp_function(2, _("Inventory &Movement Types"),"inventory/manage/movement_types.php?"); - $this->add_rapp_function(2, _("Item Ta&x Types"),"taxes/item_tax_types.php?"); - $this->add_rapp_function(2, _("&Units of Measure"),"inventory/manage/item_units.php?"); - $this->add_rapp_function(2, _("&Reorder Levels"),"inventory/reorder_level.php?"); + $this->add_module(_("Maintenance")); + $this->add_lapp_function(2, _("&Items"), + "inventory/manage/items.php?", 'SA_ITEM'); + $this->add_lapp_function(2, _("&Foreign Item Codes"), + "inventory/manage/item_codes.php?", 'SA_FORITEMCODE'); + $this->add_lapp_function(2, _("Sales &Kits"), + "inventory/manage/sales_kits.php?", 'SA_SALESKIT'); + $this->add_lapp_function(2, _("Item &Categories"), + "inventory/manage/item_categories.php?", 'SA_ITEMCATEGORY'); + $this->add_lapp_function(2, _("Inventory &Locations"), + "inventory/manage/locations.php?", 'SA_INVENTORYLOCATION'); + $this->add_rapp_function(2, _("Inventory &Movement Types"), + "inventory/manage/movement_types.php?", 'SA_INVENTORYMOVETYPE'); + $this->add_rapp_function(2, _("&Units of Measure"), + "inventory/manage/item_units.php?", 'SA_UOM'); + $this->add_rapp_function(2, _("&Reorder Levels"), + "inventory/reorder_level.php?", 'SA_REORDER'); - $this->add_module(_("Pricing and Costs")); - $this->add_lapp_function(3, _("Sales &Pricing"),"inventory/prices.php?"); - $this->add_lapp_function(3, _("Purchasing &Pricing"),"inventory/purchasing_data.php?"); - $this->add_rapp_function(3, _("Standard &Costs"),"inventory/cost_update.php?"); - if (count($installed_modules) > 0) + $this->add_module(_("Pricing and Costs")); + $this->add_lapp_function(3, _("Sales &Pricing"), + "inventory/prices.php?", 'SA_SALESPRICE'); + $this->add_lapp_function(3, _("Purchasing &Pricing"), + "inventory/purchasing_data.php?", 'SA_PURCHASEPRICING'); + $this->add_rapp_function(3, _("Standard &Costs"), + "inventory/cost_update.php?", 'SA_STANDARDCOST'); + if (count($installed_extensions) > 0) + { + foreach ($installed_extensions as $mod) { - foreach ($installed_modules as $mod) - { - if ($mod["tab"] == "stock") - $this->add_rapp_function(2, $mod["name"], "modules/".$mod["path"]."/".$mod["filename"]."?"); - } - } + if (@$mod['active'] && $mod['type'] == 'plugin' && $mod["tab"] == "stock") + $this->add_rapp_function(2, $mod["title"], + "modules/".$mod["path"]."/".$mod["filename"]."?", + isset($mod["access"]) ? $mod["access"] : 'SA_OPEN' ); + } } } +} ?> \ No newline at end of file diff --git a/applications/manufacturing.php b/applications/manufacturing.php index ffcfc021..6892ecc2 100644 --- a/applications/manufacturing.php +++ b/applications/manufacturing.php @@ -9,36 +9,46 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ - class manufacturing_app extends application +class manufacturing_app extends application +{ + function manufacturing_app() { - function manufacturing_app() - { - global $installed_modules; - $this->application("manuf",_("&Manufacturing")); + global $installed_extensions; + $this->application("manuf", _($this->help_context = "&Manufacturing")); - $this->add_module(_("Transactions")); - $this->add_lapp_function(0, _("Work &Order Entry"),"manufacturing/work_order_entry.php?"); - $this->add_lapp_function(0, _("&Outstanding Work Orders"),"manufacturing/search_work_orders.php?outstanding_only=1"); + $this->add_module(_("Transactions")); + $this->add_lapp_function(0, _("Work &Order Entry"), + "manufacturing/work_order_entry.php?", 'SA_WORKORDERENTRY'); + $this->add_lapp_function(0, _("&Outstanding Work Orders"), + "manufacturing/search_work_orders.php?outstanding_only=1", 'SA_MANUFTRANSVIEW'); - $this->add_module(_("Inquiries and Reports")); - $this->add_lapp_function(1, _("Costed Bill Of Material Inquiry"),"manufacturing/inquiry/bom_cost_inquiry.php?"); - $this->add_lapp_function(1, _("Inventory Item Where Used &Inquiry"),"manufacturing/inquiry/where_used_inquiry.php?"); - $this->add_lapp_function(1, _("Work Order &Inquiry"),"manufacturing/search_work_orders.php?"); - $this->add_rapp_function(1, _("Manufacturing &Reports"),"reporting/reports_main.php?Class=3"); + $this->add_module(_("Inquiries and Reports")); + $this->add_lapp_function(1, _("Costed Bill Of Material Inquiry"), + "manufacturing/inquiry/bom_cost_inquiry.php?", 'SA_WORKORDERCOST'); + $this->add_lapp_function(1, _("Inventory Item Where Used &Inquiry"), + "manufacturing/inquiry/where_used_inquiry.php?", 'SA_WORKORDERANALYTIC'); + $this->add_lapp_function(1, _("Work Order &Inquiry"), + "manufacturing/search_work_orders.php?", 'SA_MANUFTRANSVIEW'); + $this->add_rapp_function(1, _("Manufacturing &Reports"), + "reporting/reports_main.php?Class=3", 'SA_MANUFTRANSVIEW'); - $this->add_module(_("Maintenance")); - $this->add_lapp_function(2, _("&Bills Of Material"),"manufacturing/manage/bom_edit.php?"); - $this->add_lapp_function(2, _("&Work Centres"),"manufacturing/manage/work_centres.php?"); - if (count($installed_modules) > 0) + $this->add_module(_("Maintenance")); + $this->add_lapp_function(2, _("&Bills Of Material"), + "manufacturing/manage/bom_edit.php?", 'SA_BOM'); + $this->add_lapp_function(2, _("&Work Centres"), + "manufacturing/manage/work_centres.php?", 'SA_WORKCENTRES'); + if (count($installed_extensions) > 0) + { + foreach ($installed_extensions as $mod) { - foreach ($installed_modules as $mod) - { - if ($mod["tab"] == "manuf") - $this->add_rapp_function(2, $mod["name"], "modules/".$mod["path"]."/".$mod["filename"]."?"); - } + if (@$mod['active'] && $mod['type'] == 'plugin' && $mod["tab"] == "manuf") + $this->add_rapp_function(2, $mod["title"], + "modules/".$mod["path"]."/".$mod["filename"]."?", + isset($mod["access"]) ? $mod["access"] : 'SA_OPEN' ); } } } +} ?> \ No newline at end of file diff --git a/applications/setup.php b/applications/setup.php index d380ee8a..ac392123 100644 --- a/applications/setup.php +++ b/applications/setup.php @@ -9,51 +9,76 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ - class setup_app extends application +class setup_app extends application +{ + function setup_app() { - function setup_app() - { - global $installed_modules; - $this->application("system",_("S&etup")); + global $installed_extensions; + $this->application("system", _($this->help_context = "S&etup")); - $this->add_module(_("Company Setup")); - $this->add_lapp_function(0, _("&Company Setup"),"admin/company_preferences.php?"); - $this->add_lapp_function(0, _("&User Accounts Setup"),"admin/users.php?", 15); - $this->add_lapp_function(0, "",""); - $this->add_lapp_function(0, _("&Display Setup"),"admin/display_prefs.php?"); - $this->add_lapp_function(0, _("&Forms Setup"),"admin/forms_setup.php?"); - $this->add_rapp_function(0, _("&Taxes"),"taxes/tax_types.php?"); - $this->add_rapp_function(0, _("Tax &Groups"),"taxes/tax_groups.php?"); - $this->add_rapp_function(0, "",""); - $this->add_rapp_function(0, _("System and &General GL Setup"),"admin/gl_setup.php?"); - $this->add_rapp_function(0, _("&Fiscal Years"),"admin/fiscalyears.php?"); - $this->add_rapp_function(0, _("&Print Profiles"),"admin/print_profiles.php?"); + $this->add_module(_("Company Setup")); + $this->add_lapp_function(0, _("&Company Setup"), + "admin/company_preferences.php?", 'SA_SETUPCOMPANY'); + $this->add_lapp_function(0, _("&User Accounts Setup"), + "admin/users.php?", 'SA_USERS'); + $this->add_lapp_function(0, _("&Access Setup"), + "admin/security_roles.php?", 'SA_SECROLES'); + $this->add_lapp_function(0, _("&Display Setup"), + "admin/display_prefs.php?", 'SA_SETUPDISPLAY'); + $this->add_lapp_function(0, _("&Forms Setup"), + "admin/forms_setup.php?", 'SA_FORMSETUP'); + $this->add_rapp_function(0, _("&Taxes"), + "taxes/tax_types.php?", 'SA_TAXRATES'); + $this->add_rapp_function(0, _("Tax &Groups"), + "taxes/tax_groups.php?", 'SA_TAXGROUPS'); + $this->add_rapp_function(0, _("Item Ta&x Types"), + "taxes/item_tax_types.php?", 'SA_ITEMTAXTYPE'); + $this->add_rapp_function(0, _("System and &General GL Setup"), + "admin/gl_setup.php?", 'SA_GLSETUP'); + $this->add_rapp_function(0, _("&Fiscal Years"), + "admin/fiscalyears.php?", 'SA_FISCALYEARS'); + $this->add_rapp_function(0, _("&Print Profiles"), + "admin/print_profiles.php?", 'SA_PRINTPROFILE'); - $this->add_module(_("Miscellaneous")); - $this->add_lapp_function(1, _("Pa&yment Terms"),"admin/payment_terms.php?"); - $this->add_lapp_function(1, _("Shi&pping Company"),"admin/shipping_companies.php?"); - $this->add_rapp_function(1, _("&Points of Sale"),"sales/manage/sales_points.php?"); - $this->add_rapp_function(1, _("&Printers"),"admin/printers.php?"); + $this->add_module(_("Miscellaneous")); + $this->add_lapp_function(1, _("Pa&yment Terms"), + "admin/payment_terms.php?", 'SA_PAYTERMS'); + $this->add_lapp_function(1, _("Shi&pping Company"), + "admin/shipping_companies.php?", 'SA_SHIPPING'); + $this->add_rapp_function(1, _("&Points of Sale"), + "sales/manage/sales_points.php?", 'SA_POSSETUP'); + $this->add_rapp_function(1, _("&Printers"), + "admin/printers.php?", 'SA_PRINTERS'); - $this->add_module(_("Maintenance")); - $this->add_lapp_function(2, _("&Void a Transaction"),"admin/void_transaction.php?"); - $this->add_lapp_function(2, _("View or &Print Transactions"),"admin/view_print_transaction.php?"); - $this->add_lapp_function(2, _("&Attach Documents"),"admin/attachments.php?filterType=20"); - $this->add_rapp_function(2, _("&Backup and Restore"),"admin/backups.php?", 15); - $this->add_rapp_function(2, _("Create/Update &Companies"),"admin/create_coy.php?", 14); - $this->add_rapp_function(2, _("Install/Update &Languages"),"admin/inst_lang.php?", 14); - $this->add_rapp_function(2, _("Install/Update &Modules"),"admin/inst_module.php?", 15); - $this->add_rapp_function(2, _("Software &Upgrade"),"admin/inst_upgrade.php?", 15); - if (count($installed_modules) > 0) + $this->add_module(_("Maintenance")); + $this->add_lapp_function(2, _("&Void a Transaction"), + "admin/void_transaction.php?", 'SA_VOIDTRANSACTION'); + $this->add_lapp_function(2, _("View or &Print Transactions"), + "admin/view_print_transaction.php?", 'SA_VIEWPRINTTRANSACTION'); + $this->add_lapp_function(2, _("&Attach Documents"), + "admin/attachments.php?filterType=20", 'SA_ATTACHDOCUMENT'); + $this->add_rapp_function(2, _("&Backup and Restore"), + "admin/backups.php?", 'SA_BACKUP'); + $this->add_rapp_function(2, _("Create/Update &Companies"), + "admin/create_coy.php?", 'SA_CREATECOMPANY'); + $this->add_rapp_function(2, _("Install/Update &Languages"), + "admin/inst_lang.php?", 'SA_CREATELANGUAGE'); + $this->add_rapp_function(2, _("Install/Activate &Extensions"), + "admin/inst_module.php?", 'SA_CREATEMODULES'); + $this->add_rapp_function(2, _("Software &Upgrade"), + "admin/inst_upgrade.php?", 'SA_SOFTWAREUPGRADE'); + if (count($installed_extensions) > 0) + { + foreach ($installed_extensions as $mod) { - foreach ($installed_modules as $mod) - { - if ($mod["tab"] == "system") - $this->add_rapp_function(2, $mod["name"], "modules/".$mod["path"]."/".$mod["filename"]."?"); - } + if (@$mod['active'] && $mod['type'] == 'plugin' && $mod["tab"] == "system") + $this->add_rapp_function(2, $mod["title"], + "modules/".$mod["path"]."/".$mod["filename"]."?", + isset($mod["access"]) ? $mod["access"] : 'SA_OPEN' ); } } } +} ?> \ No newline at end of file diff --git a/applications/suppliers.php b/applications/suppliers.php index 345b3d10..304c653c 100644 --- a/applications/suppliers.php +++ b/applications/suppliers.php @@ -9,42 +9,55 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ - class suppliers_app extends application +class suppliers_app extends application +{ + function suppliers_app() { - function suppliers_app() + global $installed_extensions; + $this->application("AP", _($this->help_context = "&Purchases")); + + $this->add_module(_("Transactions")); + $this->add_lapp_function(0, _("Purchase &Order Entry"), + "purchasing/po_entry_items.php?NewOrder=Yes", 'SA_PURCHASEORDER'); + $this->add_lapp_function(0, _("&Outstanding Purchase Orders Maintenance"), + "purchasing/inquiry/po_search.php?", 'SA_SUPPTRANSVIEW'); + $this->add_rapp_function(0, _("&Payments to Suppliers"), + "purchasing/supplier_payment.php?", 'SA_SUPPLIERPAYMNT'); + $this->add_rapp_function(0, "",""); + $this->add_rapp_function(0, _("Supplier &Invoices"), + "purchasing/supplier_invoice.php?New=1", 'SA_SUPPLIERINVOICE'); + $this->add_rapp_function(0, _("Supplier &Credit Notes"), + "purchasing/supplier_credit.php?New=1", 'SA_SUPPLIERCREDIT'); + $this->add_rapp_function(0, _("&Allocate Supplier Payments or Credit Notes"), + "purchasing/allocations/supplier_allocation_main.php?", 'SA_SUPPLIERALLOC'); + + $this->add_module(_("Inquiries and Reports")); + $this->add_lapp_function(1, _("Purchase Orders &Inquiry"), + "purchasing/inquiry/po_search_completed.php?", 'SA_SUPPTRANSVIEW'); + $this->add_lapp_function(1, _("Supplier Transaction &Inquiry"), + "purchasing/inquiry/supplier_inquiry.php?", 'SA_SUPPTRANSVIEW'); + $this->add_lapp_function(1, "",""); + $this->add_lapp_function(1, _("Supplier Allocation &Inquiry"), + "purchasing/inquiry/supplier_allocation_inquiry.php?", 'SA_SUPPLIERALLOC'); + + $this->add_rapp_function(1, _("Supplier and Purchasing &Reports"), + "reporting/reports_main.php?Class=1", 'SA_SUPPTRANSVIEW'); + + $this->add_module(_("Maintenance")); + $this->add_lapp_function(2, _("&Suppliers"), + "purchasing/manage/suppliers.php?", 'SA_SUPPLIER'); + if (count($installed_extensions) > 0) { - global $installed_modules; - $this->application("AP",_("&Purchases")); - - $this->add_module(_("Transactions")); - $this->add_lapp_function(0, _("Purchase &Order Entry"),"purchasing/po_entry_items.php?NewOrder=Yes"); - $this->add_lapp_function(0, _("&Outstanding Purchase Orders Maintenance"),"purchasing/inquiry/po_search.php?"); - $this->add_rapp_function(0, _("&Payments to Suppliers"),"purchasing/supplier_payment.php?"); - $this->add_rapp_function(0, "",""); - $this->add_rapp_function(0, _("Supplier &Invoices"),"purchasing/supplier_invoice.php?New=1"); - $this->add_rapp_function(0, _("Supplier &Credit Notes"),"purchasing/supplier_credit.php?New=1"); - $this->add_rapp_function(0, _("&Allocate Supplier Payments or Credit Notes"),"purchasing/allocations/supplier_allocation_main.php?"); - - $this->add_module(_("Inquiries and Reports")); - $this->add_lapp_function(1, _("Purchase Orders &Inquiry"),"purchasing/inquiry/po_search_completed.php?"); - $this->add_lapp_function(1, _("Supplier Transaction &Inquiry"),"purchasing/inquiry/supplier_inquiry.php?"); - $this->add_lapp_function(1, "",""); - $this->add_lapp_function(1, _("Supplier Allocation &Inquiry"),"purchasing/inquiry/supplier_allocation_inquiry.php?"); - - $this->add_rapp_function(1, _("Supplier and Purchasing &Reports"),"reporting/reports_main.php?Class=1"); - - $this->add_module(_("Maintenance")); - $this->add_lapp_function(2, _("&Suppliers"),"purchasing/manage/suppliers.php?"); - if (count($installed_modules) > 0) + foreach ($installed_extensions as $mod) { - foreach ($installed_modules as $mod) - { - if ($mod["tab"] == "AP") - $this->add_rapp_function(2, $mod["name"], "modules/".$mod["path"]."/".$mod["filename"]."?"); - } - } + if (@$mod['active'] && $mod['type'] == 'plugin' && $mod["tab"] == "AP") + $this->add_rapp_function(2, $mod["title"], + "modules/".$mod["path"]."/".$mod["filename"]."?", + isset($mod["access"]) ? $mod["access"] : 'SA_OPEN' ); + } } } - +} + ?> \ No newline at end of file diff --git a/dimensions/dimension_entry.php b/dimensions/dimension_entry.php index 9014f22a..0777c2a3 100644 --- a/dimensions/dimension_entry.php +++ b/dimensions/dimension_entry.php @@ -9,21 +9,22 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 10; -$path_to_root=".."; +$page_security = 'SA_DIMENSION'; +$path_to_root = ".."; include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/manufacturing.inc"); include_once($path_to_root . "/includes/data_checks.inc"); +include_once($path_to_root . "/admin/db/tags_db.inc"); include_once($path_to_root . "/dimensions/includes/dimensions_db.inc"); include_once($path_to_root . "/dimensions/includes/dimensions_ui.inc"); $js = ""; if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Dimension Entry"), false, false, "", $js); +page(_($help_context = "Dimension Entry"), false, false, "", $js); //--------------------------------------------------------------------------------------- @@ -78,6 +79,16 @@ if (isset($_GET['ClosedID'])) safe_exit(); } +//--------------------------------------------------------------------------------------- + +if (isset($_GET['ReopenedID'])) +{ + $id = $_GET['ReopenedID']; + + display_notification_centered(_("The dimension has been re-opened. ") . " #$id"); + safe_exit(); +} + //------------------------------------------------------------------------------------------------- function safe_exit() @@ -95,19 +106,19 @@ function safe_exit() function can_process() { - global $selected_id; + global $selected_id, $Refs; if ($selected_id == -1) { - if (!references::is_valid($_POST['ref'])) + if (!$Refs->is_valid($_POST['ref'])) { display_error( _("The dimension reference must be entered.")); set_focus('ref'); return false; } - if (!is_new_reference($_POST['ref'], systypes::dimension())) + if (!is_new_reference($_POST['ref'], ST_DIMENSION)) { display_error(_("The entered reference is already in use.")); set_focus('ref'); @@ -143,21 +154,23 @@ function can_process() if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM'])) { - + if (!isset($_POST['dimension_tags'])) + $_POST['dimension_tags'] = array(); + if (can_process()) { if ($selected_id == -1) { - $id = add_dimension($_POST['ref'], $_POST['name'], $_POST['type_'], $_POST['date_'], $_POST['due_date'], $_POST['memo_']); - + add_tag_associations($id, $_POST['dimension_tags']); meta_forward($_SERVER['PHP_SELF'], "AddedID=$id"); } else { update_dimension($selected_id, $_POST['name'], $_POST['type_'], $_POST['date_'], $_POST['due_date'], $_POST['memo_']); + update_tag_associations(TAG_DIMENSION, $selected_id, $_POST['dimension_tags']); meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$selected_id"); } @@ -184,6 +197,7 @@ if (isset($_POST['delete'])) // delete delete_dimension($selected_id); + delete_tag_associations(TAG_DIMENSION,$selected_id, true); meta_forward($_SERVER['PHP_SELF'], "DeletedID=$selected_id"); } } @@ -198,6 +212,13 @@ if (isset($_POST['close'])) meta_forward($_SERVER['PHP_SELF'], "ClosedID=$selected_id"); } +if (isset($_POST['reopen'])) +{ + + // update the closed flag + reopen_dimension($selected_id); + meta_forward($_SERVER['PHP_SELF'], "ReopenedID=$selected_id"); +} //------------------------------------------------------------------------------------- start_form(); @@ -215,11 +236,11 @@ if ($selected_id != -1) } // if it's a closed dimension can't edit it - if ($myrow["closed"] == 1) - { - display_error(_("This dimension is closed and cannot be edited.")); - display_footer_exit(); - } + //if ($myrow["closed"] == 1) + //{ + // display_error(_("This dimension is closed and cannot be edited.")); + // display_footer_exit(); + //} $_POST['ref'] = $myrow["reference"]; $_POST['closed'] = $myrow["closed"]; @@ -227,7 +248,13 @@ if ($selected_id != -1) $_POST['type_'] = $myrow["type_"]; $_POST['date_'] = sql2date($myrow["date_"]); $_POST['due_date'] = sql2date($myrow["due_date"]); - $_POST['memo_'] = get_comments_string(systypes::dimension(), $selected_id); + $_POST['memo_'] = get_comments_string(ST_DIMENSION, $selected_id); + + $tags_result = get_tags_associated_with_record(TAG_DIMENSION, $selected_id); + $tagids = array(); + while ($tag = db_fetch($tags_result)) + $tagids[] = $tag['id']; + $_POST['dimension_tags'] = $tagids; hidden('ref', $_POST['ref']); @@ -237,7 +264,8 @@ if ($selected_id != -1) } else { - ref_row(_("Dimension Reference:"), 'ref', '', references::get_next(systypes::dimension())); + $_POST['dimension_tags'] = array(); + ref_row(_("Dimension Reference:"), 'ref', '', $Refs->get_next(ST_DIMENSION)); } text_row_ex(_("Name") . ":", 'name', 50, 75); @@ -248,22 +276,30 @@ number_list_row(_("Type"), 'type_', null, 1, $dim); date_row(_("Start Date") . ":", 'date_'); -date_row(_("Date Required By") . ":", 'due_date', '', null, sys_prefs::default_dimension_required_by()); +date_row(_("Date Required By") . ":", 'due_date', '', null, $SysPrefs->default_dimension_required_by()); + +tag_list_row(_("Tags:"), 'dimension_tags', 5, TAG_DIMENSION, true); textarea_row(_("Memo:"), 'memo_', null, 40, 5); end_table(1); +if (isset($_POST['closed']) && $_POST['closed'] == 1) + display_note(_("This Dimension is closed."), 0, 0, "class='currentfg'"); + if ($selected_id != -1) { echo "
"; - submit_center_first('UPDATE_ITEM', _("Update"), _('Save changes to dimension'), true); - submit('close', _("Close This Dimension"), true, _('Mark this dimension as closed'), true); + submit_center_first('UPDATE_ITEM', _("Update"), _('Save changes to dimension'), 'default'); + if ($_POST['closed'] == 1) + submit('reopen', _("Re-open This Dimension"), true, _('Mark this dimension as re-opened'), true); + else + submit('close', _("Close This Dimension"), true, _('Mark this dimension as closed'), true); submit_center_last('delete', _("Delete This Dimension"), _('Delete unused dimension'), true); } else { - submit_center('ADD_ITEM', _("Add"), true, '', true); + submit_center('ADD_ITEM', _("Add"), true, '', 'default'); } end_form(); diff --git a/dimensions/includes/dimensions_db.inc b/dimensions/includes/dimensions_db.inc index 756ff255..8a4f7a54 100644 --- a/dimensions/includes/dimensions_db.inc +++ b/dimensions/includes/dimensions_db.inc @@ -11,6 +11,8 @@ ***********************************************************************/ function add_dimension($reference, $name, $type_, $date_, $due_date, $memo_) { + global $Refs; + begin_transaction(); $date = date2sql($date_); @@ -20,12 +22,11 @@ function add_dimension($reference, $name, $type_, $date_, $due_date, $memo_) VALUES (".db_escape($reference).", ".db_escape($name).", ".db_escape($type_) .", '$date', '$duedate')"; db_query($sql, "could not add dimension"); - $id = db_insert_id(); - add_comments(systypes::dimension(), $id, $date_, $memo_); + add_comments(ST_DIMENSION, $id, $date_, $memo_); - references::save_last($reference, systypes::dimension()); + $Refs->save(ST_DIMENSION, $id, $reference); commit_transaction(); @@ -47,7 +48,7 @@ function update_dimension($id, $name, $type_, $date_, $due_date, $memo_) db_query($sql, "could not update dimension"); - update_comments(systypes::dimension(), $id, null, $memo_); + update_comments(ST_DIMENSION, $id, null, $memo_); commit_transaction(); @@ -62,7 +63,7 @@ function delete_dimension($id) $sql="DELETE FROM ".TB_PREF."dimensions WHERE id=".db_escape($id); db_query($sql,"The dimension could not be deleted"); - delete_comments(systypes::dimension(), $id); + delete_comments(ST_DIMENSION, $id); commit_transaction(); } @@ -143,4 +144,10 @@ function close_dimension($id) //-------------------------------------------------------------------------------------- +function reopen_dimension($id) +{ + $sql = "UPDATE ".TB_PREF."dimensions SET closed='0' WHERE id = $id"; + db_query($sql, "could not reopen dimension"); +} + ?> \ No newline at end of file diff --git a/dimensions/inquiry/search_dimensions.php b/dimensions/inquiry/search_dimensions.php index 750eb458..29b58efe 100644 --- a/dimensions/inquiry/search_dimensions.php +++ b/dimensions/inquiry/search_dimensions.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_DIMTRANSVIEW'; $path_to_root="../.."; include($path_to_root . "/includes/db_pager.inc"); @@ -26,12 +26,12 @@ if ($use_date_picker) if (isset($_GET['outstanding_only']) && $_GET['outstanding_only']) { $outstanding_only = 1; - page(_("Search Outstanding Dimensions"), false, false, "", $js); + page(_($help_context = "Search Outstanding Dimensions"), false, false, "", $js); } else { $outstanding_only = 0; - page(_("Search Dimensions"), false, false, "", $js); + page(_($help_context = "Search Dimensions"), false, false, "", $js); } //----------------------------------------------------------------------------------- // Ajax updates @@ -65,7 +65,7 @@ if (isset($_GET["stock_id"])) //-------------------------------------------------------------------------------------- -start_form(false, true, $_SERVER['PHP_SELF'] ."?outstanding_only=" . $outstanding_only . SID); +start_form(false, false, $_SERVER['PHP_SELF'] ."?outstanding_only=$outstanding_only"); start_table("class='tablestyle_noborder'"); start_row(); @@ -85,18 +85,16 @@ if (!$outstanding_only) else $_POST['OpenOnly'] = 1; -submit_cells('SearchOrders', _("Search"), '', '', true); +submit_cells('SearchOrders', _("Search"), '', '', 'default'); end_row(); end_table(); -end_form(); - $dim = get_company_pref('use_dimension'); function view_link($row) { - return get_dimensions_trans_view_str(systypes::dimension(), $row["id"]); + return get_dimensions_trans_view_str(ST_DIMENSION, $row["id"]); } function is_closed($row) @@ -118,13 +116,15 @@ function sum_dimension($row) function is_overdue($row) { - return date_diff(Today(), sql2date($row["due_date"]), "d") > 0; + return date_diff2(Today(), sql2date($row["due_date"]), "d") > 0; } function edit_link($row) { - return $row["closed"] ? '' : - pager_link(_("Edit"), + //return $row["closed"] ? '' : + // pager_link(_("Edit"), + // "/dimensions/dimension_entry.php?trans_no=" . $row["id"], ICON_EDIT); + return pager_link(_("Edit"), "/dimensions/dimension_entry.php?trans_no=" . $row["id"], ICON_EDIT); } @@ -185,12 +185,7 @@ if ($outstanding_only) { $table =& new_db_pager('dim_tbl', $sql, $cols); $table->set_marker('is_overdue', _("Marked dimensions are overdue.")); -if (get_post('SearchOrders')) { - $table->set_sql($sql); - $table->set_columns($cols); -} $table->width = "80%"; -start_form(); display_db_pager($table); diff --git a/dimensions/view/view_dimension.php b/dimensions/view/view_dimension.php index a8ad64d1..2fe54071 100644 --- a/dimensions/view/view_dimension.php +++ b/dimensions/view/view_dimension.php @@ -9,15 +9,15 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 10; -$path_to_root="../.."; +$page_security = 'SA_DIMTRANSVIEW'; +$path_to_root = "../.."; include_once($path_to_root . "/includes/session.inc"); $js = ""; if ($use_date_picker) $js .= get_js_date_picker(); -page(_("View Dimension"), true, false, "", $js); +page(_($help_context = "View Dimension"), true, false, "", $js); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/data_checks.inc"); @@ -38,7 +38,7 @@ if (isset($_POST['Show'])) } -display_heading(systypes::name(systypes::dimension()) . " # " . $id); +display_heading($systypes_array[ST_DIMENSION] . " # " . $id); br(1); $myrow = get_dimension($id); @@ -63,7 +63,7 @@ label_cell(sql2date($myrow["date_"])); label_cell(sql2date($myrow["due_date"])); end_row(); -comments_display_row(systypes::dimension(), $id); +comments_display_row(ST_DIMENSION, $id); end_table(); @@ -83,7 +83,7 @@ if (!isset($_POST['TransToDate'])) $_POST['TransToDate'] = Today(); date_cells(_("from:"), 'TransFromDate'); date_cells(_("to:"), 'TransToDate'); -submit_cells('Show',_("Show")); +submit_cells('Show',_("Show"), '', false, 'default'); end_row(); diff --git a/doc/2.1_Beta.txt b/doc/2.1_Beta.txt index aabb6a3e..c1e13dbc 100644 --- a/doc/2.1_Beta.txt +++ b/doc/2.1_Beta.txt @@ -16,7 +16,8 @@ Common Sales ----- -- Sales documents. Line descriptions can be edited and printing of documents handles multiple line of descriptions. +- Sales documents. Line descriptions can be edited and printing of documents handles + multiple line of descriptions. - Point of Sales definitions for better handling of cash sales - Sales Groups for grouping customers. - Recurrent Invoices @@ -40,7 +41,8 @@ Banking and General Ledger -------------------------- - Bank accounts reconciliation - Dimension view now shows balances instead of transactions -- Quick Entries (preset GL transactions) in Bank Deposit/Payment, Journal Entry and Supplier invoice/credit +- Quick Entries (preset GL transactions) in Bank Deposit/Payment, Journal Entry + and Supplier invoice/credit - Rewritten tax report and tax inquiry. Bugs fixed in this release diff --git a/doc/attachments.txt b/doc/attachments.txt index 704a41af..94900478 100644 --- a/doc/attachments.txt +++ b/doc/attachments.txt @@ -1,6 +1,7 @@ Attaching documents ------------------- -In the Setup tab, Maintenance you can attach scanned documents to transactions. You can do that here, but you -can also do it after you have entered a supplier invoice or supplier credit note. There will be a direct link -so you don't have to remember the transaction number. \ No newline at end of file +In the Setup tab, Maintenance you can attach scanned documents to transactions. +You can do that here, but you can also do it after you have entered a supplier +invoice or supplier credit note. There will be a direct link so you don't have +to remember the transaction number. \ No newline at end of file diff --git a/doc/dim_on_invoice.txt b/doc/dim_on_invoice.txt index ee3cf97f..ffd7932f 100644 --- a/doc/dim_on_invoice.txt +++ b/doc/dim_on_invoice.txt @@ -4,18 +4,23 @@ Dimensions on sales delivery notes, sales invoices and sales credit notes We now have the option to select a dimension on these documents. Here is how it works. -If there are 2 levels in company setup, 2 dimension lists are shown with respective types. if 1 level, -only one list and of course if none there is no list shown. +If there are 2 levels in company setup, 2 dimension lists are shown with +respective types. if 1 level, only one list and of course if none there is no +list shown. -If there are dimension(s) set on a customer these will be set as default in the dimension(s) lists. +If there are dimension(s) set on a customer these will be set as default in the +dimension(s) lists. -If you choose a dimension for your invoice it will overwrite eventually dimension set by item. And the dimension(s) -are saved on the cust_trans table. -To be used when going from delivery to invoice, so there is a match between the 2 links. +If you choose a dimension for your invoice it will overwrite eventually dimension +set by item. And the dimension(s) are saved on the cust_trans table. +To be used when going from delivery to invoice, so there is a match between the +2 links. -These dimension(s) goes to the GL trans. If delivery and there are standard_cost values they will show up on all COGS accounts. +These dimension(s) goes to the GL trans. If delivery and there are standard_cost +values they will show up on all COGS accounts. -If invoicing the dimensions will go to the SALES accounts, so it is easy to monitor a dimension (project or whatever). +If invoicing the dimensions will go to the SALES accounts, so it is easy to +monitor a dimension (project or whatever). Credit notes goes the other way round. The same procedure but opposite. \ No newline at end of file diff --git a/doc/extensions.txt b/doc/extensions.txt index 08d93b4d..391f8442 100644 --- a/doc/extensions.txt +++ b/doc/extensions.txt @@ -2,14 +2,17 @@ Extensions to FrontAccounting ----------------------------- We have prepared for installation of Extensions. Like installed modules. -In the root directory there is a file, installed_extensions.php. This file contains an array over installed extensions, $installed_extensions. +In the root directory there is a file, installed_extensions.php. This file +contains an array over installed extensions, $installed_extensions. There is an example array in the file. app_file = the application to be put inside the /applications directory name = array key name of the application title = menu title -folder = directory where the extension resides. Use same structure inside this as the core extensions. +folder = directory where the extension resides. Use same structure inside this +as the core extensions. The Extension will be placed as the second last menu, before 'Setup'. -At present there is no automatic installation of the extensions. They will have to be done manuelly. \ No newline at end of file +At present there is no automatic installation of the extensions. They will have +to be done manuelly. \ No newline at end of file diff --git a/doc/quick_entries.txt b/doc/quick_entries.txt index 90db1293..79f05f3b 100644 --- a/doc/quick_entries.txt +++ b/doc/quick_entries.txt @@ -6,9 +6,9 @@ Preparing Go into the Quick Entries on Banking and General Ledger tab, Maintenance. -Enter/Modify existing entries. Choose a name for your quick entry and default amount -used as a base for calculations. Determine type of entry i.e. page for which -the quick entry is designed for. Last two input fields defines default base +Enter/Modify existing entries. Choose a name for your quick entry and default +amount used as a base for calculations. Determine type of entry i.e. page for +which the quick entry is designed for. Last two input fields defines default base amount used at the start of calculations, and description of base amount used as remainder during quick entry usage. @@ -21,12 +21,13 @@ Currently following type of operations are defined: a) Post constant amount to selected GL account. b) Post percent part of base amount to selected GL account c) Post taxes for selected tax type, using base amount as net value. -d) Post taxes for selected tax type, using base amount as value with tax included. +d) Post taxes for selected tax type, using base amount as value with tax + included. e) Post remainder from previous calculations to selected GL acount. After most operations the base amount can be increased, decreased or not changed -depending on option selected. For every operation you can also select a dimension(s) -if you want to keep track of a dimension. +depending on option selected. For every operation you can also select a +dimension(s) if you want to keep track of a dimension. You normally don't need more lines for this quick entry if this is type Phone bill, gazolin or other kind of simple bills. Later on you can create @@ -34,7 +35,8 @@ more sophisticated entry lines. If tax should be includes in the base amount you can first select a line 'Tax included, reduce base and select the correct tax type. -If more lines with other Tax Types are needed, group them together and use the same action. +If more lines with other Tax Types are needed, group them together and use the same +action. And a line with 'Remainder' put on the account you want to put the rest on. That's it! @@ -61,10 +63,10 @@ the percent amount in the amount field, f.i. 9 for 9% VAT. And another line with the outgoing VAT with the same percent and amount (remember to set this as -9 for correct posting). You can also use the 'Post percent part' for depreciations, -create fixed amount lines (Post Amount) etc. etc. You can have as many lines as you want -or need. Remember nothing is posted before you press the Process button in -the bank payments/deposits/journal entry/supplier invoice/credit forms. You can always delete the lines -or leave the form and nothing has been performed. You might have entered -something wrong on one or more quick entry lines and want +create fixed amount lines (Post Amount) etc. etc. You can have as many lines as +you want or need. Remember nothing is posted before you press the Process button in +the bank payments/deposits/journal entry/supplier invoice/credit forms. You can +always delete the lines or leave the form and nothing has been performed. You +might have entered something wrong on one or more quick entry lines and want to go to Quick Entries again and change something. \ No newline at end of file diff --git a/doc/recurrent_invoice.txt b/doc/recurrent_invoice.txt index e0382fec..0a7af13c 100644 --- a/doc/recurrent_invoice.txt +++ b/doc/recurrent_invoice.txt @@ -1,35 +1,50 @@ Recurrent Invoices ------------------ -There are two ways of using recurrent invoices. You can either select a group or single customer/branches. +There are two ways of using recurrent invoices. You can either select a group or +single customer/branches. -If you are going to use groups, start by creating the groups you want to later put on the branches, Fi. Large, Medium and Small +If you are going to use groups, start by creating the groups you want to later +put on the branches, Fi. Large, Medium and Small -Go into the branches. If you want any of a custumers branch to belong to a group, mark it and update the branch. +Go into the branches. If you want any of a custumers branch to belong to a group, +mark it and update the branch. Definition. ----------- -You are now ready to make some recurrent invoice definitions, by clicking the 'Recurrent Invoices' in the Sales tab, Maintenance section. +You are now ready to make some recurrent invoice definitions, by clicking the +'Recurrent Invoices' in the Sales tab, Maintenance section. -The recurrent invoices uses the Template Orders, that are shown under Template Delivery/Template Invoice. +The recurrent invoices uses the Template Orders, that are shown under Template +Delivery/Template Invoice. -First enter a Discription of the item. Select the appropriate template. If this should be adressed to a single customer/branch, select a customer and a branch. -If it should be based on a group, set the customer to an empty value and select the group you want to send the recurrent invoices to. +First enter a Discription of the item. Select the appropriate template. If this +should be adressed to a single customer/branch, select a customer and a branch. +If it should be based on a group, set the customer to an empty value and select +the group you want to send the recurrent invoices to. -Now it is time to consider the interval of the recurrency. If you select days and set the monthly value to 0, it will be due after every days interval. -If you select a monthly value, it will be sent on a monthly base and if you select a days value it will be due on that day in the month. A value of -1 would -be the last day in the previous month. A monthly value of 3 indicated a due every quarter of a year and 12 every year and so on. +Now it is time to consider the interval of the recurrency. If you select days and +set the monthly value to 0, it will be due after every days interval. +If you select a monthly value, it will be sent on a monthly base and if you select +a days value it will be due on that day in the month. A value of -1 would be the +last day in the previous month. A monthly value of 3 indicated a due every quarter +of a year and 12 every year and so on. -The begin date is the date to start the recurrency and end date is the close date of the recurrency. +The begin date is the date to start the recurrency and end date is the close date +of the recurrency. Create and print the recurrent invoices. --------------------------------------- -Before creating recurring invoices, check that the price factor in company setup is set. If you have foreign customers the price is automatically calculated. -Go to 'Create and Print Recurring Invoices'. The due items are marked and a link 'Create invoices' are there. -Pressing this link creates all the invoices belonging to this group or single customer/branch. +Before creating recurring invoices, check that the price factor in company setup +is set. If you have foreign customers the price is automatically calculated. +Go to 'Create and Print Recurring Invoices'. The due items are marked and a link +'Create invoices' are there. +Pressing this link creates all the invoices belonging to this group or single +customer/branch. An info line tells you how many and invoice-numbers that are created. There is also a link to Print the Invoices. That's it. Happy Recurrent Invoicing. -PS. If you need more groups on a customer, create new branches with this different group. Maybe call the branch something similar as the group to easily find it. \ No newline at end of file +PS. If you need more groups on a customer, create new branches with this different +group. Maybe call the branch something similar as the group to easily find it. \ No newline at end of file diff --git a/frontaccounting.php b/frontaccounting.php index 7e220188..4ae88cbb 100644 --- a/frontaccounting.php +++ b/frontaccounting.php @@ -24,12 +24,11 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_ { foreach ($installed_extensions as $ext) { - include_once($path_to_root."/".$ext['folder']."/".$ext['app_file']); + if ($ext['type'] == 'module') + include_once($path_to_root."/".$ext['path']."/".$ext['filename']); } } - include_once($path_to_root . '/modules/installed_modules.php'); - class front_accounting { var $user; @@ -44,8 +43,9 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_ //$this->renderer =& new renderer(); } function add_application(&$app) - { - $this->applications[$app->id] = &$app; + { + if ($app->enabled) // skip inactive modules + $this->applications[$app->id] = &$app; } function get_application($id) { @@ -76,6 +76,7 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_ function init() { global $installed_extensions, $path_to_root; + $this->menu = new menu(_("Main Menu")); $this->menu->add_item(_("Main Menu"), "index.php"); $this->menu->add_item(_("Logout"), "/account/access/logout.php"); @@ -88,18 +89,26 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_ $this->add_application(new general_ledger_app()); if (count($installed_extensions) > 0) { - foreach ($installed_extensions as $ext) + // Do not use global array directly here, or you suffer + // from buggy php behaviour (unexpected loop break + // because of same var usage in class constructor). + $extensions = $installed_extensions; + foreach ($extensions as $ext) { - get_text::add_domain($_SESSION['language']->code, - $ext['folder']."/lang"); - $class = $ext['name']."_app"; - $this->add_application(new $class()); - get_text::add_domain($_SESSION['language']->code, - $path_to_root."/lang"); + if (@($ext['active'] && $ext['type'] == 'module')) // supressed warnings before 2.2 upgrade + { + $_SESSION['get_text']->add_domain($_SESSION['language']->code, + $ext['path']."/lang"); + $class = $ext['tab']."_app"; + if (class_exists($class)) + $this->add_application(new $class()); + $_SESSION['get_text']->add_domain($_SESSION['language']->code, + $path_to_root."/lang"); + } } } $this->add_application(new setup_app()); - } + } } ?> \ No newline at end of file diff --git a/gl/bank_account_reconcile.php b/gl/bank_account_reconcile.php index bdd7c88e..c06b9d5b 100644 --- a/gl/bank_account_reconcile.php +++ b/gl/bank_account_reconcile.php @@ -10,8 +10,8 @@ See the License here . ***********************************************************************/ /* Author Rob Mallon */ -$page_security = 8; -$path_to_root=".."; +$page_security = 'SA_RECONCILE'; +$path_to_root = ".."; include($path_to_root . "/includes/db_pager.inc"); include_once($path_to_root . "/includes/session.inc"); @@ -30,7 +30,7 @@ if ($use_date_picker) add_js_file('reconcile.js'); -page(_("Reconcile Bank Account"), false, false, "", $js); +page(_($help_context = "Reconcile Bank Account"), false, false, "", $js); check_db_has_bank_accounts(_("There are no bank accounts defined in the system.")); @@ -59,7 +59,9 @@ function rec_checkbox($row) function systype_name($dummy, $type) { - return systypes::name($type); + global $systypes_array; + + return $systypes_array[$type]; } function trans_view($trans) @@ -86,7 +88,7 @@ function fmt_credit($row) function fmt_person($row) { - return payment_person_types::person_name($row["person_type_id"],$row["person_id"]); + return payment_person_name($row["person_type_id"],$row["person_id"]); } $update_pager = false; @@ -106,7 +108,8 @@ function change_tpl_flag($reconcile_id) { global $Ajax; - if (!check_date()) + if (!check_date() + && check_value("rec_".$reconcile_id)) // temporary fix return false; if (get_post('bank_date')=='') // new reconciliation @@ -115,8 +118,8 @@ function change_tpl_flag($reconcile_id) $_POST['bank_date'] = date2sql(get_post('reconcile_date')); $reconcile_value = check_value("rec_".$reconcile_id) ? ("'".$_POST['bank_date'] ."'") : 'NULL'; - $sql = "UPDATE ".TB_PREF."bank_trans SET reconciled=".db_escape($reconcile_value) - ." WHERE id=".db_escape($reconcile_id); + $sql = "UPDATE ".TB_PREF."bank_trans SET reconciled=$reconcile_value" + ." WHERE id=".db_escape($reconcile_id); db_query($sql, "Can't change reconciliation status"); // save last reconcilation status (date, end balance) @@ -132,7 +135,7 @@ function change_tpl_flag($reconcile_id) } if (!isset($_POST['reconcile_date'])) { // init page - $_POST['reconcile_date'] = Today(); + $_POST['reconcile_date'] = new_doc_date(); // $_POST['bank_date'] = date2sql(Today()); } @@ -175,6 +178,8 @@ end_row(); end_table(); $date = date2sql(get_post('reconcile_date')); + // temporary fix to enable fix of invalid entries made in 2.2RC +if ($date == 0) $date = '0000-00-00'; $sql = "SELECT MAX(reconciled) as last_date, SUM(IF(reconciled<='$date', amount, 0)) as end_balance, @@ -218,7 +223,7 @@ table_header($th); start_row(); date_cells("", "reconcile_date", _('Date of bank statement to reconcile'), - null, 0, 0, 0, null, true); + get_post('bank_date')=='', 0, 0, 0, null, true); amount_cells_ex("", "beg_balance", 15); @@ -264,11 +269,8 @@ display_heading($act['bank_account_name']." - ".$act['bank_curr_code']); "X"=>array('insert'=>true, 'fun'=>'rec_checkbox') ); $table =& new_db_pager('trans_tbl', $sql, $cols); - if ($update_pager) { - $table->set_sql($sql); - $table->set_columns($cols); - } - $table->width = "60%"; + + $table->width = "80%"; display_db_pager($table); br(1); diff --git a/gl/bank_transfer.php b/gl/bank_transfer.php index c390f7a0..2256a4a0 100644 --- a/gl/bank_transfer.php +++ b/gl/bank_transfer.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$path_to_root=".."; -$page_security = 5; +$page_security = 'SA_BANKTRANSFER'; +$path_to_root = ".."; include_once($path_to_root . "/includes/session.inc"); @@ -25,7 +25,7 @@ if ($use_popup_windows) $js .= get_js_open_window(800, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Transfer between Bank Accounts"), false, false, "", $js); +page(_($help_context = "Transfer between Bank Accounts"), false, false, "", $js); check_db_has_bank_accounts(_("There are no bank accounts defined in the system.")); @@ -34,7 +34,7 @@ check_db_has_bank_accounts(_("There are no bank accounts defined in the system." if (isset($_GET['AddedID'])) { $trans_no = $_GET['AddedID']; - $trans_type = systypes::bank_transfer(); + $trans_type = ST_BANKTRANSFER; display_notification_centered( _("Transfer has been entered")); @@ -53,15 +53,16 @@ if (isset($_POST['_DatePaid_changed'])) { function gl_payment_controls() { - global $table_style2; + global $table_style2, $Refs; + $home_currency = get_company_currency(); - start_form(false, true); + start_form(); - start_table($table_style2, 5, 7); - echo ""; // outer table + start_outer_table($table_style2, 5); + + table_section(1); - echo ""; bank_accounts_list_row(_("From Account:"), 'FromBankAccount', null, true); bank_accounts_list_row(_("To Account:"), 'ToBankAccount', null, true); @@ -73,28 +74,25 @@ function gl_payment_controls() if ($from_currency != "" && $to_currency != "" && $from_currency != $to_currency) { amount_row(_("Amount:"), 'amount', null, null, $from_currency); + amount_row(_("Bank Charge:"), 'charge', null, null, $from_currency); exchange_rate_display($from_currency, $to_currency, $_POST['DatePaid']); } else { amount_row(_("Amount:"), 'amount'); + amount_row(_("Bank Charge:"), 'charge'); } - echo "
"; - echo ""; // outer table - echo ""; + table_section(2); - ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::bank_transfer())); + ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_BANKTRANSFER)); textarea_row(_("Memo:"), 'memo_', null, 40,4); - end_table(1); - - echo ""; - end_table(1); // outer table + end_outer_table(1); // outer table - submit_center('AddPayment',_("Enter Transfer"), true, '', true); + submit_center('AddPayment',_("Enter Transfer"), true, '', 'default'); end_form(); } @@ -103,6 +101,8 @@ function gl_payment_controls() function check_valid_entries() { + global $Refs; + if (!is_date($_POST['DatePaid'])) { display_error(_("The entered date is invalid.")); @@ -123,14 +123,25 @@ function check_valid_entries() return false; } - if (!references::is_valid($_POST['ref'])) + if (isset($_POST['charge']) && !check_num('charge', 0)) + { + display_error(_("The entered amount is invalid or less than zero.")); + set_focus('charge'); + return false; + } + if (isset($_POST['charge']) && input_num('charge') > 0 && get_company_pref('bank_charge_act') == '') { + display_error(_("The Bank Charge Account has not been set in System and General GL Setup.")); + set_focus('charge'); + return false; + } + if (!$Refs->is_valid($_POST['ref'])) { display_error(_("You must enter a reference.")); set_focus('ref'); return false; } - if (!is_new_reference($_POST['ref'], systypes::bank_transfer())) + if (!is_new_reference($_POST['ref'], ST_BANKTRANSFER)) { display_error(_("The entered reference is already in use.")); set_focus('ref'); @@ -152,7 +163,7 @@ function check_valid_entries() function handle_add_deposit() { $trans_no = add_bank_transfer($_POST['FromBankAccount'], $_POST['ToBankAccount'], - $_POST['DatePaid'], input_num('amount'), $_POST['ref'], $_POST['memo_']); + $_POST['DatePaid'], input_num('amount'), $_POST['ref'], $_POST['memo_'], input_num('charge')); meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no"); } diff --git a/gl/gl_bank.php b/gl/gl_bank.php index fa78eeb2..baf7f885 100644 --- a/gl/gl_bank.php +++ b/gl/gl_bank.php @@ -9,10 +9,12 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 3; -$path_to_root=".."; +$path_to_root = ".."; include_once($path_to_root . "/includes/ui/items_cart.inc"); include_once($path_to_root . "/includes/session.inc"); +$page_security = isset($_GET['NewPayment']) || + @($_SESSION['pay_items']->trans_type==ST_BANKPAYMENT) + ? 'SA_PAYMENT' : 'SA_DEPOSIT'; include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/data_checks.inc"); @@ -28,12 +30,12 @@ if ($use_date_picker) $js .= get_js_date_picker(); if (isset($_GET['NewPayment'])) { - $_SESSION['page_title'] = _("Bank Account Payment Entry"); - handle_new_order(systypes::bank_payment()); + $_SESSION['page_title'] = _($help_context = "Bank Account Payment Entry"); + handle_new_order(ST_BANKPAYMENT); } else if(isset($_GET['NewDeposit'])) { - $_SESSION['page_title'] = _("Bank Account Deposit Entry"); - handle_new_order(systypes::bank_deposit()); + $_SESSION['page_title'] = _($help_context = "Bank Account Deposit Entry"); + handle_new_order(ST_BANKDEPOSIT); } page($_SESSION['page_title'], false, false, '', $js); @@ -41,29 +43,12 @@ page($_SESSION['page_title'], false, false, '', $js); check_db_has_bank_accounts(_("There are no bank accounts defined in the system.")); //---------------------------------------------------------------------------------------- -if ($ret = context_restore()) { - if(isset($ret['supplier_id'])) - $_POST['person_id'] = $ret['supplier_id']; - if(isset($ret['customer_id'])) - $_POST['person_id'] = $ret['customer_id']; - set_focus('person_id'); - if(isset($ret['branch_id'])) { - $_POST['PersonDetailID'] = $ret['branch_id']; - set_focus('PersonDetailID'); - } -} -if (isset($_POST['_person_id_editor'])) { - if ($_POST['PayType']==payment_person_types::supplier()) - $editor = '/purchasing/manage/suppliers.php?supplier_id='; - else - $editor = '/sales/manage/customers.php?debtor_no='; - -// $_SESSION['pay_items'] should stay unchanged during call -// -context_call($path_to_root.$editor.$_POST['person_id'], - array('bank_account', 'date_', 'PayType', 'person_id', - 'PersonDetailID', 'ref', 'memo_') ); +if (list_updated('PersonDetailID')) { + $br = get_branch(get_post('PersonDetailID')); + $_POST['person_id'] = $br['debtor_no']; + $Ajax->activate('person_id'); } + //-------------------------------------------------------------------------------------------------- function line_start_focus() { global $Ajax; @@ -77,7 +62,7 @@ function line_start_focus() { if (isset($_GET['AddedID'])) { $trans_no = $_GET['AddedID']; - $trans_type = systypes::bank_payment(); + $trans_type = ST_BANKPAYMENT; display_notification_centered(_("Payment has been entered")); @@ -93,7 +78,7 @@ if (isset($_GET['AddedID'])) if (isset($_GET['AddedDep'])) { $trans_no = $_GET['AddedDep']; - $trans_type = systypes::bank_deposit(); + $trans_type = ST_BANKDEPOSIT; display_notification_centered(_("Deposit has been entered")); @@ -121,7 +106,7 @@ function handle_new_order($type) $_SESSION['pay_items'] = new items_cart($type); - $_POST['date_'] = Today(); + $_POST['date_'] = new_doc_date(); if (!is_date_in_fiscalyear($_POST['date_'])) $_POST['date_'] = end_fiscalyear(); $_SESSION['pay_items']->tran_date = $_POST['date_']; @@ -140,7 +125,7 @@ if (isset($_POST['Process'])) $input_error = 1; } - if (!references::is_valid($_POST['ref'])) + if (!$Refs->is_valid($_POST['ref'])) { display_error( _("You must enter a reference.")); set_focus('ref'); @@ -180,11 +165,12 @@ if (isset($_POST['Process'])) $trans_type = $trans[0]; $trans_no = $trans[1]; + new_doc_date($_POST['date_']); $_SESSION['pay_items']->clear_items(); unset($_SESSION['pay_items']); - meta_forward($_SERVER['PHP_SELF'], $trans_type==systypes::bank_payment() ? + meta_forward($_SERVER['PHP_SELF'], $trans_type==ST_BANKPAYMENT ? "AddedID=$trans_no" : "AddedDep=$trans_no"); } /*end of process credit note */ @@ -209,7 +195,7 @@ function check_item_data() //if (is_bank_account($_POST['code_id'])) //{ - // if ($_SESSION['pay_items']->trans_type == systypes::bank_payment()) + // if ($_SESSION['pay_items']->trans_type == ST_BANKPAYMENT) // display_error( _("You cannot make a payment to a bank account. Please use the transfer funds facility for this.")); // else // display_error( _("You cannot make a deposit from a bank account. Please use the transfer funds facility for this.")); @@ -224,11 +210,11 @@ function check_item_data() function handle_update_item() { - $amount = ($_SESSION['pay_items']->trans_type==systypes::bank_payment() ? 1:-1) * input_num('amount'); + $amount = ($_SESSION['pay_items']->trans_type==ST_BANKPAYMENT ? 1:-1) * input_num('amount'); if($_POST['UpdateItem'] != "" && check_item_data()) { - $_SESSION['pay_items']->update_gl_item($_POST['Index'], $_POST['dimension_id'], - $_POST['dimension2_id'], $amount , $_POST['LineMemo']); + $_SESSION['pay_items']->update_gl_item($_POST['Index'], $_POST['code_id'], + $_POST['dimension_id'], $_POST['dimension2_id'], $amount , $_POST['LineMemo']); } line_start_focus(); } @@ -247,7 +233,7 @@ function handle_new_item() { if (!check_item_data()) return; - $amount = ($_SESSION['pay_items']->trans_type==systypes::bank_payment() ? 1:-1) * input_num('amount'); + $amount = ($_SESSION['pay_items']->trans_type==ST_BANKPAYMENT ? 1:-1) * input_num('amount'); $_SESSION['pay_items']->add_gl_item($_POST['code_id'], $_POST['dimension_id'], $_POST['dimension2_id'], $amount, $_POST['LineMemo']); @@ -270,20 +256,20 @@ if (isset($_POST['CancelItemChanges'])) if (isset($_POST['go'])) { display_quick_entries($_SESSION['pay_items'], $_POST['person_id'], input_num('totamount'), - $_SESSION['pay_items']->trans_type==systypes::bank_payment() ? QE_PAYMENT : QE_DEPOSIT); + $_SESSION['pay_items']->trans_type==ST_BANKPAYMENT ? QE_PAYMENT : QE_DEPOSIT); $_POST['totamount'] = price_format(0); $Ajax->activate('totamount'); line_start_focus(); } //----------------------------------------------------------------------------------------------- -start_form(false, true); +start_form(); display_bank_header($_SESSION['pay_items']); start_table("$table_style2 width=90%", 10); start_row(); echo ""; @@ -291,8 +277,8 @@ end_row(); end_table(1); submit_center_first('Update', _("Update"), '', null); -submit_center_last('Process', $_SESSION['pay_items']->trans_type==systypes::bank_payment() ? - _("Process Payment"):_("Process Deposit"), '', true); +submit_center_last('Process', $_SESSION['pay_items']->trans_type==ST_BANKPAYMENT ? + _("Process Payment"):_("Process Deposit"), '', 'default'); end_form(); diff --git a/gl/gl_budget.php b/gl/gl_budget.php index 7945f171..2fc74cb4 100644 --- a/gl/gl_budget.php +++ b/gl/gl_budget.php @@ -9,13 +9,13 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 10; -$path_to_root=".."; +$page_security = 'SA_BUDGETENTRY'; +$path_to_root = ".."; include($path_to_root . "/includes/session.inc"); add_js_file('budget.js'); -page(_("Budget Entry")); +page(_($help_context = "Budget Entry")); include($path_to_root . "/includes/ui.inc"); include($path_to_root . "/gl/includes/gl_db.inc"); @@ -194,7 +194,7 @@ if (db_has_gl_accounts()) end_table(1); div_end(); submit_center_first('update', _("Update"), '', null); - submit('add', _("Save"), true, '', true); + submit('add', _("Save"), true, '', 'default'); submit_center_last('delete', _("Delete"), '', true); } end_form(); diff --git a/gl/gl_journal.php b/gl/gl_journal.php index 77ba76b4..d515b179 100644 --- a/gl/gl_journal.php +++ b/gl/gl_journal.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 3; -$path_to_root=".."; +$page_security = 'SA_JOURNALENTRY'; +$path_to_root = ".."; include_once($path_to_root . "/includes/ui/items_cart.inc"); include_once($path_to_root . "/includes/session.inc"); @@ -28,9 +28,16 @@ if ($use_popup_windows) if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Journal Entry"), false, false,'', $js); +if (isset($_GET['ModifyGL'])) { + $_SESSION['page_title'] = sprintf(_("Modifying Journal Transaction # %d."), + $_GET['trans_no']); + $help_context = "Modifying Journal Entry"; +} else + $_SESSION['page_title'] = _($help_context = "Journal Entry"); +page($_SESSION['page_title'], false, false,'', $js); //-------------------------------------------------------------------------------------------------- + function line_start_focus() { global $Ajax; @@ -42,34 +49,85 @@ function line_start_focus() { if (isset($_GET['AddedID'])) { $trans_no = $_GET['AddedID']; - $trans_type = systypes::journal_entry(); + $trans_type = ST_JOURNAL; display_notification_centered( _("Journal entry has been entered") . " #$trans_no"); display_note(get_gl_view_str($trans_type, $trans_no, _("&View this Journal Entry"))); - hyperlink_no_params($_SERVER['PHP_SELF'], _("Enter &Another Journal Entry")); + reset_focus(); + hyperlink_params($_SERVER['PHP_SELF'], _("Enter &New Journal Entry"), "NewJournal=Yes"); + + display_footer_exit(); +} elseif (isset($_GET['UpdatedID'])) +{ + $trans_no = $_GET['UpdatedID']; + $trans_type = ST_JOURNAL; + + display_notification_centered( _("Journal entry has been updated") . " #$trans_no"); + + display_note(get_gl_view_str($trans_type, $trans_no, _("&View this Journal Entry"))); + + hyperlink_no_params($path_to_root."/gl/inquiry/journal_inquiry.php", _("Return to Journal &Inquiry")); display_footer_exit(); } //-------------------------------------------------------------------------------------------------- -function handle_new_order() +if (isset($_GET['NewJournal'])) +{ + create_cart(0,0); +} +elseif (isset($_GET['ModifyGL'])) { + if (!isset($_GET['trans_type']) || $_GET['trans_type']!= 0) { + display_error(_("You can edit directly only journal entries created via Journal Entry page.")); + hyperlink_params("$path_to_root/gl/gl_journal.php", _("Entry &New Journal Entry"), "NewJournal=Yes"); + display_footer_exit(); + } + create_cart($_GET['trans_type'], $_GET['trans_no']); +} + +function create_cart($type=0, $trans_no=0) +{ + global $Refs; + if (isset($_SESSION['journal_items'])) { - $_SESSION['journal_items']->clear_items(); unset ($_SESSION['journal_items']); } - session_register("journal_items"); + $cart = new items_cart($type); + $cart->order_id = $trans_no; + + if ($trans_no) { + $result = get_gl_trans($type, $trans_no); + + if ($result) { + while ($row = db_fetch($result)) { + if ($row['amount'] == 0) continue; + $date = $row['tran_date']; + $cart->add_gl_item($row['account'], $row['dimension_id'], + $row['dimension2_id'], $row['amount'], $row['memo_']); + } + } + $cart->memo_ = get_comments_string($type, $trans_no); + $cart->tran_date = sql2date($date); + $cart->reference = $Refs->get($type, $trans_no); + $_POST['ref_original'] = $cart->reference; // Store for comparison when updating + } else { + $cart->reference = $Refs->get_next(0); + $cart->tran_date = new_doc_date(); + $_POST['ref_original'] = -1; + } + if (!is_date_in_fiscalyear($cart->tran_date)) + $cart->tran_date = end_fiscalyear(); - $_SESSION['journal_items'] = new items_cart(systypes::journal_entry()); + $_POST['memo_'] = $cart->memo_; + $_POST['ref'] = $cart->reference; + $_POST['date_'] = $cart->tran_date; - $_POST['date_'] = Today(); - if (!is_date_in_fiscalyear($_POST['date_'])) - $_POST['date_'] = end_fiscalyear(); - $_SESSION['journal_items']->tran_date = $_POST['date_']; + $_SESSION['journal_items'] = &$cart; } //----------------------------------------------------------------------------------------------- @@ -103,34 +161,44 @@ if (isset($_POST['Process'])) set_focus('date_'); $input_error = 1; } - if (!references::is_valid($_POST['ref'])) + if (!$Refs->is_valid($_POST['ref'])) { display_error( _("You must enter a reference.")); set_focus('ref'); $input_error = 1; } - elseif (references::exists(systypes::journal_entry(), $_POST['ref'])) + elseif ($Refs->exists(ST_JOURNAL, $_POST['ref'])) { - display_error( _("The entered reference is already in use.")); - set_focus('ref'); - $input_error = 1; + // The reference can exist already so long as it's the same as the original (when modifying) + if ($_POST['ref'] != $_POST['ref_original']) { + display_error( _("The entered reference is already in use.")); + set_focus('ref'); + $input_error = 1; + } } - if ($input_error == 1) unset($_POST['Process']); } if (isset($_POST['Process'])) { + $cart = &$_SESSION['journal_items']; + $new = $cart->order_id == 0; - $trans_no = add_journal_entries($_SESSION['journal_items']->gl_items, - $_POST['date_'], $_POST['ref'], check_value('Reverse'), $_POST['memo_']); + $cart->reference = $_POST['ref']; + $cart->memo_ = $_POST['memo_']; + $cart->tran_date = $_POST['date_']; - $_SESSION['journal_items']->clear_items(); - unset($_SESSION['journal_items']); + $trans_no = write_journal_entries($cart, check_value('Reverse')); - meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no"); -} /*end of process credit note */ + $cart->clear_items(); + new_doc_date($_POST['date_']); + unset($_SESSION['journal_items']); + if($new) + meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no"); + else + meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$trans_no"); +} //----------------------------------------------------------------------------------------------- @@ -175,7 +243,7 @@ function check_item_data() return false; } - if ($_SESSION["wa_current_user"]->access != 2 && is_bank_account($_POST['code_id'])) + if (!$_SESSION["wa_current_user"]->can_access('SA_BANKJOURNAL') && is_bank_account($_POST['code_id'])) { display_error(_("You cannot make a journal entry for a bank account. Please use one of the banking functions for bank transactions.")); set_focus('code_id'); @@ -196,8 +264,8 @@ function handle_update_item() else $amount = -input_num('AmountCredit'); - $_SESSION['journal_items']->update_gl_item($_POST['Index'], $_POST['dimension_id'], - $_POST['dimension2_id'], $amount, $_POST['LineMemo']); + $_SESSION['journal_items']->update_gl_item($_POST['Index'], $_POST['code_id'], + $_POST['dimension_id'], $_POST['dimension2_id'], $amount, $_POST['LineMemo']); } line_start_focus(); } @@ -249,13 +317,6 @@ if (isset($_POST['go'])) } //----------------------------------------------------------------------------------------------- -if (isset($_GET['NewJournal']) || !isset($_SESSION['journal_items'])) -{ - handle_new_order(); -} - -//----------------------------------------------------------------------------------------------- - start_form(); display_order_header($_SESSION['journal_items']); @@ -270,7 +331,7 @@ end_row(); end_table(1); submit_center('Process', _("Process Journal Entry"), true , - _('Process journal entry only if debits equal to credits'), true); + _('Process journal entry only if debits equal to credits'), 'default'); end_form(); //------------------------------------------------------------------------------------------------ diff --git a/gl/includes/db/gl_db_account_types.inc b/gl/includes/db/gl_db_account_types.inc index edf4334f..1c25db71 100644 --- a/gl/includes/db/gl_db_account_types.inc +++ b/gl/includes/db/gl_db_account_types.inc @@ -14,7 +14,7 @@ function add_account_type($id, $name, $class_id, $parent) $sql = "INSERT INTO ".TB_PREF."chart_types (id, name, class_id, parent) VALUES ($id, ".db_escape($name).", ".db_escape($class_id).", ".db_escape($parent).")"; - db_query($sql, "could not add account type"); + return db_query($sql); } function update_account_type($id, $name, $class_id, $parent) @@ -23,12 +23,15 @@ function update_account_type($id, $name, $class_id, $parent) class_id=".db_escape($class_id).", parent=".db_escape($parent) ." WHERE id = ".db_escape($id); - db_query($sql, "could not update account type"); + return db_query($sql, "could not update account type"); } -function get_account_types() +function get_account_types($all=false) { - $sql = "SELECT * FROM ".TB_PREF."chart_types ORDER BY class_id, id"; + $sql = "SELECT * FROM ".TB_PREF."chart_types"; + + if (!$all) $sql .= " WHERE !inactive"; + $sql .= " ORDER BY class_id, id"; return db_query($sql, "could not get account types"); } @@ -59,25 +62,27 @@ function delete_account_type($id) db_query($sql, "could not delete account type"); } -function add_account_class($id, $name, $balance) +function add_account_class($id, $name, $ctype) { - $sql = "INSERT INTO ".TB_PREF."chart_class (cid, class_name, balance_sheet) - VALUES (".db_escape($id).", ".db_escape($name).", ".db_escape($balance).")"; + $sql = "INSERT INTO ".TB_PREF."chart_class (cid, class_name, ctype) + VALUES (".db_escape($id).", ".db_escape($name).", ".db_escape($ctype).")"; - db_query($sql, "could not add account type"); + return db_query($sql); } -function update_account_class($id, $name, $balance) +function update_account_class($id, $name, $ctype) { $sql = "UPDATE ".TB_PREF."chart_class SET class_name=".db_escape($name).", - balance_sheet=".db_escape($balance)." WHERE cid = ".db_escape($id); + ctype=".db_escape($ctype)." WHERE cid = ".db_escape($id); - db_query($sql, "could not update account type"); + return db_query($sql); } -function get_account_classes() +function get_account_classes($all=false) { - $sql = "SELECT * FROM ".TB_PREF."chart_class ORDER BY cid"; + $sql = "SELECT * FROM ".TB_PREF."chart_class"; + if (!$all) $sql .= " WHERE !inactive"; + $sql .= " ORDER BY cid"; return db_query($sql, "could not get account types"); } @@ -108,5 +113,4 @@ function delete_account_class($id) db_query($sql, "could not delete account type"); } - ?> \ No newline at end of file diff --git a/gl/includes/db/gl_db_accounts.inc b/gl/includes/db/gl_db_accounts.inc index 2eed9ad3..518f577f 100644 --- a/gl/includes/db/gl_db_accounts.inc +++ b/gl/includes/db/gl_db_accounts.inc @@ -15,7 +15,7 @@ function add_gl_account($account_code, $account_name, $account_type, $account_co VALUES (".db_escape($account_code).", ".db_escape($account_code2).", " .db_escape($account_name).", ".db_escape($account_type).")"; - db_query($sql, "could not add gl account"); + return db_query($sql); } function update_gl_account($account_code, $account_name, $account_type, $account_code2) @@ -24,7 +24,7 @@ function update_gl_account($account_code, $account_name, $account_type, $account .",account_type=".db_escape($account_type).", account_code2=".db_escape($account_code2) ." WHERE account_code = ".db_escape($account_code); - db_query($sql, "could not update gl account"); + return db_query($sql); } function delete_gl_account($code) @@ -51,13 +51,13 @@ function get_gl_accounts($from=null, $to=null) function get_gl_accounts_all($balance=-1) { if ($balance == 1) - $where ="WHERE balance_sheet>0 AND balance_sheet<".CL_INCOME; + $where ="WHERE ctype>0 AND ctype<".CL_INCOME; elseif ($balance == 0) - $where ="WHERE balance_sheet>".CL_EQUITY." OR balance_sheet=0"; // backwards compatibility + $where ="WHERE ctype>".CL_EQUITY." OR ctype=0"; // backwards compatibility $sql = "SELECT ".TB_PREF."chart_master.account_code, ".TB_PREF."chart_master.account_name, ".TB_PREF."chart_master.account_code2, ".TB_PREF."chart_types.name AS AccountTypeName,".TB_PREF."chart_types.id AS AccountType, ".TB_PREF."chart_types.parent, ".TB_PREF."chart_class.class_name AS AccountClassName, ".TB_PREF."chart_class.cid AS ClassID, - ".TB_PREF."chart_class.balance_sheet AS ClassType + ".TB_PREF."chart_class.ctype AS ClassType FROM ".TB_PREF."chart_types INNER JOIN ".TB_PREF."chart_class ON ".TB_PREF."chart_types.class_id=".TB_PREF."chart_class.cid LEFT JOIN ".TB_PREF."chart_master ON ".TB_PREF."chart_master.account_type=".TB_PREF."chart_types.id "; if ($balance != -1) @@ -78,7 +78,7 @@ function get_gl_account($code) function is_account_balancesheet($code) { - $sql = "SELECT ".TB_PREF."chart_class.balance_sheet FROM ".TB_PREF."chart_class, " + $sql = "SELECT ".TB_PREF."chart_class.ctype FROM ".TB_PREF."chart_class, " .TB_PREF."chart_types, ".TB_PREF."chart_master WHERE ".TB_PREF."chart_master.account_type=".TB_PREF."chart_types.id AND ".TB_PREF."chart_types.class_id=".TB_PREF."chart_class.cid diff --git a/gl/includes/db/gl_db_bank_accounts.inc b/gl/includes/db/gl_db_bank_accounts.inc index 5e6fadfb..a86b2ec4 100644 --- a/gl/includes/db/gl_db_bank_accounts.inc +++ b/gl/includes/db/gl_db_bank_accounts.inc @@ -10,29 +10,45 @@ See the License here . ***********************************************************************/ //--------------------------------------------------------------------------------------------- +function clear_dflt_curr_account($curr_code) { + $sql = "UPDATE ".TB_PREF."bank_accounts SET dflt_curr_act=0 WHERE bank_curr_code=" + .db_escape($curr_code); + db_query($sql, "could not update default currency account"); +} -function add_bank_account($account_code, $account_type, $bank_account_name, $bank_name, $bank_account_number, - $bank_address, $bank_curr_code) +function add_bank_account($account_code, $account_type, $bank_account_name, + $bank_name, $bank_account_number, $bank_address, $bank_curr_code, + $dflt_curr_act) { - $sql = "INSERT INTO ".TB_PREF."bank_accounts (account_code, account_type, bank_account_name, bank_name, bank_account_number, bank_address, bank_curr_code) + if($dflt_curr_act) // only one default account for any currency + clear_dflt_curr_account($bank_curr_code); + + $sql = "INSERT INTO ".TB_PREF."bank_accounts (account_code, account_type, + bank_account_name, bank_name, bank_account_number, bank_address, + bank_curr_code, dflt_curr_act) VALUES (".db_escape($account_code).", ".db_escape($account_type).", " .db_escape($bank_account_name).", ".db_escape($bank_name).", " .db_escape($bank_account_number).",".db_escape($bank_address). - ", ".db_escape($bank_curr_code).")"; + ", ".db_escape($bank_curr_code).", ".db_escape($dflt_curr_act).")"; db_query($sql, "could not add a bank account for $account_code"); } //--------------------------------------------------------------------------------------------- -function update_bank_account($id, $account_code, $account_type, $bank_account_name, $bank_name, $bank_account_number, - $bank_address, $bank_curr_code) +function update_bank_account($id, $account_code, $account_type, $bank_account_name, + $bank_name, $bank_account_number, $bank_address, $bank_curr_code, $dflt_curr_act) { + if($dflt_curr_act) // only one default account for any currency + clear_dflt_curr_account($bank_curr_code); + $sql = "UPDATE ".TB_PREF."bank_accounts SET account_type = ".db_escape($account_type).", account_code=".db_escape($account_code).", bank_account_name=".db_escape($bank_account_name).", bank_name=".db_escape($bank_name).", bank_account_number=".db_escape($bank_account_number).", bank_curr_code=".db_escape($bank_curr_code).", - bank_address=".db_escape($bank_address)." WHERE id = ".db_escape($id); + bank_address=".db_escape($bank_address).", + dflt_curr_act=".db_escape($dflt_curr_act) + ." WHERE id = ".db_escape($id); db_query($sql, "could not update bank account for $account_code"); } @@ -204,4 +220,24 @@ function get_quick_entry_line($selected_id) //--------------------------------------------------------------------------------------------- +function get_default_bank_account($curr) +{ + /* default bank account is selected as first found account from: + . default account in $curr if any + . first defined account in $curr if any + . default account in home currency + . first defined account in home currency + */ + $home_curr = get_company_pref('curr_default'); + + $sql = "SELECT b.*, b.bank_curr_code='$home_curr' as fall_back FROM " + .TB_PREF."bank_accounts b" + ." WHERE b.bank_curr_code=".db_escape($curr) + ." OR b.bank_curr_code='$home_curr' + ORDER BY fall_back, dflt_curr_act desc"; + + $result = db_query($sql, "could not retreive default bank account"); + + return db_fetch($result); +} ?> \ No newline at end of file diff --git a/gl/includes/db/gl_db_banking.inc b/gl/includes/db/gl_db_banking.inc index 52869000..84df6f9d 100644 --- a/gl/includes/db/gl_db_banking.inc +++ b/gl/includes/db/gl_db_banking.inc @@ -27,11 +27,11 @@ function add_exchange_variation($trans_type, $trans_no, $date_, $acc_id, $accoun if ($diff != 0) { if ($trans_type == null) - $trans_type = systypes::journal_entry(); + $trans_type = ST_JOURNAL; if ($trans_no == null) $trans_no = get_next_trans_no($trans_type); if ($person_type_id == null) - $person_type_id = payment_person_types::misc(); + $person_type_id = PT_MISC; add_gl_trans($trans_type, $trans_no, $date_, $account, 0, 0, _("Exchange Variance"), -$diff, null, $person_type_id, $person_id); add_gl_trans($trans_type, $trans_no, $date_, get_company_pref('exchange_diff_act'), 0, 0, @@ -41,11 +41,11 @@ function add_exchange_variation($trans_type, $trans_no, $date_, $acc_id, $accoun function add_exchange_variation_all() { - $trans_no = get_next_trans_no(0); + $trans_no = get_next_trans_no(ST_JOURNAL); $sql = "SELECT * FROM ".TB_PREF."bank_accounts"; $result = db_query($sql, "could not retreive bank accounts"); while ($myrow = db_fetch($result)) - add_exchange_variation(0, $trans_no, null, $myrow['id'], $myrow['account_code'], + add_exchange_variation(ST_JOURNAL, $trans_no, null, $myrow['id'], $myrow['account_code'], $myrow['currency_code']); } //---------------------------------------------------------------------------------- @@ -56,11 +56,13 @@ function add_exchange_variation_all() // function add_bank_transfer($from_account, $to_account, $date_, - $amount, $ref, $memo_) + $amount, $ref, $memo_, $charge=0) { + global $Refs; + begin_transaction(); - $trans_type = systypes::bank_transfer(); + $trans_type = ST_BANKTRANSFER; $currency = get_bank_account_currency($from_account); @@ -72,16 +74,23 @@ function add_bank_transfer($from_account, $to_account, $date_, $total = 0; // do the source account postings $total += add_gl_trans($trans_type, $trans_no, $date_, $from_gl_account, 0, 0, "", - -$amount, $currency); + -($amount + $charge), $currency); add_bank_trans($trans_type, $trans_no, $from_account, $ref, - $date_, -$amount, - payment_person_types::misc(), "", $currency, + $date_, -($amount + $charge), + PT_MISC, "", $currency, "Cannot insert a source bank transaction"); add_exchange_variation($trans_type, $trans_no, $date_, $from_account, $from_gl_account, - $currency, payment_person_types::misc(), ""); + $currency, PT_MISC, ""); + if ($charge != 0) + { + /* Now Debit bank charge account with charges */ + $charge_act = get_company_pref('bank_charge_act'); + $total += add_gl_trans($trans_type, $trans_no, $date_, + $charge_act, 0, 0, "", $charge, $currency); + } // do the destination account postings $total += add_gl_trans($trans_type, $trans_no, $date_, $to_gl_account, 0, 0, "", $amount, $currency); @@ -90,15 +99,16 @@ function add_bank_transfer($from_account, $to_account, $date_, add_gl_balance($trans_type, $trans_no, $date_, -$total); add_bank_trans($trans_type, $trans_no, $to_account, $ref, - $date_, $amount, payment_person_types::misc(), "", + $date_, $amount, PT_MISC, "", $currency, "Cannot insert a destination bank transaction"); add_exchange_variation($trans_type, $trans_no, $date_, $from_account, $from_gl_account, - $currency, payment_person_types::misc(), ""); + $currency, PT_MISC, ""); add_comments($trans_type, $trans_no, $date_, $memo_); - references::save_last($ref, $trans_type); + $Refs->save($trans_type, $trans_no, $ref); + add_audit_trail($trans_type, $trans_no, $date_); commit_transaction(); @@ -117,15 +127,18 @@ function add_bank_transfer($from_account, $to_account, $date_, // returns an array of (inserted trans type, trans no) function add_bank_transaction($trans_type, $from_account, $items, $date_, - $person_type_id, $person_id, $person_detail_id, $ref, $memo_) + $person_type_id, $person_id, $person_detail_id, $ref, $memo_, $use_transaction=true) { + global $Refs; + // we can only handle type 1 (payment)and type 2 (deposit) - if ($trans_type != systypes::bank_payment() && $trans_type != systypes::bank_deposit()) + if ($trans_type != ST_BANKPAYMENT && $trans_type != ST_BANKDEPOSIT) display_db_error("Invalid type ($trans_type) sent to add_bank_transaction"); $do_exchange_variance = false; - begin_transaction(); + if ($use_transaction) + begin_transaction(); $currency = get_bank_account_currency($from_account); $bank_gl_account = get_bank_gl_account($from_account); @@ -133,7 +146,7 @@ function add_bank_transaction($trans_type, $from_account, $items, $date_, // the gl items are already inversed/negated for type 2 (deposit) $total_amount = $items->gl_items_total(); - if ($person_type_id == payment_person_types::customer()) + if ($person_type_id == PT_CUSTOMER) { // we need to add a customer transaction record @@ -146,7 +159,7 @@ function add_bank_transaction($trans_type, $from_account, $items, $date_, $ref, $cust_amount); } - elseif ($person_type_id == payment_person_types::supplier()) + elseif ($person_type_id == PT_SUPPLIER) { // we need to add a supplier transaction record // convert to supp currency @@ -177,7 +190,7 @@ function add_bank_transaction($trans_type, $from_account, $items, $date_, { $is_bank_to = is_bank_account($gl_item->code_id); - if ($trans_type == 1 AND $is_bank_to) + if ($trans_type == ST_BANKPAYMENT AND $is_bank_to) { // we don't allow payments to go to a bank account. use transfer for this ! display_db_error("invalid payment entered. Cannot pay to another bank account", ""); @@ -217,9 +230,11 @@ function add_bank_transaction($trans_type, $from_account, $items, $date_, add_comments($trans_type, $trans_no, $date_, $memo_); - references::save_last($ref, $trans_type); + $Refs->save($trans_type, $trans_no, $ref); + add_audit_trail($trans_type, $trans_no, $date_); - commit_transaction(); + if ($use_transaction) + commit_transaction(); return array($trans_type, $trans_no); } diff --git a/gl/includes/db/gl_db_currencies.inc b/gl/includes/db/gl_db_currencies.inc index 69b4e4a5..eee35e1c 100644 --- a/gl/includes/db/gl_db_currencies.inc +++ b/gl/includes/db/gl_db_currencies.inc @@ -11,23 +11,28 @@ ***********************************************************************/ //--------------------------------------------------------------------------------------------- -function update_currency($curr_abrev, $symbol, $currency, $country, $hundreds_name) +function update_currency($curr_abrev, $symbol, $currency, $country, + $hundreds_name, $auto_update) { - $sql = "UPDATE ".TB_PREF."currencies SET currency=" - .db_escape($currency).", curr_symbol=".db_escape($symbol).", - country=".db_escape($country).", hundreds_name=".db_escape($hundreds_name) - ." WHERE curr_abrev = ".db_escape($curr_abrev); + $sql = "UPDATE ".TB_PREF."currencies SET currency=".db_escape($currency) + .", curr_symbol=".db_escape($symbol).", country=".db_escape($country) + .", hundreds_name=".db_escape($hundreds_name) + .",auto_update = ".db_escape($auto_update) + ." WHERE curr_abrev = ".db_escape($curr_abrev); db_query($sql, "could not update currency for $curr_abrev"); } //--------------------------------------------------------------------------------------------- -function add_currency($curr_abrev, $symbol, $currency, $country, $hundreds_name) +function add_currency($curr_abrev, $symbol, $currency, $country, + $hundreds_name, $auto_update) { - $sql = "INSERT INTO ".TB_PREF."currencies (curr_abrev, curr_symbol, currency, country, hundreds_name) + $sql = "INSERT INTO ".TB_PREF."currencies (curr_abrev, curr_symbol, currency, + country, hundreds_name, auto_update) VALUES (".db_escape($curr_abrev).", ".db_escape($symbol).", " - .db_escape($currency).", ".db_escape($country).", ".db_escape($hundreds_name).")"; + .db_escape($currency).", ".db_escape($country).", " + .db_escape($hundreds_name).",".db_escape($auto_update).")"; db_query($sql, "could not add currency for $curr_abrev"); } @@ -56,9 +61,10 @@ function get_currency($curr_code) //--------------------------------------------------------------------------------------------- -function get_currencies() +function get_currencies($all=false) { $sql = "SELECT * FROM ".TB_PREF."currencies"; + if (!$all) $sql .= " WHERE !inactive"; return db_query($sql, "could not get currencies"); } diff --git a/gl/includes/db/gl_db_rates.inc b/gl/includes/db/gl_db_rates.inc index bd0775ea..c6d5c530 100644 --- a/gl/includes/db/gl_db_rates.inc +++ b/gl/includes/db/gl_db_rates.inc @@ -70,7 +70,19 @@ function delete_exchange_rate($rate_id) db_query($sql, "could not delete exchange rate $rate_id"); } -//--------------------------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +// Retrieve exchange rate as of date $date from external source (usually inet) +// +function retrieve_exrate($curr_b, $date) +{ + global $Hooks; + + if (method_exists($Hooks, 'retrieve_exrate')) + return $Hooks->retrieve_exrate($curr_b, $date); + else + return get_ecb_rate($curr_b); +} +//----------------------------------------------------------------------------- function get_ecb_rate($curr_b) { diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc index 82dbc830..af06cedf 100644 --- a/gl/includes/db/gl_db_trans.inc +++ b/gl/includes/db/gl_db_trans.inc @@ -97,7 +97,8 @@ function add_gl_balance($type, $trans_id, $date_, $amount, $person_type_id=null, //-------------------------------------------------------------------------------- function get_gl_transactions($from_date, $to_date, $trans_no=0, - $account=null, $dimension=0, $dimension2=0, $filter_type=null) + $account=null, $dimension=0, $dimension2=0, $filter_type=null, + $amount_min=null, $amount_max=null) { $from = date2sql($from_date); $to = date2sql($to_date); @@ -114,16 +115,22 @@ function get_gl_transactions($from_date, $to_date, $trans_no=0, if ($account != null) $sql .= " AND ".TB_PREF."gl_trans.account = ".db_escape($account); - if ($dimension > 0) - $sql .= " AND ".TB_PREF."gl_trans.dimension_id = ".db_escape($dimension); + if ($dimension != 0) + $sql .= " AND ".TB_PREF."gl_trans.dimension_id = ".($dimension<0?0:db_escape($dimension)); - if ($dimension2 > 0) - $sql .= " AND ".TB_PREF."gl_trans.dimension2_id = ".db_escape($dimension2); + if ($dimension2 != 0) + $sql .= " AND ".TB_PREF."gl_trans.dimension2_id = ".($dimension2<0?0:db_escape($dimension2)); if ($filter_type != null AND is_numeric($filter_type)) $sql .= " AND ".TB_PREF."gl_trans.type= ".db_escape($filter_type); + + if ($amount_min != null) + $sql .= " AND ABS(".TB_PREF."gl_trans.amount) >= ABS(".db_escape($amount_min).")"; + + if ($amount_max != null) + $sql .= " AND ABS(".TB_PREF."gl_trans.amount) <= ABS(".db_escape($amount_max).")"; - $sql .= " ORDER BY tran_date"; + $sql .= " ORDER BY tran_date, counter"; return db_query($sql, "The transactions for could not be retrieved"); } @@ -150,9 +157,9 @@ function get_gl_wo_cost_trans($trans_id, $person_id=-1) $sql = "SELECT ".TB_PREF."gl_trans.*, ".TB_PREF."chart_master.account_name FROM " .TB_PREF."gl_trans, ".TB_PREF."chart_master WHERE ".TB_PREF."chart_master.account_code=".TB_PREF."gl_trans.account - AND ".TB_PREF."gl_trans.type=".systypes::work_order()." AND " - .TB_PREF."gl_trans.type_no=".db_escape($trans_id)." - AND ".TB_PREF."gl_trans.person_type_id=".payment_person_types::WorkOrder(); + AND ".TB_PREF."gl_trans.type=".ST_WORKORDER + ." AND ".TB_PREF."gl_trans.type_no=".db_escape($trans_id)." + AND ".TB_PREF."gl_trans.person_type_id=".PT_WORKORDER; if ($person_id != -1) $sql .= " AND ".TB_PREF."gl_trans.person_id=".db_escape($person_id); $sql .= " AND amount < 0"; @@ -171,10 +178,10 @@ function get_gl_balance_from_to($from_date, $to_date, $account, $dimension=0, $d $sql .= " AND tran_date > '$from'"; if ($to_date != "") $sql .= " AND tran_date < '$to'"; - if ($dimension > 0) - $sql .= " AND dimension_id = ".db_escape($dimension); - if ($dimension2 > 0) - $sql .= " AND dimension2_id = ".db_escape($dimension2); + if ($dimension != 0) + $sql .= " AND dimension_id = ".($dimension<0?0:db_escape($dimension)); + if ($dimension2 != 0) + $sql .= " AND dimension2_id = ".($dimension2<0?0:db_escape($dimension2)); $result = db_query($sql, "The starting balance for account $account could not be calculated"); @@ -195,10 +202,10 @@ function get_gl_trans_from_to($from_date, $to_date, $account, $dimension=0, $dim $sql .= " AND tran_date >= '$from'"; if ($to_date != "") $sql .= " AND tran_date <= '$to'"; - if ($dimension > 0) - $sql .= " AND dimension_id = ".db_escape($dimension); - if ($dimension2 > 0) - $sql .= " AND dimension2_id = ".db_escape($dimension2); + if ($dimension != 0) + $sql .= " AND dimension_id = ".($dimension<0?0:db_escape($dimension)); + if ($dimension2 != 0) + $sql .= " AND dimension2_id = ".($dimension2<0?0:db_escape($dimension2)); $result = db_query($sql, "Transactions for account $account could not be calculated"); @@ -219,15 +226,15 @@ function get_balance($account, $dimension, $dimension2, $from, $to, $from_incl=t if ($account != null) $sql .= " account=".db_escape($account)." AND"; - if ($dimension > 0) - $sql .= " dimension_id=".db_escape($dimension)." AND"; - if ($dimension2 > 0) - $sql .= " dimension2_id=".db_escape($dimension2)." AND"; + if ($dimension != 0) + $sql .= " dimension_id = ".($dimension<0?0:db_escape($dimension))." AND"; + if ($dimension2 != 0) + $sql .= " dimension2_id = ".($dimension2<0?0:db_escape($dimension2))." AND"; $from_date = date2sql($from); if ($from_incl) $sql .= " tran_date >= '$from_date' AND"; else - $sql .= " tran_date > IF(balance_sheet>0 AND balance_sheet<".CL_INCOME.", '0000-00-00', '$from_date') AND"; + $sql .= " tran_date > IF(ctype>0 AND ctype<".CL_INCOME.", '0000-00-00', '$from_date') AND"; $to_date = date2sql($to); if ($to_incl) $sql .= " tran_date <= '$to_date' "; @@ -253,10 +260,10 @@ function get_budget_trans_from_to($from_date, $to_date, $account, $dimension=0, $sql .= " AND tran_date >= '$from' "; if ($to_date != "") $sql .= " AND tran_date <= '$to' "; - if ($dimension > 0) - $sql .= " AND dimension_id = ".db_escape($dimension); - if ($dimension2 > 0) - $sql .= " AND dimension2_id = ".db_escape($dimension2); + if ($dimension != 0) + $sql .= " AND dimension_id = ".($dimension<0?0:db_escape($dimension)); + if ($dimension2 != 0) + $sql .= " AND dimension2_id = ".($dimension2<0?0:db_escape($dimension2)); $result = db_query($sql,"No budget accounts were returned"); $row = db_fetch_row($result); @@ -342,36 +349,53 @@ function get_tax_summary($from, $to) $todate = date2sql($to); $sql = "SELECT - SUM(IF(trans_type=11 || trans_type=20,-1,1)* - IF(trans_type=2 || trans_type=10 || trans_type=11, net_amount*ex_rate,0)) net_output, - SUM(IF(trans_type=11 || trans_type=20,-1,1)* - IF(trans_type=2 || trans_type=10 || trans_type=11, amount*ex_rate,0)) payable, - SUM(IF(trans_type=11 || trans_type=20,-1,1)* - IF(trans_type=2 || trans_type=10 || trans_type=11, 0, net_amount*ex_rate)) net_input, - SUM(IF(trans_type=11 || trans_type=20,-1,1)* - IF(trans_type=2 || trans_type=10 || trans_type=11, 0, amount*ex_rate)) collectible, + SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE.",-1,1)* + IF(trans_type=".ST_BANKDEPOSIT." || trans_type=".ST_SALESINVOICE." || trans_type=".ST_CUSTCREDIT.", net_amount*ex_rate,0)) net_output, + SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE.",-1,1)* + IF(trans_type=".ST_BANKDEPOSIT." || trans_type=".ST_SALESINVOICE." || trans_type=".ST_CUSTCREDIT.", amount*ex_rate,0)) payable, + SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE.",-1,1)* + IF(trans_type=".ST_BANKDEPOSIT." || trans_type=".ST_SALESINVOICE." || trans_type=".ST_CUSTCREDIT.", 0, net_amount*ex_rate)) net_input, + SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE.",-1,1)* + IF(trans_type=".ST_BANKDEPOSIT." || trans_type=".ST_SALESINVOICE." || trans_type=".ST_CUSTCREDIT.", 0, amount*ex_rate)) collectible, taxrec.rate, ttype.id, ttype.name FROM ".TB_PREF."tax_types ttype, ".TB_PREF."trans_tax_details taxrec WHERE taxrec.tax_type_id=ttype.id - AND taxrec.trans_type != 13 + AND taxrec.trans_type != ".ST_CUSTDELIVERY." AND taxrec.tran_date >= '$fromdate' AND taxrec.tran_date <= '$todate' GROUP BY ttype.id"; //display_error($sql); return db_query($sql,"Cannot retrieve tax summary"); } + //-------------------------------------------------------------------------------- -function add_journal_entries($items, $date_, $ref, $reverse, $memo_=null) +// Write/update journal entries. +// +function write_journal_entries(&$cart, $reverse, $use_transaction=true) { - begin_transaction(); + global $Refs; + + $date_ = $cart->tran_date; + $ref = $cart->reference; + $memo_ = $cart->memo_; + $trans_type = $cart->trans_type; + $new = $cart->order_id == 0; + + if ($new) + $cart->order_id = get_next_trans_no($trans_type); + + $trans_id = $cart->order_id; - $trans_type = systypes::journal_entry(); - $trans_id = get_next_trans_no($trans_type); + if ($use_transaction) + begin_transaction(); + + if(!$new) + void_journal_trans($trans_type, $trans_id, false); - foreach ($items as $journal_item) + foreach ($cart->gl_items as $journal_item) { // post to first found bank account using given gl acount code. $is_bank_to = is_bank_account($journal_item->code_id); @@ -382,29 +406,33 @@ function add_journal_entries($items, $date_, $ref, $reverse, $memo_=null) if ($is_bank_to) { add_bank_trans($trans_type, $trans_id, $is_bank_to, $ref, - $date_, $journal_item->amount, - 0, "", get_company_currency(), + $date_, $journal_item->amount, 0, "", get_company_currency(), "Cannot insert a destination bank transaction"); } // store tax details if the gl account is a tax account add_gl_tax_details($journal_item->code_id, - ($journal_item->amount < 0.0 ? 2 : 1), $trans_id, -$journal_item->amount, 1, $date_, $memo_); + ($journal_item->amount < 0.0 ? ST_BANKDEPOSIT : ST_BANKPAYMENT), $trans_id, -$journal_item->amount, 1, $date_, $memo_); } - add_comments($trans_type, $trans_id, $date_, $memo_); + if ($new) { + add_comments($trans_type, $trans_id, $date_, $memo_); + $Refs->save($trans_type, $trans_id, $ref); + } else { + update_comments($trans_type, $trans_id, null, $memo_); + $Refs->update($trans_type, $trans_id, $ref); + } - references::save($trans_type, $trans_id, $ref); + add_audit_trail($trans_type, $trans_id, $date_); if ($reverse) { - //$reversingDate = date(user_date_display(), // Mktime(0,0,0,get_month($date_)+1,1,get_year($date_))); $reversingDate = begin_month(add_months($date_, 1)); $trans_id_reverse = get_next_trans_no($trans_type); - foreach ($items as $journal_item) + foreach ($cart->gl_items as $journal_item) { $is_bank_to = is_bank_account($journal_item->code_id); @@ -420,15 +448,17 @@ function add_journal_entries($items, $date_, $ref, $reverse, $memo_=null) } // store tax details if the gl account is a tax account add_gl_tax_details($journal_item->code_id, - ($journal_item->amount < 0.0 ? 2 : 1), $trans_id, $journal_item->amount, 1, $date, $memo_); + ($journal_item->amount < 0.0 ? ST_BANKDEPOSIT : ST_BANKPAYMENT), $trans_id, $journal_item->amount, 1, $reversingDate, $memo_); } add_comments($trans_type, $trans_id_reverse, $reversingDate, $memo_); - references::save($trans_type, $trans_id_reverse, $ref); + $Refs->save($trans_type, $trans_id_reverse, $ref); + add_audit_trail($trans_type, $trans_id_reverse, $reversingDate); } - commit_transaction(); + if ($use_transaction) + commit_transaction(); return $trans_id; } @@ -462,15 +492,17 @@ function void_gl_trans($type, $trans_id, $nested=false) //---------------------------------------------------------------------------------------- -function void_journal_trans($type, $type_no) +function void_journal_trans($type, $type_no, $use_transaction=true) { - begin_transaction(); + if ($use_transaction) + begin_transaction(); - void_gl_trans($type, $type_no, true); - void_bank_trans($type, $type_no,true); - void_trans_tax_details($type, $type_no); + void_bank_trans($type, $type_no, true); +// void_gl_trans($type, $type_no, true); // this is done above +// void_trans_tax_details($type, $type_no); // ditto - commit_transaction(); + if ($use_transaction) + commit_transaction(); } ?> \ No newline at end of file diff --git a/gl/includes/ui/gl_bank_ui.inc b/gl/includes/ui/gl_bank_ui.inc index 3a22184e..46408216 100644 --- a/gl/includes/ui/gl_bank_ui.inc +++ b/gl/includes/ui/gl_bank_ui.inc @@ -11,8 +11,8 @@ ***********************************************************************/ function display_bank_header(&$order) { - global $table_style2, $Ajax; - $payment = $order->trans_type == systypes::bank_payment(); + global $table_style2, $Ajax, $Refs; + $payment = $order->trans_type == ST_BANKPAYMENT; div_start('pmt_header'); @@ -22,7 +22,7 @@ function display_bank_header(&$order) bank_accounts_list_row( $payment ? _("From:") : _("To:"), 'bank_account', null, true); - date_row(_("Date:"), 'date_', '', null, 0, 0, 0, null, true); + date_row(_("Date:"), 'date_', '', true, 0, 0, 0, null, true); table_section(2, "33%"); @@ -44,36 +44,39 @@ function display_bank_header(&$order) $_POST['person_id'] = ''; $Ajax->activate('pmt_header'); $Ajax->activate('code_id'); + $Ajax->activate('pagehelp'); + $Ajax->activate('editors'); } payment_person_types_list_row( $payment ? _("Pay To:"):_("From:"), 'PayType', $_POST['PayType'], true); switch ($_POST['PayType']) { - case payment_person_types::misc() : + case PT_MISC : text_row_ex($payment ?_("To the Order of:"):_("Name:"), 'person_id', 40, 50); break; - //case payment_person_types::WorkOrder() : + //case PT_WORKORDER : // workorders_list_row(_("Work Order:"), 'person_id', null); // break; - case payment_person_types::supplier() : - supplier_list_row(_("Supplier:"), 'person_id', null, false, true); + case PT_SUPPLIER : + supplier_list_row(_("Supplier:"), 'person_id', null, false, true, false, true); break; - case payment_person_types::customer() : - customer_list_row(_("Customer:"), 'person_id', null, false, true); + case PT_CUSTOMER : + customer_list_row(_("Customer:"), 'person_id', null, false, true, false, true); if (db_customer_has_branches($_POST['person_id'])) { - customer_branches_list_row(_("Branch:"), $_POST['person_id'], 'PersonDetailID', null, false, true, true); + customer_branches_list_row(_("Branch:"), $_POST['person_id'], + 'PersonDetailID', null, false, true, true, true); } else { - $_POST['PersonDetailID'] = reserved_words::get_any_numeric(); + $_POST['PersonDetailID'] = ANY_NUMERIC; hidden('PersonDetailID'); } break; - case payment_person_types::QuickEntry() : + case PT_QUICKENTRY : quick_entries_list_row(_("Type").":", 'person_id', null, ($payment ? QE_PAYMENT : QE_DEPOSIT), true); $qid = get_quick_entry(get_post('person_id')); if (list_updated('person_id')) { @@ -88,7 +91,7 @@ function display_bank_header(&$order) // break; } - $person_currency = payment_person_types::person_currency($_POST['PayType'], $_POST['person_id']); + $person_currency = payment_person_currency($_POST['PayType'], $_POST['person_id']); $bank_currency = get_bank_account_currency($_POST['bank_account']); exchange_rate_display($bank_currency, $person_currency, $_POST['date_']); @@ -96,9 +99,9 @@ function display_bank_header(&$order) table_section(3, "33%"); if (isset($_GET['NewPayment'])) - ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::bank_payment())); + ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_BANKPAYMENT)); else - ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::bank_deposit())); + ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_BANKDEPOSIT)); end_outer_table(1); // outer table @@ -146,7 +149,7 @@ function display_gl_items($title, &$order) if ($dim > 1) label_cell(get_dimension_string($item->dimension2_id, true)); //amount_cell(abs($item->amount)); - if ($order->trans_type == systypes::bank_deposit()) + if ($order->trans_type == ST_BANKDEPOSIT) amount_cell(-$item->amount); else amount_cell($item->amount); @@ -168,12 +171,8 @@ function display_gl_items($title, &$order) gl_edit_item_controls($order, $dim); if ($order->count_gl_items()) - { - $total = $order->gl_items_total(); - if ($order->trans_type == systypes::bank_deposit()) - $total *= -1; - label_row(_("Total"), number_format2($total, user_price_dec()),"colspan=" . $colspan . " align=right", "align=right",3); - } + label_row(_("Total"), number_format2(abs($order->gl_items_total()), user_price_dec()),"colspan=" . $colspan . " align=right", "align=right",3); + end_table(); div_end(); } @@ -183,7 +182,7 @@ function display_gl_items($title, &$order) function gl_edit_item_controls(&$order, $dim, $Index=null) { global $Ajax; - $payment = $order->trans_type == systypes::bank_payment(); + $payment = $order->trans_type == ST_BANKPAYMENT; start_row(); $id = find_submit('Edit'); @@ -198,9 +197,7 @@ function gl_edit_item_controls(&$order, $dim, $Index=null) $_POST['LineMemo'] = $item->reference; hidden('Index', $id); - hidden('code_id', $item->code_id); - label_cell($_POST['code_id']); - label_cell($item->description); + echo gl_all_accounts_list('code_id', null, true, true); if ($dim >= 1) dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1); if ($dim > 1) @@ -217,23 +214,23 @@ function gl_edit_item_controls(&$order, $dim, $Index=null) $Ajax->activate('code_id'); } - if ($_POST['PayType'] == payment_person_types::customer()) + if ($_POST['PayType'] == PT_CUSTOMER) { $acc = get_branch_accounts($_POST['PersonDetailID']); $_POST['code_id'] = $acc['receivables_account']; } - elseif ($_POST['PayType'] == payment_person_types::supplier()) + elseif ($_POST['PayType'] == PT_SUPPLIER) { $acc = get_supplier_accounts($_POST['person_id']); $_POST['code_id'] = $acc['payable_account']; } - //elseif ($_POST['PayType'] == payment_person_types::WorkOrder()) + //elseif ($_POST['PayType'] == PT_WORKORDER) // $_POST['code_id'] = get_company_pref('default_assembly_act'); else { $_POST['code_id'] = get_company_pref($payment ? 'default_cogs_act':'default_inv_sales_act'); } - gl_all_accounts_list('code_id', null, false, true); + echo gl_all_accounts_list('code_id', null, true, true); if ($dim >= 1) dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1); if ($dim > 1) @@ -245,7 +242,7 @@ function gl_edit_item_controls(&$order, $dim, $Index=null) hidden('dimension2_id', 0); amount_cells(null, 'amount'); - text_cells_ex(null, 'LineMemo', 35, 50); + text_cells_ex(null, 'LineMemo', 35, 255); if ($id != -1) { diff --git a/gl/includes/ui/gl_journal_ui.inc b/gl/includes/ui/gl_journal_ui.inc index 74602849..3d0a9723 100644 --- a/gl/includes/ui/gl_journal_ui.inc +++ b/gl/includes/ui/gl_journal_ui.inc @@ -19,23 +19,26 @@ function display_order_header(&$Order) global $table_style2, $Ajax; $qes = has_quick_entries(QE_JOURNAL); - + $new = $Order->order_id==0; start_outer_table("$table_style2 width=90%"); table_section(1); start_row(); - date_cells(_("Date:"), 'date_'); - ref_cells(_("Reference:"), 'ref', '', references::get_next(0)); + date_cells(_("Date:"), 'date_', '', $new); + + table_section(2, $qes ? "20%" : "50%"); + ref_cells(_("Reference:"), 'ref', ''); + hidden('ref_original'); end_row(); - if ($qes) - table_section(2, "20%"); - else - table_section(2, "50%"); - start_row(); - check_cells(_("Reverse Transaction:"), 'Reverse', null); - end_row(); + if ($new) { + table_section(3, "20%"); + start_row(); + check_cells(_("Reverse Transaction:"), 'Reverse', null); + end_row(); + } + if ($qes !== false) { table_section(3, "50%"); @@ -147,6 +150,7 @@ function gl_edit_item_controls(&$order, $dim, $Index=null) $id = find_submit('Edit'); if ($Index != -1 && $Index == $id) { + // Modifying an existing row $item = $order->gl_items[$Index]; $_POST['code_id'] = $item->code_id; $_POST['dimension_id'] = $item->dimension_id; @@ -165,9 +169,8 @@ function gl_edit_item_controls(&$order, $dim, $Index=null) $_POST['LineMemo'] = $item->reference; hidden('Index', $id); - hidden('code_id', $item->code_id); - label_cell($_POST['code_id']); - label_cell($item->description); + $skip_bank = !$_SESSION["wa_current_user"]->can_access('SA_BANKJOURNAL'); + echo gl_all_accounts_list('code_id', null, $skip_bank, true); if ($dim >= 1) dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1); if ($dim > 1) @@ -176,6 +179,7 @@ function gl_edit_item_controls(&$order, $dim, $Index=null) } else { + // Adding a new row $_POST['AmountDebit'] = ''; //price_format(0); $_POST['AmountCredit'] = ''; //price_format(0); $_POST['dimension_id'] = 0; @@ -187,8 +191,8 @@ function gl_edit_item_controls(&$order, $dim, $Index=null) $Ajax->activate('code_id'); } - $skip_bank = ($_SESSION["wa_current_user"]->access != 2); - gl_all_accounts_list('code_id', null, $skip_bank, true); + $skip_bank = !$_SESSION["wa_current_user"]->can_access('SA_BANKJOURNAL'); + echo gl_all_accounts_list('code_id', null, $skip_bank, true); if ($dim >= 1) dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1); if ($dim > 1) @@ -201,7 +205,7 @@ function gl_edit_item_controls(&$order, $dim, $Index=null) small_amount_cells(null, 'AmountDebit'); small_amount_cells(null, 'AmountCredit'); - text_cells_ex(null, 'LineMemo', 35, 50); + text_cells_ex(null, 'LineMemo', 35, 255); if ($id != -1) { diff --git a/gl/inquiry/bank_inquiry.php b/gl/inquiry/bank_inquiry.php index 475c4818..b9dcf28e 100644 --- a/gl/inquiry/bank_inquiry.php +++ b/gl/inquiry/bank_inquiry.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 8; +$page_security = 'SA_BANKTRANSVIEW'; $path_to_root="../.."; include_once($path_to_root . "/includes/session.inc"); @@ -25,7 +25,7 @@ if ($use_popup_windows) $js .= get_js_open_window(800, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Bank Statement"), false, false, "", $js); +page(_($help_context = "Bank Statement"), false, false, "", $js); check_db_has_bank_accounts(_("There are no bank accounts defined in the system.")); @@ -46,7 +46,7 @@ bank_accounts_list_cells(_("Account:"), 'bank_account', null); date_cells(_("From:"), 'TransAfterDate', '', null, -30); date_cells(_("To:"), 'TransToDate'); -submit_cells('Show',_("Show"),'','', true); +submit_cells('Show',_("Show"),'','', 'default'); end_row(); end_table(); end_form(); @@ -101,13 +101,13 @@ while ($myrow = db_fetch($result)) $running_total += $myrow["amount"]; $trandate = sql2date($myrow["trans_date"]); - label_cell(systypes::name($myrow["type"])); + label_cell($systypes_array[$myrow["type"]]); label_cell(get_trans_view_str($myrow["type"],$myrow["trans_no"])); label_cell(get_trans_view_str($myrow["type"],$myrow["trans_no"],$myrow['ref'])); label_cell($trandate); display_debit_or_credit_cells($myrow["amount"]); amount_cell($running_total); - label_cell(payment_person_types::person_name($myrow["person_type_id"],$myrow["person_id"])); + label_cell(payment_person_name($myrow["person_type_id"],$myrow["person_id"])); label_cell(get_gl_view_str($myrow["type"], $myrow["trans_no"])); end_row(); diff --git a/gl/inquiry/gl_account_inquiry.php b/gl/inquiry/gl_account_inquiry.php index 22b31a78..a86f0c2b 100644 --- a/gl/inquiry/gl_account_inquiry.php +++ b/gl/inquiry/gl_account_inquiry.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 8; -$path_to_root="../.."; +$page_security = 'SA_GLTRANSVIEW'; +$path_to_root = "../.."; include_once($path_to_root . "/includes/session.inc"); @@ -27,7 +27,7 @@ if ($use_popup_windows) if ($use_date_picker) $js .= get_js_date_picker(); -page(_("General Ledger Account Inquiry"), false, false, '', $js); +page(_($help_context = "General Ledger Inquiry"), false, false, '', $js); //---------------------------------------------------------------------------------------------------- // Ajax updates @@ -47,6 +47,15 @@ if (isset($_GET["Dimension"])) $_POST["Dimension"] = $_GET["Dimension"]; if (isset($_GET["Dimension2"])) $_POST["Dimension2"] = $_GET["Dimension2"]; +if (isset($_GET["amount_min"])) + $_POST["amount_min"] = $_GET["amount_min"]; +if (isset($_GET["amount_max"])) + $_POST["amount_max"] = $_GET["amount_max"]; + +if (!isset($_POST["amount_min"])) + $_POST["amount_min"] = price_format(0); +if (!isset($_POST["amount_max"])) + $_POST["amount_max"] = price_format(0); //---------------------------------------------------------------------------------------------------- @@ -57,24 +66,28 @@ function gl_inquiry_controls() $dim = get_company_pref('use_dimension'); start_form(); - //start_table($table_style2); start_table("class='tablestyle_noborder'"); start_row(); - - gl_all_accounts_list_cells(_("Account:"), 'account', null); - + gl_all_accounts_list_cells(_("Account:"), 'account', null, false, false, "All Accounts"); date_cells(_("from:"), 'TransFromDate', '', null, -30); date_cells(_("to:"), 'TransToDate'); - submit_cells('Show',_("Show"),'','', true); - end_row(); + end_table(); + start_table(); + start_row(); if ($dim >= 1) - dimensions_list_row(_("Dimension")." 1", 'Dimension', null, true, " ", false, 1); + dimensions_list_cells(_("Dimension")." 1:", 'Dimension', null, true, " ", false, 1); if ($dim > 1) - dimensions_list_row(_("Dimension")." 2", 'Dimension2', null, true, " ", false, 2); + dimensions_list_cells(_("Dimension")." 2:", 'Dimension2', null, true, " ", false, 2); + + small_amount_cells(_("Amount min:"), 'amount_min', null); + small_amount_cells(_("Amount max:"), 'amount_max', null); + submit_cells('Show',_("Show"),'','', 'default'); + end_row(); end_table(); + echo '
'; end_form(); } @@ -82,11 +95,12 @@ function gl_inquiry_controls() function show_results() { - global $path_to_root, $table_style; + global $path_to_root, $table_style, $systypes_array; + + if (!isset($_POST["account"])) + $_POST["account"] = null; - if (!isset($_POST["account"]) || $_POST["account"] == "") - return; - $act_name = get_gl_account_name($_POST["account"]); + $act_name = $_POST["account"] ? get_gl_account_name($_POST["account"]) : ""; $dim = get_company_pref('use_dimension'); /*Now get the transactions */ @@ -95,25 +109,44 @@ function show_results() if (!isset($_POST['Dimension2'])) $_POST['Dimension2'] = 0; $result = get_gl_transactions($_POST['TransFromDate'], $_POST['TransToDate'], -1, - $_POST["account"], $_POST['Dimension'], $_POST['Dimension2']); + $_POST["account"], $_POST['Dimension'], $_POST['Dimension2'], null, + input_num('amount_min'), input_num('amount_max')); $colspan = ($dim == 2 ? "6" : ($dim == 1 ? "5" : "4")); - div_start('trans_tbl'); - //echo "\nDimension =". $_POST['Dimension']; - display_heading($_POST["account"]. "   ".$act_name); + if ($_POST["account"] != null) + display_heading($_POST["account"]. "   ".$act_name); + + // Only show balances if an account is specified AND we're not filtering by amounts + $show_balances = $_POST["account"] != null && + input_num("amount_min") == 0 && + input_num("amount_max") == 0; + start_table($table_style); + + $first_cols = array(_("Type"), _("#"), _("Date")); + + if ($_POST["account"] == null) + $account_col = array(_("Account")); + else + $account_col = array(); + if ($dim == 2) - $th = array(_("Type"), _("#"), _("Date"), _("Dimension")." 1", _("Dimension")." 2", - _("Person/Item"), _("Debit"), _("Credit"), _("Balance"), _("Memo")); + $dim_cols = array(_("Dimension")." 1", _("Dimension")." 2"); else if ($dim == 1) - $th = array(_("Type"), _("#"), _("Date"), _("Dimension"), - _("Person/Item"), _("Debit"), _("Credit"), _("Balance"), _("Memo")); + $dim_cols = array(_("Dimension")); else - $th = array(_("Type"), _("#"), _("Date"), - _("Person/Item"), _("Debit"), _("Credit"), _("Balance"), _("Memo")); + $dim_cols = array(); + + if ($show_balances) + $remaining_cols = array(_("Person/Item"), _("Debit"), _("Credit"), _("Balance"), _("Memo")); + else + $remaining_cols = array(_("Person/Item"), _("Debit"), _("Credit"), _("Memo")); + + $th = array_merge($first_cols, $account_col, $dim_cols, $remaining_cols); + table_header($th); - if (is_account_balancesheet($_POST["account"])) + if ($_POST["account"] != null && is_account_balancesheet($_POST["account"])) $begin = ""; else { @@ -123,15 +156,17 @@ function show_results() $begin = add_days($begin, -1); } - $bfw = get_gl_balance_from_to($begin, $_POST['TransFromDate'], $_POST["account"], $_POST['Dimension'], $_POST['Dimension2']); - - start_row("class='inquirybg'"); - label_cell(""._("Opening Balance")." - ".$_POST['TransFromDate']."", "colspan=$colspan"); - display_debit_or_credit_cells($bfw); - label_cell(""); - label_cell(""); - end_row(); - //$running_total =0; + $bfw = 0; + if ($show_balances) { + $bfw = get_gl_balance_from_to($begin, $_POST['TransFromDate'], $_POST["account"], $_POST['Dimension'], $_POST['Dimension2']); + start_row("class='inquirybg'"); + label_cell(""._("Opening Balance")." - ".$_POST['TransFromDate']."", "colspan=$colspan"); + display_debit_or_credit_cells($bfw); + label_cell(""); + label_cell(""); + end_row(); + } + $running_total = $bfw; $j = 1; $k = 0; //row colour counter @@ -145,16 +180,21 @@ function show_results() $trandate = sql2date($myrow["tran_date"]); - label_cell(systypes::name($myrow["type"])); + label_cell($systypes_array[$myrow["type"]]); label_cell(get_gl_view_str($myrow["type"], $myrow["type_no"], $myrow["type_no"], true)); label_cell($trandate); + + if ($_POST["account"] == null) + label_cell($myrow["account"] . ' ' . get_gl_account_name($myrow["account"])); + if ($dim >= 1) label_cell(get_dimension_string($myrow['dimension_id'], true)); if ($dim > 1) label_cell(get_dimension_string($myrow['dimension2_id'], true)); - label_cell(payment_person_types::person_name($myrow["person_type_id"],$myrow["person_id"])); + label_cell(payment_person_name($myrow["person_type_id"],$myrow["person_id"])); display_debit_or_credit_cells($myrow["amount"]); - amount_cell($running_total); + if ($show_balances) + amount_cell($running_total); label_cell($myrow['memo_']); end_row(); @@ -167,24 +207,31 @@ function show_results() } //end of while loop - start_row("class='inquirybg'"); - label_cell("" . _("Ending Balance") ." - ".$_POST['TransToDate']. "", "colspan=$colspan"); - display_debit_or_credit_cells($running_total); - label_cell(""); - label_cell(""); - end_row(); + if ($show_balances) { + start_row("class='inquirybg'"); + label_cell("" . _("Ending Balance") ." - ".$_POST['TransToDate']. "", "colspan=$colspan"); + display_debit_or_credit_cells($running_total); + label_cell(""); + label_cell(""); + end_row(); + } end_table(2); if (db_num_rows($result) == 0) - display_note(_("No general ledger transactions have been created for this account on the selected dates."), 0, 1); - div_end(); + display_note(_("No general ledger transactions have been created for the specified criteria."), 0, 1); + } //---------------------------------------------------------------------------------------------------- gl_inquiry_controls(); -show_results(); +div_start('trans_tbl'); + +if (get_post('Show')) + show_results(); + +div_end(); //---------------------------------------------------------------------------------------------------- diff --git a/gl/inquiry/gl_trial_balance.php b/gl/inquiry/gl_trial_balance.php index 6bf807cd..50ff2e3d 100644 --- a/gl/inquiry/gl_trial_balance.php +++ b/gl/inquiry/gl_trial_balance.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 8; +$page_security = 'SA_GLANALYTIC'; $path_to_root="../.."; include_once($path_to_root . "/includes/session.inc"); @@ -24,7 +24,7 @@ $js = ""; if ($use_date_picker) $js = get_js_date_picker(); -page(_("Trial Balance"), false, false, "", $js); +page(_($help_context = "Trial Balance"), false, false, "", $js); //---------------------------------------------------------------------------------------------------- // Ajax updates @@ -46,7 +46,7 @@ function gl_inquiry_controls() check_cells(_("No zero values"), 'NoZero', null); check_cells(_("Only balances"), 'Balance', null); - submit_cells('Show',_("Show"),'','', true); + submit_cells('Show',_("Show"),'','', 'default'); end_table(); end_form(); } @@ -94,7 +94,7 @@ function display_trial_balance() continue; alt_table_row_color($k); - $url = "" . $account["account_code"] . ""; + $url = "" . $account["account_code"] . ""; label_cell($url); label_cell($account["account_name"]); diff --git a/gl/inquiry/tax_inquiry.php b/gl/inquiry/tax_inquiry.php index c68ddabb..394963ab 100644 --- a/gl/inquiry/tax_inquiry.php +++ b/gl/inquiry/tax_inquiry.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 8; +$page_security = 'SA_TAXREP'; $path_to_root="../.."; include_once($path_to_root . "/includes/session.inc"); @@ -27,7 +27,7 @@ if ($use_popup_windows) if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Tax Inquiry"), false, false, '', $js); +page(_($help_context = "Tax Inquiry"), false, false, '', $js); //---------------------------------------------------------------------------------------------------- // Ajax updates @@ -63,7 +63,7 @@ function tax_inquiry_controls() date_cells(_("from:"), 'TransFromDate', '', null, -30); date_cells(_("to:"), 'TransToDate'); - submit_cells('Show',_("Show"),'','', true); + submit_cells('Show',_("Show"),'','', 'default'); end_row(); diff --git a/gl/manage/bank_accounts.php b/gl/manage/bank_accounts.php index 54bbe444..ae1dc41e 100644 --- a/gl/manage/bank_accounts.php +++ b/gl/manage/bank_accounts.php @@ -9,11 +9,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 10; -$path_to_root="../.."; +$page_security = 'SA_BANKACCOUNT'; +$path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("Bank Accounts")); +page(_($help_context = "Bank Accounts")); include($path_to_root . "/includes/ui.inc"); @@ -42,7 +42,8 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') update_bank_account($selected_id, $_POST['account_code'], $_POST['account_type'], $_POST['bank_account_name'], $_POST['bank_name'], $_POST['bank_account_number'], - $_POST['bank_address'], $_POST['BankAccountCurrency']); + $_POST['bank_address'], $_POST['BankAccountCurrency'], + $_POST['dflt_curr_act']); display_notification(_('Bank account has been updated')); } else @@ -50,8 +51,8 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') add_bank_account($_POST['account_code'], $_POST['account_type'], $_POST['bank_account_name'], $_POST['bank_name'], - $_POST['bank_account_number'], $_POST['bank_address'], - $_POST['BankAccountCurrency']); + $_POST['bank_account_number'], $_POST['bank_address'], + $_POST['BankAccountCurrency'], $_POST['dflt_curr_act']); display_notification(_('New bank account has been added')); } $Mode = 'RESET'; @@ -62,10 +63,10 @@ elseif( $Mode == 'Delete') //the link to delete a selected record was clicked instead of the submit button $cancel_delete = 0; - + $acc = db_escape($selected_id); // PREVENT DELETES IF DEPENDENT RECORDS IN 'bank_trans' - $sql= "SELECT COUNT(*) FROM ".TB_PREF."bank_trans WHERE bank_act='$selected_id'"; + $sql= "SELECT COUNT(*) FROM ".TB_PREF."bank_trans WHERE bank_act=$acc"; $result = db_query($sql,"check failed"); $myrow = db_fetch_row($result); if ($myrow[0] > 0) @@ -73,7 +74,7 @@ elseif( $Mode == 'Delete') $cancel_delete = 1; display_error(_("Cannot delete this bank account because transactions have been created using this account.")); } - $sql= "SELECT COUNT(*) FROM ".TB_PREF."sales_pos WHERE pos_account='$selected_id'"; + $sql= "SELECT COUNT(*) FROM ".TB_PREF."sales_pos WHERE pos_account=$acc"; $result = db_query($sql,"check failed"); $myrow = db_fetch_row($result); if ($myrow[0] > 0) @@ -100,8 +101,9 @@ if ($Mode == 'RESET') $sql = "SELECT account.*, gl_account.account_name FROM ".TB_PREF."bank_accounts account, ".TB_PREF."chart_master gl_account - WHERE account.account_code = gl_account.account_code" - ." ORDER BY account_code, bank_curr_code"; + WHERE account.account_code = gl_account.account_code"; +if (!check_value('show_inactive')) $sql .= " AND !account.inactive"; +$sql .= " ORDER BY account_code, bank_curr_code"; $result = db_query($sql,"could not get bank accounts"); @@ -111,7 +113,8 @@ start_form(); start_table("$table_style width='80%'"); $th = array(_("Account Name"), _("Type"), _("Currency"), _("GL Account"), - _("Bank"), _("Number"), _("Bank Address"),'',''); + _("Bank"), _("Number"), _("Bank Address"), _("Dflt"), '',''); +inactive_control_column($th); table_header($th); $k = 0; @@ -121,21 +124,25 @@ while ($myrow = db_fetch($result)) alt_table_row_color($k); label_cell($myrow["bank_account_name"], "nowrap"); - label_cell(bank_account_types::name($myrow["account_type"]), "nowrap"); + label_cell($bank_account_types[$myrow["account_type"]], "nowrap"); label_cell($myrow["bank_curr_code"], "nowrap"); label_cell($myrow["account_code"] . " " . $myrow["account_name"], "nowrap"); label_cell($myrow["bank_name"], "nowrap"); label_cell($myrow["bank_account_number"], "nowrap"); label_cell($myrow["bank_address"]); + if ($myrow["dflt_curr_act"]) + label_cell(_("Yes")); + else + label_cell(_("No")); + + inactive_control_cell($myrow["id"], $myrow["inactive"], 'bank_accounts', 'id'); edit_button_cell("Edit".$myrow["id"], _("Edit")); delete_button_cell("Delete".$myrow["id"], _("Delete")); end_row(); } -end_table(); -end_form(); -echo '
'; -start_form(); +inactive_control_row($th); +end_table(1); $is_editing = $selected_id != -1; @@ -153,6 +160,7 @@ if ($is_editing) $_POST['bank_account_number'] = $myrow["bank_account_number"]; $_POST['bank_address'] = $myrow["bank_address"]; $_POST['BankAccountCurrency'] = $myrow["bank_curr_code"]; + $_POST['dflt_curr_act'] = $myrow["dflt_curr_act"]; } hidden('selected_id', $selected_id); hidden('account_code'); @@ -165,7 +173,7 @@ text_row(_("Bank Account Name:"), 'bank_account_name', null, 50, 100); if ($is_editing) { - label_row(_("Account Type:"), bank_account_types::name($_POST['account_type'])); + label_row(_("Account Type:"), $bank_account_types[$_POST['account_type']]); } else { @@ -180,6 +188,8 @@ else currencies_list_row(_("Bank Account Currency:"), 'BankAccountCurrency', null); } +yesno_list_row(_("Default currency account:"), 'dflt_curr_act'); + if($is_editing) label_row(_("Bank Account GL Code:"), $_POST['account_code']); else @@ -191,7 +201,7 @@ textarea_row(_("Bank Address:"), 'bank_address', null, 40, 5); end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); diff --git a/gl/manage/currencies.php b/gl/manage/currencies.php index f1b91de0..9bf6a9cd 100644 --- a/gl/manage/currencies.php +++ b/gl/manage/currencies.php @@ -9,11 +9,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 9; -$path_to_root="../.."; +$page_security = 'SA_CURRENCY'; +$path_to_root = "../.."; include_once($path_to_root . "/includes/session.inc"); -page(_("Currencies")); +page(_($help_context = "Currencies")); include_once($path_to_root . "/includes/ui.inc"); include_once($path_to_root . "/includes/banking.inc"); @@ -65,14 +65,14 @@ function handle_submit() { update_currency($_POST['Abbreviation'], $_POST['Symbol'], $_POST['CurrencyName'], - $_POST['country'], $_POST['hundreds_name']); + $_POST['country'], $_POST['hundreds_name'], check_value('auto_update')); display_notification(_('Selected currency settings has been updated')); } else { add_currency($_POST['Abbreviation'], $_POST['Symbol'], $_POST['CurrencyName'], - $_POST['country'], $_POST['hundreds_name']); + $_POST['country'], $_POST['hundreds_name'], check_value('auto_update')); display_notification(_('New currency has been added')); } $Mode = 'RESET'; @@ -86,8 +86,10 @@ function check_can_delete() if ($selected_id == "") return false; + $curr = db_escape($selected_id); + // PREVENT DELETES IF DEPENDENT RECORDS IN debtors_master - $sql= "SELECT COUNT(*) FROM ".TB_PREF."debtors_master WHERE curr_code = '$selected_id'"; + $sql= "SELECT COUNT(*) FROM ".TB_PREF."debtors_master WHERE curr_code = $curr"; $result = db_query($sql); $myrow = db_fetch_row($result); if ($myrow[0] > 0) @@ -96,7 +98,7 @@ function check_can_delete() return false; } - $sql= "SELECT COUNT(*) FROM ".TB_PREF."suppliers WHERE curr_code = '$selected_id'"; + $sql= "SELECT COUNT(*) FROM ".TB_PREF."suppliers WHERE curr_code = $curr"; $result = db_query($sql); $myrow = db_fetch_row($result); if ($myrow[0] > 0) @@ -105,7 +107,7 @@ function check_can_delete() return false; } - $sql= "SELECT COUNT(*) FROM ".TB_PREF."company WHERE curr_default = '$selected_id'"; + $sql= "SELECT COUNT(*) FROM ".TB_PREF."company WHERE curr_default = $curr"; $result = db_query($sql); $myrow = db_fetch_row($result); if ($myrow[0] > 0) @@ -115,7 +117,7 @@ function check_can_delete() } // see if there are any bank accounts that use this currency - $sql= "SELECT COUNT(*) FROM ".TB_PREF."bank_accounts WHERE bank_curr_code = '$selected_id'"; + $sql= "SELECT COUNT(*) FROM ".TB_PREF."bank_accounts WHERE bank_curr_code = $curr"; $result = db_query($sql); $myrow = db_fetch_row($result); if ($myrow[0] > 0) @@ -146,13 +148,13 @@ function display_currencies() { global $table_style; - $company_currency = get_company_currency(); + $company_currency = get_company_currency(); - $result = get_currencies(); - start_form(); + $result = get_currencies(check_value('show_inactive')); start_table($table_style); $th = array(_("Abbreviation"), _("Symbol"), _("Currency Name"), - _("Hundredths name"), _("Country"), "", ""); + _("Hundredths name"), _("Country"), _("Auto update"), "", ""); + inactive_control_column($th); table_header($th); $k = 0; //row colour counter @@ -172,6 +174,9 @@ function display_currencies() label_cell($myrow["currency"]); label_cell($myrow["hundreds_name"]); label_cell($myrow["country"]); + label_cell( $myrow[1] == $company_currency ? '-' : + ($myrow["auto_update"] ? _('Yes') :_('No')), "align='center'"); + inactive_control_cell($myrow["curr_abrev"], $myrow["inactive"], 'currencies', 'curr_abrev'); edit_button_cell("Edit".$myrow["curr_abrev"], _("Edit")); if ($myrow["curr_abrev"] != $company_currency) delete_button_cell("Delete".$myrow["curr_abrev"], _("Delete")); @@ -181,8 +186,8 @@ function display_currencies() } //END WHILE LIST LOOP + inactive_control_row($th); end_table(); - end_form(); display_note(_("The marked currency is the home currency which cannot be deleted."), 0, 0, "class='currentfg'"); } @@ -192,7 +197,6 @@ function display_currency_edit($selected_id) { global $table_style2, $Mode; - start_form(); start_table($table_style2); if ($selected_id != '') @@ -206,6 +210,7 @@ function display_currency_edit($selected_id) $_POST['CurrencyName'] = $myrow["currency"]; $_POST['country'] = $myrow["country"]; $_POST['hundreds_name'] = $myrow["hundreds_name"]; + $_POST['auto_update'] = $myrow["auto_update"]; } hidden('Abbreviation'); hidden('selected_id', $selected_id); @@ -213,19 +218,18 @@ function display_currency_edit($selected_id) } else { - text_row_ex(_("Currency Abbreviation:"), 'Abbreviation', 4, 3); + $_POST['auto_update'] = 1; + text_row_ex(_("Currency Abbreviation:"), 'Abbreviation', 4, 3); } text_row_ex(_("Currency Symbol:"), 'Symbol', 10); text_row_ex(_("Currency Name:"), 'CurrencyName', 20); text_row_ex(_("Hundredths Name:"), 'hundreds_name', 15); text_row_ex(_("Country:"), 'country', 40); - + check_row(_("Automatic exchange rate update:"), 'auto_update', get_post('auto_update')); end_table(1); - submit_add_or_update_center($selected_id == '', '', true); - - end_form(); + submit_add_or_update_center($selected_id == '', '', 'both'); } //--------------------------------------------------------------------------------------------- @@ -247,10 +251,11 @@ if ($Mode == 'RESET') $_POST['hundreds_name'] = ''; } +start_form(); display_currencies(); display_currency_edit($selected_id); - +end_form(); //--------------------------------------------------------------------------------------------- end_page(); diff --git a/gl/manage/exchange_rates.php b/gl/manage/exchange_rates.php index 55646fa1..a22b7152 100644 --- a/gl/manage/exchange_rates.php +++ b/gl/manage/exchange_rates.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 9; -$path_to_root="../.."; +$page_security = 'SA_EXCHANGERATE'; +$path_to_root = "../.."; include($path_to_root . "/includes/db_pager.inc"); include_once($path_to_root . "/includes/session.inc"); @@ -21,7 +21,7 @@ include_once($path_to_root . "/includes/banking.inc"); $js = ""; if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Exchange Rates"), false, false, "", $js); +page(_($help_context = "Exchange Rates"), false, false, "", $js); simple_page_mode(false); @@ -128,7 +128,8 @@ function display_rate_edit() } if (isset($_POST['get_rate'])) { - $_POST['BuyRate'] = exrate_format(get_ecb_rate($_POST['curr_abrev'])); + $_POST['BuyRate'] = + exrate_format(retrieve_exrate($_POST['curr_abrev'], $_POST['date_'])); $Ajax->activate('BuyRate'); } small_amount_row(_("Exchange Rate:"), 'BuyRate', null, '', @@ -137,7 +138,7 @@ function display_rate_edit() end_table(1); - submit_add_or_update_center($selected_id == '', '', true); + submit_add_or_update_center($selected_id == '', '', 'both'); display_note(_("Exchange rates are entered against the company currency."), 1); } @@ -164,14 +165,14 @@ if ($Mode == 'Delete') //--------------------------------------------------------------------------------------------- -start_form(false, true); +start_form(); if (!isset($_POST['curr_abrev'])) $_POST['curr_abrev'] = get_global_curr_code(); echo "
"; echo _("Select a currency :") . " "; -currencies_list('curr_abrev', null, true); +echo currencies_list('curr_abrev', null, true); echo "
"; // if currency sel has changed, clear the form @@ -185,7 +186,7 @@ set_global_curr_code($_POST['curr_abrev']); $sql = "SELECT date_, rate_buy, id FROM " .TB_PREF."exchange_rates " - ."WHERE curr_code='".$_POST['curr_abrev']."' + ."WHERE curr_code=".db_escape($_POST['curr_abrev'])." ORDER BY date_ DESC"; $cols = array( @@ -206,10 +207,6 @@ else { br(1); - if (list_updated('curr_abrev')) { - $table->set_sql($sql); - $table->set_columns($cols); - } $table->width = "40%"; display_db_pager($table); br(1); diff --git a/gl/manage/gl_account_classes.php b/gl/manage/gl_account_classes.php index 30d43e39..bc141c37 100644 --- a/gl/manage/gl_account_classes.php +++ b/gl/manage/gl_account_classes.php @@ -9,11 +9,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 3; -$path_to_root="../.."; +$page_security = 'SA_GLACCOUNTCLASS'; +$path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("GL Account Classes")); +page(_($help_context = "GL Account Classes")); include($path_to_root . "/gl/includes/gl_db.inc"); @@ -52,15 +52,16 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') if ($selected_id != -1) { - update_account_class($selected_id, $_POST['name'], $_POST['Balance']); - display_notification(_('Selected account class settings has been updated')); + if(update_account_class($selected_id, $_POST['name'], $_POST['ctype'])) + display_notification(_('Selected account class settings has been updated')); } else { - add_account_class($_POST['id'], $_POST['name'], $_POST['Balance']); - display_notification(_('New account class has been added')); + if(add_account_class($_POST['id'], $_POST['name'], $_POST['ctype'])) { + display_notification(_('New account class has been added')); + $Mode = 'RESET'; + } } - $Mode = 'RESET'; } } @@ -101,16 +102,18 @@ if ($Mode == 'Delete') if ($Mode == 'RESET') { $selected_id = -1; - $_POST['id'] = $_POST['name'] = $_POST['Balance'] = ''; + $_POST['id'] = $_POST['name'] = $_POST['ctype'] = ''; } //----------------------------------------------------------------------------------- -$result = get_account_classes(); +$result = get_account_classes(check_value('show_inactive')); + start_form(); start_table($table_style); $th = array(_("Class ID"), _("Class Name"), _("Class Type"), "", ""); if (isset($use_oldstyle_convert) && $use_oldstyle_convert == 1) $th[2] = _("Balance Sheet"); +inactive_control_column($th); table_header($th); $k = 0; @@ -123,23 +126,20 @@ while ($myrow = db_fetch($result)) label_cell($myrow['class_name']); if (isset($use_oldstyle_convert) && $use_oldstyle_convert == 1) { - $myrow['balance_sheet'] = ($myrow["balance_sheet"] >= CL_ASSETS && $myrow["balance_sheet"] < CL_INCOME ? 1 : 0); - label_cell(($myrow['balance_sheet'] == 1 ? _("Yes") : _("No"))); + $myrow['ctype'] = ($myrow["ctype"] >= CL_ASSETS && $myrow["ctype"] < CL_INCOME ? 1 : 0); + label_cell(($myrow['ctype'] == 1 ? _("Yes") : _("No"))); } else - label_cell($class_types[$myrow["balance_sheet"]]); + label_cell($class_types[$myrow["ctype"]]); + inactive_control_cell($myrow["cid"], $myrow["inactive"], 'chart_class', 'cid'); edit_button_cell("Edit".$myrow["cid"], _("Edit")); delete_button_cell("Delete".$myrow["cid"], _("Delete")); end_row(); } - -end_table(); -end_form(); -echo '
'; +inactive_control_row($th); +end_table(1); //----------------------------------------------------------------------------------- -start_form(); - start_table($table_style2); if ($selected_id != -1) @@ -151,9 +151,9 @@ if ($selected_id != -1) $_POST['id'] = $myrow["cid"]; $_POST['name'] = $myrow["class_name"]; if (isset($use_oldstyle_convert) && $use_oldstyle_convert == 1) - $_POST['Balance'] = ($myrow["balance_sheet"] >= CL_ASSETS && $myrow["balance_sheet"] < CL_INCOME ? 1 : 0); + $_POST['ctype'] = ($myrow["ctype"] >= CL_ASSETS && $myrow["ctype"] < CL_INCOME ? 1 : 0); else - $_POST['Balance'] = $myrow["balance_sheet"]; + $_POST['ctype'] = $myrow["ctype"]; hidden('selected_id', $selected_id); } hidden('id'); @@ -169,13 +169,13 @@ else text_row_ex(_("Class Name:"), 'name', 50, 60); if (isset($use_oldstyle_convert) && $use_oldstyle_convert == 1) - check_row(_("Balance Sheet"), 'Balance', null); + check_row(_("Balance Sheet"), 'ctype', null); else - class_types_list_row(_("Class Type:"), 'Balance', null); + class_types_list_row(_("Class Type:"), 'ctype', null); end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); diff --git a/gl/manage/gl_account_types.php b/gl/manage/gl_account_types.php index b0898e13..ac3b32cf 100644 --- a/gl/manage/gl_account_types.php +++ b/gl/manage/gl_account_types.php @@ -9,11 +9,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 3; -$path_to_root="../.."; +$page_security = 'SA_GLACCOUNTGROUP'; +$path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("GL Account Groups")); +page(_($help_context = "GL Account Groups")); include($path_to_root . "/gl/includes/gl_db.inc"); @@ -58,15 +58,16 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') if ($selected_id != -1) { - update_account_type($selected_id, $_POST['name'], $_POST['class_id'], $_POST['parent']); - display_notification(_('Selected account type has been updated')); + if (update_account_type($selected_id, $_POST['name'], $_POST['class_id'], $_POST['parent'])) + display_notification(_('Selected account type has been updated')); } else { - add_account_type($_POST['id'], $_POST['name'], $_POST['class_id'], $_POST['parent']); - display_notification(_('New account type has been added')); + if (add_account_type($_POST['id'], $_POST['name'], $_POST['class_id'], $_POST['parent'])) { + display_notification(_('New account type has been added')); + $Mode = 'RESET'; + } } - $Mode = 'RESET'; } } @@ -76,8 +77,10 @@ function can_delete($selected_id) { if ($selected_id == -1) return false; + $type = db_escape($selected_id); + $sql= "SELECT COUNT(*) FROM ".TB_PREF."chart_master - WHERE account_type=$selected_id"; + WHERE account_type=$type"; $result = db_query($sql, "could not query chart master"); $myrow = db_fetch_row($result); if ($myrow[0] > 0) @@ -87,7 +90,7 @@ function can_delete($selected_id) } $sql= "SELECT COUNT(*) FROM ".TB_PREF."chart_types - WHERE parent=$selected_id"; + WHERE parent=$type"; $result = db_query($sql, "could not query chart types"); $myrow = db_fetch_row($result); if ($myrow[0] > 0) @@ -121,10 +124,12 @@ if ($Mode == 'RESET') } //----------------------------------------------------------------------------------- -$result = get_account_types(); +$result = get_account_types(check_value('show_inactive')); + start_form(); start_table($table_style); -$th = array(_("ID"), _("Name"), _("Subgroup Of"), _("Class Name"), "", ""); +$th = array(_("ID"), _("Name"), _("Subgroup Of"), _("Class Type"), "", ""); +inactive_control_column($th); table_header($th); $k = 0; @@ -135,7 +140,7 @@ while ($myrow = db_fetch($result)) $bs_text = get_account_class_name($myrow["class_id"]); - if ($myrow["parent"] == reserved_words::get_any_numeric()) + if ($myrow["parent"] == ANY_NUMERIC) { $parent_text = ""; } @@ -148,18 +153,16 @@ while ($myrow = db_fetch($result)) label_cell($myrow["name"]); label_cell($parent_text); label_cell($bs_text); + inactive_control_cell($myrow["id"], $myrow["inactive"], 'chart_types', 'id'); edit_button_cell("Edit".$myrow["id"], _("Edit")); delete_button_cell("Delete".$myrow["id"], _("Delete")); end_row(); } -end_table(); -end_form(); -echo '
'; +inactive_control_row($th); +end_table(1); //----------------------------------------------------------------------------------- -start_form(); - start_table($table_style2); if ($selected_id != -1) @@ -184,11 +187,11 @@ text_row_ex(_("Name:"), 'name', 50); gl_account_types_list_row(_("Subgroup Of:"), 'parent', null, _("None"), true); -class_list_row(_("Class Name:"), 'class_id', null); +class_list_row(_("Class Type:"), 'class_id', null); end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); diff --git a/gl/manage/gl_accounts.php b/gl/manage/gl_accounts.php index 9bf7ed8d..e9efad86 100644 --- a/gl/manage/gl_accounts.php +++ b/gl/manage/gl_accounts.php @@ -9,14 +9,15 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 10; -$path_to_root="../.."; +$page_security = 'SA_GLACCOUNT'; +$path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("Chart of Accounts")); +page(_($help_context = "Chart of Accounts")); include($path_to_root . "/includes/ui.inc"); include($path_to_root . "/gl/includes/gl_db.inc"); +include($path_to_root . "/admin/db/tags_db.inc"); include_once($path_to_root . "/includes/data_checks.inc"); check_db_has_gl_account_groups(_("There are no account groups defined. Please define at least one account group before entering accounts.")); @@ -26,6 +27,7 @@ check_db_has_gl_account_groups(_("There are no account groups defined. Please de if (isset($_POST['_AccountList_update'])) { $_POST['selected_account'] = $_POST['AccountList']; + unset($_POST['account_code']); } if (isset($_POST['selected_account'])) @@ -38,7 +40,6 @@ elseif (isset($_GET['selected_account'])) } else $selected_account = ""; - //------------------------------------------------------------------------------------- if (isset($_POST['add']) || isset($_POST['update'])) @@ -69,16 +70,31 @@ if (isset($_POST['add']) || isset($_POST['update'])) { if ($accounts_alpha == 2) $_POST['account_code'] = strtoupper($_POST['account_code']); + + if (!isset($_POST['account_tags'])) + $_POST['account_tags'] = array(); + if ($selected_account) { - update_gl_account($_POST['account_code'], $_POST['account_name'], $_POST['account_type'], $_POST['account_code2']); - display_notification(_("Account data has been updated.")); + if (update_gl_account($_POST['account_code'], $_POST['account_name'], + $_POST['account_type'], $_POST['account_code2'])) { + update_record_status($_POST['account_code'], $_POST['inactive'], + 'chart_master', 'account_code'); + update_tag_associations(TAG_ACCOUNT, $_POST['account_code'], + $_POST['account_tags']); + $Ajax->activate('account_code'); // in case of status change + display_notification(_("Account data has been updated.")); + } } else { - add_gl_account($_POST['account_code'], $_POST['account_name'], $_POST['account_type'], $_POST['account_code2']); - $selected_account = $_POST['AccountList'] = $_POST['account_code']; - display_notification(_("New account has been added.")); + if (add_gl_account($_POST['account_code'], $_POST['account_name'], + $_POST['account_type'], $_POST['account_code2'])) + { + add_tag_associations($_POST['account_code'], $_POST['account_tags']); + display_notification(_("New account has been added.")); + $selected_account = $_POST['AccountList'] = $_POST['account_code']; + } } $Ajax->activate('_page_body'); } @@ -90,7 +106,9 @@ function can_delete($selected_account) { if ($selected_account == "") return false; - $sql= "SELECT COUNT(*) FROM ".TB_PREF."gl_trans WHERE account='$selected_account'"; + $acc = db_escape($selected_account); + + $sql= "SELECT COUNT(*) FROM ".TB_PREF."gl_trans WHERE account=$acc"; $result = db_query($sql,"Couldn't test for existing transactions"); $myrow = db_fetch_row($result); @@ -100,18 +118,18 @@ function can_delete($selected_account) return false; } - $sql= "SELECT COUNT(*) FROM ".TB_PREF."company WHERE debtors_act='$selected_account' - OR pyt_discount_act='$selected_account' - OR creditors_act='$selected_account' - OR freight_act='$selected_account' - OR default_sales_act='$selected_account' - OR default_sales_discount_act='$selected_account' - OR default_prompt_payment_act='$selected_account' - OR default_inventory_act='$selected_account' - OR default_cogs_act='$selected_account' - OR default_adj_act='$selected_account' - OR default_inv_sales_act='$selected_account' - OR default_assembly_act='$selected_account'"; + $sql= "SELECT COUNT(*) FROM ".TB_PREF."company WHERE debtors_act=$acc + OR pyt_discount_act=$acc + OR creditors_act=$acc + OR freight_act=$acc + OR default_sales_act=$acc + OR default_sales_discount_act=$acc + OR default_prompt_payment_act=$acc + OR default_inventory_act=$acc + OR default_cogs_act=$acc + OR default_adj_act=$acc + OR default_inv_sales_act=$acc + OR default_assembly_act=$acc"; $result = db_query($sql,"Couldn't test for default company GL codes"); $myrow = db_fetch_row($result); @@ -121,7 +139,7 @@ function can_delete($selected_account) return false; } - $sql= "SELECT COUNT(*) FROM ".TB_PREF."bank_accounts WHERE account_code='$selected_account'"; + $sql= "SELECT COUNT(*) FROM ".TB_PREF."bank_accounts WHERE account_code=$acc"; $result = db_query($sql,"Couldn't test for bank accounts"); $myrow = db_fetch_row($result); @@ -132,10 +150,10 @@ function can_delete($selected_account) } $sql= "SELECT COUNT(*) FROM ".TB_PREF."stock_master WHERE - inventory_account='$selected_account' - OR cogs_account='$selected_account' - OR adjustment_account='$selected_account' - OR sales_account='$selected_account'"; + inventory_account=$acc + OR cogs_account=$acc + OR adjustment_account=$acc + OR sales_account=$acc"; $result = db_query($sql,"Couldn't test for existing stock GL codes"); $myrow = db_fetch_row($result); @@ -145,7 +163,7 @@ function can_delete($selected_account) return false; } - $sql= "SELECT COUNT(*) FROM ".TB_PREF."tax_types WHERE sales_gl_code='$selected_account' OR purchasing_gl_code='$selected_account'"; + $sql= "SELECT COUNT(*) FROM ".TB_PREF."tax_types WHERE sales_gl_code=$acc OR purchasing_gl_code=$acc"; $result = db_query($sql,"Couldn't test for existing tax GL codes"); $myrow = db_fetch_row($result); @@ -156,10 +174,10 @@ function can_delete($selected_account) } $sql= "SELECT COUNT(*) FROM ".TB_PREF."cust_branch WHERE - sales_account='$selected_account' - OR sales_discount_account='$selected_account' - OR receivables_account='$selected_account' - OR payment_discount_account='$selected_account'"; + sales_account=$acc + OR sales_discount_account=$acc + OR receivables_account=$acc + OR payment_discount_account=$acc"; $result = db_query($sql,"Couldn't test for existing cust branch GL codes"); $myrow = db_fetch_row($result); @@ -170,9 +188,9 @@ function can_delete($selected_account) } $sql= "SELECT COUNT(*) FROM ".TB_PREF."suppliers WHERE - purchase_account='$selected_account' - OR payment_discount_account='$selected_account' - OR payable_account='$selected_account'"; + purchase_account=$acc + OR payment_discount_account=$acc + OR payable_account=$acc"; $result = db_query($sql,"Couldn't test for existing suppliers GL codes"); $myrow = db_fetch_row($result); @@ -183,7 +201,7 @@ function can_delete($selected_account) } $sql= "SELECT COUNT(*) FROM ".TB_PREF."quick_entry_lines WHERE - dest_id='$selected_account' AND UPPER(LEFT(action, 1)) <> 'T'"; + dest_id=$acc AND UPPER(LEFT(action, 1)) <> 'T'"; $result = db_query($sql,"Couldn't test for existing suppliers GL codes"); $myrow = db_fetch_row($result); @@ -204,8 +222,11 @@ if (isset($_POST['delete'])) if (can_delete($selected_account)) { delete_gl_account($selected_account); - $selected_account = $_POST['account_code'] = $_POST['AccountList'] = ''; + $selected_account = $_POST['AccountList'] = ''; + delete_tag_associations(TAG_ACCOUNT,$selected_account, true); + $selected_account = $_POST['AccountList'] = ''; display_notification(_("Selected account has been deleted")); + unset($_POST['account_code']); $Ajax->activate('_page_body'); } } @@ -216,11 +237,17 @@ start_form(); if (db_has_gl_accounts()) { - echo "
"; - echo _("Select an Account:") . " "; - gl_all_accounts_list('AccountList', null, false, false, - _('New account'), true); - echo "
"; + start_table("class = 'tablestyle_noborder'"); + start_row(); + gl_all_accounts_list_cells(null, 'AccountList', null, false, false, + _('New account'), true, check_value('show_inactive')); + check_cells(_("Show inactive:"), 'show_inactive', null, true); + end_row(); + end_table(); + if (get_post('_show_inactive_update')) { + $Ajax->activate('AccountList'); + set_focus('AccountList'); + } } br(1); @@ -235,16 +262,27 @@ if ($selected_account != "") $_POST['account_code2'] = $myrow["account_code2"]; $_POST['account_name'] = $myrow["account_name"]; $_POST['account_type'] = $myrow["account_type"]; + $_POST['inactive'] = $myrow["inactive"]; + + $tags_result = get_tags_associated_with_record(TAG_ACCOUNT, $selected_account); + $tagids = array(); + while ($tag = db_fetch($tags_result)) + $tagids[] = $tag['id']; + $_POST['account_tags'] = $tagids; hidden('account_code', $_POST['account_code']); hidden('selected_account', $selected_account); label_row(_("Account Code:"), $_POST['account_code']); } -else +else { - $_POST['account_code'] = $_POST['account_code2'] = ''; - $_POST['account_name'] = $_POST['account_type'] = ''; + if (!isset($_POST['account_code'])) { + $_POST['account_tags'] = array(); + $_POST['account_code'] = $_POST['account_code2'] = ''; + $_POST['account_name'] = $_POST['account_type'] = ''; + $_POST['inactive'] = 0; + } text_row_ex(_("Account Code:"), 'account_code', 11); } @@ -254,15 +292,18 @@ text_row_ex(_("Account Name:"), 'account_name', 60); gl_account_types_list_row(_("Account Group:"), 'account_type', null); +tag_list_row(_("Account Tags:"), 'account_tags', 5, TAG_ACCOUNT, true); + +record_status_list_row(_("Account status:"), 'inactive'); end_table(1); if ($selected_account == "") { - submit_center('add', _("Add Account"), true, '', true); + submit_center('add', _("Add Account"), true, '', 'default'); } else { - submit_center_first('update', _("Update Account"), '', true); + submit_center_first('update', _("Update Account"), '', 'default'); submit_center_last('delete', _("Delete account"), '',true); } end_form(); diff --git a/gl/manage/gl_quick_entries.php b/gl/manage/gl_quick_entries.php index ed19b7fe..a9ad9b55 100644 --- a/gl/manage/gl_quick_entries.php +++ b/gl/manage/gl_quick_entries.php @@ -9,11 +9,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 3; -$path_to_root="../.."; +$page_security = 'SA_QUICKENTRY'; +$path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("Quick Entries")); +page(_($help_context = "Quick Entries")); include($path_to_root . "/gl/includes/gl_db.inc"); @@ -216,7 +216,7 @@ amount_row(_("Default Base Amount").':', 'base_amount', price_format(0)); end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); @@ -307,7 +307,7 @@ if ($selected_id != -1) } else { - gl_all_accounts_list_row(_("Account").":", 'dest_id', null); + gl_all_accounts_list_row(_("Account").":", 'dest_id', null, $_POST['type'] == QE_DEPOSIT || $_POST['type'] == QE_PAYMENT); if ($actn != '=') { if ($actn == '%') diff --git a/gl/view/bank_transfer_view.php b/gl/view/bank_transfer_view.php index b656a644..b56a331c 100644 --- a/gl/view/bank_transfer_view.php +++ b/gl/view/bank_transfer_view.php @@ -9,12 +9,12 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 1; +$page_security = 'SA_BANKTRANSVIEW'; $path_to_root="../.."; include($path_to_root . "/includes/session.inc"); -page(_("View Bank Transfer"), true); +page(_($help_context = "View Bank Transfer"), true); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); @@ -25,7 +25,7 @@ if (isset($_GET["trans_no"])){ $trans_no = $_GET["trans_no"]; } -$result = get_bank_trans(systypes::bank_transfer(), $trans_no); +$result = get_bank_trans(ST_BANKTRANSFER, $trans_no); if (db_num_rows($result) != 2) display_db_error("Bank transfer does not contain two records"); @@ -58,7 +58,7 @@ if ($from_trans['bank_curr_code'] != $to_trans['bank_curr_code']) $show_both_amounts = true; } -display_heading(systypes::name(systypes::bank_transfer()) . " #$trans_no"); +display_heading($systypes_array[ST_BANKTRANSFER] . " #$trans_no"); echo "
"; start_table("$table_style width=80%"); @@ -81,14 +81,15 @@ if ($show_both_amounts) end_row(); start_row(); label_cells(_("Date"), sql2date($from_trans['trans_date']), "class='tableheader2'"); -label_cells(_("Transfer Type"), bank_account_types::transfer_type($from_trans['account_type']), "class='tableheader2'"); +label_cells(_("Transfer Type"), $bank_transfer_types[$from_trans['account_type']], + "class='tableheader2'"); label_cells(_("Reference"), $from_trans['ref'], "class='tableheader2'"); end_row(); -comments_display_row(systypes::bank_transfer(), $trans_no); +comments_display_row(ST_BANKTRANSFER, $trans_no); end_table(1); -is_voided_display(systypes::bank_transfer(), $trans_no, _("This transfer has been voided.")); +is_voided_display(ST_BANKTRANSFER, $trans_no, _("This transfer has been voided.")); end_page(true); ?> \ No newline at end of file diff --git a/gl/view/gl_deposit_view.php b/gl/view/gl_deposit_view.php index 95449bd7..4a7da98b 100644 --- a/gl/view/gl_deposit_view.php +++ b/gl/view/gl_deposit_view.php @@ -9,12 +9,12 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 1; -$path_to_root="../.."; +$page_security = 'SA_BANKTRANSVIEW'; +$path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("View Bank Deposit"), true); +page(_($help_context = "View Bank Deposit"), true); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); @@ -27,7 +27,7 @@ if (isset($_GET["trans_no"])) } // get the pay-to bank payment info -$result = get_bank_trans(systypes::bank_deposit(), $trans_no); +$result = get_bank_trans(ST_BANKDEPOSIT, $trans_no); if (db_num_rows($result) != 1) display_db_error("duplicate payment bank transaction found", ""); @@ -68,19 +68,19 @@ label_cells(_("Amount"), number_format2($to_trans['amount'], user_price_dec()), label_cells(_("Date"), sql2date($to_trans['trans_date']), "class='tableheader2'"); end_row(); start_row(); -label_cells(_("From"), payment_person_types::person_name($to_trans['person_type_id'], $to_trans['person_id']), "class='tableheader2'", "colspan=$colspan1"); -label_cells(_("Deposit Type"), bank_account_types::transfer_type($to_trans['account_type']), "class='tableheader2'"); +label_cells(_("From"), payment_person_name($to_trans['person_type_id'], $to_trans['person_id']), "class='tableheader2'", "colspan=$colspan1"); +label_cells(_("Deposit Type"), $bank_transfer_types[$to_trans['account_type']], "class='tableheader2'"); end_row(); start_row(); label_cells(_("Reference"), $to_trans['ref'], "class='tableheader2'", "colspan=$colspan2"); end_row(); -comments_display_row(systypes::bank_deposit(), $trans_no); +comments_display_row(ST_BANKDEPOSIT, $trans_no); end_table(1); -is_voided_display(systypes::bank_deposit(), $trans_no, _("This deposit has been voided.")); +is_voided_display(ST_BANKDEPOSIT, $trans_no, _("This deposit has been voided.")); -$items = get_gl_trans(systypes::bank_deposit(), $trans_no); +$items = get_gl_trans(ST_BANKDEPOSIT, $trans_no); if (db_num_rows($items) == 0) { @@ -94,8 +94,16 @@ else display_heading2(_("Item Amounts are Shown in :") . " " . $company_currency); start_table("$table_style width=80%"); - $th = array(_("Account Code"), _("Account Description"), - _("Amount"), _("Memo")); + $dim = get_company_pref('use_dimension'); + if ($dim == 2) + $th = array(_("Account Code"), _("Account Description"), _("Dimension")." 1", _("Dimension")." 2", + _("Amount"), _("Memo")); + else if ($dim == 1) + $th = array(_("Account Code"), _("Account Description"), _("Dimension"), + _("Amount"), _("Memo")); + else + $th = array(_("Account Code"), _("Account Description"), + _("Amount"), _("Memo")); table_header($th); $k = 0; //row colour counter @@ -110,14 +118,18 @@ else label_cell($item["account"]); label_cell($item["account_name"]); - amount_cell(abs($item["amount"])); + if ($dim >= 1) + label_cell(get_dimension_string($item['dimension_id'], true)); + if ($dim > 1) + label_cell(get_dimension_string($item['dimension2_id'], true)); + amount_cell($item["amount"]); label_cell($item["memo_"]); end_row(); - $total_amount += abs($item["amount"]); + $total_amount += $item["amount"]; } } - label_row(_("Total"), number_format2($total_amount, user_price_dec()),"colspan=2 align=right", "align=right"); + label_row(_("Total"), number_format2($total_amount, user_price_dec()),"colspan=".(2+$dim)." align=right", "align=right"); end_table(1); diff --git a/gl/view/gl_payment_view.php b/gl/view/gl_payment_view.php index 32f89335..44dd2948 100644 --- a/gl/view/gl_payment_view.php +++ b/gl/view/gl_payment_view.php @@ -9,12 +9,12 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 1; -$path_to_root="../.."; +$page_security = 'SA_BANKTRANSVIEW'; +$path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("View Bank Payment"), true); +page(_($help_context = "View Bank Payment"), true); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); @@ -27,7 +27,7 @@ if (isset($_GET["trans_no"])) } // get the pay-from bank payment info -$result = get_bank_trans(systypes::bank_payment(), $trans_no); +$result = get_bank_trans(ST_BANKPAYMENT, $trans_no); if (db_num_rows($result) != 1) display_db_error("duplicate payment bank transaction found", ""); @@ -62,23 +62,23 @@ start_row(); label_cells(_("From Bank Account"), $from_trans['bank_account_name'], "class='tableheader2'"); if ($show_currencies) label_cells(_("Currency"), $from_trans['bank_curr_code'], "class='tableheader2'"); -label_cells(_("Amount"), number_format2(-$from_trans['amount'], user_price_dec()), "class='tableheader2'", "align=right"); +label_cells(_("Amount"), number_format2($from_trans['amount'], user_price_dec()), "class='tableheader2'", "align=right"); label_cells(_("Date"), sql2date($from_trans['trans_date']), "class='tableheader2'"); end_row(); start_row(); -label_cells(_("Pay To"), payment_person_types::person_name($from_trans['person_type_id'], $from_trans['person_id']), "class='tableheader2'", "colspan=$colspan1"); -label_cells(_("Payment Type"),bank_account_types::transfer_type($from_trans['account_type']), "class='tableheader2'"); +label_cells(_("Pay To"), payment_person_name($from_trans['person_type_id'], $from_trans['person_id']), "class='tableheader2'", "colspan=$colspan1"); +label_cells(_("Payment Type"), $bank_transfer_types[$from_trans['account_type']], "class='tableheader2'"); end_row(); start_row(); label_cells(_("Reference"), $from_trans['ref'], "class='tableheader2'", "colspan=$colspan2"); end_row(); -comments_display_row(systypes::bank_payment(), $trans_no); +comments_display_row(ST_BANKPAYMENT, $trans_no); end_table(1); -$voided = is_voided_display(systypes::bank_payment(), $trans_no, _("This payment has been voided.")); +$voided = is_voided_display(ST_BANKPAYMENT, $trans_no, _("This payment has been voided.")); -$items = get_gl_trans(systypes::bank_payment(), $trans_no); +$items = get_gl_trans(ST_BANKPAYMENT, $trans_no); if (db_num_rows($items)==0) { @@ -93,12 +93,20 @@ else echo "
"; start_table("$table_style width=80%"); - $th = array(_("Account Code"), _("Account Description"), - _("Amount"), _("Memo")); + $dim = get_company_pref('use_dimension'); + if ($dim == 2) + $th = array(_("Account Code"), _("Account Description"), _("Dimension")." 1", _("Dimension")." 2", + _("Amount"), _("Memo")); + else if ($dim == 1) + $th = array(_("Account Code"), _("Account Description"), _("Dimension"), + _("Amount"), _("Memo")); + else + $th = array(_("Account Code"), _("Account Description"), + _("Amount"), _("Memo")); table_header($th); $k = 0; //row colour counter - $totalAmount = 0; + $total_amount = 0; while ($item = db_fetch($items)) { @@ -109,14 +117,18 @@ else label_cell($item["account"]); label_cell($item["account_name"]); + if ($dim >= 1) + label_cell(get_dimension_string($item['dimension_id'], true)); + if ($dim > 1) + label_cell(get_dimension_string($item['dimension2_id'], true)); amount_cell($item["amount"]); label_cell($item["memo_"]); end_row(); - $totalAmount += $item["amount"]; + $total_amount += $item["amount"]; } } - label_row(_("Total"), number_format2($totalAmount, user_price_dec()),"colspan=2 align=right", "align=right"); + label_row(_("Total"), number_format2($total_amount, user_price_dec()),"colspan=".(2+$dim)." align=right", "align=right"); end_table(1); diff --git a/gl/view/gl_trans_view.php b/gl/view/gl_trans_view.php index 4feed339..32276c3a 100644 --- a/gl/view/gl_trans_view.php +++ b/gl/view/gl_trans_view.php @@ -9,11 +9,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 8; -$path_to_root="../.."; +$page_security = 'SA_GLTRANSVIEW'; +$path_to_root = "../.."; include_once($path_to_root . "/includes/session.inc"); -page(_("General Ledger Transaction Details"), true); +page(_($help_context = "General Ledger Transaction Details"), true); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); @@ -29,16 +29,17 @@ if (!isset($_GET['type_id']) || !isset($_GET['trans_no'])) function display_gl_heading($myrow) { - global $table_style; - $trans_name = systypes::name($_GET['type_id']); + global $table_style, $systypes_array; + $trans_name = $systypes_array[$_GET['type_id']]; start_table("$table_style width=95%"); - $th = array(_("General Ledger Transaction Details"), + $th = array(_("General Ledger Transaction Details"), _("Reference"), _("Date"), _("Person/Item")); table_header($th); start_row(); label_cell("$trans_name #" . $_GET['trans_no']); + label_cell($myrow["reference"]); label_cell(sql2date($myrow["tran_date"])); - label_cell(payment_person_types::person_name($myrow["person_type_id"],$myrow["person_id"])); + label_cell(payment_person_name($myrow["person_type_id"],$myrow["person_id"])); end_row(); @@ -46,18 +47,19 @@ function display_gl_heading($myrow) end_table(1); } - -$sql = "SELECT ".TB_PREF."gl_trans.*, account_name FROM " - .TB_PREF."gl_trans, ".TB_PREF."chart_master WHERE " - .TB_PREF."gl_trans.account = ".TB_PREF."chart_master.account_code AND type= " - .db_escape($_GET['type_id']) . " AND type_no = ".db_escape($_GET['trans_no']) - . " ORDER BY counter"; +$sql = "SELECT gl.*, cm.account_name, IF(ISNULL(refs.reference), '', refs.reference) AS reference FROM " + .TB_PREF."gl_trans as gl + LEFT JOIN ".TB_PREF."chart_master as cm ON gl.account = cm.account_code + LEFT JOIN ".TB_PREF."refs as refs ON (gl.type=refs.type AND gl.type_no=refs.id)" + ." WHERE gl.type= ".db_escape($_GET['type_id']) + ." AND gl.type_no = ".db_escape($_GET['trans_no']) + ." ORDER BY counter"; $result = db_query($sql,"could not get transactions"); //alert("sql = ".$sql); if (db_num_rows($result) == 0) { - echo "

" . _("No general ledger transactions have been created for") . " " .systypes::name($_GET['type_id'])." " . _("number") . " " . $_GET['trans_no'] . "



"; + echo "

" . _("No general ledger transactions have been created for") . " " .$systypes_array[$_GET['type_id']]." " . _("number") . " " . $_GET['trans_no'] . "



"; end_page(true); exit; } diff --git a/includes/JsHttpRequest.php b/includes/JsHttpRequest.php index c0a2036a..1ef9a815 100644 --- a/includes/JsHttpRequest.php +++ b/includes/JsHttpRequest.php @@ -15,7 +15,7 @@ * This backend library also supports POST requests additionally to GET. * * @author Dmitry Koterov - * @version 5.x $Id$ + * @version 5.x */ class JsHttpRequest @@ -230,12 +230,12 @@ class JsHttpRequest $result = array(); if ($isList) { foreach ($a as $v) { - $result[] = JsHttpRequest::php2js($v); + $result[] = $this->php2js($v); } return '[ ' . join(', ', $result) . ' ]'; } else { foreach ($a as $k => $v) { - $result[] = JsHttpRequest::php2js($k) . ': ' . JsHttpRequest::php2js($v); + $result[] = $this->php2js($k) . ': ' . $this->php2js($v); } return '{ ' . join(', ', $result) . ' }'; } diff --git a/includes/banking.inc b/includes/banking.inc index cf532ea0..301a3729 100644 --- a/includes/banking.inc +++ b/includes/banking.inc @@ -164,7 +164,9 @@ function exchange_from_to($amount, $from_curr_code, $to_curr_code, $date_) function exchange_variation($pyt_type, $pyt_no, $type, $trans_no, $pyt_date, $amount, $person_type, $neg=false) { - if ($person_type == payment_person_types::customer()) + global $systypes_array; + + if ($person_type == PT_CUSTOMER) { $trans = get_customer_trans($trans_no, $type); $pyt_trans = get_customer_trans($pyt_no, $pyt_type); @@ -190,20 +192,20 @@ function exchange_variation($pyt_type, $pyt_no, $type, $trans_no, $pyt_date, $am if ($inv_amt != $pay_amt) { $diff = $inv_amt - $pay_amt; - if ($person_type == payment_person_types::supplier()) + if ($person_type == PT_SUPPLIER) $diff = -$diff; if ($neg) $diff = -$diff; $exc_var_act = get_company_pref('exchange_diff_act'); if (date1_greater_date2($date, $pyt_date)) { - $memo = systypes::name($pyt_type)." ".$pyt_no; + $memo = $systypes_array[$pyt_type]." ".$pyt_no; add_gl_trans($type, $trans_no, $date, $ar_ap_act, 0, 0, $memo, -$diff, null, $person_type, $person_id); add_gl_trans($type, $trans_no, $date, $exc_var_act, 0, 0, $memo, $diff, null, $person_type, $person_id); } else { - $memo = systypes::name($type)." ".$trans_no; + $memo = $systypes_array[$type]." ".$trans_no; add_gl_trans($pyt_type, $pyt_no, $pyt_date, $ar_ap_act, 0, 0, $memo, -$diff, null, $person_type, $person_id); add_gl_trans($pyt_type, $pyt_no, $pyt_date, $exc_var_act, 0, 0, $memo, $diff, null, $person_type, $person_id); } diff --git a/includes/current_user.inc b/includes/current_user.inc index a47b822a..99d31477 100644 --- a/includes/current_user.inc +++ b/includes/current_user.inc @@ -15,14 +15,17 @@ include_once($path_to_root . "/includes/prefs/userprefs.inc"); class current_user { - + var $user; var $loginname; var $username; - var $name; + var $name; var $company; var $pos; var $access; - + var $timeout; + var $last_act; + var $role_set = false; + var $old_db; var $logged; var $ui_mode = 0; @@ -30,7 +33,10 @@ class current_user function current_user() { - $this->loginname = $this->username = $this->name = $this->company = ""; + global $def_coy; + + $this->loginname = $this->username = $this->name = ""; + $this->company = isset($def_coy)? $def_coy : 0; $this->logged = false; $this->prefs = new user_prefs(); @@ -48,52 +54,106 @@ class current_user function login($company, $loginname, $password) { + global $security_areas, $security_groups, $security_headings, $path_to_root; + $this->set_company($company); + $this->logged = false; $Auth_Result = get_user_for_login($loginname, $password); if (db_num_rows($Auth_Result) > 0) { - $myrow = db_fetch($Auth_Result); - - $this->access = $myrow["full_access"]; + $myrow = db_fetch($Auth_Result); + $this->old_db = isset($myrow["full_access"]); + if (! @$myrow["inactive"]) { + if ($this->old_db) { + // Transition code: + // db was not yet upgraded after source update to v.2.2 + // give enough access for admin user to continue upgrade + if (!isset($security_groups) || !isset($security_headings)) { + echo "


"; + echo _('Before software upgrade you have to include old $security_groups and $security_headings arrays from old config.php file to the new one.'); + echo '
'.""._("Back").""; + echo "

"; + exit; + } + $this->access = $myrow["full_access"]; + if (in_array(20, $security_groups[$this->access])) + // temporary access for admin users + $this->role_set[] = $security_areas['SA_SOFTWAREUPGRADE'][0]; + else { + echo "


"; + echo _('System is available for site admin only until full database upgrade'); + echo "

"; + exit; + } + } else { + $this->role_set = array(); + $this->access = $myrow["role_id"]; + // store area codes available for current user role + $role = get_security_role($this->access); + if (!$role) + return false; + foreach( $role['areas'] as $code ) + // filter only area codes for enabled security sections + if (in_array($code&~0xff, $role['sections'])) + $this->role_set[] = $code; + } $this->name = $myrow["real_name"]; $this->pos = $myrow["pos"]; $this->loginname = $loginname; $this->username = $this->loginname; $this->prefs = new user_prefs($myrow); - - update_user_visitdate($loginname); - $this->logged = true; - - } - else - { - $this->logged = false; + $this->user = @$myrow["id"]; + update_user_visitdate($this->username); + $this->logged = true; + $this->last_act = time(); + $this->timeout = session_timeout(); + } } - return $this->logged; } function check_user_access() { global $security_groups; - return is_array($security_groups[$this->access]); + if ($this->old_db) { + // notification after upgrade from pre-2.2 version + return isset($security_groups) && is_array(@$security_groups[$this->access]); + } else + return !isset($security_groups) && is_array($this->role_set); + } + + function can_access($page_level) + { + global $security_groups, $security_areas; + if (isset($security_groups)) { + return $this->company == 0 && + in_array(20, $security_groups[$this->access]); + } + + if ($page_level === 'SA_OPEN') + return true; + if ($page_level === 'SA_DENIED' || $page_level === '') + return false; + + $code = $security_areas[$page_level][0]; + + // only first registered company has site admin privileges + return $code && in_array($code, $this->role_set) + && ($this->company == 0 || (($code&~0xff) != SS_SADMIN)); } function can_access_page($page_level) { - global $security_groups; - // first registered company has site admin privileges - return isset($page_level) && in_array($page_level, $security_groups[$this->access]) - && ($this->company == 0 || $page_level != 20); + return $this->can_access($page_level); } - function get_db_connection() + function get_db_connection($id=-1) { global $db_connections; - $connection = $db_connections[$this->company]; + $connection = $db_connections[$id == -1 ? $this->company : $id]; //print_r($connection); @@ -110,14 +170,14 @@ class current_user function update_prefs($price_dec, $qty_dec, $exrate_dec, $percent_dec, $showgl, $showcodes, $date_format, $date_sep, $tho_sep, $dec_sep, $theme, $pagesize, $show_hints, $profile, $rep_popup, $query_size, - $graphic_links, $lang) { - update_user_display_prefs($this->username, $price_dec, + $graphic_links, $lang, $stickydate, $startup_tab) { + update_user_display_prefs($this->user, $price_dec, $qty_dec, $exrate_dec, $percent_dec, $showgl, $showcodes, $date_format, $date_sep, $tho_sep, $dec_sep, $theme, $pagesize, - $show_hints, $profile, $rep_popup, $query_size, $graphic_links, $lang); + $show_hints, $profile, $rep_popup, $query_size, $graphic_links, $lang, $stickydate, $startup_tab); // re-read the prefs - $user = get_user($this->username); + $user = get_user($this->user); $this->prefs = new user_prefs($user); } } @@ -316,18 +376,28 @@ function user_graphic_links() return $_SESSION["wa_current_user"]->prefs->graphic_links(); } +function sticky_doc_date() +{ + return $_SESSION["wa_current_user"]->prefs->sticky_date(); +} + +function user_startup_tab() +{ + return $_SESSION["wa_current_user"]->prefs->start_up_tab(); +} + function set_user_prefs($price_dec, $qty_dec, $exrate_dec, $percent_dec, $showgl, $showcodes, $date_format, $date_sep, $tho_sep, $dec_sep, $theme, $pagesize, $show_hints, - $print_profile, $rep_popup, $query_size, $graphic_links, $lang) + $print_profile, $rep_popup, $query_size, $graphic_links, $lang, $stickydate, $startup_tab) { $_SESSION["wa_current_user"]->update_prefs($price_dec, $qty_dec, $exrate_dec, $percent_dec, $showgl, $showcodes, $date_format, $date_sep, $tho_sep, $dec_sep, $theme, $pagesize, $show_hints, - $print_profile, $rep_popup, $query_size, $graphic_links, $lang); + $print_profile, $rep_popup, $query_size, $graphic_links, $lang, $stickydate, $startup_tab); } function add_user_js_data() { - global $path_to_root, $thoseps, $decseps; + global $path_to_root, $thoseps, $decseps, $date_system, $dateseps; $ts = $thoseps[user_tho_sep()]; $ds = $decseps[user_dec_sep()]; @@ -336,6 +406,10 @@ function add_user_js_data() { . "var user = {\n" . "theme: '". $path_to_root . '/themes/'. user_theme().'/'."',\n" . "loadtxt: '"._('Requesting data...')."',\n" + . "date: '".Today()."',\n" // server date + . "datesys: ".$date_system.",\n" + . "datefmt: ".user_date_format().",\n" + . "datesep: '".$dateseps[user_date_sep()]."',\n" . "ts: '$ts',\n" . "ds: '$ds',\n" . "pdec : " . user_price_dec() . "}\n"; @@ -345,4 +419,9 @@ function add_user_js_data() { //-------------------------------------------------------------------------- +function session_timeout() +{ + $tout = @get_company_pref('login_tout'); // mask warning for db ver. 2.2 + return $tout ? $tout : ini_get('session.gc_maxlifetime'); +} ?> \ No newline at end of file diff --git a/includes/data_checks.inc b/includes/data_checks.inc index 0b461636..295a353e 100644 --- a/includes/data_checks.inc +++ b/includes/data_checks.inc @@ -123,12 +123,14 @@ function check_db_has_movement_types($msg) function db_customer_has_branches($customer_id) { - return check_empty_result("SELECT COUNT(*) FROM ".TB_PREF."cust_branch WHERE debtor_no='$customer_id'"); + return check_empty_result("SELECT COUNT(*) FROM ".TB_PREF."cust_branch " + ."WHERE debtor_no='$customer_id'"); } function db_has_customer_branches() { - return check_empty_result("SELECT COUNT(*) FROM ".TB_PREF."cust_branch"); + return check_empty_result("SELECT COUNT(*) FROM " + .TB_PREF."cust_branch WHERE !inactive"); } function check_db_has_customer_branches($msg) @@ -426,6 +428,22 @@ function db_has_quick_entries() return check_empty_result("SELECT COUNT(*) FROM ".TB_PREF."quick_entries"); } +function db_has_tags($type) +{ + return check_empty_result("SELECT COUNT(*) FROM ".TB_PREF."tags WHERE type=$type"); +} + +function check_db_has_tags($type, $msg) +{ + global $path_to_root; + if (!db_has_tags($type)) + { + display_error($msg, true); + end_page(); + exit; + } +} + function check_empty_result($sql) { $result = db_query($sql, "could not do check empty query"); diff --git a/includes/date_functions.inc b/includes/date_functions.inc index c6813531..13294eb0 100644 --- a/includes/date_functions.inc +++ b/includes/date_functions.inc @@ -13,11 +13,13 @@ date validation and parsing functions These functions refer to the global variable defining the date format -The date format is defined in config.php called DefaultDateFormat +The date format is defined in config.php called dateformats this can be a string either "d/m/Y" for UK/Australia/New Zealand dates or -"m/d/Y" for US/Canada format dates +"m/d/Y" for US/Canada format dates depending on setting in preferences. */ +if(function_exists("date_default_timezone_set") && function_exists("date_default_timezone_get")) + @date_default_timezone_set(@date_default_timezone_get()); function __date($year, $month, $day) { @@ -141,6 +143,19 @@ function Now() else return date("H:i"); } +// +// Retrieve and optionaly set default date for new document. +// +function new_doc_date($date=null) +{ + if (isset($date)) + $_SESSION['_default_date'] = $date; + + if (!isset($_SESSION['_default_date']) || !sticky_doc_date()) + $_SESSION['_default_date'] = Today(); + + return $_SESSION['_default_date']; +} function is_date_in_fiscalyear($date, $convert=false) { @@ -347,9 +362,11 @@ and converts to a yyyy/mm/dd format */ $year = substr($date_,0,4); } } + else + $year = $month = $day = 0; //to modify assumption in 2030 - if ($date_system == 0) + if ($date_system == 0 || $date_system == 3) { if ((int)$year < 60) { @@ -403,7 +420,7 @@ function date1_greater_date2 ($date1, $date2) } -function date_diff ($date1, $date2, $period) +function date_diff2 ($date1, $date2, $period) { /* expects dates in the format specified in $DefaultDateFormat - period can be one of 'd','w','y','m' diff --git a/includes/db/comments_db.inc b/includes/db/comments_db.inc index d431e97d..4e61dd49 100644 --- a/includes/db/comments_db.inc +++ b/includes/db/comments_db.inc @@ -13,7 +13,8 @@ function get_comments($type, $type_no) { - $sql = "SELECT * FROM ".TB_PREF."comments WHERE type=$type AND id=$type_no"; + $sql = "SELECT * FROM ".TB_PREF."comments WHERE type=" + .db_escape($type)." AND id=".db_escape($type_no); return db_query($sql, "could not query comments transaction table"); } @@ -26,7 +27,8 @@ function add_comments($type, $type_no, $date_, $memo_) { $date = date2sql($date_); $sql = "INSERT INTO ".TB_PREF."comments (type, id, date_, memo_) - VALUES ($type, $type_no, '$date', ".db_escape($memo_).")"; + VALUES (".db_escape($type).", ".db_escape($type_no) + .", '$date', ".db_escape($memo_).")"; db_query($sql, "could not add comments transaction entry"); } @@ -44,7 +46,9 @@ function update_comments($type, $id, $date_, $memo_) else { $date = date2sql($date_); - $sql = "UPDATE ".TB_PREF."comments SET memo_=".db_escape($memo_)." WHERE type=$type AND id=$id AND date_='$date'"; + $sql = "UPDATE ".TB_PREF."comments SET memo_=".db_escape($memo_) + ." WHERE type=".db_escape($type)." AND id=".db_escape($id) + ." AND date_='$date'"; db_query($sql, "could not update comments"); } } @@ -53,7 +57,8 @@ function update_comments($type, $id, $date_, $memo_) function delete_comments($type, $type_no) { - $sql = "DELETE FROM ".TB_PREF."comments WHERE type=$type AND id=$type_no"; + $sql = "DELETE FROM ".TB_PREF."comments WHERE type=".db_escape($type) + ." AND id=".db_escape($type_no); db_query($sql, "could not delete from comments transaction table"); } diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc index 7f0911dc..203883b0 100644 --- a/includes/db/connect_db.inc +++ b/includes/db/connect_db.inc @@ -14,10 +14,7 @@ function set_global_connection() { global $db; - if (isset($_SESSION["wa_current_user"]) && $_SESSION["wa_current_user"]->company !='') - $db = $_SESSION["wa_current_user"]->get_db_connection(); - else - $db = null; + $db = $_SESSION["wa_current_user"]->get_db_connection(); } $db_duplicate_error_code = 1062; @@ -26,9 +23,8 @@ $db_duplicate_error_code = 1062; function db_query($sql, $err_msg=null) { - global $db, $show_sql, $sql_trail, $select_trail; - - //echo "
$sql
"; + global $db, $show_sql, $sql_trail, $select_trail, $go_debug; + if ($show_sql) { echo "SQL.."; @@ -49,12 +45,13 @@ function db_query($sql, $err_msg=null) } } - if ($err_msg != null) - if (function_exists('xdebug_call_file')) - check_db_error('
At file '.xdebug_call_file().':'.xdebug_call_line().':
'.$err_msg, $sql); - else - check_db_error($err_msg, $sql); - + if ($err_msg != null || $go_debug) { + $exit = $err_msg != null; + if (function_exists('xdebug_call_file')) + check_db_error('
At file '.xdebug_call_file().':'.xdebug_call_line().':
'.$err_msg, $sql, $exit); + else + check_db_error($err_msg, $sql, $exit); + } return $result; } @@ -87,7 +84,7 @@ function db_free_result ($result) mysql_free_result($result); } -function db_num_rows (&$result) +function db_num_rows ($result) { return mysql_num_rows($result); } diff --git a/includes/db/inventory_db.inc b/includes/db/inventory_db.inc index 4fcc7a41..3695166b 100644 --- a/includes/db/inventory_db.inc +++ b/includes/db/inventory_db.inc @@ -17,11 +17,11 @@ function get_qoh_on_date($stock_id, $location=null, $date_=null, $exclude=0) $date = date2sql($date_); $sql = "SELECT SUM(qty) FROM ".TB_PREF."stock_moves - WHERE stock_id='$stock_id' + WHERE stock_id=".db_escape($stock_id)." AND tran_date <= '$date'"; if ($location != null) - $sql .= " AND loc_code = '$location'"; + $sql .= " AND loc_code = ".db_escape($location); $result = db_query($sql, "QOH calulcation failed"); @@ -29,9 +29,9 @@ function get_qoh_on_date($stock_id, $location=null, $date_=null, $exclude=0) if ($exclude > 0) { $sql = "SELECT SUM(qty) FROM ".TB_PREF."stock_moves - WHERE stock_id='$stock_id' - AND type=$exclude - AND tran_date = '$date'"; + WHERE stock_id=".db_escape($stock_id) + ." AND type=".db_escape($exclude) + ." AND tran_date = '$date'"; $result = db_query($sql, "QOH calulcation failed"); $myrow2 = db_fetch_row($result); @@ -48,8 +48,8 @@ function get_item_edit_info($stock_id) { $sql = "SELECT material_cost + labour_cost + overhead_cost AS standard_cost, units, decimals FROM ".TB_PREF."stock_master,".TB_PREF."item_units - WHERE stock_id='$stock_id' - AND ".TB_PREF."stock_master.units=".TB_PREF."item_units.abbr"; + WHERE stock_id=".db_escape($stock_id) + ." AND ".TB_PREF."stock_master.units=".TB_PREF."item_units.abbr"; $result = db_query($sql, "The standard cost cannot be retrieved"); return db_fetch($result); @@ -60,7 +60,7 @@ function get_item_edit_info($stock_id) function get_standard_cost($stock_id) { $sql = "SELECT material_cost + labour_cost + overhead_cost AS std_cost - FROM ".TB_PREF."stock_master WHERE stock_id='$stock_id'"; + FROM ".TB_PREF."stock_master WHERE stock_id=".db_escape($stock_id); $result = db_query($sql, "The standard cost cannot be retrieved"); $myrow = db_fetch_row($result); @@ -73,7 +73,7 @@ function get_standard_cost($stock_id) function is_inventory_item($stock_id) { $sql = "SELECT stock_id FROM ".TB_PREF."stock_master - WHERE stock_id='$stock_id' AND mb_flag <> 'D'"; + WHERE stock_id=".db_escape($stock_id)." AND mb_flag <> 'D'"; $result = db_query($sql, "Cannot query is inventory item or not"); return db_num_rows($result) > 0; @@ -87,7 +87,7 @@ Function get_stock_gl_code($stock_id) $sql = "SELECT inventory_account, cogs_account, adjustment_account, sales_account, assembly_account, dimension_id, dimension2_id FROM - ".TB_PREF."stock_master WHERE stock_id = '$stock_id'"; + ".TB_PREF."stock_master WHERE stock_id = ".db_escape($stock_id); $get = db_query($sql,"retreive stock gl code"); return db_fetch($get); @@ -112,9 +112,13 @@ function add_stock_move($type, $stock_id, $trans_no, $location, $sql = "INSERT INTO ".TB_PREF."stock_moves (stock_id, trans_no, type, loc_code, tran_date, person_id, reference, qty, standard_cost, visible, price, - discount_percent) VALUES ('$stock_id', $trans_no, $type, - ".db_escape($location).", '$date', '$person_id', ".db_escape($reference).", $quantity, $std_cost, - $show_or_hide, $price, $discount_percent)"; + discount_percent) VALUES (".db_escape($stock_id) + .", ".db_escape($trans_no).", ".db_escape($type) + .", ".db_escape($location).", '$date', " + .db_escape($person_id).", ".db_escape($reference).", " + .db_escape($quantity).", ".db_escape($std_cost)."," + .db_escape($show_or_hide).", ".db_escape($price).", " + .db_escape($discount_percent).")"; if ($error_msg == "") $error_msg = "The stock movement record cannot be inserted"; @@ -128,8 +132,11 @@ function update_stock_move_pid($type, $stock_id, $from, $to, $pid, $cost) { $from = date2sql($from); $to = date2sql($to); - $sql = "UPDATE ".TB_PREF."stock_moves SET standard_cost=$cost WHERE type=$type - AND stock_id='$stock_id' AND tran_date>='$from' AND tran_date<='$to' AND person_id = $pid"; + $sql = "UPDATE ".TB_PREF."stock_moves SET standard_cost=".db_escape($cost) + ." WHERE type=".db_escape($type) + ." AND stock_id=".db_escape($stock_id) + ." AND tran_date>='$from' AND tran_date<='$to' + AND person_id = ".db_escape($pid); db_query($sql, "The stock movement standard_cost cannot be updated"); } @@ -137,13 +144,15 @@ function update_stock_move_pid($type, $stock_id, $from, $to, $pid, $cost) function get_stock_moves($type, $type_no, $visible=false) { - $sql = "SELECT ".TB_PREF."stock_moves.*, ".TB_PREF."stock_master.description, ".TB_PREF."stock_master.units, - ".TB_PREF."locations.location_name, - ".TB_PREF."stock_master.material_cost + ".TB_PREF."stock_master.labour_cost + ".TB_PREF."stock_master.overhead_cost AS FixedStandardCost + $sql = "SELECT ".TB_PREF."stock_moves.*, ".TB_PREF."stock_master.description, " + .TB_PREF."stock_master.units,".TB_PREF."locations.location_name," + .TB_PREF."stock_master.material_cost + " + .TB_PREF."stock_master.labour_cost + " + .TB_PREF."stock_master.overhead_cost AS FixedStandardCost FROM ".TB_PREF."stock_moves,".TB_PREF."locations,".TB_PREF."stock_master WHERE ".TB_PREF."stock_moves.stock_id = ".TB_PREF."stock_master.stock_id AND ".TB_PREF."locations.loc_code=".TB_PREF."stock_moves.loc_code - AND type=$type AND trans_no=$type_no ORDER BY trans_id"; + AND type=".db_escape($type)." AND trans_no=".db_escape($type_no)." ORDER BY trans_id"; if ($visible) $sql .= " AND ".TB_PREF."stock_moves.visible=1"; @@ -155,7 +164,7 @@ function get_stock_moves($type, $type_no, $visible=false) function void_stock_move($type, $type_no) { $sql = "UPDATE ".TB_PREF."stock_moves SET qty=0, price=0, discount_percent=0, - standard_cost=0 WHERE type=$type AND trans_no=$type_no"; + standard_cost=0 WHERE type=".db_escape($type)." AND trans_no=".db_escape($type_no); db_query($sql, "Could not void stock moves"); } @@ -164,7 +173,8 @@ function void_stock_move($type, $type_no) function get_location_name($loc_code) { - $sql = "SELECT location_name FROM ".TB_PREF."locations WHERE loc_code='$loc_code'"; + $sql = "SELECT location_name FROM ".TB_PREF."locations WHERE loc_code=" + .db_escape($loc_code); $result = db_query($sql, "could not retreive the location name for $loc_code"); diff --git a/includes/db/manufacturing_db.inc b/includes/db/manufacturing_db.inc index 1153010d..31fb3ece 100644 --- a/includes/db/manufacturing_db.inc +++ b/includes/db/manufacturing_db.inc @@ -12,13 +12,15 @@ //---------------------------------------------------------------------------------------- function get_demand_qty($stock_id, $location) { - $sql = "SELECT SUM(".TB_PREF."sales_order_details.quantity - ".TB_PREF."sales_order_details.qty_sent) AS QtyDemand - FROM ".TB_PREF."sales_order_details, + $sql = "SELECT SUM(".TB_PREF."sales_order_details.quantity - " + .TB_PREF."sales_order_details.qty_sent) AS QtyDemand + FROM ".TB_PREF."sales_order_details, ".TB_PREF."sales_orders - WHERE ".TB_PREF."sales_order_details.order_no=".TB_PREF."sales_orders.order_no AND "; + WHERE ".TB_PREF."sales_order_details.order_no=" + .TB_PREF."sales_orders.order_no AND "; if ($location != "") - $sql .= TB_PREF."sales_orders.from_stk_loc ='$location' AND "; - $sql .= TB_PREF."sales_order_details.stk_code = '$stock_id'"; + $sql .= TB_PREF."sales_orders.from_stk_loc =".db_escape($location)." AND "; + $sql .= TB_PREF."sales_order_details.stk_code = ".db_escape($stock_id); $result = db_query($sql,"No transactions were returned"); $row = db_fetch($result); @@ -36,7 +38,7 @@ function load_stock_levels($location) $date = date2sql(Today()); $sql = "SELECT stock_id, SUM(qty) FROM ".TB_PREF."stock_moves WHERE tran_date <= '$date'"; - if ($location != '') $sql .= " AND loc_code = '$location'"; + if ($location != '') $sql .= " AND loc_code = ".db_escape($location); $sql .= " GROUP BY stock_id"; $result = db_query($sql, "QOH calulcation failed"); while ($row = db_fetch($result)) { @@ -63,8 +65,9 @@ function stock_demand_manufacture($stock_id, $qty, $demand_id, $location, $level if ($qty <= $stock_qty) return $demand; $bom = $bom_list[$stock_id]; if ($bom == NULL) { - $sql = "SELECT parent, component, quantity FROM ".TB_PREF."bom WHERE parent = '$stock_id'"; - if ($location != "") $sql .= " AND loc_code = '$location'"; + $sql = "SELECT parent, component, quantity FROM " + .TB_PREF."bom WHERE parent = ".db_escape($stock_id); + if ($location != "") $sql .= " AND loc_code = ".db_escape($location); $result = db_query($sql, "Could not search bom"); $bom = array(); // Even if we get no results, remember that fact @@ -100,7 +103,7 @@ function get_demand_asm_qty($stock_id, $location) ".TB_PREF."stock_master WHERE ".TB_PREF."sales_orders.order_no = ".TB_PREF."sales_order_details.order_no AND "; if ($location != "") - $sql .= TB_PREF."sales_orders.from_stk_loc ='$location' AND "; + $sql .= TB_PREF."sales_orders.from_stk_loc =".db_escape($location)." AND "; $sql .= TB_PREF."sales_order_details.quantity-".TB_PREF."sales_order_details.qty_sent > 0 AND ".TB_PREF."stock_master.stock_id=".TB_PREF."sales_order_details.stk_code AND (".TB_PREF."stock_master.mb_flag='M' OR ".TB_PREF."stock_master.mb_flag='A') @@ -114,12 +117,14 @@ function get_demand_asm_qty($stock_id, $location) function get_on_porder_qty($stock_id, $location) { - $sql = "SELECT SUM(".TB_PREF."purch_order_details.quantity_ordered - ".TB_PREF."purch_order_details.quantity_received) AS qoo - FROM ".TB_PREF."purch_order_details INNER JOIN ".TB_PREF."purch_orders ON ".TB_PREF."purch_order_details.order_no=".TB_PREF."purch_orders.order_no - WHERE ".TB_PREF."purch_order_details.item_code='$stock_id' "; + $sql = "SELECT SUM(".TB_PREF."purch_order_details.quantity_ordered - " + .TB_PREF."purch_order_details.quantity_received) AS qoo + FROM ".TB_PREF."purch_order_details INNER JOIN " + .TB_PREF."purch_orders ON ".TB_PREF."purch_order_details.order_no=".TB_PREF."purch_orders.order_no + WHERE ".TB_PREF."purch_order_details.item_code=".db_escape($stock_id)." "; if ($location != "") - $sql .= "AND ".TB_PREF."purch_orders.into_stock_location='$location' "; - $sql .= "AND ".TB_PREF."purch_order_details.item_code='$stock_id'"; + $sql .= "AND ".TB_PREF."purch_orders.into_stock_location=".db_escape($location)." "; + $sql .= "AND ".TB_PREF."purch_order_details.item_code=".db_escape($stock_id); $qoo_result = db_query($sql,"could not receive quantity on order for item"); if (db_num_rows($qoo_result) == 1) @@ -140,9 +145,9 @@ function get_on_worder_qty($stock_id, $location) (".TB_PREF."wo_requirements.units_req-".TB_PREF."wo_requirements.units_issued)) AS qoo FROM ".TB_PREF."wo_requirements INNER JOIN ".TB_PREF."workorders ON ".TB_PREF."wo_requirements.workorder_id=".TB_PREF."workorders.id - WHERE ".TB_PREF."wo_requirements.stock_id='$stock_id' "; + WHERE ".TB_PREF."wo_requirements.stock_id=".db_escape($stock_id)." "; if ($location != "") - $sql .= "AND ".TB_PREF."wo_requirements.loc_code='$location' "; + $sql .= "AND ".TB_PREF."wo_requirements.loc_code=".db_escape($location)." "; $sql .= "AND ".TB_PREF."workorders.released=1"; $qoo_result = db_query($sql,"could not receive quantity on order for item"); if (db_num_rows($qoo_result) == 1) @@ -157,9 +162,9 @@ function get_on_worder_qty($stock_id, $location) { $sql = "SELECT SUM((".TB_PREF."workorders.units_reqd-".TB_PREF."workorders.units_issued)) AS qoo FROM ".TB_PREF."workorders - WHERE ".TB_PREF."workorders.stock_id='$stock_id' "; + WHERE ".TB_PREF."workorders.stock_id=".db_escape($stock_id)." "; if ($location != "") - $sql .= "AND ".TB_PREF."workorders.loc_code='$location' "; + $sql .= "AND ".TB_PREF."workorders.loc_code=".db_escape($location)." "; $sql .= "AND ".TB_PREF."workorders.released=1"; $qoo_result = db_query($sql,"could not receive quantity on order for item"); if (db_num_rows($qoo_result) == 1) @@ -173,7 +178,8 @@ function get_on_worder_qty($stock_id, $location) function get_mb_flag($stock_id) { - $sql = "SELECT mb_flag FROM ".TB_PREF."stock_master WHERE stock_id = '" . $stock_id . "'"; + $sql = "SELECT mb_flag FROM ".TB_PREF."stock_master WHERE stock_id = " + .db_escape($stock_id); $result = db_query($sql, "retreive mb_flag from item"); if (db_num_rows($result) == 0) @@ -192,7 +198,7 @@ function get_bom($item) ".TB_PREF."stock_master.material_cost+ ".TB_PREF."stock_master.labour_cost+".TB_PREF."stock_master.overhead_cost AS standard_cost, units, ".TB_PREF."bom.quantity * (".TB_PREF."stock_master.material_cost+ ".TB_PREF."stock_master.labour_cost+ ".TB_PREF."stock_master.overhead_cost) AS ComponentCost FROM (".TB_PREF."workcentres, ".TB_PREF."locations, ".TB_PREF."bom) INNER JOIN ".TB_PREF."stock_master ON ".TB_PREF."bom.component = ".TB_PREF."stock_master.stock_id - WHERE ".TB_PREF."bom.parent = '" . $item . "' + WHERE ".TB_PREF."bom.parent = ".db_escape($item)." AND ".TB_PREF."workcentres.id=".TB_PREF."bom.workcentre_added AND ".TB_PREF."bom.loc_code = ".TB_PREF."locations.loc_code ORDER BY ".TB_PREF."bom.id"; diff --git a/includes/db/references_db.inc b/includes/db/references_db.inc index 48b16fad..e5212c65 100644 --- a/includes/db/references_db.inc +++ b/includes/db/references_db.inc @@ -13,9 +13,11 @@ function get_reference($type, $id) { - $sql = "SELECT * FROM ".TB_PREF."refs WHERE type=$type AND id=$id"; + $sql = "SELECT * FROM ".TB_PREF."refs WHERE type=".db_escape($type)." AND id=".db_escape($id); - return db_query($sql, "could not query reference table"); + $result = db_query($sql, "could not query reference table"); + $row = db_fetch($result); + return $row['reference']; } //-------------------------------------------------------------------------------------------------- @@ -23,16 +25,26 @@ function get_reference($type, $id) function add_reference($type, $id, $reference) { $sql = "INSERT INTO ".TB_PREF."refs (type, id, reference) - VALUES ($type, $id, " . db_escape(trim($reference)) . ")"; + VALUES (".db_escape($type).", ".db_escape($id).", " + . db_escape(trim($reference)) . ")"; db_query($sql, "could not add reference entry"); } +//-------------------------------------------------------------------------------------------------- + +function update_reference($type, $id, $reference) +{ + $sql = "UPDATE ".TB_PREF."refs SET reference=".db_escape($reference) + ." WHERE type=".db_escape($type)." AND id=".db_escape($id); + db_query($sql, "could not update reference entry"); +} + //-------------------------------------------------------------------------------------------------- function delete_reference($type, $id) { - $sql = "DELETE FROM ".TB_PREF."refs WHERE type=$type AND id=$id"; + $sql = "DELETE FROM ".TB_PREF."refs WHERE type=$type AND id=".db_escape($id); return db_query($sql, "could not delete from reference table"); } @@ -41,7 +53,8 @@ function delete_reference($type, $id) function find_reference($type, $reference) { - $sql = "SELECT id FROM ".TB_PREF."refs WHERE type=$type AND reference='$reference'"; + $sql = "SELECT id FROM ".TB_PREF."refs WHERE type=".db_escape($type) + ." AND reference=".db_escape($reference); $result = db_query($sql, "could not query reference table"); @@ -52,7 +65,8 @@ function find_reference($type, $reference) function save_next_reference($type, $reference) { - $sql = "UPDATE ".TB_PREF."sys_types SET next_reference=" . db_escape(trim($reference)) . " WHERE type_id = $type"; + $sql = "UPDATE ".TB_PREF."sys_types SET next_reference=" . db_escape(trim($reference)) + . " WHERE type_id = ".db_escape($type); db_query($sql, "The next transaction ref for $type could not be updated"); } @@ -61,7 +75,7 @@ function save_next_reference($type, $reference) function get_next_reference($type) { - $sql = "SELECT next_reference FROM ".TB_PREF."sys_types WHERE type_id = $type"; + $sql = "SELECT next_reference FROM ".TB_PREF."sys_types WHERE type_id = ".db_escape($type); $result = db_query($sql,"The last transaction ref for $type could not be retreived"); diff --git a/includes/db/sql_functions.inc b/includes/db/sql_functions.inc index b869f6bd..0fa479dc 100644 --- a/includes/db/sql_functions.inc +++ b/includes/db/sql_functions.inc @@ -9,8 +9,10 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -//------------------------------------------------------------------- - +// +// General database functions common for all modules. +// +//------------------------------------------------------------------- function begin_transaction() { db_query("BEGIN", "could not start a transaction"); @@ -25,5 +27,13 @@ function cancel_transaction() { db_query("ROLLBACK", "could not cancel a transaction"); } - +//----------------------------------------------------------------------------- +// Update record activity status. +// +function update_record_status($id, $status, $table, $key) { + $sql = "UPDATE ".TB_PREF.$table." SET inactive = " + . db_escape($status)." WHERE $key=".db_escape($id); + + db_query($sql, "Can't update record status"); +} ?> diff --git a/includes/db_pager.inc b/includes/db_pager.inc index 819b4757..e09659a0 100644 --- a/includes/db_pager.inc +++ b/includes/db_pager.inc @@ -52,11 +52,14 @@ class db_pager { var $ready = false; // this var is false after change in sql before first // and before first query. - + var $inactive_ctrl = false; + var $main_tbl; // table and key field name for inactive ctrl and edit/delete links + var $key; // key field name + // db_pager constructor // accepts $sql like 'SELECT ...[FROM ...][WHERE ...][GROUP ...][ORDER ...]' // $name is base name for pager controls - function db_pager($sql, $name, $page_len=0) + function db_pager($sql, $name, $table = null, $page_len=0) { global $table_style; $this->width = "95%"; @@ -157,14 +160,18 @@ class db_pager { $c = 0; // add result field names to column defs for // col value retrieve and sort purposes - for ($c = $i = 0; $c < count($this->columns); $c++) { - if (!(isset($this->columns[$c]['insert']) && $this->columns[$c]['insert'])) - $this->columns[$c]['name']= mysql_field_name($result, $i++); + $cnt = min(mysql_num_fields($result), count($this->columns)); + for ($c = $i = 0; $c < $cnt; $c++) { + if (!(isset($this->columns[$c]['insert']) && $this->columns[$c]['insert'])) { +// if (!@($this->columns[$c]['type']=='skip')) + $this->columns[$c]['name']= mysql_field_name($result, $i); + if (!@($this->columns[$c]['type']=='insert')) + $i++; + } } - - while ($row = db_fetch_assoc($result)) + while ($row = db_fetch_assoc($result)) { $this->data[] = $row; - + } } else return false; return true; @@ -217,7 +224,7 @@ class db_pager { $h = ''; $c = $coldef; } else { - $h = $coldef; + $h = $coldef; $c = 'text'; } } @@ -228,11 +235,13 @@ class db_pager { $c['type'] = 'text'; switch($c['type']) { - case 'insert': - default: - $c['head'] = $h; break; - case 'skip': // skip the column (no header) - unset($c['head']); // paranoid code + case 'inactive': + $this->inactive_ctrl = true; + case 'insert': + default: + $c['head'] = $h; break; + case 'skip': // skip the column (no header) + unset($c['head']); break; } $this->columns[] = $c; } @@ -247,7 +256,7 @@ class db_pager { $select = $this->select; $from = $this->from; $where = $this->where; - $group = $this->group; + $group = $this->group; $order = $this->order; if(count($this->extra_where)) { @@ -372,6 +381,44 @@ class db_pager { $this->footer_fun = $func; $this->footer_class = $footercl; } + // + // Setter for table editors with inactive cell control. + // + function set_inactive_ctrl($table, $key) { + $this->inactive_ctrl = array('table'=>$table, 'key'=>$key); + } + // + // Helper for display inactive control cells + // + function inactive_control_cell(&$row) + { + if ($this->inactive_ctrl) { +// return inactive_control_cell($row[$this->inactive_ctrl['key']], +// $row['inactive'], $this->inactive_ctrl['table'], +// $this->inactive_ctrl['key']); + + global $Ajax; + + $key = $this->key ? + $this->key : $this->columns[0]['name']; // TODO - support for complex keys + $id = $row[$key]; + $table = $this->main_tbl; + $name = "Inactive". $id; + $value = $row['inactive'] ? 1:0; + + if (check_value('show_inactive')) { + if (isset($_POST['LInact'][$id]) && (get_post('_Inactive'.$id.'_update') || + get_post('Update')) && (check_value('Inactive'.$id) != $value)) { + update_record_status($id, !$value, $table, $key); + $value = !$value; + } + echo ''; + } + } else + return ''; + } + }; //----------------------------------------------------------------------------- // Creates new db_pager $_SESSION object on first page call. @@ -399,20 +446,22 @@ class db_pager { // during display, but can be used in format handlers for 'spec' and 'insert' // type columns. -function &new_db_pager($name, $sql, $coldef, $page_len = 0) { - - if ($_SERVER['REQUEST_METHOD'] == 'GET') - unset($_SESSION[$name]); // kill old pager if any exists on first page call +function &new_db_pager($name, $sql, $coldef, $table = null, $key = null, $page_len = 0) { + if (isset($_SESSION[$name]) && + ($_SERVER['REQUEST_METHOD'] == 'GET' || $_SESSION[$name]->sql != $sql)) { + unset($_SESSION[$name]); // kill pager if sql has changed + } if (!isset($_SESSION[$name])) { - $_SESSION[$name] =& new db_pager($sql, $name, $page_len); + $_SESSION[$name] =& new db_pager($sql, $name, $table, $page_len); + $_SESSION[$name]->main_tbl = $table; + $_SESSION[$name]->key = $key; $_SESSION[$name]->set_sql($sql); $_SESSION[$name]->set_columns($coldef); } - $ret = &$_SESSION[$name]; + return $_SESSION[$name]; - return $ret; } // // Force pager initialization. diff --git a/includes/errors.inc b/includes/errors.inc index 83ccb6c0..bfa213d5 100644 --- a/includes/errors.inc +++ b/includes/errors.inc @@ -12,11 +12,6 @@ $messages = array(); // container for system messages $before_box = ''; // temporary container for output html data before error box -$msg_colors = array( - E_USER_ERROR => array('bg'=>'#ffcccc', 'txt'=>'#dd2200', 'bd'=>'#cc3300'), - E_USER_WARNING => array('bg'=>'#ffff00', 'txt'=>'#ff5500', 'bd'=>'#ff9900'), - E_USER_NOTICE => array('bg'=>'#ccffcc', 'txt'=>'#007700', 'bd'=>'#33cc00')); - //----------------------------------------------------------------------------- // Error handler - collects all php/user messages for // display in message box. @@ -24,6 +19,15 @@ $msg_colors = array( function error_handler($errno, $errstr, $file, $line) { global $messages, $go_debug; + // skip well known warnings we don't care about. + // Please use restrainedly to not risk loss of important messages + $excluded_warnings = array('html_entity_decode', 'htmlspecialchars'); + foreach($excluded_warnings as $ref) { + if (strpos($errstr, $ref) !== false) { + return true; + } + } + // error_reporting==0 when messages are set off with @ if ($errno & error_reporting()) $messages[] = array($errno, $errstr, $file, $line); @@ -36,14 +40,19 @@ function error_handler($errno, $errstr, $file, $line) { //------------------------------------------------------------------------------ // Formats system messages before insert them into message
// FIX center is unused now -function fmt_errors($center=true) { - global $messages, $msg_colors; +function fmt_errors($center=false) { + global $messages, $path_to_root; + $msg_class = array( + E_USER_ERROR => 'err_msg', + E_USER_WARNING =>'warn_msg', + E_USER_NOTICE => 'note_msg'); + $type = E_USER_NOTICE; - + $content = ''; +// $class = 'no_msg'; if (count($messages)) { - $content = ''; - foreach($messages as $msg) { + foreach($messages as $cnt=>$msg) { if ($msg[0]>$type) continue; if ($msg[0]<$type) { @@ -57,23 +66,16 @@ function fmt_errors($center=true) { } } $str = $msg[1]; - $c = $msg_colors[$type]; if ($msg[0] < E_USER_ERROR && $msg[2] != null) $str .= ' '._('in file').': '.$msg[2].' '._('at line ').$msg[3]; - - $content .= "
"; - } - - $str = "
"; -display_gl_items($_SESSION['pay_items']->trans_type==systypes::bank_payment() ? +display_gl_items($_SESSION['pay_items']->trans_type==ST_BANKPAYMENT ? _("Payment Items"):_("Deposit Items"), $_SESSION['pay_items']); gl_options_controls(); echo "'. checkbox(null, $name, $value, true, '', "align='center'") + . hidden("LInact[$id]", $value, false) . '
" - .$str."
" - . $content . "

\n"; - - } - else - $str = ''; - - return $str; + $content .= ($cnt ? '
' : '').$str; + } + $class = $msg_class[$type]; + $content = "
$content
"; + } else + if ($path_to_root=='.') + return ''; + return $content; } //----------------------------------------------------------------------------- // Error box
element. @@ -98,9 +100,15 @@ function end_flush () { function display_db_error($msg, $sql_statement=null, $exit=true) { global $db, $debug; + + $warning = $msg==null; $db_error = db_error_no(); - $str = "" . _("DATABASE ERROR :") . " $msg
"; +// $str = "" . _("DATABASE ERROR :") . " $msg
"; + if($warning) + $str = "" . _("Debug mode database warning:") . "
"; + else + $str = "" . _("DATABASE ERROR :") . " $msg
"; if ($db_error != 0) { @@ -114,9 +122,10 @@ function display_db_error($msg, $sql_statement=null, $exit=true) } $str .= "

"; - - trigger_error($str, E_USER_ERROR); - + if($msg) + trigger_error($str, E_USER_ERROR); + else // $msg can be null here only in debug mode, otherwise the error is ignored + trigger_error($str, E_USER_WARNING); if ($exit) exit; } @@ -142,8 +151,9 @@ function check_db_error($msg, $sql_statement, $exit_if_error=true, $rollback_if_ if ($db_error != 0) { - if (!frindly_db_error($db_error)) - display_db_error($msg, $sql_statement, false); + if (!frindly_db_error($db_error)) { + display_db_error($msg, $sql_statement, false); + } if ($rollback_if_error) { @@ -152,8 +162,7 @@ function check_db_error($msg, $sql_statement, $exit_if_error=true, $rollback_if_ if ($exit_if_error) { - echo "

"; - exit; + end_page(); exit; } } return $db_error; diff --git a/includes/lang/gettext.php b/includes/lang/gettext.php index 4c4f1633..cc2f04d0 100644 --- a/includes/lang/gettext.php +++ b/includes/lang/gettext.php @@ -25,194 +25,21 @@ define('GETTEXT_NATIVE', 1); define('GETTEXT_PHP', 2); -/** -* Generic gettext static class. -* -* This class allows gettext usage with php even if the gettext support is -* not compiled in php. -* -* The developper can choose between the GETTEXT_NATIVE support and the -* GETTEXT_PHP support on initialisation. If native is not supported, the -* system will fall back to PHP support. -* -* On both systems, this package add a variable interpolation system so you can -* translate entire dynamic sentences in stead of peace of sentences. -* -* Small example without pear error lookup : -* -* -* -* A gettext mini-howto should be provided with this package, if you're new -* to gettext usage, please read it to learn how to build a gettext -* translation directory (locale). -* -* @todo Tools to manage gettext files in php. -* -* - non traducted domains / keys -* - modification of keys -* - domain creation, preparation, delete, ... -* - tool to extract required messages from TOF templates -* -* @version 0.5 -* @author Laurent Bedubourg -*/ -class get_text -{ - /** - * This method returns current gettext support class. - * - * @return GetText_Support - * @static 1 - * @access private - */ - function &_support($set=false) - { - static $support_obj; - if ($set !== false) - { - $support_obj = $set; - } - elseif (!isset($support_obj)) - { - trigger_error("get_text not initialized !". '\n'. - "Please call get_text::init() before calling ". - "any get_text function !" . '\n' , E_USER_ERROR); - } - return $support_obj; - } - - /** - * Initialize gettext package. - * - * This method instantiate the gettext support depending on managerType - * value. - * - * GETTEXT_NATIVE try to use gettext php support and fall back to PHP - * support if not installed. - * - * GETTEXT_PHP explicitely request the usage of PHP support. - * - * @param int $managerType - * Gettext support type. - * - * @access public - * @static 1 - */ - function init($managerType = GETTEXT_NATIVE) - { +function get_text_init($managerType = GETTEXT_NATIVE) { + + if (!isset($_SESSION['get_text'])) { + if ($managerType == GETTEXT_NATIVE) { if (function_exists('gettext')) { - return get_text::_support(new gettext_native_support()); + $_SESSION['get_text'] = new gettext_native_support(); + return; } } // fail back to php support - return get_text::_support(new gettext_php_support()); - } - - /** - * Set the language to use for traduction. - * - * @param string $lang_code - * The language code usually defined as ll_CC, ll is the two letter - * language code and CC is the two letter country code. - * - * @throws GetText_Error if language is not supported by your system. - */ - function set_language($lang_code, $encoding) - { - $support = &get_text::_support(); - return $support->set_language($lang_code, $encoding); - } - - /** - * Add a translation domain. - * - * The domain name is usually the name of the .po file you wish to use. - * For example, if you created a file 'lang/ll_CC/LC_MESSAGES/myapp.po', - * you'll use 'myapp' as the domain name. - * - * @param string $domain - * The domain name. - * - * @param string $path optional - * The path to the locale directory (ie: /path/to/locale/) which - * contains ll_CC directories. - */ - function add_domain($domain, $path=false) - { - $support =& get_text::_support(); - return $support->add_domain($domain, $path); - } - - /** - * Retrieve the translation for specified key. - * - * @param string $key - * String to translate using gettext support. - */ - function gettext($key) - { - $support = &get_text::_support(); - return $support->gettext($key); - } - - /** - * Add a variable to gettext interpolation system. - * - * @param string $key - * The variable name. - * - * @param string $value - * The variable value. - */ - function set_var($key, $value) - { - $support =& get_text::_support(); - return $support->set_var($key, $value); - } - - /** - * Add an hashtable of variables. - * - * @param hashtable $hash - * PHP associative array of variables. - */ - function set_vars($hash) - { - $support =& get_text::_support(); - return $support->set_vars($hash); - } - - /** - * Reset interpolation variables. - */ - function reset() - { - $support =& get_text::_support(); - return $support->reset(); - } + $_SESSION['get_text'] = new gettext_php_support(); + } } function raise_error($str) { @@ -243,7 +70,7 @@ class gettext_native_support putenv("LANG=$lang_code"); putenv("LC_ALL=$lang_code"); putenv("LANGUAGE=$lang_code"); - + //$set = setlocale(LC_ALL, "$lang_code"); //$set = setlocale(LC_ALL, "$encoding"); $set = setlocale(LC_ALL, $lang_code.".".$encoding); diff --git a/includes/lang/language.php b/includes/lang/language.php index 0727222c..f9b86b17 100644 --- a/includes/lang/language.php +++ b/includes/lang/language.php @@ -57,10 +57,9 @@ class language // check id file exists only once for session $_SESSION['language']->is_locale_file = file_exists($locale); } - $lang = $_SESSION['language']; - get_text::set_language($lang->code, $lang->encoding); - get_text::add_domain($lang->code, $path_to_root . "/lang"); + $_SESSION['get_text']->set_language($lang->code, $lang->encoding); + $_SESSION['get_text']->add_domain($lang->code, $path_to_root . "/lang"); // Necessary for ajax calls. Due to bug in php 4.3.10 for this // version set globally in php.ini @@ -69,7 +68,7 @@ class language if (isset($_SESSION['App']) && $changed) $_SESSION['App']->init(); // refresh menu } - +} /** * This method loads an array of language objects into a session variable * called $_SESSIONS['languages']. Only supported languages are added. @@ -92,36 +91,16 @@ class language $_SESSION['language'] = $_SESSION['languages'][$dflt_lang]; } -} -/* - Test if named function is defined in locale.inc file. -*/ -function has_locale($fun=null) -{ - global $path_to_root; - - if ($_SESSION['language']->is_locale_file) - { - global $path_to_root; - include_once($path_to_root . "/lang/" . - $_SESSION['language']->code . "/locale.inc"); - - if (!isset($fun) || function_exists($fun)) - return true; - } - return false; -} - function _set($key,$value) { - get_text::set_var($key,$value); + $_SESSION['get_text']->set_var($key,$value); } if (!function_exists("_")) { function _($text) { - $retVal = get_text::gettext($text); + $retVal = $_SESSION['get_text']->gettext($text); if ($retVal == "") return $text; return $retVal; diff --git a/includes/main.inc b/includes/main.inc index 5d4371ba..fcb8b99a 100644 --- a/includes/main.inc +++ b/includes/main.inc @@ -11,7 +11,6 @@ ***********************************************************************/ include_once($path_to_root . "/includes/db/connect_db.inc"); -include_once($path_to_root . "/includes/reserved.inc"); include_once($path_to_root . "/includes/errors.inc"); include_once($path_to_root . "/includes/types.inc"); include_once($path_to_root . "/includes/systypes.inc"); @@ -19,23 +18,26 @@ include_once($path_to_root . "/includes/references.inc"); include_once($path_to_root . "/includes/prefs/sysprefs.inc"); include_once($path_to_root . "/includes/db/comments_db.inc"); include_once($path_to_root . "/includes/db/sql_functions.inc"); +include_once($path_to_root . "/includes/db/audit_trail_db.inc"); +//include_once($path_to_root . "/includes/validation.inc"); include_once($path_to_root . "/admin/db/users_db.inc"); include_once($path_to_root . "/includes/ui/ui_view.inc"); include_once($path_to_root . "/includes/ui/ui_controls.inc"); -include_once($path_to_root . "/installed_extensions.php"); function page($title, $no_menu=false, $is_index=false, $onload="", $js="", $script_only=false) { - global $path_to_root; + global $path_to_root, $page_security; + $hide_menu = $no_menu; include($path_to_root . "/includes/page/header.inc"); page_header($title, $no_menu, $is_index, $onload, $js); - error_box(); + check_page_security($page_security); +// error_box(); if($script_only) { echo '
  • All the standing configuration data is defined from the Setup tab and each link should be reviewed to enter appropriate data for the -business. Setup wizards that guide you through this process has been -implemented and we strongly recommend you to use this approach, see Installation -steps (automatic, recommended) .
    • - -

    Troubleshooting

    +business.

    Troubleshooting

    1. If FrontAccounting is installed locally, you may have the session save path not set correctly. Normally this is diff --git a/install/index.php b/install/index.php index 99d810a1..56924549 100644 --- a/install/index.php +++ b/install/index.php @@ -1,13 +1,10 @@ . + This installer is based on code from the + Website Baker Project + Copyright (C) 2004-2007, Ryan Djurovich. + The code is released under GPLv3 + modified by FrontAcounting, LLC. ***********************************************************************/ error_reporting(E_ALL); ini_set("display_errors", "On"); @@ -24,6 +21,7 @@ if(!isset($_GET['sessions_checked']) || $_GET['sessions_checked'] != 'true') { // Set session variable $_SESSION['session_support'] = 'Enabled'; + $_SESSION['message'] = ''; // Reload page header('Location: index.php?sessions_checked=true'); exit(0); @@ -90,8 +88,15 @@ function change_os(type) {
      Logo
      - - +
      Error: Seems you have FrontAccounting application already installed.
      +After logging as an admin to first installed company you can: +
        +
      • Add more companies using Add/Update Companies under Setup tab;
        • +
      • Upgrade FA version using Upgrade Software under Setup tab.
        • +
      +
      Error:
      config_db.php - Writeable'; } elseif(!file_exists($path_to_root.'/config_db.php')) { echo 'File Not Found'; } else { echo 'Unwriteable'; } ?> + Writeable'; } elseif(file_exists($path_to_root.'/config_db.php')) { echo 'File Exists'; } else { echo 'Unwriteable'; } ?> modules/ - Writeable'; } elseif(!file_exists($path_to_root.'/lang/')) { echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?> + Writeable'; } elseif(!file_exists($path_to_root.'/modules/')) { echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?> lang/ @@ -225,7 +230,7 @@ function change_os(type) { Please enter your MySQL database server details below... - Host Name: + Host Name: @@ -253,12 +258,20 @@ function change_os(type) {   - /> + />
            (Please note: May remove existing tables and data) + + Fill database with demo data: + + /> +
      + +   +

      Step 5

      Please enter the training company name below (you can create your own company later)... diff --git a/install/save.php b/install/save.php index 2df68e9f..b11263a3 100644 --- a/install/save.php +++ b/install/save.php @@ -1,13 +1,10 @@ . + This installer is based on code from the + Website Baker Project + Copyright (C) 2004-2007, Ryan Djurovich. + The code is released under GPLv3 + modified by FrontAcounting, LLC. ***********************************************************************/ error_reporting(E_ALL); ini_set("display_errors", "On"); @@ -37,42 +34,15 @@ function display_error($message) if(isset($_POST['company_name'])) { $_SESSION['ba_url'] = $_POST['ba_url']; - if(!isset($_POST['operating_system'])) - { - $_SESSION['operating_system'] = 'linux'; - } - else - { - $_SESSION['operating_system'] = $_POST['operating_system']; - } - if(!isset($_POST['world_writeable'])) - { - $_SESSION['world_writeable'] = false; - } - else - { - $_SESSION['world_writeable'] = true; - } + $_SESSION['operating_system'] = isset($_POST['operating_system']); + $_SESSION['world_writeable'] = isset($_POST['world_writeable']); $_SESSION['database_host'] = $_POST['database_host']; $_SESSION['database_username'] = $_POST['database_username']; $_SESSION['database_password'] = $_POST['database_password']; $_SESSION['database_name'] = $_POST['database_name']; - if(!isset($_POST['table_prefix'])) - { - $_SESSION['table_prefix'] = false; - } - else - { - $_SESSION['table_prefix'] = true; - } - if(!isset($_POST['install_tables'])) - { - $_SESSION['install_tables'] = false; - } - else - { - $_SESSION['install_tables'] = true; - } + $_SESSION['demo_data'] = isset($_POST['demo_data']); + $_SESSION['table_prefix'] = isset($_POST['table_prefix']); + $_SESSION['install_tables'] = isset($_POST['install_tables']); $_SESSION['company_name'] = $_POST['company_name']; $_SESSION['admin_email'] = $_POST['admin_email']; $_SESSION['admin_password'] = $_POST['admin_password']; @@ -281,7 +251,7 @@ else // End website company name // Check if the user has entered a correct path -if (!file_exists($path_to_root.'/sql/en_US-demo.sql')) +if (!file_exists($path_to_root.'/sql/en_US-'.(isset($_POST['demo_data']) ? 'demo':'new').'.sql')) { display_error('It appears the Absolute path that you entered is incorrect'); } @@ -325,9 +295,33 @@ if ($admin_password != $admin_repassword) } // End admin user details code +if (!file_exists($path_to_root . "/config.php")) { + copy($path_to_root. "/config.default.php", $path_to_root. "/config.php"); +} + include_once($path_to_root . "/includes/db/connect_db.inc"); include_once($path_to_root . "/admin/db/maintenance_db.inc"); -include_once($path_to_root . "/config_db.php"); + +if (!file_exists($path_to_root . "/installed_extensions.php")) { + $next_extension_id = 1; + write_extensions(array()); + write_extensions(array(),0); +} +if (!file_exists($path_to_root . "/lang/installed_languages.inc")) { + $installed_languages = array ( + 0 => array ('code' => 'en_GB', 'name' => 'English', 'encoding' => 'iso-8859-1')); + $dflt_lang = 'en_GB'; + write_lang(); +} + +if (file_exists($path_to_root . "/config_db.php")) + include_once($path_to_root . "/config_db.php"); + else +{ + $def_coy = 0; + $tb_pref_counter = 0; + $db_connections = array (); +} $id = count($db_connections); if ($table_prefix != "" && $id > 0) @@ -363,7 +357,7 @@ if (!$db) $result = mysql_select_db($database_name, $db); } if($result) { - $import_filename = $path_to_root."/sql/en_US-demo.sql"; + $import_filename = $path_to_root.'/sql/en_US-'.(isset($_POST['demo_data']) ? 'demo':'new').'.sql'; db_import($import_filename, $db_connections[$id]); } } @@ -390,7 +384,6 @@ if (!$db) session_unset(); session_destroy(); $_SESSION = array(); - header("Location: ".$path_to_root."/index.php"); exit(); diff --git a/inventory/adjustments.php b/inventory/adjustments.php index bf3f290f..20ac09d1 100644 --- a/inventory/adjustments.php +++ b/inventory/adjustments.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 3; -$path_to_root=".."; +$page_security = 'SA_INVENTORYADJUSTMENT'; +$path_to_root = ".."; include_once($path_to_root . "/includes/ui/items_cart.inc"); include_once($path_to_root . "/includes/session.inc"); @@ -25,7 +25,7 @@ if ($use_popup_windows) $js .= get_js_open_window(800, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Item Adjustments Note"), false, false, "", $js); +page(_($help_context = "Item Adjustments Note"), false, false, "", $js); //----------------------------------------------------------------------------------------------- @@ -38,7 +38,7 @@ check_db_has_movement_types(_("There are no inventory movement types defined in if (isset($_GET['AddedID'])) { $trans_no = $_GET['AddedID']; - $trans_type = systypes::inventory_adjustment(); + $trans_type = ST_INVADJUST; display_notification_centered(_("Items adjustment has been processed")); display_note(get_trans_view_str($trans_type, $trans_no, _("&View this adjustment"))); @@ -69,8 +69,8 @@ function handle_new_order() session_register("adj_items"); - $_SESSION['adj_items'] = new items_cart(systypes::inventory_adjustment()); - $_POST['AdjDate'] = Today(); + $_SESSION['adj_items'] = new items_cart(ST_INVADJUST); + $_POST['AdjDate'] = new_doc_date(); if (!is_date_in_fiscalyear($_POST['AdjDate'])) $_POST['AdjDate'] = end_fiscalyear(); $_SESSION['adj_items']->tran_date = $_POST['AdjDate']; @@ -80,6 +80,8 @@ function handle_new_order() function can_process() { + global $Refs; + $adj = &$_SESSION['adj_items']; if (count($adj->line_items) == 0) { @@ -87,14 +89,14 @@ function can_process() set_focus('stock_id'); return false; } - if (!references::is_valid($_POST['ref'])) + if (!$Refs->is_valid($_POST['ref'])) { display_error( _("You must enter a reference.")); set_focus('ref'); return false; } - if (!is_new_reference($_POST['ref'], systypes::inventory_adjustment())) + if (!is_new_reference($_POST['ref'], ST_INVADJUST)) { display_error( _("The entered reference is already in use.")); set_focus('ref'); @@ -134,7 +136,7 @@ if (isset($_POST['Process']) && can_process()){ $trans_no = add_stock_adjustment($_SESSION['adj_items']->line_items, $_POST['StockLocation'], $_POST['AdjDate'], $_POST['type'], $_POST['Increase'], $_POST['ref'], $_POST['memo_']); - + new_doc_date($_POST['AdjDate']); $_SESSION['adj_items']->clear_items(); unset($_SESSION['adj_items']); @@ -217,7 +219,7 @@ if (isset($_GET['NewAdjustment']) || !isset($_SESSION['adj_items'])) } //----------------------------------------------------------------------------------------------- -start_form(false, true); +start_form(); display_order_header($_SESSION['adj_items']); @@ -229,7 +231,7 @@ adjustment_options_controls(); end_outer_table(1, false); submit_center_first('Update', _("Update"), '', null); -submit_center_last('Process', _("Process Adjustment"), '', true); +submit_center_last('Process', _("Process Adjustment"), '', 'default'); end_form(); end_page(); diff --git a/inventory/cost_update.php b/inventory/cost_update.php index 432bf652..2ce775fc 100644 --- a/inventory/cost_update.php +++ b/inventory/cost_update.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; -$path_to_root=".."; +$page_security = 'SA_STANDARDCOST'; +$path_to_root = ".."; include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/includes/date_functions.inc"); @@ -23,7 +23,7 @@ include_once($path_to_root . "/inventory/includes/inventory_db.inc"); $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 500); -page(_("Inventory Item Cost Update"), false, false, "", $js); +page(_($help_context = "Inventory Item Cost Update"), false, false, "", $js); //-------------------------------------------------------------------------------------- @@ -68,7 +68,7 @@ if (isset($_POST['UpdateData'])) if ($update_no > 0) { - display_note(get_gl_view_str(systypes::cost_update(), $update_no, _("View the GL Journal Entries for this Cost Update")), 0, 1); + display_note(get_gl_view_str(ST_COSTUPDATE, $update_no, _("View the GL Journal Entries for this Cost Update")), 0, 1); } } } @@ -77,13 +77,13 @@ if (list_updated('stock_id')) $Ajax->activate('cost_table'); //----------------------------------------------------------------------------------------- -start_form(false, true); +start_form(); if (!isset($_POST['stock_id'])) $_POST['stock_id'] = get_global_stock_item(); echo "
      " . _("Item:"). " "; -stock_costable_items_list('stock_id', $_POST['stock_id'], false, true); +echo stock_costable_items_list('stock_id', $_POST['stock_id'], false, true); echo "
      "; set_global_stock_item($_POST['stock_id']); @@ -126,7 +126,7 @@ else end_table(1); div_end(); -submit_center('UpdateData', _("Update")); +submit_center('UpdateData', _("Update"), true, false, 'default'); end_form(); end_page(); diff --git a/inventory/includes/db/items_adjust_db.inc b/inventory/includes/db/items_adjust_db.inc index 57f74bb5..ae2e25c7 100644 --- a/inventory/includes/db/items_adjust_db.inc +++ b/inventory/includes/db/items_adjust_db.inc @@ -13,9 +13,11 @@ function add_stock_adjustment($items, $location, $date_, $type, $increase, $reference, $memo_) { + global $Refs; + begin_transaction(); - $adj_id = get_next_trans_no(systypes::inventory_adjustment()); + $adj_id = get_next_trans_no(ST_INVADJUST); foreach ($items as $line_item) { @@ -27,9 +29,10 @@ function add_stock_adjustment($items, $location, $date_, $type, $increase, $refe $line_item->quantity, $line_item->standard_cost, $memo_); } - add_comments(systypes::inventory_adjustment(), $adj_id, $date_, $memo_); + add_comments(ST_INVADJUST, $adj_id, $date_, $memo_); - references::save_last($reference, systypes::inventory_adjustment()); + $Refs->save(ST_INVADJUST, $adj_id, $reference); + add_audit_trail(ST_INVADJUST, $adj_id, $date_); commit_transaction(); @@ -40,15 +43,15 @@ function add_stock_adjustment($items, $location, $date_, $type, $increase, $refe function void_stock_adjustment($type_no) { - void_gl_trans(systypes::inventory_adjustment(), $type_no); - void_stock_move(systypes::inventory_adjustment(), $type_no); + void_gl_trans(ST_INVADJUST, $type_no); + void_stock_move(ST_INVADJUST, $type_no); } //------------------------------------------------------------------------------------------------------------- function get_stock_adjustment_items($trans_no) { - $result = get_stock_moves(systypes::inventory_adjustment(), $trans_no); + $result = get_stock_moves(ST_INVADJUST, $trans_no); if (db_num_rows($result) == 0) { @@ -72,7 +75,7 @@ function add_stock_adjustment_item($adj_id, $stock_id, $location, $date_, $type, update_average_material_cost(null, $stock_id, $standard_cost, $quantity, $date_); - add_stock_move(systypes::inventory_adjustment(), $stock_id, $adj_id, $location, + add_stock_move(ST_INVADJUST, $stock_id, $adj_id, $location, $date_, $reference, $quantity, $standard_cost, $type); if ($standard_cost > 0) @@ -80,10 +83,10 @@ function add_stock_adjustment_item($adj_id, $stock_id, $location, $date_, $type, $stock_gl_codes = get_stock_gl_code($stock_id); - add_gl_trans_std_cost(systypes::inventory_adjustment(), $adj_id, $date_, + add_gl_trans_std_cost(ST_INVADJUST, $adj_id, $date_, $stock_gl_codes['adjustment_account'], $stock_gl_codes['dimension_id'], $stock_gl_codes['dimension2_id'], $memo_, ($standard_cost * -($quantity))); - add_gl_trans_std_cost(systypes::inventory_adjustment(), $adj_id, $date_, $stock_gl_codes['inventory_account'], 0, 0, $memo_, ($standard_cost * $quantity)); + add_gl_trans_std_cost(ST_INVADJUST, $adj_id, $date_, $stock_gl_codes['inventory_account'], 0, 0, $memo_, ($standard_cost * $quantity)); } } diff --git a/inventory/includes/db/items_category_db.inc b/inventory/includes/db/items_category_db.inc index 20f469b0..11f9486d 100644 --- a/inventory/includes/db/items_category_db.inc +++ b/inventory/includes/db/items_category_db.inc @@ -9,34 +9,64 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -function add_item_category($description) - +function add_item_category($description, $tax_type_id, $sales_account, + $cogs_account, $inventory_account, $adjustment_account, $assembly_account, + $units, $mb_flag, $dim1, $dim2, $no_sale) { - $sql = "INSERT INTO ".TB_PREF."stock_category (description) - VALUES (".db_escape($description).")"; + $sql = "INSERT INTO ".TB_PREF."stock_category (description, dflt_tax_type, + dflt_units, dflt_mb_flag, dflt_sales_act, dflt_cogs_act, + dflt_inventory_act, dflt_adjustment_act, dflt_assembly_act, + dflt_dim1, dflt_dim2, dflt_no_sale) + VALUES (" + .db_escape($description)."," + .db_escape($tax_type_id)."," + .db_escape($units)."," + .db_escape($mb_flag)."," + .db_escape($sales_account)."," + .db_escape($cogs_account)."," + .db_escape($inventory_account)."," + .db_escape($adjustment_account)."," + .db_escape($assembly_account)."," + .db_escape($dim1)."," + .db_escape($dim2)."," + .db_escape($no_sale).")"; db_query($sql,"an item category could not be added"); } -function update_item_category($ItemCategory, $description) +function update_item_category($id, $description, $tax_type_id, + $sales_account, $cogs_account, $inventory_account, $adjustment_account, + $assembly_account, $units, $mb_flag, $dim1, $dim2, $no_sale) { - $sql = "UPDATE ".TB_PREF."stock_category SET description = ".db_escape($description)." - WHERE category_id = ".db_escape($ItemCategory); + $sql = "UPDATE ".TB_PREF."stock_category SET " + ."description = ".db_escape($description)."," + ."dflt_tax_type = ".db_escape($tax_type_id)."," + ."dflt_units = ".db_escape($units)."," + ."dflt_mb_flag = ".db_escape($mb_flag)."," + ."dflt_sales_act = ".db_escape($sales_account)."," + ."dflt_cogs_act = ".db_escape($cogs_account)."," + ."dflt_inventory_act = ".db_escape($inventory_account)."," + ."dflt_adjustment_act = ".db_escape($adjustment_account)."," + ."dflt_assembly_act = ".db_escape($assembly_account)."," + ."dflt_dim1 = ".db_escape($dim1)."," + ."dflt_dim2 = ".db_escape($dim2)."," + ."dflt_no_sale = ".db_escape($no_sale) + ."WHERE category_id = ".db_escape($id); db_query($sql,"an item category could not be updated"); } -function delete_item_category($ItemCategory) +function delete_item_category($id) { - $sql="DELETE FROM ".TB_PREF."stock_category WHERE category_id=".db_escape($ItemCategory); + $sql="DELETE FROM ".TB_PREF."stock_category WHERE category_id=".db_escape($id); db_query($sql,"an item category could not be deleted"); } -function get_item_category($ItemCategory) +function get_item_category($id) { - $sql="SELECT * FROM ".TB_PREF."stock_category WHERE category_id=".db_escape($ItemCategory); + $sql="SELECT * FROM ".TB_PREF."stock_category WHERE category_id=".db_escape($id); $result = db_query($sql,"an item category could not be retrieved"); diff --git a/inventory/includes/db/items_db.inc b/inventory/includes/db/items_db.inc index dfe25948..b0553726 100644 --- a/inventory/includes/db/items_db.inc +++ b/inventory/includes/db/items_db.inc @@ -9,9 +9,10 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -function update_item($stock_id, $description, $long_description, $category_id, $tax_type_id, - $sales_account, $inventory_account, $cogs_account, $adjustment_account, - $assembly_account, $dimension_id, $dimension2_id) +function update_item($stock_id, $description, $long_description, $category_id, + $tax_type_id, $units='', $mb_flag='', $sales_account, $inventory_account, + $cogs_account, $adjustment_account, $assembly_account, $dimension_id, + $dimension2_id, $no_sale) { $sql = "UPDATE ".TB_PREF."stock_master SET long_description=".db_escape($long_description).", description=".db_escape($description).", @@ -23,28 +24,38 @@ function update_item($stock_id, $description, $long_description, $category_id, $ assembly_account=".db_escape($assembly_account).", dimension_id=".db_escape($dimension_id).", dimension2_id=".db_escape($dimension2_id).", - tax_type_id=".db_escape($tax_type_id)." - WHERE stock_id=".db_escape($stock_id); + tax_type_id=".db_escape($tax_type_id).", + no_sale=".db_escape($no_sale); + + if ($units != '') + $sql .= ", units='$units'"; + + if ($mb_flag != '') + $sql .= ", mb_flag='$mb_flag'"; + + $sql .= " WHERE stock_id=".db_escape($stock_id); db_query($sql, "The item could not be updated"); update_item_code(-1, $stock_id, $stock_id, $description, $category_id, 1, 0); } -function add_item($stock_id, $description, $long_description, $category_id, $tax_type_id, $units, $mb_flag, - $sales_account, $inventory_account, $cogs_account, $adjustment_account, - $assembly_account, $dimension_id, $dimension2_id) +function add_item($stock_id, $description, $long_description, $category_id, + $tax_type_id, $units, $mb_flag, $sales_account, $inventory_account, + $cogs_account, $adjustment_account, $assembly_account, $dimension_id, + $dimension2_id, $no_sale) { $sql = "INSERT INTO ".TB_PREF."stock_master (stock_id, description, long_description, category_id, tax_type_id, units, mb_flag, sales_account, inventory_account, cogs_account, - adjustment_account, assembly_account, dimension_id, dimension2_id) + adjustment_account, assembly_account, dimension_id, dimension2_id, no_sale) VALUES (".db_escape($stock_id).", ".db_escape($description).", ".db_escape($long_description).", ".db_escape($category_id).", ".db_escape($tax_type_id).", " .db_escape($units).", ".db_escape($mb_flag).", ".db_escape($sales_account).", ".db_escape($inventory_account) .", ".db_escape($cogs_account).",".db_escape($adjustment_account) .", ".db_escape($assembly_account).", " - .db_escape($dimension_id).", ".db_escape($dimension2_id).")"; + .db_escape($dimension_id).", ".db_escape($dimension2_id)."," + .db_escape($no_sale).")"; db_query($sql, "The item could not be added"); diff --git a/inventory/includes/db/items_locations_db.inc b/inventory/includes/db/items_locations_db.inc index ae7d352e..b0372971 100644 --- a/inventory/includes/db/items_locations_db.inc +++ b/inventory/includes/db/items_locations_db.inc @@ -9,12 +9,13 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -function add_item_location($loc_code, $location_name, $delivery_address, $phone, $fax, $email, $contact) +function add_item_location($loc_code, $location_name, $delivery_address, $phone, $phone2, $fax, $email, $contact) { - $sql = "INSERT INTO ".TB_PREF."locations (loc_code, location_name, delivery_address, phone, fax, email, contact) - VALUES (".db_escape($loc_code).", ".db_escape($location_name) - .", ".db_escape($delivery_address).", ".db_escape($phone) - .", ".db_escape($fax).", ".db_escape($email).", ".db_escape($contact).")"; + $sql = "INSERT INTO ".TB_PREF."locations (loc_code, location_name, delivery_address, phone, phone2, fax, email, contact) + VALUES (".db_escape($loc_code).", ".db_escape($location_name).", ".db_escape($delivery_address).", " + .db_escape($phone).", ".db_escape($phone2).", ".db_escape($fax).", ".db_escape($email).", " + .db_escape($contact).")"; + db_query($sql,"a location could not be added"); /* Also need to add loc_stock records for all existing items */ @@ -26,12 +27,12 @@ function add_item_location($loc_code, $location_name, $delivery_address, $phone, //------------------------------------------------------------------------------------ -function update_item_location($loc_code, $location_name, $delivery_address, $phone, $fax, $email, $contact) +function update_item_location($loc_code, $location_name, $delivery_address, $phone, $phone2, $fax, $email, $contact) { $sql = "UPDATE ".TB_PREF."locations SET location_name=".db_escape($location_name).", delivery_address=".db_escape($delivery_address).", - phone=".db_escape($phone).", fax=".db_escape($fax).", + phone=".db_escape($phone).", phone2=".db_escape($phone2).", fax=".db_escape($fax).", email=".db_escape($email).", contact=".db_escape($contact)." WHERE loc_code = ".db_escape($loc_code); diff --git a/inventory/includes/db/items_trans_db.inc b/inventory/includes/db/items_trans_db.inc index 55fa5fb1..7292814d 100644 --- a/inventory/includes/db/items_trans_db.inc +++ b/inventory/includes/db/items_trans_db.inc @@ -34,30 +34,31 @@ function stock_cost_update($stock_id, $material_cost, $labour_cost, $overhead_co $qoh = get_qoh_on_date($_POST['stock_id']); + $date_ = Today(); if ($qoh > 0) { - $update_no = get_next_trans_no(systypes::cost_update()); - $date_ = Today(); + $update_no = get_next_trans_no(ST_COSTUPDATE); if (!is_date_in_fiscalyear($date_)) $date_ = end_fiscalyear(); $stock_gl_code = get_stock_gl_code($stock_id); - + $new_cost = $material_cost + $labour_cost + $overhead_cost; - + $value_of_change = $qoh * ($new_cost - $last_cost); - + $memo_ = "Cost was " . $last_cost . " changed to " . $new_cost . " x quantity on hand of $qoh"; - add_gl_trans_std_cost(systypes::cost_update(), $update_no, $date_, $stock_gl_code["adjustment_account"], + add_gl_trans_std_cost(ST_COSTUPDATE, $update_no, $date_, $stock_gl_code["adjustment_account"], $stock_gl_code["dimension_id"], $stock_gl_code["dimension2_id"], $memo_, (-$value_of_change)); - add_gl_trans_std_cost(systypes::cost_update(), $update_no, $date_, $stock_gl_code["inventory_account"], 0, 0, $memo_, + add_gl_trans_std_cost(ST_COSTUPDATE, $update_no, $date_, $stock_gl_code["inventory_account"], 0, 0, $memo_, $value_of_change); } + add_audit_trail(ST_COSTUPDATE, $update_no, $date_); commit_transaction(); - + return $update_no; } diff --git a/inventory/includes/db/items_transfer_db.inc b/inventory/includes/db/items_transfer_db.inc index dc587e3d..da1ceec2 100644 --- a/inventory/includes/db/items_transfer_db.inc +++ b/inventory/includes/db/items_transfer_db.inc @@ -13,9 +13,11 @@ function add_stock_transfer($Items, $location_from, $location_to, $date_, $type, $reference, $memo_) { + global $Refs; + begin_transaction(); - $transfer_id = get_next_trans_no(systypes::location_transfer()); + $transfer_id = get_next_trans_no(ST_LOCTRANSFER); foreach ($Items as $line_item) { @@ -23,9 +25,10 @@ function add_stock_transfer($Items, $location_from, $location_to, $date_, $type, $location_to, $date_, $type, $reference, $line_item->quantity); } - add_comments(systypes::location_transfer(), $transfer_id, $date_, $memo_); + add_comments(ST_LOCTRANSFER, $transfer_id, $date_, $memo_); - references::save_last($reference, systypes::location_transfer()); + $Refs->save(ST_LOCTRANSFER, $transfer_id, $reference); + add_audit_trail(ST_LOCTRANSFER, $transfer_id, $date_); commit_transaction(); @@ -42,10 +45,10 @@ function add_stock_transfer($Items, $location_from, $location_to, $date_, $type, function add_stock_transfer_item($transfer_id, $stock_id, $location_from, $location_to, $date_, $type, $reference, $quantity) { - add_stock_move(systypes::location_transfer(), $stock_id, $transfer_id, $location_from, + add_stock_move(ST_LOCTRANSFER, $stock_id, $transfer_id, $location_from, $date_, $reference, -$quantity, 0, $type); - add_stock_move(systypes::location_transfer(), $stock_id, $transfer_id, $location_to, + add_stock_move(ST_LOCTRANSFER, $stock_id, $transfer_id, $location_to, $date_, $reference, $quantity, 0, $type); } @@ -77,7 +80,7 @@ function get_stock_transfer($trans_no) function get_stock_transfer_items($trans_no) { - $result = get_stock_moves(systypes::location_transfer(), $trans_no); + $result = get_stock_moves(ST_LOCTRANSFER, $trans_no); if (db_num_rows($result) == 0) { @@ -91,7 +94,7 @@ function get_stock_transfer_items($trans_no) function void_stock_transfer($type_no) { - void_stock_move(systypes::location_transfer(), $type_no); + void_stock_move(ST_LOCTRANSFER, $type_no); } ?> \ No newline at end of file diff --git a/inventory/includes/db/items_units_db.inc b/inventory/includes/db/items_units_db.inc index b3df604a..c06aeafb 100644 --- a/inventory/includes/db/items_units_db.inc +++ b/inventory/includes/db/items_units_db.inc @@ -58,8 +58,10 @@ function item_unit_used($unit) { return ($myrow[0] > 0); } -function get_all_item_units() { - $sql = "SELECT * FROM ".TB_PREF."item_units ORDER BY name"; +function get_all_item_units($all=false) { + $sql = "SELECT * FROM ".TB_PREF."item_units"; + if (!$all) $sql .= " WHERE !inactive"; + $sql .= " ORDER BY name"; return db_query($sql, "could not get stock categories"); } // 2008-06-15. Added Joe Hunt to get a measure of unit by given stock_id diff --git a/inventory/includes/db/movement_types_db.inc b/inventory/includes/db/movement_types_db.inc index f6562b18..210cad43 100644 --- a/inventory/includes/db/movement_types_db.inc +++ b/inventory/includes/db/movement_types_db.inc @@ -25,9 +25,10 @@ function update_movement_type($type_id, $name) db_query($sql, "could not update item movement type"); } -function get_all_movement_type() +function get_all_movement_type($all=false) { $sql = "SELECT * FROM ".TB_PREF."movement_types"; + if (!$all) $sql .= " WHERE !inactive"; return db_query($sql, "could not get all item movement type"); } diff --git a/inventory/includes/item_adjustments_ui.inc b/inventory/includes/item_adjustments_ui.inc index 8c115bd3..7b67cca3 100644 --- a/inventory/includes/item_adjustments_ui.inc +++ b/inventory/includes/item_adjustments_ui.inc @@ -26,17 +26,17 @@ function add_to_order(&$order, $new_item, $new_item_qty, $standard_cost) function display_order_header(&$order) { - global $table_style2; + global $table_style2, $Refs; start_outer_table("width=70% $table_style2"); // outer table table_section(1); locations_list_row(_("Location:"), 'StockLocation', null); - ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::inventory_adjustment())); + ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_INVADJUST)); table_section(2, "33%"); - date_row(_("Date:"), 'AdjDate'); + date_row(_("Date:"), 'AdjDate', '', true); table_section(3, "33%"); @@ -99,7 +99,7 @@ function display_adjustment_items($title, &$order) if ($id == -1) adjustment_edit_item_controls($order); - label_row(_("Total"), number_format2($total,user_price_dec()), "colspan=5", "align=right"); + label_row(_("Total"), number_format2($total,user_price_dec()), "align=right colspan=5", "align=right", 2); end_table(); div_end(); diff --git a/inventory/includes/stock_transfers_ui.inc b/inventory/includes/stock_transfers_ui.inc index 729f8c7a..33df8fde 100644 --- a/inventory/includes/stock_transfers_ui.inc +++ b/inventory/includes/stock_transfers_ui.inc @@ -26,7 +26,7 @@ function add_to_order(&$order, $new_item, $new_item_qty, $standard_cost) function display_order_header(&$order) { - global $table_style; + global $table_style, $Refs; start_outer_table("width=70% $table_style"); @@ -37,9 +37,9 @@ function display_order_header(&$order) table_section(2, "33%"); - ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::location_transfer())); + ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_LOCTRANSFER)); - date_row(_("Date:"), 'AdjDate'); + date_row(_("Date:"), 'AdjDate', '', true); table_section(3, "33%"); diff --git a/inventory/inquiry/stock_movements.php b/inventory/inquiry/stock_movements.php index bed42358..61388dd1 100644 --- a/inventory/inquiry/stock_movements.php +++ b/inventory/inquiry/stock_movements.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; -$path_to_root="../.."; +$page_security = 'SA_ITEMSTRANSVIEW'; +$path_to_root = "../.."; include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/includes/date_functions.inc"); @@ -24,7 +24,7 @@ if ($use_popup_windows) if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Inventory Item Movement"), false, false, "", $js); +page(_($help_context = "Inventory Item Movement"), false, false, "", $js); //------------------------------------------------------------------------------------------------ check_db_has_stock_items(_("There are no items defined in the system.")); @@ -39,7 +39,7 @@ if (isset($_GET['stock_id'])) $_POST['stock_id'] = $_GET['stock_id']; } -start_form(false, true); +start_form(); if (!isset($_POST['stock_id'])) $_POST['stock_id'] = get_global_stock_item(); @@ -53,7 +53,7 @@ locations_list_cells(_("From Location:"), 'StockLocation', null); date_cells(_("From:"), 'AfterDate', '', null, -30); date_cells(_("To:"), 'BeforeDate'); -submit_cells('ShowMoves',_("Show Movements"),'',_('Refresh Inquiry'), true); +submit_cells('ShowMoves',_("Show Movements"),'',_('Refresh Inquiry'), 'default'); end_table(); end_form(); @@ -112,7 +112,7 @@ while ($myrow = db_fetch($result)) $trandate = sql2date($myrow["tran_date"]); - $type_name = systypes::name($myrow["type"]); + $type_name = $systypes_array[$myrow["type"]]; if ($myrow["qty"] > 0) { @@ -136,7 +136,7 @@ while ($myrow = db_fetch($result)) $person = $myrow["person_id"]; $gl_posting = ""; - if (($myrow["type"] == 13) || ($myrow["type"] == 11)) + if (($myrow["type"] == ST_CUSTDELIVERY) || ($myrow["type"] == ST_CUSTCREDIT)) { $cust_row = get_customer_details_from_trans($myrow["type"], $myrow["trans_no"]); @@ -144,7 +144,7 @@ while ($myrow = db_fetch($result)) $person = $cust_row['name'] . " (" . $cust_row['br_name'] . ")"; } - elseif ($myrow["type"] == 25 || $myrow['type'] == 21) + elseif ($myrow["type"] == ST_SUPPRECEIVE || $myrow['type'] == ST_SUPPCREDIT) { // get the supplier name $sql = "SELECT supp_name FROM ".TB_PREF."suppliers WHERE supplier_id = '" . $myrow["person_id"] . "'"; @@ -155,14 +155,14 @@ while ($myrow = db_fetch($result)) if (strlen($supp_row['supp_name']) > 0) $person = $supp_row['supp_name']; } - elseif ($myrow["type"] == systypes::location_transfer() || $myrow["type"] == systypes::inventory_adjustment()) + elseif ($myrow["type"] == ST_LOCTRANSFER || $myrow["type"] == ST_INVADJUST) { // get the adjustment type $movement_type = get_movement_type($myrow["person_id"]); $person = $movement_type["name"]; } - elseif ($myrow["type"]==systypes::work_order() || $myrow["type"] == 28 || - $myrow["type"] == 29) + elseif ($myrow["type"]==ST_WORKORDER || $myrow["type"] == ST_MANUISSUE || + $myrow["type"] == ST_MANURECEIVE) { $person = ""; } diff --git a/inventory/inquiry/stock_status.php b/inventory/inquiry/stock_status.php index 331ea383..d3d8781a 100644 --- a/inventory/inquiry/stock_status.php +++ b/inventory/inquiry/stock_status.php @@ -9,15 +9,15 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; -$path_to_root="../.."; +$page_security = 'SA_ITEMSSTATVIEW'; +$path_to_root = "../.."; include_once($path_to_root . "/includes/session.inc"); if (isset($_GET['stock_id'])){ $_POST['stock_id'] = $_GET['stock_id']; - page(_("Inventory Item Status"), true); + page(_($help_context = "Inventory Item Status"), true); } else { - page(_("Inventory Item Status")); + page(_($help_context = "Inventory Item Status")); } include_once($path_to_root . "/includes/date_functions.inc"); @@ -33,13 +33,13 @@ if (list_updated('stock_id')) check_db_has_stock_items(_("There are no items defined in the system.")); -start_form(false, true); +start_form(); if (!isset($_POST['stock_id'])) $_POST['stock_id'] = get_global_stock_item(); echo "
      " . _("Item:"). " "; -stock_items_list('stock_id', $_POST['stock_id'], false, true); +echo stock_items_list('stock_id', $_POST['stock_id'], false, true); echo "
      "; echo "
      "; diff --git a/inventory/manage/item_categories.php b/inventory/manage/item_categories.php index 149e23e6..a12f56ff 100644 --- a/inventory/manage/item_categories.php +++ b/inventory/manage/item_categories.php @@ -9,11 +9,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 11; -$path_to_root="../.."; +$page_security = 'SA_ITEMCATEGORY'; +$path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("Item Categories")); +page(_($help_context = "Item Categories")); include_once($path_to_root . "/includes/ui.inc"); @@ -39,12 +39,22 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') { if ($selected_id != -1) { - update_item_category($selected_id, $_POST['description']); + update_item_category($selected_id, $_POST['description'], + $_POST['tax_type_id'], $_POST['sales_account'], + $_POST['cogs_account'], $_POST['inventory_account'], + $_POST['adjustment_account'], $_POST['assembly_account'], + $_POST['units'], $_POST['mb_flag'], $_POST['dim1'], $_POST['dim2'], + check_value('no_sale')); display_notification(_('Selected item category has been updated')); } else { - add_item_category($_POST['description']); + add_item_category($_POST['description'], + $_POST['tax_type_id'], $_POST['sales_account'], + $_POST['cogs_account'], $_POST['inventory_account'], + $_POST['adjustment_account'], $_POST['assembly_account'], + $_POST['units'], $_POST['mb_flag'], $_POST['dim1'], + $_POST['dim2'], check_value('no_sale')); display_notification(_('New item category has been added')); } $Mode = 'RESET'; @@ -75,16 +85,28 @@ if ($Mode == 'Delete') if ($Mode == 'RESET') { $selected_id = -1; + $sav = get_post('show_inactive'); unset($_POST); + $_POST['show_inactive'] = $sav; +} +if (list_updated('mb_flag')) { + $Ajax->activate('details'); } //---------------------------------------------------------------------------------- -$sql = "SELECT * FROM ".TB_PREF."stock_category"; +$sql = "SELECT c.*, t.name as tax_name FROM ".TB_PREF."stock_category c, " + .TB_PREF."item_tax_types t WHERE c.dflt_tax_type=t.id"; +if (!check_value('show_inactive')) $sql .= " AND !c.inactive"; + $result = db_query($sql, "could not get stock categories"); start_form(); -start_table("$table_style width=30%"); -$th = array(_("Name"), "", ""); +start_table("$table_style width=80%"); +$th = array(_("Name"), _("Tax type"), _("Units"), _("Type"), _("Sales Act"), +_("Inventory Account"), _("COGS Account"), _("Adjustment Account"), +_("Assembly Account"), "", ""); +inactive_control_column($th); + table_header($th); $k = 0; //row colour counter @@ -94,18 +116,26 @@ while ($myrow = db_fetch($result)) alt_table_row_color($k); label_cell($myrow["description"]); - edit_button_cell("Edit".$myrow[0], _("Edit")); - delete_button_cell("Delete".$myrow[0], _("Delete")); + label_cell($myrow["tax_name"]); + label_cell($myrow["dflt_units"], "align=center"); + label_cell($stock_types[$myrow["dflt_mb_flag"]]); + label_cell($myrow["dflt_sales_act"], "align=center"); + label_cell($myrow["dflt_inventory_act"], "align=center"); + label_cell($myrow["dflt_cogs_act"], "align=center"); + label_cell($myrow["dflt_adjustment_act"], "align=center"); + label_cell($myrow["dflt_assembly_act"], "align=center"); + inactive_control_cell($myrow["category_id"], $myrow["inactive"], 'stock_category', 'category_id'); + edit_button_cell("Edit".$myrow["category_id"], _("Edit")); + delete_button_cell("Delete".$myrow["category_id"], _("Delete")); end_row(); } +inactive_control_row($th); end_table(); -end_form(); echo '
      '; //---------------------------------------------------------------------------------- -start_form(); - +div_start('details'); start_table($table_style2); if ($selected_id != -1) @@ -116,16 +146,92 @@ if ($selected_id != -1) $_POST['category_id'] = $myrow["category_id"]; $_POST['description'] = $myrow["description"]; - } + $_POST['tax_type_id'] = $myrow["dflt_tax_type"]; + $_POST['sales_account'] = $myrow["dflt_sales_act"]; + $_POST['cogs_account'] = $myrow["dflt_cogs_act"]; + $_POST['inventory_account'] = $myrow["dflt_inventory_act"]; + $_POST['adjustment_account'] = $myrow["dflt_adjustment_act"]; + $_POST['assembly_account'] = $myrow["dflt_assembly_act"]; + $_POST['units'] = $myrow["dflt_units"]; + $_POST['mb_flag'] = $myrow["dflt_mb_flag"]; + $_POST['dim1'] = $myrow["dflt_dim1"]; + $_POST['dim2'] = $myrow["dflt_dim2"]; + $_POST['no_sale'] = $myrow["dflt_no_sale"]; + } hidden('selected_id', $selected_id); hidden('category_id'); +} else if ($Mode != 'CLONE') { + $_POST['long_description'] = ''; + $_POST['description'] = ''; + $_POST['no_sale'] = 0; + + $company_record = get_company_prefs(); + + if (get_post('inventory_account') == "") + $_POST['inventory_account'] = $company_record["default_inventory_act"]; + + if (get_post('cogs_account') == "") + $_POST['cogs_account'] = $company_record["default_cogs_act"]; + + if (get_post('sales_account') == "") + $_POST['sales_account'] = $company_record["default_inv_sales_act"]; + + if (get_post('adjustment_account') == "") + $_POST['adjustment_account'] = $company_record["default_adj_act"]; + + if (get_post('assembly_account') == "") + $_POST['assembly_account'] = $company_record["default_assembly_act"]; + } text_row(_("Category Name:"), 'description', null, 30, 30); -end_table(1); +table_section_title(_("Default values for new items")); -submit_add_or_update_center($selected_id == -1, '', true); +item_tax_types_list_row(_("Item Tax Type:"), 'tax_type_id', null); + +stock_item_types_list_row(_("Item Type:"), 'mb_flag', null, true); + +stock_units_list_row(_("Units of Measure:"), 'units', null); + +check_row(_("Exclude from sales:"), 'no_sale'); + +gl_all_accounts_list_row(_("Sales Account:"), 'sales_account', $_POST['sales_account']); + +if (is_service($_POST['mb_flag'])) +{ + gl_all_accounts_list_row(_("C.O.G.S. Account:"), 'cogs_account', $_POST['cogs_account']); + hidden('inventory_account', $_POST['inventory_account']); + hidden('adjustment_account', $_POST['adjustment_account']); +} +else +{ + gl_all_accounts_list_row(_("Inventory Account:"), 'inventory_account', $_POST['inventory_account']); + + gl_all_accounts_list_row(_("C.O.G.S. Account:"), 'cogs_account', $_POST['cogs_account']); + gl_all_accounts_list_row(_("Inventory Adjustments Account:"), 'adjustment_account', $_POST['adjustment_account']); +} + +if (is_manufactured($_POST['mb_flag'])) + gl_all_accounts_list_row(_("Item Assembly Costs Account:"), 'assembly_account', $_POST['assembly_account']); +else + hidden('assembly_account', $_POST['assembly_account']); + +$dim = get_company_pref('use_dimension'); +if ($dim >= 1) +{ + dimensions_list_row(_("Dimension")." 1", 'dim1', null, true, " ", false, 1); + if ($dim > 1) + dimensions_list_row(_("Dimension")." 2", 'dim2', null, true, " ", false, 2); +} +if ($dim < 1) + hidden('dim1', 0); +if ($dim < 2) + hidden('dim2', 0); + +end_table(1); +div_end(); +submit_add_or_update_center($selected_id == -1, '', 'both', true); end_form(); diff --git a/inventory/manage/item_codes.php b/inventory/manage/item_codes.php index 4b9fcd79..a731d9ed 100644 --- a/inventory/manage/item_codes.php +++ b/inventory/manage/item_codes.php @@ -9,11 +9,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 11; -$path_to_root="../.."; +$page_security = 'SA_FORITEMCODE'; +$path_to_root = "../.."; include_once($path_to_root . "/includes/session.inc"); -page(_("Foreign Item Codes")); +page(_($help_context = "Foreign Item Codes")); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); @@ -97,13 +97,13 @@ if (list_updated('stock_id')) //-------------------------------------------------------------------------------------------------- -start_form(false, true); +start_form(); if (!isset($_POST['stock_id'])) $_POST['stock_id'] = get_global_stock_item(); echo "
      " . _("Item:"). " "; -stock_purchasable_items_list('stock_id', $_POST['stock_id'], false, true); +echo stock_purchasable_items_list('stock_id', $_POST['stock_id'], false, true); echo "
      "; @@ -179,7 +179,7 @@ stock_categories_list_row(_("Category:"), 'category_id', null); end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); end_page(); diff --git a/inventory/manage/item_units.php b/inventory/manage/item_units.php index 688fda3b..9a23f645 100644 --- a/inventory/manage/item_units.php +++ b/inventory/manage/item_units.php @@ -9,11 +9,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 11; -$path_to_root="../.."; +$page_security = 'SA_UOM'; +$path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("Units of Measure")); +page(_($help_context = "Units of Measure")); include_once($path_to_root . "/includes/ui.inc"); @@ -80,15 +80,19 @@ if ($Mode == 'Delete') if ($Mode == 'RESET') { $selected_id = ''; + $sav = get_post('show_inactive'); unset($_POST); + $_POST['show_inactive'] = $sav; } //---------------------------------------------------------------------------------- -$result = get_all_item_units(); +$result = get_all_item_units(check_value('show_inactive')); + start_form(); start_table("$table_style width=40%"); $th = array(_('Unit'), _('Description'), _('Decimals'), "", ""); +inactive_control_column($th); table_header($th); $k = 0; //row colour counter @@ -102,19 +106,17 @@ while ($myrow = db_fetch($result)) label_cell($myrow["name"]); label_cell(($myrow["decimals"]==-1?_("User Quantity Decimals"):$myrow["decimals"])); - edit_button_cell("Edit".$myrow[0], _("Edit")); - delete_button_cell("Delete".$myrow[0], _("Delete")); + inactive_control_cell($myrow["abbr"], $myrow["inactive"], 'item_units', 'abbr'); + edit_button_cell("Edit".$myrow["abbr"], _("Edit")); + delete_button_cell("Delete".$myrow["abbr"], _("Delete")); end_row(); } -end_table(); -end_form(); -echo '
      '; +inactive_control_row($th); +end_table(1); //---------------------------------------------------------------------------------- -start_form(); - start_table($table_style2); if ($selected_id != '') @@ -141,7 +143,7 @@ number_list_row(_("Decimal Places:"), 'decimals', null, 0, 6, _("User Quantity D end_table(1); -submit_add_or_update_center($selected_id == '', '', true); +submit_add_or_update_center($selected_id == '', '', 'both'); end_form(); diff --git a/inventory/manage/items.php b/inventory/manage/items.php index 70ecb4e6..ac042933 100644 --- a/inventory/manage/items.php +++ b/inventory/manage/items.php @@ -9,11 +9,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 11; -$path_to_root="../.."; +$page_security = 'SA_ITEM'; +$path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("Items")); +page(_($help_context = "Items"), @$_REQUEST['popup']); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); @@ -22,7 +22,7 @@ include_once($path_to_root . "/includes/data_checks.inc"); include_once($path_to_root . "/inventory/includes/inventory_db.inc"); $user_comp = user_company(); -$new_item = get_post('stock_id')==''; +$new_item = get_post('stock_id')=='' || get_post('cancel') || get_post('clone'); //------------------------------------------------------------------------------------ if (isset($_GET['stock_id'])) @@ -39,6 +39,14 @@ if (list_updated('stock_id')) { $Ajax->activate('details'); $Ajax->activate('controls'); } + +if (get_post('cancel')) { + $_POST['NewStockID'] = $_POST['stock_id'] = ''; + clear_data(); + set_focus('stock_id'); + $Ajax->activate('_page_body'); +} + if (list_updated('category_id') || list_updated('mb_flag')) { $Ajax->activate('details'); } @@ -89,7 +97,6 @@ if (isset($_FILES['pic']) && $_FILES['pic']['name'] != '') /* EOF Add Image upload for New Item - by Ori */ } - check_db_has_stock_categories(_("There are no item categories defined in the system. At least one item category is required to add a item.")); check_db_has_item_tax_types(_("There are no item tax types defined in the system. At least one item tax type is required to add a item.")); @@ -105,6 +112,7 @@ function clear_data() unset($_POST['NewStockID']); unset($_POST['dimension_id']); unset($_POST['dimension2_id']); + unset($_POST['no_sale']); } //------------------------------------------------------------------------------------ @@ -154,13 +162,20 @@ if (isset($_POST['addupdate'])) if (!$new_item) { /*so its an existing one */ - update_item($_POST['NewStockID'], $_POST['description'], - $_POST['long_description'], $_POST['category_id'], $_POST['tax_type_id'], - $_POST['sales_account'], $_POST['inventory_account'], $_POST['cogs_account'], + $_POST['long_description'], $_POST['category_id'], + $_POST['tax_type_id'], get_post('units'), + get_post('mb_flag'), $_POST['sales_account'], + $_POST['inventory_account'], $_POST['cogs_account'], $_POST['adjustment_account'], $_POST['assembly_account'], - $_POST['dimension_id'], $_POST['dimension2_id']); - + $_POST['dimension_id'], $_POST['dimension2_id'], + check_value('no_sale')); + update_record_status($_POST['NewStockID'], $_POST['inactive'], + 'stock_master', 'stock_id'); + update_record_status($_POST['NewStockID'], $_POST['inactive'], + 'item_codes', 'item_code'); + set_focus('stock_id'); + $Ajax->activate('stock_id'); // in case of status change display_notification(_("Item has been updated.")); } else @@ -171,69 +186,76 @@ if (isset($_POST['addupdate'])) $_POST['units'], $_POST['mb_flag'], $_POST['sales_account'], $_POST['inventory_account'], $_POST['cogs_account'], $_POST['adjustment_account'], $_POST['assembly_account'], - $_POST['dimension_id'], $_POST['dimension2_id']); + $_POST['dimension_id'], $_POST['dimension2_id'], + check_value('no_sale')); display_notification(_("A new item has been added.")); - $_POST['stock_id'] = $_POST['NewStockID']; + $_POST['stock_id'] = $_POST['NewStockID'] = + $_POST['description'] = $_POST['long_description'] = ''; + $_POST['no_sale'] = 0; + set_focus('NewStockID'); } - set_focus('stock_id'); $Ajax->activate('_page_body'); } } +if (get_post('clone')) { + unset($_POST['stock_id']); + unset($_POST['inactive']); + set_focus('NewStockID'); + $Ajax->activate('_page_body'); +} + //------------------------------------------------------------------------------------ -function can_delete($stock_id) +function check_usage($stock_id, $dispmsg=true) { - $sql= "SELECT COUNT(*) FROM ".TB_PREF."stock_moves WHERE stock_id=".db_escape($stock_id); - $result = db_query($sql, "could not query stock moves"); - $myrow = db_fetch_row($result); - if ($myrow[0] > 0) - { - display_error(_('Cannot delete this item because there are stock movements that refer to this item.')); - return false; + $sqls= array( + "SELECT COUNT(*) FROM " + .TB_PREF."stock_moves WHERE stock_id=".db_escape($stock_id) => + _('Cannot delete this item because there are stock movements that refer to this item.'), + "SELECT COUNT(*) FROM " + .TB_PREF."bom WHERE component=".db_escape($stock_id)=> + _('Cannot delete this item record because there are bills of material that require this part as a component.'), + "SELECT COUNT(*) FROM " + .TB_PREF."sales_order_details WHERE stk_code=".db_escape($stock_id) => + _('Cannot delete this item because there are existing purchase order items for it.'), + "SELECT COUNT(*) FROM " + .TB_PREF."purch_order_details WHERE item_code=".db_escape($stock_id)=> + _('Cannot delete this item because there are existing purchase order items for it.') + ); + + $msg = ''; + + foreach($sqls as $sql=>$err) { + $result = db_query($sql, "could not query stock usage"); + $myrow = db_fetch_row($result); + if ($myrow[0] > 0) + { + $msg = $err; break; + } } - $sql= "SELECT COUNT(*) FROM ".TB_PREF."bom WHERE component=".db_escape($stock_id); - $result = db_query($sql, "could not query boms"); - $myrow = db_fetch_row($result); - if ($myrow[0] > 0) - { - display_error(_('Cannot delete this item record because there are bills of material that require this part as a component.')); - return false; - } + if ($msg == '') { - $sql= "SELECT COUNT(*) FROM ".TB_PREF."sales_order_details WHERE stk_code=".db_escape($stock_id); - $result = db_query($sql, "could not query sales orders"); - $myrow = db_fetch_row($result); - if ($myrow[0] > 0) - { - display_error(_('Cannot delete this item record because there are existing sales orders for this part.')); - return false; - } + $kits = get_where_used($stock_id); + $num_kits = db_num_rows($kits); + if ($num_kits) { + $msg = _("This item cannot be deleted because some code aliases + or foreign codes was entered for it, or there are kits defined + using this item as component") + .':
      '; + + while($num_kits--) { + $kit = db_fetch($kits); + $msg .= "'".$kit[0]."'"; + if ($num_kits) $msg .= ','; + } - $sql= "SELECT COUNT(*) FROM ".TB_PREF."purch_order_details WHERE item_code=".db_escape($stock_id); - $result = db_query($sql, "could not query purchase orders"); - $myrow = db_fetch_row($result); - if ($myrow[0] > 0) - { - display_error(_('Cannot delete this item because there are existing purchase order items for it.')); - return false; - } - $kits = get_where_used($stock_id); - $num_kits = db_num_rows($kits); - if ($num_kits) { - $msg = _("This item cannot be deleted because some code aliases - or foreign codes was entered for it, or there are kits defined - using this item as component") - .':
      '; - - while($num_kits--) { - $kit = db_fetch($kits); - $msg .= "'".$kit[0]."'"; - if ($num_kits) $msg .= ','; } - display_error($msg); + } + if ($msg != '') { + if($dispmsg) display_error($msg); return false; } return true; @@ -244,7 +266,7 @@ function can_delete($stock_id) if (isset($_POST['delete']) && strlen($_POST['delete']) > 1) { - if (can_delete($_POST['NewStockID'])) { + if (check_usage($_POST['NewStockID'])) { $stock_id = $_POST['NewStockID']; delete_item($stock_id); @@ -261,13 +283,6 @@ if (isset($_POST['delete']) && strlen($_POST['delete']) > 1) } //-------------------------------------------------------------------------------------------- -if (isset($_POST['select'])) -{ - context_return(array('stock_id' => $_POST['stock_id'])); -} - -//------------------------------------------------------------------------------------ - start_form(true); if (db_has_stock_items()) @@ -275,10 +290,16 @@ if (db_has_stock_items()) start_table("class='tablestyle_noborder'"); start_row(); stock_items_list_cells(_("Select an item:"), 'stock_id', null, - _('New item'), true); - $new_item = get_post('stock_id')==''; + _('New item'), true, check_value('show_inactive')); + $new_item = get_post('stock_id')==''; + check_cells(_("Show inactive:"), 'show_inactive', null, true); end_row(); end_table(); + + if (get_post('_show_inactive_update')) { + $Ajax->activate('stock_id'); + set_focus('stock_id'); + } } div_start('details'); @@ -289,33 +310,11 @@ table_section(1); table_section_title(_("Item")); //------------------------------------------------------------------------------------ - if ($new_item) { - -/*If the page was called without $_POST['NewStockID'] passed to page then assume a new item is to be entered show a form with a part Code field other wise the form showing the fields with the existing entries against the part will show for editing with only a hidden stock_id field. New is set to flag that the page may have called itself and still be entering a new part, in which case the page needs to know not to go looking up details for an existing part*/ - text_row(_("Item Code:"), 'NewStockID', null, 21, 20); - $company_record = get_company_prefs(); - - if (!isset($_POST['inventory_account']) || $_POST['inventory_account'] == "") - $_POST['inventory_account'] = $company_record["default_inventory_act"]; - - if (!isset($_POST['cogs_account']) || $_POST['cogs_account'] == "") - $_POST['cogs_account'] = $company_record["default_cogs_act"]; - - if (!isset($_POST['sales_account']) || $_POST['sales_account'] == "") - $_POST['sales_account'] = $company_record["default_inv_sales_act"]; - - if (!isset($_POST['adjustment_account']) || $_POST['adjustment_account'] == "") - $_POST['adjustment_account'] = $company_record["default_adj_act"]; - - if (!isset($_POST['assembly_account']) || $_POST['assembly_account'] == "") - $_POST['assembly_account'] = $company_record["default_assembly_act"]; - - if (list_updated('mb_flag') && is_service($_POST['mb_flag'])) - $_POST['inventory_account'] = $company_record["default_cogs_act"]; + $_POST['inactive'] = 0; } else { // Must be modifying an existing item @@ -337,7 +336,9 @@ else $_POST['assembly_account'] = $myrow['assembly_account']; $_POST['dimension_id'] = $myrow['dimension_id']; $_POST['dimension2_id'] = $myrow['dimension2_id']; + $_POST['no_sale'] = $myrow['no_sale']; $_POST['del_image'] = 0; + $_POST['inactive'] = $myrow["inactive"]; label_row(_("Item Code:"),$_POST['NewStockID']); hidden('NewStockID', $_POST['NewStockID']); set_focus('description'); @@ -347,15 +348,32 @@ text_row(_("Name:"), 'description', null, 52, 50); textarea_row(_('Description:'), 'long_description', null, 42, 3); -stock_categories_list_row(_("Category:"), 'category_id', null); +stock_categories_list_row(_("Category:"), 'category_id', null, false, $new_item); + +if ($new_item && (list_updated('category_id') || !isset($_POST['units']))) { + + $category_record = get_item_category($_POST['category_id']); + + $_POST['tax_type_id'] = $category_record["dflt_tax_type"]; + $_POST['units'] = $category_record["dflt_units"]; + $_POST['mb_flag'] = $category_record["dflt_mb_flag"]; + $_POST['inventory_account'] = $category_record["dflt_inventory_act"]; + $_POST['cogs_account'] = $category_record["dflt_cogs_act"]; + $_POST['sales_account'] = $category_record["dflt_sales_act"]; + $_POST['adjustment_account'] = $category_record["dflt_adjustment_act"]; + $_POST['assembly_account'] = $category_record["dflt_assembly_act"]; + $_POST['dimension_id'] = $category_record["dflt_dim1"]; + $_POST['dimension2_id'] = $category_record["dflt_dim2"]; + $_POST['no_sale'] = $category_record["dflt_no_sale"]; +} +$fresh_item = !isset($_POST['NewStockID']) || $new_item + || check_usage($_POST['stock_id'],false); item_tax_types_list_row(_("Item Tax Type:"), 'tax_type_id', null); -stock_item_types_list_row(_("Item Type:"), 'mb_flag', null, - (!isset($_POST['NewStockID']) || $new_item)); +stock_item_types_list_row(_("Item Type:"), 'mb_flag', null, $fresh_item); -stock_units_list_row(_('Units of Measure:'), 'units', null, - (!isset($_POST['NewStockID']) || $new_item)); +stock_units_list_row(_('Units of Measure:'), 'units', null, $fresh_item); $dim = get_company_pref('use_dimension'); if ($dim >= 1) @@ -385,8 +403,8 @@ if (!is_service($_POST['mb_flag'])) } else { - gl_all_accounts_list_row(_("C.O.G.S. Account:"), 'inventory_account', $_POST['inventory_account']); - hidden('cogs_account', $_POST['cogs_account']); + gl_all_accounts_list_row(_("C.O.G.S. Account:"), 'cogs_account', $_POST['cogs_account']); + hidden('inventory_account', $_POST['inventory_account']); hidden('adjustment_account', $_POST['adjustment_account']); } @@ -396,7 +414,7 @@ if (is_manufactured($_POST['mb_flag'])) else hidden('assembly_account', $_POST['assembly_account']); -table_section_title(_("Picture")); +table_section_title(_("Other")); // Add image upload for New Item - by Joe label_row(_("Image File (.jpg)") . ":", ""); @@ -419,23 +437,31 @@ else label_row(" ", $stock_img_link); if ($check_remove_image) - check_row(_("Delete Image:"), 'del_image', $_POST['del_image']); + check_row(_("Delete Image:"), 'del_image'); +check_row(_("Exclude from sales:"), 'no_sale'); + +record_status_list_row(_("Item status:"), 'inactive'); end_outer_table(1); div_end(); div_start('controls'); if (!isset($_POST['NewStockID']) || $new_item) { - submit_center('addupdate', _("Insert New Item"), true, '', true); + submit_center('addupdate', _("Insert New Item"), true, '', 'default'); } else { - submit_center_first('addupdate', _("Update Item"), '', true); - submit_return('select', _("Return"), _("Select this items and return to document entry."), true); - submit_center_last('delete', _("Delete This Item"), '', true); + submit_center_first('addupdate', _("Update Item"), '', + @$_REQUEST['popup'] ? true : 'default'); + submit_return('select', get_post('stock_id'), + _("Select this items and return to document entry."), 'default'); + submit('clone', _("Clone This Item"), true, '', true); + submit('delete', _("Delete This Item"), true, '', true); + submit_center_last('cancel', _("Cancel"), _("Cancel Edition"), 'cancel'); } div_end(); +hidden('popup', @$_REQUEST['popup']); end_form(); //------------------------------------------------------------------------------------ diff --git a/inventory/manage/locations.php b/inventory/manage/locations.php index 79384703..6dae2fa3 100644 --- a/inventory/manage/locations.php +++ b/inventory/manage/locations.php @@ -9,11 +9,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 11; -$path_to_root="../.."; +$page_security = 'SA_INVENTORYLOCATION'; +$path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("Inventory Locations")); +page(_($help_context = "Inventory Locations")); include_once($path_to_root . "/includes/ui.inc"); @@ -52,7 +52,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') { update_item_location($selected_id, $_POST['location_name'], $_POST['delivery_address'], - $_POST['phone'], $_POST['fax'], $_POST['email'], $_POST['contact']); + $_POST['phone'], $_POST['phone2'], $_POST['fax'], $_POST['email'], $_POST['contact']); display_notification(_('Selected location has been updated')); } else @@ -61,7 +61,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') /*selected_id is null cos no item selected on first time round so must be adding a record must be submitting new entries in the new Location form */ add_item_location($_POST['loc_code'], $_POST['location_name'], $_POST['delivery_address'], - $_POST['phone'], $_POST['fax'], $_POST['email'], $_POST['contact']); + $_POST['phone'], $_POST['phone2'], $_POST['fax'], $_POST['email'], $_POST['contact']); display_notification(_('New location has been added')); } @@ -157,39 +157,42 @@ if ($Mode == 'Delete') if ($Mode == 'RESET') { $selected_id = -1; + $sav = get_post('show_inactive'); unset($_POST); + $_POST['show_inactive'] = $sav; } $sql = "SELECT * FROM ".TB_PREF."locations"; +if (!check_value('show_inactive')) $sql .= " WHERE !inactive"; $result = db_query($sql, "could not query locations");; start_form(); -start_table("$table_style width=30%"); -$th = array(_("Location Code"), _("Location Name"), "", ""); +start_table($table_style); +$th = array(_("Location Code"), _("Location Name"), _("Address"), _("Phone"), _("Secondary Phone"), "", ""); +inactive_control_column($th); table_header($th); $k = 0; //row colour counter -while ($myrow = db_fetch_row($result)) +while ($myrow = db_fetch($result)) { alt_table_row_color($k); - label_cell($myrow[0]); - label_cell($myrow[1]); - edit_button_cell("Edit".$myrow[0], _("Edit")); - delete_button_cell("Delete".$myrow[0], _("Delete")); + label_cell($myrow["loc_code"]); + label_cell($myrow["location_name"]); + label_cell($myrow["delivery_address"]); + label_cell($myrow["phone"]); + label_cell($myrow["phone2"]); + inactive_control_cell($myrow["loc_code"], $myrow["inactive"], 'locations', 'loc_code'); + edit_button_cell("Edit".$myrow["loc_code"], _("Edit")); + delete_button_cell("Delete".$myrow["loc_code"], _("Delete")); end_row(); } //END WHILE LIST LOOP - -//end of ifs and buts! - +inactive_control_row($th); end_table(); -end_form(); echo '
      '; -start_form(); - start_table($table_style2); $_POST['email'] = ""; @@ -205,6 +208,7 @@ if ($selected_id != -1) $_POST['delivery_address'] = $myrow["delivery_address"]; $_POST['contact'] = $myrow["contact"]; $_POST['phone'] = $myrow["phone"]; + $_POST['phone2'] = $myrow["phone2"]; $_POST['fax'] = $myrow["fax"]; $_POST['email'] = $myrow["email"]; } @@ -222,12 +226,13 @@ text_row_ex(_("Contact for deliveries:"), 'contact', 30, 30); textarea_row(_("Address:"), 'delivery_address', null, 35, 5); -text_row_ex(_("Telephone No:"), 'phone', 30, 30); -text_row_ex(_("Facsimile No:"), 'fax', 30, 30); +text_row_ex(_("Telephone No:"), 'phone', 32, 30); +text_row_ex(_("Secondary Phone Number:"), 'phone2', 32, 30); +text_row_ex(_("Facsimile No:"), 'fax', 32, 30); email_row_ex(_("E-mail:"), 'email', 30); end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); diff --git a/inventory/manage/movement_types.php b/inventory/manage/movement_types.php index b1eb260f..259f6dce 100644 --- a/inventory/manage/movement_types.php +++ b/inventory/manage/movement_types.php @@ -9,11 +9,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 3; -$path_to_root="../.."; +$page_security = 'SA_INVENTORYMOVETYPE'; +$path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("Inventory Movement Types")); +page(_($help_context = "Inventory Movement Types")); include_once($path_to_root . "/inventory/includes/inventory_db.inc"); @@ -57,7 +57,8 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') function can_delete($selected_id) { $sql= "SELECT COUNT(*) FROM ".TB_PREF."stock_moves - WHERE type=" . systypes::inventory_adjustment(). " AND person_id=".db_escape($selected_id); + WHERE type=" . ST_INVADJUST. " AND person_id=".db_escape($selected_id); + $result = db_query($sql, "could not query stock moves"); $myrow = db_fetch_row($result); if ($myrow[0] > 0) @@ -85,16 +86,19 @@ if ($Mode == 'Delete') if ($Mode == 'RESET') { $selected_id = -1; + $sav = get_post('show_inactive'); unset($_POST); + $_POST['show_inactive'] = $sav; } //----------------------------------------------------------------------------------- -$result = get_all_movement_type(); +$result = get_all_movement_type(check_value('show_inactive')); start_form(); start_table("$table_style width=30%"); $th = array(_("Description"), "", ""); +inactive_control_column($th); table_header($th); $k = 0; while ($myrow = db_fetch($result)) @@ -103,19 +107,16 @@ while ($myrow = db_fetch($result)) alt_table_row_color($k); label_cell($myrow["name"]); + inactive_control_cell($myrow["id"], $myrow["inactive"], 'movement_types', 'id'); edit_button_cell("Edit".$myrow['id'], _("Edit")); delete_button_cell("Delete".$myrow['id'], _("Delete")); end_row(); } - -end_table(); -end_form(); -echo '
      '; +inactive_control_row($th); +end_table(1); //----------------------------------------------------------------------------------- -start_form(); - start_table($table_style2); if ($selected_id != -1) @@ -134,7 +135,7 @@ text_row(_("Description:"), 'name', null, 50, 50); end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); diff --git a/inventory/manage/sales_kits.php b/inventory/manage/sales_kits.php index 78872860..005af381 100644 --- a/inventory/manage/sales_kits.php +++ b/inventory/manage/sales_kits.php @@ -9,11 +9,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 11; -$path_to_root="../.."; +$page_security = 'SA_SALESKIT'; +$path_to_root = "../.."; include_once($path_to_root . "/includes/session.inc"); -page(_("Sales Kits & Alias Codes")); +page(_($help_context = "Sales Kits & Alias Codes")); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); @@ -180,10 +180,10 @@ if ($Mode == 'RESET') } //-------------------------------------------------------------------------------------------------- -start_form(false, true); +start_form(); echo "
      " . _("Select a sale kit:") . " "; -sales_kits_list('item_code', null, _('New kit'), true); +echo sales_kits_list('item_code', null, _('New kit'), true); echo "

      "; $props = get_kit_props($_POST['item_code']); @@ -244,7 +244,7 @@ if (get_post('item_code') == '') { qty_row(_("Quantity:"), 'quantity', number_format2(1, $dec), '', $units, $dec); end_table(1); - submit_add_or_update_center($selected_id == -1, '', true); + submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); //---------------------------------------------------------------------------------- diff --git a/inventory/prices.php b/inventory/prices.php index 61bb7576..40dd11f7 100644 --- a/inventory/prices.php +++ b/inventory/prices.php @@ -9,11 +9,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; -$path_to_root=".."; +$page_security = 'SA_SALESPRICE'; +$path_to_root = ".."; include_once($path_to_root . "/includes/session.inc"); -page(_("Inventory Item Sales prices")); +page(_($help_context = "Inventory Item Sales prices")); include_once($path_to_root . "/sales/includes/sales_db.inc"); include_once($path_to_root . "/sales/includes/db/sales_types_db.inc"); @@ -48,13 +48,13 @@ if (!isset($_POST['curr_abrev'])) //--------------------------------------------------------------------------------------------------- -start_form(false, true); +start_form(); if (!isset($_POST['stock_id'])) $_POST['stock_id'] = get_global_stock_item(); echo "
      " . _("Item:"). " "; -sales_items_list('stock_id', $_POST['stock_id'], false, true); +echo sales_items_list('stock_id', $_POST['stock_id'], false, true); echo "
      "; set_global_stock_item($_POST['stock_id']); @@ -115,7 +115,7 @@ if (list_updated('stock_id')) { $Ajax->activate('price_table'); $Ajax->activate('price_details'); } -if (list_updated('stock_id') || isset($_POST['_curr_abrev_update']) ) { +if (list_updated('stock_id') || isset($_POST['_curr_abrev_update']) || isset($_POST['_sales_type_id_update'])) { // after change of stock, currency or salestype selector // display default calculated price for new settings. // If we have this price already in db it is overwritten later. @@ -133,7 +133,7 @@ start_table("$table_style width=30%"); $th = array(_("Currency"), _("Sales Type"), _("Price"), "", ""); table_header($th); $k = 0; //row colour counter - +$calculated = false; while ($myrow = db_fetch($prices_list)) { @@ -150,6 +150,8 @@ while ($myrow = db_fetch($prices_list)) end_table(); if (db_num_rows($prices_list) == 0) { + if (get_company_pref('add_pct') != -1) + $calculated = true; display_note(_("There are no prices set up for this part."), 1); } div_end(); @@ -172,6 +174,7 @@ start_table($table_style2); currencies_list_row(_("Currency:"), 'curr_abrev', null, true); sales_types_list_row(_("Sales Type:"), 'sales_type_id', null, true); + if (!isset($_POST['price'])) { $_POST['price'] = price_format(get_kit_price(get_post('stock_id'), get_post('curr_abrev'), get_post('sales_type_id'))); @@ -181,8 +184,10 @@ $kit = get_item_code_dflts($_POST['stock_id']); small_amount_row(_("Price:"), 'price', null, '', _('per') .' '.$kit["units"]); end_table(1); +if ($calculated) + display_note(_("The price is calculated."), 0, 1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); div_end(); end_form(); diff --git a/inventory/purchasing_data.php b/inventory/purchasing_data.php index be3e7a03..b77a92bd 100644 --- a/inventory/purchasing_data.php +++ b/inventory/purchasing_data.php @@ -9,11 +9,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 4; -$path_to_root=".."; +$page_security = 'SA_PURCHASEPRICING'; +$path_to_root = ".."; include_once($path_to_root . "/includes/session.inc"); -page(_("Supplier Purchasing Data")); +page(_($help_context = "Supplier Purchasing Data")); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); @@ -24,16 +24,8 @@ check_db_has_purchasable_items(_("There are no purchasable inventory items defin check_db_has_suppliers(_("There are no suppliers defined in the system.")); //---------------------------------------------------------------------------------------- -if ($ret = context_restore()) { - if(isset($ret['supplier_id'])) - $_POST['supplier_id'] = $ret['supplier_id']; -} -if (isset($_POST['_supplier_id_editor'])) { - context_call($path_to_root.'/purchasing/manage/suppliers.php?supplier_id='.$_POST['supplier_id'], - array( 'supplier_id', 'stock_id','_stock_id_edit', 'price', - 'suppliers_uom', 'supplier_description','conversion_factor')); -} simple_page_mode(true); + //-------------------------------------------------------------------------------------------------- if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') @@ -117,13 +109,13 @@ if (list_updated('stock_id')) $Ajax->activate('price_table'); //-------------------------------------------------------------------------------------------------- -start_form(false, true); +start_form(); if (!isset($_POST['stock_id'])) $_POST['stock_id'] = get_global_stock_item(); echo "
      " . _("Item:"). " "; -stock_purchasable_items_list('stock_id', $_POST['stock_id'], false, true); +echo stock_purchasable_items_list('stock_id', $_POST['stock_id'], false, true); echo "
      "; @@ -238,7 +230,7 @@ text_row(_("Supplier's Code or Description:"), 'supplier_description', null, 50, end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); end_page(); diff --git a/inventory/reorder_level.php b/inventory/reorder_level.php index 2c5de464..25e84955 100644 --- a/inventory/reorder_level.php +++ b/inventory/reorder_level.php @@ -9,11 +9,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 4; -$path_to_root=".."; +$page_security = 'SA_REORDER'; +$path_to_root = ".."; include_once($path_to_root . "/includes/session.inc"); -page(_("Reorder Levels")); +page(_($help_context = "Reorder Levels")); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); @@ -35,13 +35,13 @@ if (list_updated('stock_id')) } //------------------------------------------------------------------------------------ -start_form(false, true); +start_form(); if (!isset($_POST['stock_id'])) $_POST['stock_id'] = get_global_stock_item(); echo "
      " . _("Item:"). " "; -stock_costable_items_list('stock_id', $_POST['stock_id'], false, true); +echo stock_costable_items_list('stock_id', $_POST['stock_id'], false, true); echo "
      "; @@ -93,7 +93,7 @@ while ($myrow = db_fetch($result)) end_table(1); div_end(); -submit_center('UpdateData', _("Update")); +submit_center('UpdateData', _("Update"), true, false, 'default'); end_form(); end_page(); diff --git a/inventory/transfers.php b/inventory/transfers.php index 299f4802..49e66e5e 100644 --- a/inventory/transfers.php +++ b/inventory/transfers.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 3; -$path_to_root=".."; +$page_security = 'SA_LOCATIONTRANSFER'; +$path_to_root = ".."; include_once($path_to_root . "/includes/ui/items_cart.inc"); include_once($path_to_root . "/includes/session.inc"); @@ -25,7 +25,7 @@ if ($use_popup_windows) $js .= get_js_open_window(800, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Inventory Location Transfers"), false, false, "", $js); +page(_($help_context = "Inventory Location Transfers"), false, false, "", $js); //----------------------------------------------------------------------------------------------- @@ -38,7 +38,7 @@ check_db_has_movement_types(_("There are no inventory movement types defined in if (isset($_GET['AddedID'])) { $trans_no = $_GET['AddedID']; - $trans_type = systypes::location_transfer(); + $trans_type = ST_LOCTRANSFER; display_notification_centered(_("Inventory transfer has been processed")); display_note(get_trans_view_str($trans_type, $trans_no, _("&View this transfer"))); @@ -67,8 +67,8 @@ function handle_new_order() session_register("transfer_items"); - $_SESSION['transfer_items'] = new items_cart(systypes::location_transfer()); - $_POST['AdjDate'] = Today(); + $_SESSION['transfer_items'] = new items_cart(ST_LOCTRANSFER); + $_POST['AdjDate'] = new_doc_date(); if (!is_date_in_fiscalyear($_POST['AdjDate'])) $_POST['AdjDate'] = end_fiscalyear(); $_SESSION['transfer_items']->tran_date = $_POST['AdjDate']; @@ -78,6 +78,7 @@ function handle_new_order() if (isset($_POST['Process'])) { + global $Refs; $tr = &$_SESSION['transfer_items']; $input_error = 0; @@ -87,13 +88,13 @@ if (isset($_POST['Process'])) set_focus('stock_id'); return false; } - if (!references::is_valid($_POST['ref'])) + 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'], systypes::location_transfer())) + elseif (!is_new_reference($_POST['ref'], ST_LOCTRANSFER)) { display_error(_("The entered reference is already in use.")); set_focus('ref'); @@ -143,7 +144,7 @@ if (isset($_POST['Process'])) $trans_no = add_stock_transfer($_SESSION['transfer_items']->line_items, $_POST['FromStockLocation'], $_POST['ToStockLocation'], $_POST['AdjDate'], $_POST['type'], $_POST['ref'], $_POST['memo_']); - + new_doc_date($_POST['AdjDate']); $_SESSION['transfer_items']->clear_items(); unset($_SESSION['transfer_items']); @@ -219,7 +220,7 @@ if (isset($_GET['NewTransfer']) || !isset($_SESSION['transfer_items'])) } //----------------------------------------------------------------------------------------------- -start_form(false, true); +start_form(); display_order_header($_SESSION['transfer_items']); @@ -233,7 +234,7 @@ end_row(); end_table(1); submit_center_first('Update', _("Update"), '', null); -submit_center_last('Process', _("Process Transfer"), '', true); +submit_center_last('Process', _("Process Transfer"), '', 'default'); end_form(); end_page(); diff --git a/inventory/view/view_adjustment.php b/inventory/view/view_adjustment.php index 4aad5a48..6bc50764 100644 --- a/inventory/view/view_adjustment.php +++ b/inventory/view/view_adjustment.php @@ -9,12 +9,12 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 1; -$path_to_root="../.."; +$page_security = 'SA_ITEMSTRANSVIEW'; +$path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("View Inventory Adjustment"), true); +page(_($help_context = "View Inventory Adjustment"), true); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); @@ -25,7 +25,7 @@ if (isset($_GET["trans_no"])) $trans_no = $_GET["trans_no"]; } -display_heading(systypes::name(systypes::inventory_adjustment()) . " #$trans_no"); +display_heading($systypes_array[ST_INVADJUST] . " #$trans_no"); br(1); $adjustment_items = get_stock_adjustment_items($trans_no); @@ -45,7 +45,7 @@ while ($adjustment = db_fetch($adjustment_items)) label_cells(_("Date"), sql2date($adjustment['tran_date']), "class='tableheader2'"); label_cells(_("Adjustment Type"), $adjustment_type['name'], "class='tableheader2'"); end_row(); - comments_display_row(systypes::inventory_adjustment(), $trans_no); + comments_display_row(ST_INVADJUST, $trans_no); end_table(); $header_shown = true; @@ -70,7 +70,7 @@ while ($adjustment = db_fetch($adjustment_items)) end_table(1); -is_voided_display(systypes::inventory_adjustment(), $trans_no, _("This adjustment has been voided.")); +is_voided_display(ST_INVADJUST, $trans_no, _("This adjustment has been voided.")); end_page(true); ?> \ No newline at end of file diff --git a/inventory/view/view_transfer.php b/inventory/view/view_transfer.php index 4d6a4473..195f91bc 100644 --- a/inventory/view/view_transfer.php +++ b/inventory/view/view_transfer.php @@ -9,12 +9,12 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 1; -$path_to_root="../.."; +$page_security = 'SA_ITEMSTRANSVIEW'; +$path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("View Inventory Transfer"), true); +page(_($help_context = "View Inventory Transfer"), true); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); @@ -30,7 +30,7 @@ $transfer_items = get_stock_transfer($trans_no); $from_trans = $transfer_items[0]; $to_trans = $transfer_items[1]; -display_heading(systypes::name(systypes::location_transfer()) . " #$trans_no"); +display_heading($systypes_array[ST_LOCTRANSFER] . " #$trans_no"); echo "
      "; start_table("$table_style2 width=90%"); @@ -47,7 +47,7 @@ label_cells(_("Adjustment Type"), $adjustment_type['name'], "class='tableheader2 label_cells(_("Date"), sql2date($from_trans['tran_date']), "class='tableheader2'"); end_row(); -comments_display_row(systypes::location_transfer(), $trans_no); +comments_display_row(ST_LOCTRANSFER, $trans_no); end_table(1); @@ -56,7 +56,7 @@ start_table("$table_style width=90%"); $th = array(_("Item"), _("Description"), _("Quantity"), _("Units")); table_header($th); -$transfer_items = get_stock_moves(systypes::location_transfer(), $trans_no); +$transfer_items = get_stock_moves(ST_LOCTRANSFER, $trans_no); $k = 0; while ($item = db_fetch($transfer_items)) { @@ -74,7 +74,7 @@ while ($item = db_fetch($transfer_items)) end_table(1); -is_voided_display(systypes::location_transfer(), $trans_no, _("This transfer has been voided.")); +is_voided_display(ST_LOCTRANSFER, $trans_no, _("This transfer has been voided.")); end_page(true); ?> \ No newline at end of file diff --git a/js/inserts.js b/js/inserts.js index 6883f7a1..4d665e84 100644 --- a/js/inserts.js +++ b/js/inserts.js @@ -11,14 +11,8 @@ var _focus; var _hotkeys = { 'alt': false, // whether is the Alt key pressed - 'focus': -1 // currently selected indeks of document.links + 'focus': -1 // currently selected indeks of document.links }; -var _validate = {}; // validation functions - -function debug(msg) { - box = document.getElementById('msgbox') - box.innerHTML= box.innerHTML+'
      '+msg -} function save_focus(e) { _focus = e.name||e.id; @@ -64,7 +58,7 @@ function _set_combo_input(e) { } else if(this.className=='combo2') { this.style.display = 'none'; select.style.display = 'inline'; - setFocus(select.name); + setFocus(select); } return false; }; @@ -140,37 +134,46 @@ function _set_combo_select(e) { this.style.display = 'none'; box.style.display = 'inline'; box.value=''; - setFocus(box.name); + setFocus(box); return false; } - if (this.getAttribute('aspect') == 'editable' && key==115) { - // F4: call related database editor - not available in non-js fallback mode - JsHttpRequest.request('_'+this.name+'_editor', this.form); - return false; // prevent default binding - // TODO: stopPropagation when needed - } } } +var _w; + +function callEditor(key) { + var el = document.getElementsByName(editors[key][1])[0]; + if(_w) _w.close(); // this is really necessary to have window on top in FF2 :/ + _w = open(editors[key][0]+el.value+'&popup=1', + "edit","Scrollbars=0,resizable=0,width=800,height=600"); + if (_w.opener == null) + _w.opener = self; + editors._call = key; // store call point for passBack + _w.focus(); +} + +function passBack(value) { + var o = opener; + if(value != false) { + var back = o.editors[o.editors._call]; // form input bindings + var to = o.document.getElementsByName(back[1])[0]; + if (to) { + if (to[0] != undefined) + to[0].value = value; // ugly hack to set selector to any value + to.value = value; + // update page after item selection + o.JsHttpRequest.request('_'+to.name+'_update', to.form); + o.setFocus(to.name); + } + } + close(); +} + /* Behaviour definitions */ var inserts = { - 'form': function(e) { - e.onkeydown = function(ev) { - ev = ev||window.event; - key = ev.keyCode||ev.which; - if((ev.ctrlKey && key == 13) || key == 27) { - _hotkeys.alt = false; - ev.cancelBubble = true; - if(ev.stopPropagation) ev.stopPropagation(); -// here ctrl-enter/escape support - ev.returnValue = false; - return false; - } - return true; - } - }, 'input': function(e) { if(e.onfocus==undefined) { e.onfocus = function() { @@ -210,10 +213,10 @@ var inserts = { function(e) { e.onclick = function() { save_focus(e); - if (e.getAttribute('aspect') == 'process') - JsHttpRequest.request(this, null, 30000); - else - JsHttpRequest.request(this); + if (e.getAttribute('aspect') == 'process') + JsHttpRequest.request(this, null, 30000); + else + JsHttpRequest.request(this); return false; } }, @@ -221,8 +224,8 @@ var inserts = { if (e.name) { var func = _validate[e.name]; var old = e.onclick; - if(func) { - if (typeof old != 'function') { + if(func) { + if (typeof old != 'function' || old == func) { // prevent multiply binding on ajax update e.onclick = func; } else { e.onclick = function() { @@ -254,15 +257,13 @@ var inserts = { JsHttpRequest.request('_'+this.name+'_changed', this.form); } } -/* e.onkeydown = function(ev) { - ev = ev||window.event; - key = ev.keyCode||ev.which; - if (key == 13 && (this.value != this.getAttribute('_last_val'))) { - this.blur(); - return false; - } - } -*/ }, + }, + 'button[aspect=selector], input[aspect=selector]': function(e) { + e.onclick = function() { + passBack(this.getAttribute('rel')); + return false; + } + }, 'select': function(e) { if(e.onfocus==undefined) { e.onfocus = function() { @@ -273,13 +274,6 @@ var inserts = { _set_combo_select(e); } }, - 'textarea,a': function(e) { - if(e.onfocus==undefined) { - e.onfocus = function() { - save_focus(this); - }; - } - }, 'a.printlink': function(l) { l.onclick = function() { save_focus(this); @@ -287,6 +281,17 @@ var inserts = { return false; } }, + 'a': function(e) { // traverse menu + e.onkeydown = function(ev) { + ev = ev||window.event; + key = ev.keyCode||ev.which; + if(key==37 || key==38 || key==39 || key==40) { + move_focus(key, e, document.links); + ev.returnValue = false; + return false; + } + } + }, 'ul.ajaxtabs': function(ul) { var ulist=ul.getElementsByTagName("li"); for (var x=0; x47 && key<58) || (key>64 && key<91))) { - _hotkeys.alt = true; + } + else if (_hotkeys.alt && ((key>47 && key<58) || (key>64 && key<91))) { var n = _hotkeys.focus; var l = document.links; var cnt = l.length; @@ -354,13 +374,43 @@ function setHotKeys() { } return stopEv(ev); } + if((ev.ctrlKey && key == 13) || key == 27) { + _hotkeys.alt = false; // cancel link selection + _hotkeys.focus = -1; + ev.cancelBubble = true; + if(ev.stopPropagation) ev.stopPropagation(); + // activate submit/escape form + for(var j=0; j=0) { diff --git a/js/utils.js b/js/utils.js index b8055c99..64a266d7 100644 --- a/js/utils.js +++ b/js/utils.js @@ -10,8 +10,17 @@ ***********************************************************************/ function set_mark(img) { var box = document.getElementById('ajaxmark'); - if(img) box.src = user.theme+'images/'+ img; - box.style.visibility = img ? 'visible' : 'hidden' + if(box) { + if(img) box.src = user.theme+'images/'+ img; + box.style.visibility = img ? 'visible' : 'hidden' + } +} + +function disp_msg(msg, cl) { + var box = document.getElementById('msgbox') + box.innerHTML= "
      "+ msg+'
      '; +// box.style.display = msg=='' ? 'none':'block'; + if (msg!='') window.scrollTo(0,element_pos(box).y-10); } // @@ -25,13 +34,13 @@ function set_mark(img) { // request is directed to current location // JsHttpRequest.request= function(trigger, form, tout) { +// if (trigger.type=='submit' && !validate(trigger)) return false; tout = tout | 3000; // default timeout value set_mark(tout>5000 ? 'progressbar.gif' : 'ajax-loader.gif'); JsHttpRequest._request(trigger, form, tout, 2); } JsHttpRequest._request = function(trigger, form, tout, retry) { - if (trigger.tagName=='A') { var content = {}; var upload = 0; @@ -146,9 +155,7 @@ JsHttpRequest._request = function(trigger, form, tout, retry) { var q = {}; if (typeof(inp) == "string") - submitObj = document.getElementsByName(inp)[0]; - else - submitObj = inp; + submitObj = document.getElementsByName(inp)[0]||inp; objForm = objForm || (submitObj && submitObj.form); @@ -177,10 +184,13 @@ JsHttpRequest._request = function(trigger, form, tout, retry) { { if(el.type=='select-multiple') { + name = name.substr(0,name.length-2); + q[name] = new Array; for (var j = 0; j < el.length; j++) { + s = name.substring(0, name.length-2); if (el.options[j].selected == true) - q[name] = el.options[j].value; + q[name].push(el.options[j].value); } } else @@ -225,9 +235,11 @@ function price_format(post, num, dec, label, color) { function get_amount(doc, label) { if(label) - var val = document.getElementById(doc).innerHTML; + var val = document.getElementById(doc).innerHTML; else - var val = document.getElementsByName(doc)[0].value; + var val = typeof(doc) == "string" ? + document.getElementsByName(doc)[0].value : doc.value; + val = val.replace(new RegExp('\\'+user.ts, 'g'),''); val = +val.replace(new RegExp('\\'+user.ds, 'g'),'.'); return isNaN(val) ? 0 : val; @@ -241,25 +253,22 @@ function goBack() { } function setFocus(name, byId) { - if(document.location.pathname.indexOf('index.php') != -1) { - // this is application menu page - set focus on first link - // var el = document.getElementById('msgbox'); - // TODO find first link after msgbox and set focus - } - if(!name) { - if (_focus) - name = _focus; // last focus set in onfocus handlers - else - if (document.forms.length) { // no current focus (first page display) - set it from from last form - var cur = document.getElementsByName('_focus')[document.forms.length-1]; - if(cur) name = cur.value; - } - } - if(byId) - el = document.getElementById(name); - else - el = document.getElementsByName(name)[0]; + if(typeof(name)=='object') + el = name; + else { + if(!name) { // page load/ajax update + if (_focus) + name = _focus; // last focus set in onfocus handlers + else + if (document.forms.length) { // no current focus (first page display) - set it from from last form + var cur = document.getElementsByName('_focus')[document.forms.length-1]; + if(cur) name = cur.value; + } + } + if(byId || !(el = document.getElementsByName(name)[0])) + el = document.getElementById(name); + } if(el && el.focus) { // The timeout is needed to prevent unpredictable behaviour on IE & Gecko. // Using tmp var prevents crash on IE5 @@ -268,3 +277,66 @@ function setFocus(name, byId) { setTimeout(tmp, 0); } } +/* + Find closest element in neighbourhood and set focus. + dir is arrow keycode. +*/ +function move_focus(dir, e0, neighbours) +{ + var p0 = element_pos(e0); + var t; + var l=0; + for(var i=0; ip0.y)) || (dir==38 && (p.yp0.x)))) { + var l1 = (p.y-p0.y)*(p.y-p0.y)+(p.x-p0.x)*(p.x-p0.x); + if ((l1t<8 delta 52 wcmZo=Z)M*Q$jEJAq-$WRU}R)vYCJiHQ5KoMxrH&7k\n" "Language-Team: Translators\n" "MIME-Version: 1.0\n" @@ -15,8104 +15,8764 @@ msgstr "" "X-Poedit-Language: English\n" "X-Poedit-Country: UNITED KINGDOM\n" "X-Poedit-SourceCharset: iso-8859-1\n" -"X-Poedit-Basepath: c:\\Apache2\\htdocs\\account21\n" -"X-Poedit-SearchPath-0: c:\\Apache2\\htdocs\\account21\n" +"X-Poedit-Basepath: c:\\Apache2\\htdocs\\account22\n" +"X-Poedit-SearchPath-0: c:\\Apache2\\htdocs\\account22\n" -#: c:\Apache2\htdocs\account21/config.php:164 -msgid "Inquiries" -msgstr "" - -#: c:\Apache2\htdocs\account21/config.php:165 -msgid "Accountant" -msgstr "" - -#: c:\Apache2\htdocs\account21/config.php:166 -msgid "System Administrator" -msgstr "" - -#: c:\Apache2\htdocs\account21/frontaccounting.php:79 -#: c:\Apache2\htdocs\account21/frontaccounting.php:80 +#: c:\Apache2\htdocs\account22/frontaccounting.php:80 +#: c:\Apache2\htdocs\account22/frontaccounting.php:81 msgid "Main Menu" msgstr "" -#: c:\Apache2\htdocs\account21/frontaccounting.php:81 -#: c:\Apache2\htdocs\account21/access/logout.php:17 +#: c:\Apache2\htdocs\account22/frontaccounting.php:82 +#: c:\Apache2\htdocs\account22/access/logout.php:17 +#: c:\Apache2\htdocs\account22/access/backup/logout1.php:17 msgid "Logout" msgstr "" -#: c:\Apache2\htdocs\account21/access/login.php:13 +#: c:\Apache2\htdocs\account22/access/login.php:13 +#: c:\Apache2\htdocs\account22/access/backup/login1.php:13 +#: c:\Apache2\htdocs\account22/access/backup/login2.php:13 msgid "Restricted access" msgstr "" -#: c:\Apache2\htdocs\account21/access/login.php:19 +#: c:\Apache2\htdocs\account22/access/login.php:33 +#: c:\Apache2\htdocs\account22/access/backup/login1.php:18 +#: c:\Apache2\htdocs\account22/access/backup/login2.php:32 msgid "Login as user: demouser and password: password" msgstr "" -#: c:\Apache2\htdocs\account21/access/login.php:23 +#: c:\Apache2\htdocs\account22/access/login.php:37 +#: c:\Apache2\htdocs\account22/access/backup/login1.php:22 +#: c:\Apache2\htdocs\account22/access/backup/login2.php:36 msgid "Please login here" msgstr "" -#: c:\Apache2\htdocs\account21/access/login.php:54 +#: c:\Apache2\htdocs\account22/access/login.php:45 +#: c:\Apache2\htdocs\account22/access/login.php:74 +#: c:\Apache2\htdocs\account22/access/backup/login1.php:57 +#: c:\Apache2\htdocs\account22/access/backup/login1.php:69 +#: c:\Apache2\htdocs\account22/access/backup/login2.php:44 +#: c:\Apache2\htdocs\account22/access/backup/login2.php:56 +msgid "Authorization timeout" +msgstr "" + +#: c:\Apache2\htdocs\account22/access/login.php:45 +#: c:\Apache2\htdocs\account22/access/login.php:81 +msgid "Login" +msgstr "" + +#: c:\Apache2\htdocs\account22/access/login.php:81 +#: c:\Apache2\htdocs\account22/access/backup/login1.php:80 +#: c:\Apache2\htdocs\account22/access/backup/login2.php:63 msgid "Version" msgstr "" -#: c:\Apache2\htdocs\account21/access/login.php:81 +#: c:\Apache2\htdocs\account22/access/login.php:84 +#: c:\Apache2\htdocs\account22/access/backup/login1.php:105 +#: c:\Apache2\htdocs\account22/access/backup/login2.php:73 msgid "User name" msgstr "" -#: c:\Apache2\htdocs\account21/access/login.php:83 +#: c:\Apache2\htdocs\account22/access/login.php:88 +#: c:\Apache2\htdocs\account22/access/backup/login1.php:107 +#: c:\Apache2\htdocs\account22/access/backup/login2.php:77 msgid "Password" msgstr "" -#: c:\Apache2\htdocs\account21/access/login.php:86 -#: c:\Apache2\htdocs\account21/admin/create_coy.php:215 -#: c:\Apache2\htdocs\account21/admin/create_coy.php:304 +#: c:\Apache2\htdocs\account22/access/login.php:97 +#: c:\Apache2\htdocs\account22/access/backup/login1.php:116 +#: c:\Apache2\htdocs\account22/access/backup/login2.php:86 msgid "Company" msgstr "" -#: c:\Apache2\htdocs\account21/access/login.php:102 +#: c:\Apache2\htdocs\account22/access/login.php:106 +#: c:\Apache2\htdocs\account22/access/backup/login1.php:133 +#: c:\Apache2\htdocs\account22/access/backup/login2.php:95 msgid "Login -->" msgstr "" -#: c:\Apache2\htdocs\account21/access/logout.php:31 +#: c:\Apache2\htdocs\account22/access/login.php:133 +msgid "Theme:" +msgstr "" + +#: c:\Apache2\htdocs\account22/access/logout.php:28 +#: c:\Apache2\htdocs\account22/access/backup/logout1.php:31 msgid "Thank you for using" msgstr "" -#: c:\Apache2\htdocs\account21/access/logout.php:43 +#: c:\Apache2\htdocs\account22/access/logout.php:39 +#: c:\Apache2\htdocs\account22/access/backup/logout1.php:43 msgid "Click here to Login Again." msgstr "" -#: c:\Apache2\htdocs\account21/admin/attachments.php:71 +#: c:\Apache2\htdocs\account22/admin/attachments.php:71 msgid "Attach Documents" msgstr "" -#: c:\Apache2\htdocs\account21/admin/attachments.php:118 +#: c:\Apache2\htdocs\account22/admin/attachments.php:120 msgid "Attachment has been inserted." msgstr "" -#: c:\Apache2\htdocs\account21/admin/attachments.php:135 +#: c:\Apache2\htdocs\account22/admin/attachments.php:137 msgid "Attachment has been updated." msgstr "" -#: c:\Apache2\htdocs\account21/admin/attachments.php:148 +#: c:\Apache2\htdocs\account22/admin/attachments.php:150 msgid "Attachment has been deleted." msgstr "" -#: c:\Apache2\htdocs\account21/admin/attachments.php:165 +#: c:\Apache2\htdocs\account22/admin/attachments.php:167 msgid "Type:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/attachments.php:192 +#: c:\Apache2\htdocs\account22/admin/attachments.php:195 msgid "#" msgstr "" -#: c:\Apache2\htdocs\account21/admin/attachments.php:192 -#: c:\Apache2\htdocs\account21/admin/attachments.php:247 +#: c:\Apache2\htdocs\account22/admin/attachments.php:195 +#: c:\Apache2\htdocs\account22/admin/attachments.php:250 msgid "Description" msgstr "" -#: c:\Apache2\htdocs\account21/admin/attachments.php:192 -#: c:\Apache2\htdocs\account21/admin/backups.php:62 -#: c:\Apache2\htdocs\account21/admin/backups.php:140 +#: c:\Apache2\htdocs\account22/admin/attachments.php:195 +#: c:\Apache2\htdocs\account22/admin/backups.php:57 +#: c:\Apache2\htdocs\account22/admin/backups.php:135 msgid "Filename" msgstr "" -#: c:\Apache2\htdocs\account21/admin/attachments.php:192 +#: c:\Apache2\htdocs\account22/admin/attachments.php:195 msgid "Size" msgstr "" -#: c:\Apache2\htdocs\account21/admin/attachments.php:192 +#: c:\Apache2\htdocs\account22/admin/attachments.php:195 msgid "Filetype" msgstr "" -#: c:\Apache2\htdocs\account21/admin/attachments.php:192 +#: c:\Apache2\htdocs\account22/admin/attachments.php:195 msgid "Date Uploaded" msgstr "" -#: c:\Apache2\htdocs\account21/admin/attachments.php:209 -#: c:\Apache2\htdocs\account21/admin/create_coy.php:239 -#: c:\Apache2\htdocs\account21/admin/fiscalyears.php:151 +#: c:\Apache2\htdocs\account22/admin/attachments.php:212 msgid "Edit" msgstr "" -#: c:\Apache2\htdocs\account21/admin/attachments.php:210 +#: c:\Apache2\htdocs\account22/admin/attachments.php:213 msgid "View" msgstr "" -#: c:\Apache2\htdocs\account21/admin/attachments.php:211 +#: c:\Apache2\htdocs\account22/admin/attachments.php:214 msgid "Download" msgstr "" -#: c:\Apache2\htdocs\account21/admin/attachments.php:212 -#: c:\Apache2\htdocs\account21/admin/create_coy.php:240 -#: c:\Apache2\htdocs\account21/admin/fiscalyears.php:153 +#: c:\Apache2\htdocs\account22/admin/attachments.php:215 msgid "Delete" msgstr "" -#: c:\Apache2\htdocs\account21/admin/attachments.php:241 -#: c:\Apache2\htdocs\account21/admin/attachments.php:246 +#: c:\Apache2\htdocs\account22/admin/attachments.php:244 +#: c:\Apache2\htdocs\account22/admin/attachments.php:249 msgid "Transaction #" msgstr "" -#: c:\Apache2\htdocs\account21/admin/attachments.php:249 +#: c:\Apache2\htdocs\account22/admin/attachments.php:252 msgid "Attached File" msgstr "" -#: c:\Apache2\htdocs\account21/admin/backups.php:37 +#: c:\Apache2\htdocs\account22/admin/backups.php:37 msgid "Backup and Restore Database" msgstr "" -#: c:\Apache2\htdocs\account21/admin/backups.php:44 +#: c:\Apache2\htdocs\account22/admin/backups.php:44 msgid "Backup paths have not been set correctly." msgstr "" -#: c:\Apache2\htdocs\account21/admin/backups.php:45 +#: c:\Apache2\htdocs\account22/admin/backups.php:45 msgid "Please contact System Administrator." msgstr "" -#: c:\Apache2\htdocs\account21/admin/backups.php:46 +#: c:\Apache2\htdocs\account22/admin/backups.php:46 msgid "cannot find backup directory" msgstr "" -#: c:\Apache2\htdocs\account21/admin/backups.php:61 +#: c:\Apache2\htdocs\account22/admin/backups.php:56 msgid "Backup successfully generated." msgstr "" -#: c:\Apache2\htdocs\account21/admin/backups.php:64 +#: c:\Apache2\htdocs\account22/admin/backups.php:59 msgid "Database backup failed." msgstr "" -#: c:\Apache2\htdocs\account21/admin/backups.php:97 -#: c:\Apache2\htdocs\account21/admin/create_coy.php:227 -#: c:\Apache2\htdocs\account21/admin/fiscalyears.php:142 +#: c:\Apache2\htdocs\account22/admin/backups.php:92 msgid "No" msgstr "" -#: c:\Apache2\htdocs\account21/admin/backups.php:134 +#: c:\Apache2\htdocs\account22/admin/backups.php:129 msgid "Restore backup completed." msgstr "" -#: c:\Apache2\htdocs\account21/admin/backups.php:139 +#: c:\Apache2\htdocs\account22/admin/backups.php:134 msgid "File successfully deleted." msgstr "" -#: c:\Apache2\htdocs\account21/admin/backups.php:144 +#: c:\Apache2\htdocs\account22/admin/backups.php:139 msgid "Can't delete backup file." msgstr "" -#: c:\Apache2\htdocs\account21/admin/backups.php:153 +#: c:\Apache2\htdocs\account22/admin/backups.php:148 msgid "You can only upload *.sql backup files" msgstr "" -#: c:\Apache2\htdocs\account21/admin/backups.php:159 +#: c:\Apache2\htdocs\account22/admin/backups.php:154 msgid "File was not uploaded into the system." msgstr "" -#: c:\Apache2\htdocs\account21/admin/backups.php:165 +#: c:\Apache2\htdocs\account22/admin/backups.php:160 msgid "Create backup" msgstr "" -#: c:\Apache2\htdocs\account21/admin/backups.php:166 +#: c:\Apache2\htdocs\account22/admin/backups.php:161 msgid "Comments:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/backups.php:167 +#: c:\Apache2\htdocs\account22/admin/backups.php:162 msgid "Compression:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/backups.php:169 +#: c:\Apache2\htdocs\account22/admin/backups.php:164 msgid "Create Backup" msgstr "" -#: c:\Apache2\htdocs\account21/admin/backups.php:171 +#: c:\Apache2\htdocs\account22/admin/backups.php:166 msgid "Backup scripts maintenance" msgstr "" -#: c:\Apache2\htdocs\account21/admin/backups.php:177 +#: c:\Apache2\htdocs\account22/admin/backups.php:172 msgid "View Backup" msgstr "" -#: c:\Apache2\htdocs\account21/admin/backups.php:178 +#: c:\Apache2\htdocs\account22/admin/backups.php:173 msgid "Download Backup" msgstr "" -#: c:\Apache2\htdocs\account21/admin/backups.php:179 +#: c:\Apache2\htdocs\account22/admin/backups.php:174 msgid "Restore Backup" msgstr "" -#: c:\Apache2\htdocs\account21/admin/backups.php:182 -#, php-format -msgid "You are about to remove %s backup file.
      Do you want to continue ?" +#: c:\Apache2\htdocs\account22/admin/backups.php:175 +msgid "" +"You are about to restore database from backup file.\n" +"Do you want to continue?" msgstr "" -#: c:\Apache2\htdocs\account21/admin/backups.php:186 +#: c:\Apache2\htdocs\account22/admin/backups.php:177 msgid "Delete Backup" msgstr "" -#: c:\Apache2\htdocs\account21/admin/backups.php:192 +#: c:\Apache2\htdocs\account22/admin/backups.php:178 +#, php-format +msgid "" +"You are about to remove selected backup file.\n" +"Do you want to continue ?" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/backups.php:184 msgid "Upload file" msgstr "" -#: c:\Apache2\htdocs\account21/admin/change_current_user_password.php:16 -#: c:\Apache2\htdocs\account21/admin/change_current_user_password.php:97 +#: c:\Apache2\htdocs\account22/admin/change_current_user_password.php:16 +#: c:\Apache2\htdocs\account22/admin/change_current_user_password.php:92 msgid "Change password" msgstr "" -#: c:\Apache2\htdocs\account21/admin/change_current_user_password.php:31 +#: c:\Apache2\htdocs\account22/admin/change_current_user_password.php:28 msgid "The password entered must be at least 4 characters long." msgstr "" -#: c:\Apache2\htdocs\account21/admin/change_current_user_password.php:38 +#: c:\Apache2\htdocs\account22/admin/change_current_user_password.php:35 msgid "The password cannot contain the user login." msgstr "" -#: c:\Apache2\htdocs\account21/admin/change_current_user_password.php:45 +#: c:\Apache2\htdocs\account22/admin/change_current_user_password.php:42 msgid "The passwords entered are not the same." msgstr "" -#: c:\Apache2\htdocs\account21/admin/change_current_user_password.php:59 +#: c:\Apache2\htdocs\account22/admin/change_current_user_password.php:56 msgid "Password cannot be changed in demo mode." msgstr "" -#: c:\Apache2\htdocs\account21/admin/change_current_user_password.php:62 +#: c:\Apache2\htdocs\account22/admin/change_current_user_password.php:61 msgid "Your password has been updated." msgstr "" -#: c:\Apache2\htdocs\account21/admin/change_current_user_password.php:78 +#: c:\Apache2\htdocs\account22/admin/change_current_user_password.php:73 msgid "User login:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/change_current_user_password.php:84 +#: c:\Apache2\htdocs\account22/admin/change_current_user_password.php:79 msgid "Password:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/change_current_user_password.php:89 +#: c:\Apache2\htdocs\account22/admin/change_current_user_password.php:84 msgid "Repeat password:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/change_current_user_password.php:93 +#: c:\Apache2\htdocs\account22/admin/change_current_user_password.php:88 msgid "Enter your new password in the fields." msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:16 +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:16 msgid "Company Setup" msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:32 +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:31 +msgid "Login timeout must be positive number not less than 10." +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:38 msgid "The company name must be entered." msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:50 +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:56 msgid "Only jpg and png files are supported - a file extension of .jpg or .png is expected" msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:55 +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:61 msgid "The file size is over the maximum allowed. The maximum size allowed in KB is" msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:60 +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:66 msgid "Only graphics files can be uploaded" msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:68 -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:90 +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:74 +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:96 msgid "The existing image could not be removed" msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:78 +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:84 msgid "Error uploading logo file" msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:106 +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:117 msgid "Company setup has been updated." msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:150 +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:160 msgid "Name (to appear on reports):" msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:151 +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:161 +#: c:\Apache2\htdocs\account22/admin/shipping_companies.php:171 msgid "Address:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:153 +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:162 +msgid "Domicile:" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:164 +#: c:\Apache2\htdocs\account22/admin/shipping_companies.php:167 msgid "Phone Number:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:154 +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:165 msgid "Fax Number:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:155 +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:166 msgid "Email Address:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:157 +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:168 msgid "Official Company Number:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:158 +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:169 msgid "GSTNo:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:160 -msgid "Tax Periods:" +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:171 +msgid "Home Currency:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:160 -msgid "Months." +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:172 +msgid "Fiscal Year:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:161 -msgid "Tax Last Period:" +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:176 +msgid "Tax Periods:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:161 -msgid "Months back." +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:176 +msgid "Months." msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:163 -msgid "Home Currency:" +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:177 +msgid "Tax Last Period:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:167 -msgid "Fiscal Year:" +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:177 +msgid "Months back." msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:168 +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:179 msgid "Company Logo:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:169 +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:180 msgid "New Company Logo (.jpg)" msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:170 +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:181 msgid "Delete Company Logo:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:171 -msgid "Domicile:" -msgstr "" - -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:173 +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:183 msgid "Use Dimensions:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:174 +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:184 msgid "Base for auto price calculations:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:175 +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:185 msgid "No base price list" msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:177 +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:186 +msgid "Add Price from Std Cost:" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:188 +msgid "Round to nearest:" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:190 msgid "Search Item List" msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:178 +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:191 msgid "Search Customer List" msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:179 +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:192 msgid "Search Supplier List" msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:183 -msgid "Custom Field Name" +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:194 +msgid "Time Zone on Reports" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:195 +msgid "Login Timeout:" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:195 +msgid "seconds" msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:183 -msgid "Custom Field Value" +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:196 +msgid "Version Id" msgstr "" -#: c:\Apache2\htdocs\account21/admin/company_preferences.php:203 -#: c:\Apache2\htdocs\account21/admin/display_prefs.php:132 +#: c:\Apache2\htdocs\account22/admin/company_preferences.php:201 +#: c:\Apache2\htdocs\account22/admin/display_prefs.php:140 +#: c:\Apache2\htdocs\account22/admin/forms_setup.php:61 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:220 +#: c:\Apache2\htdocs\account22/admin/inst_module.php:267 msgid "Update" msgstr "" -#: c:\Apache2\htdocs\account21/admin/create_coy.php:21 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:21 msgid "Create/Update Company" msgstr "" -#: c:\Apache2\htdocs\account21/admin/create_coy.php:52 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:52 msgid "This database settings are already used by another company." msgstr "" -#: c:\Apache2\htdocs\account21/admin/create_coy.php:57 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:57 msgid "You cannot have table set without prefix together with prefixed sets in the same database." msgstr "" -#: c:\Apache2\htdocs\account21/admin/create_coy.php:117 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:117 msgid "Error creating Database: " msgstr "" -#: c:\Apache2\htdocs\account21/admin/create_coy.php:117 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:117 msgid ", Please create it manually" msgstr "" -#: c:\Apache2\htdocs\account21/admin/create_coy.php:132 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:132 msgid "Error uploading Database Script, please upload it manually" msgstr "" -#: c:\Apache2\htdocs\account21/admin/create_coy.php:140 -#: c:\Apache2\htdocs\account21/admin/create_coy.php:186 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:140 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:188 msgid "Cannot open the configuration file - " msgstr "" -#: c:\Apache2\htdocs\account21/admin/create_coy.php:142 -#: c:\Apache2\htdocs\account21/admin/create_coy.php:188 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:142 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:190 msgid "Cannot write to the configuration file - " msgstr "" -#: c:\Apache2\htdocs\account21/admin/create_coy.php:144 -#: c:\Apache2\htdocs\account21/admin/create_coy.php:190 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:144 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:192 msgid "The configuration file " msgstr "" -#: c:\Apache2\htdocs\account21/admin/create_coy.php:144 -#: c:\Apache2\htdocs\account21/admin/create_coy.php:190 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:144 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:192 msgid " is not writable. Change its permissions so it is, then re-run the operation." msgstr "" -#: c:\Apache2\htdocs\account21/admin/create_coy.php:169 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:171 msgid "Cannot remove company data directory " msgstr "" -#: c:\Apache2\htdocs\account21/admin/create_coy.php:174 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:176 msgid "Cannot rename company subdirectory" msgstr "" -#: c:\Apache2\htdocs\account21/admin/create_coy.php:180 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:182 msgid "Error removing Database: " msgstr "" -#: c:\Apache2\htdocs\account21/admin/create_coy.php:180 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:182 msgid ", please remove it manually" msgstr "" -#: c:\Apache2\htdocs\account21/admin/create_coy.php:208 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:210 msgid "Are you sure you want to delete company no. " msgstr "" -#: c:\Apache2\htdocs\account21/admin/create_coy.php:215 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:217 msgid "Database Host" msgstr "" -#: c:\Apache2\htdocs\account21/admin/create_coy.php:215 -#: c:\Apache2\htdocs\account21/admin/create_coy.php:306 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:217 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:308 msgid "Database User" msgstr "" -#: c:\Apache2\htdocs\account21/admin/create_coy.php:216 -#: c:\Apache2\htdocs\account21/admin/create_coy.php:309 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:218 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:311 msgid "Database Name" msgstr "" -#: c:\Apache2\htdocs\account21/admin/create_coy.php:216 -#: c:\Apache2\htdocs\account21/admin/create_coy.php:311 -#: c:\Apache2\htdocs\account21/admin/create_coy.php:313 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:218 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:313 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:315 msgid "Table Pref" msgstr "" -#: c:\Apache2\htdocs\account21/admin/create_coy.php:216 -#: c:\Apache2\htdocs\account21/admin/create_coy.php:314 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:218 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:316 +#: c:\Apache2\htdocs\account22/admin/inst_lang.php:139 +#: c:\Apache2\htdocs\account22/admin/print_profiles.php:164 msgid "Default" msgstr "" -#: c:\Apache2\htdocs\account21/admin/create_coy.php:225 -#: c:\Apache2\htdocs\account21/admin/fiscalyears.php:146 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:227 +#: c:\Apache2\htdocs\account22/admin/fiscalyears.php:417 +#: c:\Apache2\htdocs\account22/admin/inst_lang.php:156 +#: c:\Apache2\htdocs\account22/admin/inst_lang.php:160 msgid "Yes" msgstr "" -#: c:\Apache2\htdocs\account21/admin/create_coy.php:253 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:255 msgid "The marked company is the current company which cannot be deleted." msgstr "" -#: c:\Apache2\htdocs\account21/admin/create_coy.php:305 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:307 +#: c:\Apache2\htdocs\account22/admin/printers.php:88 msgid "Host" msgstr "" -#: c:\Apache2\htdocs\account21/admin/create_coy.php:308 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:310 msgid "Database Password" msgstr "" -#: c:\Apache2\htdocs\account21/admin/create_coy.php:311 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:313 +#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:184 msgid "None" msgstr "" -#: c:\Apache2\htdocs\account21/admin/create_coy.php:317 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:319 msgid "Database Script" msgstr "" -#: c:\Apache2\htdocs\account21/admin/create_coy.php:321 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:323 msgid "New script Admin Password" msgstr "" -#: c:\Apache2\htdocs\account21/admin/create_coy.php:324 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:326 msgid "Choose from Database scripts in SQL folder. No Database is created without a script." msgstr "" -#: c:\Apache2\htdocs\account21/admin/create_coy.php:325 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:327 +#: c:\Apache2\htdocs\account22/admin/inst_lang.php:226 msgid "Save" msgstr "" -#: c:\Apache2\htdocs\account21/admin/create_coy.php:353 +#: c:\Apache2\htdocs\account22/admin/create_coy.php:355 msgid "Create a new company" msgstr "" -#: c:\Apache2\htdocs\account21/admin/display_prefs.php:16 +#: c:\Apache2\htdocs\account22/admin/display_prefs.php:16 msgid "Display Setup" msgstr "" -#: c:\Apache2\htdocs\account21/admin/display_prefs.php:30 +#: c:\Apache2\htdocs\account22/admin/display_prefs.php:30 msgid "Query size must be integer and greater than zero." msgstr "" -#: c:\Apache2\htdocs\account21/admin/display_prefs.php:56 +#: c:\Apache2\htdocs\account22/admin/display_prefs.php:59 msgid "Display settings have been updated." msgstr "" -#: c:\Apache2\htdocs\account21/admin/display_prefs.php:65 +#: c:\Apache2\htdocs\account22/admin/display_prefs.php:68 msgid "Decimal Places" msgstr "" -#: c:\Apache2\htdocs\account21/admin/display_prefs.php:67 +#: c:\Apache2\htdocs\account22/admin/display_prefs.php:70 msgid "Prices/Amounts:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/display_prefs.php:68 +#: c:\Apache2\htdocs\account22/admin/display_prefs.php:71 msgid "Quantities:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/display_prefs.php:69 +#: c:\Apache2\htdocs\account22/admin/display_prefs.php:72 msgid "Exchange Rates:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/display_prefs.php:70 +#: c:\Apache2\htdocs\account22/admin/display_prefs.php:73 msgid "Percentages:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/display_prefs.php:72 +#: c:\Apache2\htdocs\account22/admin/display_prefs.php:75 msgid "Dateformat and Separators" msgstr "" -#: c:\Apache2\htdocs\account21/admin/display_prefs.php:74 +#: c:\Apache2\htdocs\account22/admin/display_prefs.php:77 msgid "Dateformat:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/display_prefs.php:76 +#: c:\Apache2\htdocs\account22/admin/display_prefs.php:79 msgid "Date Separator:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/display_prefs.php:81 +#: c:\Apache2\htdocs\account22/admin/display_prefs.php:84 msgid "Thousand Separator:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/display_prefs.php:86 +#: c:\Apache2\htdocs\account22/admin/display_prefs.php:89 msgid "Decimal Separator:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/display_prefs.php:93 +#: c:\Apache2\htdocs\account22/admin/display_prefs.php:96 +#: c:\Apache2\htdocs\account22/admin/inst_lang.php:139 msgid "Language" msgstr "" -#: c:\Apache2\htdocs\account21/admin/display_prefs.php:95 +#: c:\Apache2\htdocs\account22/admin/display_prefs.php:98 msgid "Language:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/display_prefs.php:98 +#: c:\Apache2\htdocs\account22/admin/display_prefs.php:101 msgid "Miscellaneous" msgstr "" -#: c:\Apache2\htdocs\account21/admin/display_prefs.php:100 +#: c:\Apache2\htdocs\account22/admin/display_prefs.php:103 msgid "Show hints for new users:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/display_prefs.php:102 +#: c:\Apache2\htdocs\account22/admin/display_prefs.php:105 msgid "Show GL Information:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/display_prefs.php:104 +#: c:\Apache2\htdocs\account22/admin/display_prefs.php:107 msgid "Show Item Codes:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/display_prefs.php:106 -msgid "Theme:" +#: c:\Apache2\htdocs\account22/admin/display_prefs.php:114 +msgid "Page Size:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/display_prefs.php:111 -msgid "Page Size:" +#: c:\Apache2\htdocs\account22/admin/display_prefs.php:116 +msgid "Start-up Tab" msgstr "" -#: c:\Apache2\htdocs\account21/admin/display_prefs.php:119 +#: c:\Apache2\htdocs\account22/admin/display_prefs.php:124 msgid "Printing profile" msgstr "" -#: c:\Apache2\htdocs\account21/admin/display_prefs.php:120 +#: c:\Apache2\htdocs\account22/admin/display_prefs.php:125 msgid "Browser printing support" msgstr "" -#: c:\Apache2\htdocs\account21/admin/display_prefs.php:122 +#: c:\Apache2\htdocs\account22/admin/display_prefs.php:127 msgid "Use popup window to display reports:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/display_prefs.php:123 +#: c:\Apache2\htdocs\account22/admin/display_prefs.php:128 msgid "Set this option to on if your browser directly supports pdf files" msgstr "" -#: c:\Apache2\htdocs\account21/admin/display_prefs.php:125 +#: c:\Apache2\htdocs\account22/admin/display_prefs.php:130 msgid "Use icons instead of text links:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/display_prefs.php:126 +#: c:\Apache2\htdocs\account22/admin/display_prefs.php:131 msgid "Set this option to on for using icons instead of text links" msgstr "" -#: c:\Apache2\htdocs\account21/admin/display_prefs.php:128 +#: c:\Apache2\htdocs\account22/admin/display_prefs.php:133 msgid "Query page size:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/fiscalyears.php:22 +#: c:\Apache2\htdocs\account22/admin/display_prefs.php:135 +msgid "Remember last document date:" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/display_prefs.php:136 +msgid "If set document date is remembered on subsequent documents, otherwise default is current date" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/fiscalyears.php:24 msgid "Fiscal Years" msgstr "" -#: c:\Apache2\htdocs\account21/admin/fiscalyears.php:40 +#: c:\Apache2\htdocs\account22/admin/fiscalyears.php:67 msgid "Invalid BEGIN date in fiscal year." msgstr "" -#: c:\Apache2\htdocs\account21/admin/fiscalyears.php:46 +#: c:\Apache2\htdocs\account22/admin/fiscalyears.php:73 msgid "Invalid END date in fiscal year." msgstr "" -#: c:\Apache2\htdocs\account21/admin/fiscalyears.php:52 +#: c:\Apache2\htdocs\account22/admin/fiscalyears.php:79 msgid "BEGIN date bigger than END date." msgstr "" -#: c:\Apache2\htdocs\account21/admin/fiscalyears.php:67 +#: c:\Apache2\htdocs\account22/admin/fiscalyears.php:91 +msgid "The Retained Earnings Account or the Profit and Loss Year Account has not been set in System and General GL Setup" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/fiscalyears.php:115 +#: c:\Apache2\htdocs\account22/admin/fiscalyears.php:117 +msgid "Closing Year" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/fiscalyears.php:147 +msgid "Cannot CLOSE this year because there are open fiscal years before" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/fiscalyears.php:158 msgid "Selected fiscal year has been updated" msgstr "" -#: c:\Apache2\htdocs\account21/admin/fiscalyears.php:74 +#: c:\Apache2\htdocs\account22/admin/fiscalyears.php:166 msgid "New fiscal year has been added" msgstr "" -#: c:\Apache2\htdocs\account21/admin/fiscalyears.php:92 -msgid "Cannot delete this fiscal year because items have been created referring to it." +#: c:\Apache2\htdocs\account22/admin/fiscalyears.php:179 +msgid "Cannot delete this fiscal year because thera are fiscal years before." +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/fiscalyears.php:184 +msgid "Cannot delete this fiscal year because the fiscal year is not closed." +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/fiscalyears.php:215 +msgid "Open Balance" msgstr "" -#: c:\Apache2\htdocs\account21/admin/fiscalyears.php:108 +#: c:\Apache2\htdocs\account22/admin/fiscalyears.php:376 msgid "Selected fiscal year has been deleted" msgstr "" -#: c:\Apache2\htdocs\account21/admin/fiscalyears.php:125 +#: c:\Apache2\htdocs\account22/admin/fiscalyears.php:391 +msgid "" +"Warning: During fiscal year removal all transactions \n" +"\t\tare removed and converted into relevant balances. This process is irreversible!" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/fiscalyears.php:396 msgid "Fiscal Year Begin" msgstr "" -#: c:\Apache2\htdocs\account21/admin/fiscalyears.php:125 +#: c:\Apache2\htdocs\account22/admin/fiscalyears.php:396 msgid "Fiscal Year End" msgstr "" -#: c:\Apache2\htdocs\account21/admin/fiscalyears.php:125 +#: c:\Apache2\htdocs\account22/admin/fiscalyears.php:396 msgid "Closed" msgstr "" -#: c:\Apache2\htdocs\account21/admin/fiscalyears.php:161 +#: c:\Apache2\htdocs\account22/admin/fiscalyears.php:426 +#, php-format +msgid "Are you sure you want to remove fiscal year %s - %s? All transactions are removed and converted into relevant balances. Do you want to continue ?" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/fiscalyears.php:434 msgid "The marked fiscal year is the current fiscal year which cannot be deleted." msgstr "" -#: c:\Apache2\htdocs\account21/admin/fiscalyears.php:185 -#: c:\Apache2\htdocs\account21/admin/fiscalyears.php:190 +#: c:\Apache2\htdocs\account22/admin/fiscalyears.php:458 +#: c:\Apache2\htdocs\account22/admin/fiscalyears.php:463 msgid "Fiscal Year Begin:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/fiscalyears.php:186 -#: c:\Apache2\htdocs\account21/admin/fiscalyears.php:191 +#: c:\Apache2\htdocs\account22/admin/fiscalyears.php:459 +#: c:\Apache2\htdocs\account22/admin/fiscalyears.php:464 msgid "Fiscal Year End:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/fiscalyears.php:195 +#: c:\Apache2\htdocs\account22/admin/fiscalyears.php:468 msgid "Is Closed:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/forms_setup.php:16 +#: c:\Apache2\htdocs\account22/admin/forms_setup.php:16 msgid "Forms Setup" msgstr "" -#: c:\Apache2\htdocs\account21/admin/forms_setup.php:36 +#: c:\Apache2\htdocs\account22/admin/forms_setup.php:36 msgid "Forms settings have been updated." msgstr "" -#: c:\Apache2\htdocs\account21/admin/forms_setup.php:46 +#: c:\Apache2\htdocs\account22/admin/forms_setup.php:46 msgid "Form" msgstr "" -#: c:\Apache2\htdocs\account21/admin/forms_setup.php:46 +#: c:\Apache2\htdocs\account22/admin/forms_setup.php:46 msgid "Next Reference" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:16 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:16 msgid "System and General GL Setup" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:30 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:30 msgid "The delivery over-receive allowance must be between 0 and 100." msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:37 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:37 msgid "The invoice over-charge allowance must be between 0 and 100." msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:44 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:44 msgid "The past due days interval allowance must be between 0 and 100." msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:76 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:78 msgid "The general GL setup has been updated." msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:123 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:129 msgid "General GL" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:130 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:136 msgid "Past Due Days Interval:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:130 -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:163 -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:204 -#: c:\Apache2\htdocs\account21/admin/payment_terms.php:167 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:136 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:171 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:179 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:213 +#: c:\Apache2\htdocs\account22/admin/payment_terms.php:172 msgid "days" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:132 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:138 +msgid "Retained Earnings:" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:140 +msgid "Profit/Loss Year:" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:142 msgid "Exchange Variances Account:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:136 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:144 +msgid "Bank Charges Account:" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:148 msgid "Customers and Sales" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:138 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:150 msgid "Default Credit Limit:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:140 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:152 msgid "Accumulate batch shipping:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:142 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:154 msgid "Legal Text on Invoice:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:144 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:156 msgid "Shipping Charged Account:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:148 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:160 msgid "Customers and Sales Defaults" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:150 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:162 msgid "Receivable Account:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:152 -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:190 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:164 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:199 msgid "Sales Account:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:155 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:167 msgid "Sales Discount Account:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:157 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:169 msgid "Prompt Payment Discount Account:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:161 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:171 +msgid "Delivery Required By:" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:177 msgid "Dimension Defaults" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:163 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:179 msgid "Dimension Required By After:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:168 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:182 msgid "Suppliers and Purchasing" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:170 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:184 msgid "Delivery Over-Receive Allowance:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:172 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:186 msgid "Invoice Over-Charge Allowance:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:179 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:188 msgid "Suppliers and Purchasing Defaults" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:181 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:190 msgid "Payable Account:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:183 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:192 msgid "Purchase Discount Account:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:185 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:194 msgid "Inventory" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:187 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:196 msgid "Allow Negative Inventory:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:189 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:198 msgid "Items Defaults" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:192 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:201 msgid "Inventory Account:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:194 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:203 msgid "C.O.G.S. Account:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:196 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:205 msgid "Inventory Adjustments Account:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:198 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:207 msgid "Item Assembly Costs Account:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:202 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:211 msgid "Manufacturing Defaults" msgstr "" -#: c:\Apache2\htdocs\account21/admin/gl_setup.php:204 +#: c:\Apache2\htdocs\account22/admin/gl_setup.php:213 msgid "Work Order Required By After:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_lang.php:16 +#: c:\Apache2\htdocs\account22/admin/inst_lang.php:16 msgid "Install/Update Languages" msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_lang.php:41 +#: c:\Apache2\htdocs\account22/admin/inst_lang.php:41 msgid "Language name, code nor encoding cannot be empty" msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_lang.php:135 -msgid "Cannot open the languages file - " -msgstr "" - -#: c:\Apache2\htdocs\account21/admin/inst_lang.php:142 -msgid "Cannot write to the language file - " -msgstr "" - -#: c:\Apache2\htdocs\account21/admin/inst_lang.php:152 -msgid "The language file " -msgstr "" - -#: c:\Apache2\htdocs\account21/admin/inst_lang.php:244 +#: c:\Apache2\htdocs\account22/admin/inst_lang.php:133 msgid "Are you sure you want to delete language no. " msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_lang.php:250 -#: c:\Apache2\htdocs\account21/admin/inst_module.php:277 -#: c:\Apache2\htdocs\account21/admin/inst_module.php:340 -#: c:\Apache2\htdocs\account21/admin/printers.php:88 -#: c:\Apache2\htdocs\account21/admin/shipping_companies.php:111 +#: c:\Apache2\htdocs\account22/admin/inst_lang.php:139 +#: c:\Apache2\htdocs\account22/admin/inst_module.php:194 +#: c:\Apache2\htdocs\account22/admin/inst_module.php:236 +#: c:\Apache2\htdocs\account22/admin/inst_module.php:296 +#: c:\Apache2\htdocs\account22/admin/printers.php:88 +#: c:\Apache2\htdocs\account22/admin/shipping_companies.php:117 msgid "Name" msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_lang.php:250 -#: c:\Apache2\htdocs\account21/admin/inst_lang.php:327 +#: c:\Apache2\htdocs\account22/admin/inst_lang.php:139 +#: c:\Apache2\htdocs\account22/admin/inst_lang.php:216 msgid "Encoding" msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_lang.php:250 -#: c:\Apache2\htdocs\account21/admin/inst_lang.php:329 +#: c:\Apache2\htdocs\account22/admin/inst_lang.php:139 +#: c:\Apache2\htdocs\account22/admin/inst_lang.php:218 msgid "Right To Left" msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_lang.php:286 +#: c:\Apache2\htdocs\account22/admin/inst_lang.php:175 msgid "The marked language is the current language which cannot be deleted." msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_lang.php:325 +#: c:\Apache2\htdocs\account22/admin/inst_lang.php:214 msgid "Language Code" msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_lang.php:326 +#: c:\Apache2\htdocs\account22/admin/inst_lang.php:215 msgid "Language Name" msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_lang.php:330 +#: c:\Apache2\htdocs\account22/admin/inst_lang.php:219 msgid "Default Language" msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_lang.php:332 -#: c:\Apache2\htdocs\account21/admin/inst_lang.php:333 +#: c:\Apache2\htdocs\account22/admin/inst_lang.php:221 +#: c:\Apache2\htdocs\account22/admin/inst_lang.php:222 msgid "Language File" msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_lang.php:336 +#: c:\Apache2\htdocs\account22/admin/inst_lang.php:225 msgid "Select your language files from your local harddisk." msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_lang.php:366 +#: c:\Apache2\htdocs\account22/admin/inst_lang.php:255 msgid "Create a new language" msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_module.php:16 -msgid "Install/Update Modules" +#: c:\Apache2\htdocs\account22/admin/inst_module.php:16 +msgid "Install/Activate extensions" msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_module.php:25 -msgid "Sales" +#: c:\Apache2\htdocs\account22/admin/inst_module.php:30 +msgid "Cannot update system extensions list." msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_module.php:25 -msgid "Purchases" +#: c:\Apache2\htdocs\account22/admin/inst_module.php:48 +#, php-format +msgid "Cannot update extensions list for company '%s'." msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_module.php:25 -msgid "Items and Inventory" +#: c:\Apache2\htdocs\account22/admin/inst_module.php:59 +msgid "Extension name cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_module.php:25 -msgid "Manufacturing" +#: c:\Apache2\htdocs\account22/admin/inst_module.php:64 +msgid "Extension name have to be unique." msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_module.php:26 -msgid "Dimensions" +#: c:\Apache2\htdocs\account22/admin/inst_module.php:70 +msgid "Extension title cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_module.php:26 -msgid "Banking and General Ledger" +#: c:\Apache2\htdocs\account22/admin/inst_module.php:74 +msgid "Extension folder name cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_module.php:26 -msgid "Setup" +#: c:\Apache2\htdocs\account22/admin/inst_module.php:78 +msgid "You have to select plugin file to upload" msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_module.php:164 -msgid "Cannot open the modules file - " +#: c:\Apache2\htdocs\account22/admin/inst_module.php:96 +msgid "Module installation support is not implemented yet. You have to do it manually." msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_module.php:171 -msgid "Cannot write to the modules file - " +#: c:\Apache2\htdocs\account22/admin/inst_module.php:183 +msgid "Selected extension has been successfully deleted" msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_module.php:181 -msgid "The modules file " +#: c:\Apache2\htdocs\account22/admin/inst_module.php:194 +#: c:\Apache2\htdocs\account22/admin/inst_module.php:236 +msgid "Tab" msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_module.php:271 -msgid "Are you sure you want to delete module: " +#: c:\Apache2\htdocs\account22/admin/inst_module.php:194 +#: c:\Apache2\htdocs\account22/admin/inst_module.php:236 +msgid "Link text" msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_module.php:277 -msgid "Tab" +#: c:\Apache2\htdocs\account22/admin/inst_module.php:194 +#: c:\Apache2\htdocs\account22/admin/inst_module.php:297 +msgid "Folder" msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_module.php:277 -#: c:\Apache2\htdocs\account21/admin/inst_module.php:341 -msgid "Folder" +#: c:\Apache2\htdocs\account22/admin/inst_module.php:195 +msgid "Access extensions" msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_module.php:339 +#: c:\Apache2\htdocs\account22/admin/inst_module.php:223 +msgid "" +"You are about to delete this extension\\n" +"Do you want to continue?" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/inst_module.php:236 +msgid "Active" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/inst_module.php:299 msgid "Menu Tab" msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_module.php:343 +#: c:\Apache2\htdocs\account22/admin/inst_module.php:300 +msgid "Menu Link Text" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/inst_module.php:302 +msgid "Default status" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/inst_module.php:304 msgid "Module File" msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_module.php:344 +#: c:\Apache2\htdocs\account22/admin/inst_module.php:305 +msgid "Access Levels Extensions" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/inst_module.php:306 msgid "SQL File" msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_module.php:347 +#: c:\Apache2\htdocs\account22/admin/inst_module.php:309 msgid "Select your module PHP file from your local harddisk." msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_module.php:377 -msgid "Create a new module" +#: c:\Apache2\htdocs\account22/admin/inst_module.php:317 +msgid "Extension data has been updated." +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/inst_module.php:319 +msgid "Extension has been installed." +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/inst_module.php:336 +msgid "Current active extensions set has been saved." +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/inst_module.php:350 +msgid "Extensions:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_upgrade.php:16 +#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:16 msgid "Software Upgrade" msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_upgrade.php:133 +#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:111 +msgid "Upgrade cannot be done because database has been already partially upgraded. Please downgrade database to clean previous version or try forced upgrade." +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:139 msgid "Cannot connect to database for company" msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_upgrade.php:150 +#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:151 #, php-format msgid "Database upgrade to version %s failed for company '%s'." msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_upgrade.php:153 +#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:154 msgid "You should restore company database from latest backup file" msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_upgrade.php:164 +#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:165 msgid "All companies data has been successfully updated" msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_upgrade.php:171 +#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:172 msgid "Sql file" msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_upgrade.php:171 +#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:172 msgid "Install" msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_upgrade.php:172 +#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:173 msgid "Force upgrade" msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_upgrade.php:187 +#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:190 msgid "Installed" msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_upgrade.php:194 +#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:196 +#, php-format +msgid "Partially installed (%s)" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:205 +msgid "" +"Database upgrades marked as partially installed cannot be installed automatically.\n" +"You have to clean database manually to enable them, or try to perform forced upgrade." +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:209 msgid "Upgrade system" msgstr "" -#: c:\Apache2\htdocs\account21/admin/inst_upgrade.php:194 +#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:209 msgid "Save database and perform upgrade" msgstr "" -#: c:\Apache2\htdocs\account21/admin/payment_terms.php:16 +#: c:\Apache2\htdocs\account22/admin/payment_terms.php:16 msgid "Payment Terms" msgstr "" -#: c:\Apache2\htdocs\account21/admin/payment_terms.php:31 +#: c:\Apache2\htdocs\account22/admin/payment_terms.php:31 msgid "The number of days or the day in the following month must be numeric." msgstr "" -#: c:\Apache2\htdocs\account21/admin/payment_terms.php:37 +#: c:\Apache2\htdocs\account22/admin/payment_terms.php:37 msgid "The Terms description must be entered." msgstr "" -#: c:\Apache2\htdocs\account21/admin/payment_terms.php:43 +#: c:\Apache2\htdocs\account22/admin/payment_terms.php:43 msgid "When the check box to indicate a day in the following month is the due date, the due date cannot be a day after the 30th. A number between 1 and 30 is expected." msgstr "" -#: c:\Apache2\htdocs\account21/admin/payment_terms.php:49 +#: c:\Apache2\htdocs\account22/admin/payment_terms.php:49 msgid "When the check box is not checked to indicate that the term expects a number of days after which accounts are due, the number entered should be less than 500 days." msgstr "" -#: c:\Apache2\htdocs\account21/admin/payment_terms.php:74 +#: c:\Apache2\htdocs\account22/admin/payment_terms.php:74 msgid "Selected payment terms have been updated" msgstr "" -#: c:\Apache2\htdocs\account21/admin/payment_terms.php:93 +#: c:\Apache2\htdocs\account22/admin/payment_terms.php:93 msgid "New payment terms have been added" msgstr "" -#: c:\Apache2\htdocs\account21/admin/payment_terms.php:111 +#: c:\Apache2\htdocs\account22/admin/payment_terms.php:111 msgid "Cannot delete this payment term, because customer accounts have been created referring to this term." msgstr "" -#: c:\Apache2\htdocs\account21/admin/payment_terms.php:120 +#: c:\Apache2\htdocs\account22/admin/payment_terms.php:120 msgid "Cannot delete this payment term, because supplier accounts have been created referring to this term" msgstr "" -#: c:\Apache2\htdocs\account21/admin/payment_terms.php:128 +#: c:\Apache2\htdocs\account22/admin/payment_terms.php:128 msgid "Selected payment terms have been deleted" msgstr "" -#: c:\Apache2\htdocs\account21/admin/payment_terms.php:146 +#: c:\Apache2\htdocs\account22/admin/payment_terms.php:150 msgid "Following Month On" msgstr "" -#: c:\Apache2\htdocs\account21/admin/payment_terms.php:146 +#: c:\Apache2\htdocs\account22/admin/payment_terms.php:150 msgid "Due After (Days)" msgstr "" -#: c:\Apache2\htdocs\account21/admin/payment_terms.php:154 -#: c:\Apache2\htdocs\account21/admin/payment_terms.php:163 +#: c:\Apache2\htdocs\account22/admin/payment_terms.php:159 +#: c:\Apache2\htdocs\account22/admin/payment_terms.php:168 msgid "N/A" msgstr "" -#: c:\Apache2\htdocs\account21/admin/payment_terms.php:209 +#: c:\Apache2\htdocs\account22/admin/payment_terms.php:213 msgid "Terms Description:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/payment_terms.php:211 +#: c:\Apache2\htdocs\account22/admin/payment_terms.php:215 msgid "Due After A Given No. Of Days:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/payment_terms.php:221 +#: c:\Apache2\htdocs\account22/admin/payment_terms.php:225 msgid "Days (Or Day In Following Month):" msgstr "" -#: c:\Apache2\htdocs\account21/admin/printers.php:16 +#: c:\Apache2\htdocs\account22/admin/printers.php:16 msgid "Printer Locations" msgstr "" -#: c:\Apache2\htdocs\account21/admin/printers.php:31 +#: c:\Apache2\htdocs\account22/admin/printers.php:31 msgid "Printer name cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account21/admin/printers.php:36 +#: c:\Apache2\htdocs\account22/admin/printers.php:36 msgid "You have selected printing to server at user IP." msgstr "" -#: c:\Apache2\htdocs\account21/admin/printers.php:41 +#: c:\Apache2\htdocs\account22/admin/printers.php:41 msgid "Timeout cannot be less than zero nor longer than 60 (sec)." msgstr "" -#: c:\Apache2\htdocs\account21/admin/printers.php:52 +#: c:\Apache2\htdocs\account22/admin/printers.php:52 msgid "New printer definition has been created" msgstr "" -#: c:\Apache2\htdocs\account21/admin/printers.php:53 +#: c:\Apache2\htdocs\account22/admin/printers.php:53 msgid "Selected printer definition has been updated" msgstr "" -#: c:\Apache2\htdocs\account21/admin/printers.php:67 +#: c:\Apache2\htdocs\account22/admin/printers.php:67 msgid "Cannot delete this printer definition, because print profile have been created using it." msgstr "" -#: c:\Apache2\htdocs\account21/admin/printers.php:73 +#: c:\Apache2\htdocs\account22/admin/printers.php:73 msgid "Selected printer definition has been deleted" msgstr "" -#: c:\Apache2\htdocs\account21/admin/printers.php:88 -#: c:\Apache2\htdocs\account21/admin/printers.php:140 +#: c:\Apache2\htdocs\account22/admin/printers.php:88 +#: c:\Apache2\htdocs\account22/admin/printers.php:140 msgid "Printer Queue" msgstr "" -#: c:\Apache2\htdocs\account21/admin/printers.php:136 +#: c:\Apache2\htdocs\account22/admin/printers.php:136 msgid "Printer Name" msgstr "" -#: c:\Apache2\htdocs\account21/admin/printers.php:137 +#: c:\Apache2\htdocs\account22/admin/printers.php:137 msgid "Printer Description" msgstr "" -#: c:\Apache2\htdocs\account21/admin/printers.php:138 +#: c:\Apache2\htdocs\account22/admin/printers.php:138 msgid "Host name or IP" msgstr "" -#: c:\Apache2\htdocs\account21/admin/printers.php:139 +#: c:\Apache2\htdocs\account22/admin/printers.php:139 msgid "Port" msgstr "" -#: c:\Apache2\htdocs\account21/admin/printers.php:141 +#: c:\Apache2\htdocs\account22/admin/printers.php:141 msgid "Timeout" msgstr "" -#: c:\Apache2\htdocs\account21/admin/print_profiles.php:18 +#: c:\Apache2\htdocs\account22/admin/print_profiles.php:18 msgid "Printing Profiles" msgstr "" -#: c:\Apache2\htdocs\account21/admin/print_profiles.php:33 +#: c:\Apache2\htdocs\account22/admin/print_profiles.php:33 msgid "Default printing destination" msgstr "" -#: c:\Apache2\htdocs\account21/admin/print_profiles.php:93 +#: c:\Apache2\htdocs\account22/admin/print_profiles.php:93 msgid "Printing profile name cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account21/admin/print_profiles.php:109 +#: c:\Apache2\htdocs\account22/admin/print_profiles.php:109 msgid "New printing profile has been created" msgstr "" -#: c:\Apache2\htdocs\account21/admin/print_profiles.php:112 +#: c:\Apache2\htdocs\account22/admin/print_profiles.php:112 msgid "Printing profile has been updated" msgstr "" -#: c:\Apache2\htdocs\account21/admin/print_profiles.php:121 +#: c:\Apache2\htdocs\account22/admin/print_profiles.php:121 msgid "Selected printing profile has been deleted" msgstr "" -#: c:\Apache2\htdocs\account21/admin/print_profiles.php:132 +#: c:\Apache2\htdocs\account22/admin/print_profiles.php:132 msgid "Select printing profile" msgstr "" -#: c:\Apache2\htdocs\account21/admin/print_profiles.php:133 +#: c:\Apache2\htdocs\account22/admin/print_profiles.php:133 msgid "New printing profile" msgstr "" -#: c:\Apache2\htdocs\account21/admin/print_profiles.php:138 -#: c:\Apache2\htdocs\account21/admin/print_profiles.php:140 +#: c:\Apache2\htdocs\account22/admin/print_profiles.php:138 +#: c:\Apache2\htdocs\account22/admin/print_profiles.php:140 msgid "Printing Profile Name" msgstr "" -#: c:\Apache2\htdocs\account21/admin/print_profiles.php:150 +#: c:\Apache2\htdocs\account22/admin/print_profiles.php:150 msgid "Report Id" msgstr "" -#: c:\Apache2\htdocs\account21/admin/print_profiles.php:150 +#: c:\Apache2\htdocs\account22/admin/print_profiles.php:150 msgid "Printer" msgstr "" -#: c:\Apache2\htdocs\account21/admin/print_profiles.php:164 +#: c:\Apache2\htdocs\account22/admin/print_profiles.php:164 msgid "Browser support" msgstr "" -#: c:\Apache2\htdocs\account21/admin/print_profiles.php:171 +#: c:\Apache2\htdocs\account22/admin/print_profiles.php:171 msgid "no title was found in this report definition file." msgstr "" -#: c:\Apache2\htdocs\account21/admin/print_profiles.php:177 +#: c:\Apache2\htdocs\account22/admin/print_profiles.php:177 msgid "Add New Profile" msgstr "" -#: c:\Apache2\htdocs\account21/admin/print_profiles.php:179 +#: c:\Apache2\htdocs\account22/admin/print_profiles.php:179 msgid "Update Profile" msgstr "" -#: c:\Apache2\htdocs\account21/admin/print_profiles.php:180 +#: c:\Apache2\htdocs\account22/admin/print_profiles.php:180 msgid "Update printer profile" msgstr "" -#: c:\Apache2\htdocs\account21/admin/print_profiles.php:181 +#: c:\Apache2\htdocs\account22/admin/print_profiles.php:181 msgid "Delete Profile" msgstr "" -#: c:\Apache2\htdocs\account21/admin/print_profiles.php:182 +#: c:\Apache2\htdocs\account22/admin/print_profiles.php:182 msgid "Delete printer profile (only if not used by any user)" msgstr "" -#: c:\Apache2\htdocs\account21/admin/shipping_companies.php:15 +#: c:\Apache2\htdocs\account22/admin/security_roles.php:18 +msgid "Access setup" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/security_roles.php:63 +msgid "Role description cannot be empty." +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/security_roles.php:69 +msgid "Role name cannot be empty." +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/security_roles.php:76 +msgid "Access level edition in Company setup section have to be enabled for your account." +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/security_roles.php:105 +msgid "New security role has been added." +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/security_roles.php:113 +msgid "Security role has been updated." +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/security_roles.php:126 +msgid "This role is currently assigned to some users and cannot be deleted" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/security_roles.php:129 +msgid "Security role has been sucessfully deleted." +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/security_roles.php:178 +msgid "Role:" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/security_roles.php:180 +msgid "Show inactive:" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/security_roles.php:195 +msgid "Role name:" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/security_roles.php:196 +msgid "Role description:" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/security_roles.php:197 +msgid "Current status:" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/security_roles.php:221 +msgid "On/off set of features" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/security_roles.php:240 +#: c:\Apache2\htdocs\account22/admin/security_roles.php:246 +msgid "Update view" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/security_roles.php:241 +msgid "Insert New Role" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/security_roles.php:245 +msgid "Save Role" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/security_roles.php:247 +msgid "Clone This Role" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/security_roles.php:248 +msgid "Delete This Role" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/security_roles.php:249 +msgid "Cancel" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/security_roles.php:249 +msgid "Cancel Edition" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/shipping_companies.php:15 msgid "Shipping Company" msgstr "" -#: c:\Apache2\htdocs\account21/admin/shipping_companies.php:25 +#: c:\Apache2\htdocs\account22/admin/shipping_companies.php:25 msgid "The shipping company name cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account21/admin/shipping_companies.php:43 +#: c:\Apache2\htdocs\account22/admin/shipping_companies.php:44 msgid "New shipping company has been added" msgstr "" -#: c:\Apache2\htdocs\account21/admin/shipping_companies.php:59 +#: c:\Apache2\htdocs\account22/admin/shipping_companies.php:61 msgid "Selected shipping company has been updated" msgstr "" -#: c:\Apache2\htdocs\account21/admin/shipping_companies.php:75 +#: c:\Apache2\htdocs\account22/admin/shipping_companies.php:77 msgid "Cannot delete this shipping company because sales orders have been created using this shipper." msgstr "" -#: c:\Apache2\htdocs\account21/admin/shipping_companies.php:87 +#: c:\Apache2\htdocs\account22/admin/shipping_companies.php:89 msgid "Cannot delete this shipping company because invoices have been created using this shipping company." msgstr "" -#: c:\Apache2\htdocs\account21/admin/shipping_companies.php:93 +#: c:\Apache2\htdocs\account22/admin/shipping_companies.php:95 msgid "Selected shipping company has been deleted" msgstr "" -#: c:\Apache2\htdocs\account21/admin/shipping_companies.php:111 +#: c:\Apache2\htdocs\account22/admin/shipping_companies.php:117 msgid "Contact Person" msgstr "" -#: c:\Apache2\htdocs\account21/admin/shipping_companies.php:111 +#: c:\Apache2\htdocs\account22/admin/shipping_companies.php:117 msgid "Phone Number" msgstr "" -#: c:\Apache2\htdocs\account21/admin/shipping_companies.php:111 +#: c:\Apache2\htdocs\account22/admin/shipping_companies.php:117 +msgid "Secondary Phone" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/shipping_companies.php:117 msgid "Address" msgstr "" -#: c:\Apache2\htdocs\account21/admin/shipping_companies.php:156 +#: c:\Apache2\htdocs\account22/admin/shipping_companies.php:163 msgid "Name:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/shipping_companies.php:158 +#: c:\Apache2\htdocs\account22/admin/shipping_companies.php:165 msgid "Contact Person:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/users.php:16 +#: c:\Apache2\htdocs\account22/admin/shipping_companies.php:169 +msgid "Secondary Phone Number:" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/tags.php:33 +msgid "Unspecified tag type" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/tags.php:40 +msgid "Account Tags" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/tags.php:44 +msgid "Dimension Tags" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/tags.php:57 +msgid "The tag name cannot be empty." +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/tags.php:73 +msgid "Selected tag settings have been updated" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/tags.php:78 +msgid "New tag has been added" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/tags.php:94 +msgid "Cannot delete this tag because records have been created referring to it." +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/tags.php:109 +msgid "Selected tag has been deleted" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/tags.php:128 +msgid "Tag Name" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/tags.php:128 +msgid "Tag Description" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/tags.php:165 +msgid "Tag Name:" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/tags.php:166 +msgid "Tag Description:" +msgstr "" + +#: c:\Apache2\htdocs\account22/admin/users.php:16 msgid "Users" msgstr "" -#: c:\Apache2\htdocs\account21/admin/users.php:31 +#: c:\Apache2\htdocs\account22/admin/users.php:31 msgid "The user login entered must be at least 4 characters long." msgstr "" -#: c:\Apache2\htdocs\account21/admin/users.php:72 +#: c:\Apache2\htdocs\account22/admin/users.php:72 msgid "The selected user has been updated." msgstr "" -#: c:\Apache2\htdocs\account21/admin/users.php:89 +#: c:\Apache2\htdocs\account22/admin/users.php:88 msgid "A new user has been added." msgstr "" -#: c:\Apache2\htdocs\account21/admin/users.php:100 +#: c:\Apache2\htdocs\account22/admin/users.php:99 msgid "User has been deleted." msgstr "" -#: c:\Apache2\htdocs\account21/admin/users.php:116 -#: c:\Apache2\htdocs\account21/admin/users.php:119 +#: c:\Apache2\htdocs\account22/admin/users.php:116 msgid "User login" msgstr "" -#: c:\Apache2\htdocs\account21/admin/users.php:116 -#: c:\Apache2\htdocs\account21/admin/users.php:119 -#: c:\Apache2\htdocs\account21/admin/users.php:201 +#: c:\Apache2\htdocs\account22/admin/users.php:116 +#: c:\Apache2\htdocs\account22/admin/users.php:203 msgid "Full Name" msgstr "" -#: c:\Apache2\htdocs\account21/admin/users.php:116 -#: c:\Apache2\htdocs\account21/admin/users.php:119 +#: c:\Apache2\htdocs\account22/admin/users.php:116 msgid "Phone" msgstr "" -#: c:\Apache2\htdocs\account21/admin/users.php:117 -#: c:\Apache2\htdocs\account21/admin/users.php:120 +#: c:\Apache2\htdocs\account22/admin/users.php:117 msgid "E-mail" msgstr "" -#: c:\Apache2\htdocs\account21/admin/users.php:117 -#: c:\Apache2\htdocs\account21/admin/users.php:120 +#: c:\Apache2\htdocs\account22/admin/users.php:117 msgid "Last Visit" msgstr "" -#: c:\Apache2\htdocs\account21/admin/users.php:117 -#: c:\Apache2\htdocs\account21/admin/users.php:120 +#: c:\Apache2\htdocs\account22/admin/users.php:117 msgid "Access Level" msgstr "" -#: c:\Apache2\htdocs\account21/admin/users.php:184 +#: c:\Apache2\htdocs\account22/admin/users.php:186 msgid "User Login:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/users.php:198 +#: c:\Apache2\htdocs\account22/admin/users.php:200 msgid "Enter a new password to change, leave empty to keep current." msgstr "" -#: c:\Apache2\htdocs\account21/admin/users.php:203 +#: c:\Apache2\htdocs\account22/admin/users.php:205 msgid "Telephone No.:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/users.php:207 +#: c:\Apache2\htdocs\account22/admin/users.php:209 msgid "Access Level:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/users.php:211 +#: c:\Apache2\htdocs\account22/admin/users.php:213 msgid "User's POS" msgstr "" -#: c:\Apache2\htdocs\account21/admin/users.php:216 +#: c:\Apache2\htdocs\account22/admin/users.php:218 msgid "Use popup window for reports:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/view_print_transaction.php:26 +#: c:\Apache2\htdocs\account22/admin/view_print_transaction.php:26 msgid "View or Print Transactions" msgstr "" -#: c:\Apache2\htdocs\account21/admin/view_print_transaction.php:37 -#: c:\Apache2\htdocs\account21/admin/view_print_transaction.php:129 +#: c:\Apache2\htdocs\account22/admin/view_print_transaction.php:37 +#: c:\Apache2\htdocs\account22/admin/view_print_transaction.php:129 msgid "Print" msgstr "" -#: c:\Apache2\htdocs\account21/admin/view_print_transaction.php:47 +#: c:\Apache2\htdocs\account22/admin/view_print_transaction.php:47 msgid "Only documents can be printed." msgstr "" -#: c:\Apache2\htdocs\account21/admin/view_print_transaction.php:59 +#: c:\Apache2\htdocs\account22/admin/view_print_transaction.php:59 msgid "from #:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/view_print_transaction.php:61 +#: c:\Apache2\htdocs\account22/admin/view_print_transaction.php:61 msgid "to #:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/view_print_transaction.php:63 +#: c:\Apache2\htdocs\account22/admin/view_print_transaction.php:63 msgid "Search" msgstr "" -#: c:\Apache2\htdocs\account21/admin/view_print_transaction.php:76 +#: c:\Apache2\htdocs\account22/admin/view_print_transaction.php:76 msgid "The starting transaction number is expected to be numeric and greater than zero." msgstr "" -#: c:\Apache2\htdocs\account21/admin/view_print_transaction.php:82 +#: c:\Apache2\htdocs\account22/admin/view_print_transaction.php:82 msgid "The ending transaction number is expected to be numeric and greater than zero." msgstr "" -#: c:\Apache2\htdocs\account21/admin/view_print_transaction.php:127 +#: c:\Apache2\htdocs\account22/admin/view_print_transaction.php:127 msgid "Reference" msgstr "" -#: c:\Apache2\htdocs\account21/admin/view_print_transaction.php:130 +#: c:\Apache2\htdocs\account22/admin/view_print_transaction.php:130 msgid "GL" msgstr "" -#: c:\Apache2\htdocs\account21/admin/void_transaction.php:27 +#: c:\Apache2\htdocs\account22/admin/void_transaction.php:27 msgid "Void a Transaction" msgstr "" -#: c:\Apache2\htdocs\account21/admin/void_transaction.php:109 +#: c:\Apache2\htdocs\account22/admin/void_transaction.php:113 msgid "Transaction Type:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/void_transaction.php:111 +#: c:\Apache2\htdocs\account22/admin/void_transaction.php:115 msgid "Transaction #:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/void_transaction.php:113 +#: c:\Apache2\htdocs\account22/admin/void_transaction.php:117 msgid "Voiding Date:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/void_transaction.php:115 +#: c:\Apache2\htdocs\account22/admin/void_transaction.php:119 msgid "Memo:" msgstr "" -#: c:\Apache2\htdocs\account21/admin/void_transaction.php:120 -#: c:\Apache2\htdocs\account21/admin/void_transaction.php:129 +#: c:\Apache2\htdocs\account22/admin/void_transaction.php:124 +#: c:\Apache2\htdocs\account22/admin/void_transaction.php:133 msgid "Void Transaction" msgstr "" -#: c:\Apache2\htdocs\account21/admin/void_transaction.php:125 -#: c:\Apache2\htdocs\account21/admin/void_transaction.php:204 +#: c:\Apache2\htdocs\account22/admin/void_transaction.php:129 +#: c:\Apache2\htdocs\account22/admin/void_transaction.php:213 msgid "The entered transaction does not exist or cannot be voided." msgstr "" -#: c:\Apache2\htdocs\account21/admin/void_transaction.php:133 +#: c:\Apache2\htdocs\account22/admin/void_transaction.php:137 msgid "Are you sure you want to void this transaction ? This action cannot be undone." msgstr "" -#: c:\Apache2\htdocs\account21/admin/void_transaction.php:135 -#: c:\Apache2\htdocs\account21/admin/void_transaction.php:137 +#: c:\Apache2\htdocs\account22/admin/void_transaction.php:139 +#: c:\Apache2\htdocs\account22/admin/void_transaction.php:141 msgid "View Transaction" msgstr "" -#: c:\Apache2\htdocs\account21/admin/void_transaction.php:140 +#: c:\Apache2\htdocs\account22/admin/void_transaction.php:144 msgid "Proceed" msgstr "" -#: c:\Apache2\htdocs\account21/admin/void_transaction.php:141 -msgid "Cancel" +#: c:\Apache2\htdocs\account22/admin/void_transaction.php:158 +msgid "The selected transaction was closed for edition and cannot be voided." msgstr "" -#: c:\Apache2\htdocs\account21/admin/void_transaction.php:154 +#: c:\Apache2\htdocs\account22/admin/void_transaction.php:164 msgid "The entered date is invalid." msgstr "" -#: c:\Apache2\htdocs\account21/admin/void_transaction.php:160 +#: c:\Apache2\htdocs\account22/admin/void_transaction.php:170 msgid "The entered date is not in fiscal year." msgstr "" -#: c:\Apache2\htdocs\account21/admin/void_transaction.php:167 +#: c:\Apache2\htdocs\account22/admin/void_transaction.php:177 msgid "The transaction number is expected to be numeric and greater than zero." msgstr "" -#: c:\Apache2\htdocs\account21/admin/void_transaction.php:185 +#: c:\Apache2\htdocs\account22/admin/void_transaction.php:194 msgid "The selected transaction has already been voided." msgstr "" -#: c:\Apache2\htdocs\account21/admin/void_transaction.php:198 +#: c:\Apache2\htdocs\account22/admin/void_transaction.php:207 msgid "Selected transaction has been voided." msgstr "" -#: c:\Apache2\htdocs\account21/applications/customers.php:17 +#: c:\Apache2\htdocs\account22/applications/customers.php:17 msgid "&Sales" msgstr "" -#: c:\Apache2\htdocs\account21/applications/customers.php:19 -#: c:\Apache2\htdocs\account21/applications/dimensions.php:22 +#: c:\Apache2\htdocs\account22/applications/customers.php:19 +#: c:\Apache2\htdocs\account22/applications/dimensions.php:22 +#: c:\Apache2\htdocs\account22/applications/generalledger.php:19 +#: c:\Apache2\htdocs\account22/applications/inventory.php:19 +#: c:\Apache2\htdocs\account22/applications/manufacturing.php:19 +#: c:\Apache2\htdocs\account22/applications/suppliers.php:19 msgid "Transactions" msgstr "" -#: c:\Apache2\htdocs\account21/applications/customers.php:20 +#: c:\Apache2\htdocs\account22/applications/customers.php:20 +msgid "Sales &Quotation Entry" +msgstr "" + +#: c:\Apache2\htdocs\account22/applications/customers.php:22 msgid "Sales &Order Entry" msgstr "" -#: c:\Apache2\htdocs\account21/applications/customers.php:21 +#: c:\Apache2\htdocs\account22/applications/customers.php:24 msgid "Direct &Delivery" msgstr "" -#: c:\Apache2\htdocs\account21/applications/customers.php:22 +#: c:\Apache2\htdocs\account22/applications/customers.php:26 msgid "Direct &Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/applications/customers.php:24 +#: c:\Apache2\htdocs\account22/applications/customers.php:29 msgid "&Delivery Against Sales Orders" msgstr "" -#: c:\Apache2\htdocs\account21/applications/customers.php:25 +#: c:\Apache2\htdocs\account22/applications/customers.php:31 msgid "&Invoice Against Sales Delivery" msgstr "" -#: c:\Apache2\htdocs\account21/applications/customers.php:27 +#: c:\Apache2\htdocs\account22/applications/customers.php:34 msgid "&Template Delivery" msgstr "" -#: c:\Apache2\htdocs\account21/applications/customers.php:28 +#: c:\Apache2\htdocs\account22/applications/customers.php:36 msgid "&Template Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/applications/customers.php:29 +#: c:\Apache2\htdocs\account22/applications/customers.php:38 msgid "&Create and Print Recurrent Invoices" msgstr "" -#: c:\Apache2\htdocs\account21/applications/customers.php:31 +#: c:\Apache2\htdocs\account22/applications/customers.php:41 msgid "Customer &Payments" msgstr "" -#: c:\Apache2\htdocs\account21/applications/customers.php:32 +#: c:\Apache2\htdocs\account22/applications/customers.php:43 msgid "Customer &Credit Notes" msgstr "" -#: c:\Apache2\htdocs\account21/applications/customers.php:33 +#: c:\Apache2\htdocs\account22/applications/customers.php:45 msgid "&Allocate Customer Payments or Credit Notes" msgstr "" -#: c:\Apache2\htdocs\account21/applications/customers.php:35 -#: c:\Apache2\htdocs\account21/applications/dimensions.php:26 +#: c:\Apache2\htdocs\account22/applications/customers.php:48 +#: c:\Apache2\htdocs\account22/applications/dimensions.php:28 +#: c:\Apache2\htdocs\account22/applications/generalledger.php:33 +#: c:\Apache2\htdocs\account22/applications/inventory.php:25 +#: c:\Apache2\htdocs\account22/applications/manufacturing.php:25 +#: c:\Apache2\htdocs\account22/applications/suppliers.php:34 msgid "Inquiries and Reports" msgstr "" -#: c:\Apache2\htdocs\account21/applications/customers.php:36 +#: c:\Apache2\htdocs\account22/applications/customers.php:49 +msgid "Sales Quotation I&nquiry" +msgstr "" + +#: c:\Apache2\htdocs\account22/applications/customers.php:51 msgid "Sales Order &Inquiry" msgstr "" -#: c:\Apache2\htdocs\account21/applications/customers.php:37 +#: c:\Apache2\htdocs\account22/applications/customers.php:53 msgid "Customer Transaction &Inquiry" msgstr "" -#: c:\Apache2\htdocs\account21/applications/customers.php:39 +#: c:\Apache2\htdocs\account22/applications/customers.php:56 msgid "Customer Allocation &Inquiry" msgstr "" -#: c:\Apache2\htdocs\account21/applications/customers.php:41 +#: c:\Apache2\htdocs\account22/applications/customers.php:59 msgid "Customer and Sales &Reports" msgstr "" -#: c:\Apache2\htdocs\account21/applications/customers.php:43 -#: c:\Apache2\htdocs\account21/applications/dimensions.php:38 +#: c:\Apache2\htdocs\account22/applications/customers.php:62 +#: c:\Apache2\htdocs\account22/applications/dimensions.php:35 +#: c:\Apache2\htdocs\account22/applications/generalledger.php:50 +#: c:\Apache2\htdocs\account22/applications/inventory.php:33 +#: c:\Apache2\htdocs\account22/applications/manufacturing.php:35 +#: c:\Apache2\htdocs\account22/applications/setup.php:53 +#: c:\Apache2\htdocs\account22/applications/suppliers.php:46 msgid "Maintenance" msgstr "" -#: c:\Apache2\htdocs\account21/applications/customers.php:44 +#: c:\Apache2\htdocs\account22/applications/customers.php:63 msgid "Add and Manage &Customers" msgstr "" -#: c:\Apache2\htdocs\account21/applications/customers.php:45 +#: c:\Apache2\htdocs\account22/applications/customers.php:65 msgid "Customer &Branches" msgstr "" -#: c:\Apache2\htdocs\account21/applications/customers.php:46 +#: c:\Apache2\htdocs\account22/applications/customers.php:67 msgid "Sales &Groups" msgstr "" -#: c:\Apache2\htdocs\account21/applications/customers.php:47 +#: c:\Apache2\htdocs\account22/applications/customers.php:69 msgid "Recurrent &Invoices" msgstr "" -#: c:\Apache2\htdocs\account21/applications/customers.php:48 +#: c:\Apache2\htdocs\account22/applications/customers.php:71 msgid "Sales T&ypes" msgstr "" -#: c:\Apache2\htdocs\account21/applications/customers.php:49 +#: c:\Apache2\htdocs\account22/applications/customers.php:73 msgid "Sales &Persons" msgstr "" -#: c:\Apache2\htdocs\account21/applications/customers.php:50 +#: c:\Apache2\htdocs\account22/applications/customers.php:75 msgid "Sales &Areas" msgstr "" -#: c:\Apache2\htdocs\account21/applications/customers.php:51 +#: c:\Apache2\htdocs\account22/applications/customers.php:77 msgid "Credit &Status Setup" msgstr "" -#: c:\Apache2\htdocs\account21/applications/dimensions.php:18 +#: c:\Apache2\htdocs\account22/applications/dimensions.php:18 msgid "&Dimensions" msgstr "" -#: c:\Apache2\htdocs\account21/applications/dimensions.php:23 +#: c:\Apache2\htdocs\account22/applications/dimensions.php:23 msgid "Dimension &Entry" msgstr "" -#: c:\Apache2\htdocs\account21/applications/dimensions.php:24 +#: c:\Apache2\htdocs\account22/applications/dimensions.php:25 msgid "&Outstanding Dimensions" msgstr "" -#: c:\Apache2\htdocs\account21/applications/dimensions.php:27 +#: c:\Apache2\htdocs\account22/applications/dimensions.php:29 msgid "Dimension &Inquiry" msgstr "" -#: c:\Apache2\htdocs\account21/applications/dimensions.php:29 +#: c:\Apache2\htdocs\account22/applications/dimensions.php:32 msgid "Dimension &Reports" msgstr "" -#: c:\Apache2\htdocs\account21/applications/generalledger.php:17 +#: c:\Apache2\htdocs\account22/applications/dimensions.php:36 +msgid "Dimension &Tags" +msgstr "" + +#: c:\Apache2\htdocs\account22/applications/generalledger.php:17 msgid "&Banking and General Ledger" msgstr "" -#: c:\Apache2\htdocs\account21/applications/generalledger.php:20 +#: c:\Apache2\htdocs\account22/applications/generalledger.php:20 msgid "&Payments" msgstr "" -#: c:\Apache2\htdocs\account21/applications/generalledger.php:21 +#: c:\Apache2\htdocs\account22/applications/generalledger.php:22 msgid "&Deposits" msgstr "" -#: c:\Apache2\htdocs\account21/applications/generalledger.php:22 +#: c:\Apache2\htdocs\account22/applications/generalledger.php:24 msgid "Bank Account &Transfers" msgstr "" -#: c:\Apache2\htdocs\account21/applications/generalledger.php:23 +#: c:\Apache2\htdocs\account22/applications/generalledger.php:26 msgid "&Journal Entry" msgstr "" -#: c:\Apache2\htdocs\account21/applications/generalledger.php:24 +#: c:\Apache2\htdocs\account22/applications/generalledger.php:28 msgid "&Budget Entry" msgstr "" -#: c:\Apache2\htdocs\account21/applications/generalledger.php:25 +#: c:\Apache2\htdocs\account22/applications/generalledger.php:30 msgid "&Reconcile Bank Account" msgstr "" -#: c:\Apache2\htdocs\account21/applications/generalledger.php:27 -msgid "Bank Account &Inquiry" +#: c:\Apache2\htdocs\account22/applications/generalledger.php:34 +msgid "&Journal Inquiry" msgstr "" -#: c:\Apache2\htdocs\account21/applications/generalledger.php:28 -msgid "GL Account &Inquiry" +#: c:\Apache2\htdocs\account22/applications/generalledger.php:36 +msgid "GL &Inquiry" msgstr "" -#: c:\Apache2\htdocs\account21/applications/generalledger.php:29 -msgid "Trial &Balance" +#: c:\Apache2\htdocs\account22/applications/generalledger.php:38 +msgid "Bank Account &Inquiry" msgstr "" -#: c:\Apache2\htdocs\account21/applications/generalledger.php:30 +#: c:\Apache2\htdocs\account22/applications/generalledger.php:40 msgid "Ta&x Inquiry" msgstr "" -#: c:\Apache2\htdocs\account21/applications/generalledger.php:32 +#: c:\Apache2\htdocs\account22/applications/generalledger.php:43 +msgid "Trial &Balance" +msgstr "" + +#: c:\Apache2\htdocs\account22/applications/generalledger.php:45 msgid "Banking &Reports" msgstr "" -#: c:\Apache2\htdocs\account21/applications/generalledger.php:33 +#: c:\Apache2\htdocs\account22/applications/generalledger.php:47 msgid "General Ledger &Reports" msgstr "" -#: c:\Apache2\htdocs\account21/applications/generalledger.php:36 +#: c:\Apache2\htdocs\account22/applications/generalledger.php:51 msgid "Bank &Accounts" msgstr "" -#: c:\Apache2\htdocs\account21/applications/generalledger.php:37 +#: c:\Apache2\htdocs\account22/applications/generalledger.php:53 msgid "&Quick Entries" msgstr "" -#: c:\Apache2\htdocs\account21/applications/generalledger.php:39 +#: c:\Apache2\htdocs\account22/applications/generalledger.php:55 +msgid "Account &Tags" +msgstr "" + +#: c:\Apache2\htdocs\account22/applications/generalledger.php:58 msgid "&Currencies" msgstr "" -#: c:\Apache2\htdocs\account21/applications/generalledger.php:40 +#: c:\Apache2\htdocs\account22/applications/generalledger.php:60 msgid "&Exchange Rates" msgstr "" -#: c:\Apache2\htdocs\account21/applications/generalledger.php:42 +#: c:\Apache2\htdocs\account22/applications/generalledger.php:63 msgid "&GL Accounts" msgstr "" -#: c:\Apache2\htdocs\account21/applications/generalledger.php:43 +#: c:\Apache2\htdocs\account22/applications/generalledger.php:65 msgid "GL Account &Groups" msgstr "" -#: c:\Apache2\htdocs\account21/applications/generalledger.php:44 +#: c:\Apache2\htdocs\account22/applications/generalledger.php:67 msgid "GL Account &Classes" msgstr "" -#: c:\Apache2\htdocs\account21/applications/inventory.php:17 +#: c:\Apache2\htdocs\account22/applications/inventory.php:17 msgid "&Items and Inventory" msgstr "" -#: c:\Apache2\htdocs\account21/applications/inventory.php:20 +#: c:\Apache2\htdocs\account22/applications/inventory.php:20 msgid "Inventory Location &Transfers" msgstr "" -#: c:\Apache2\htdocs\account21/applications/inventory.php:21 +#: c:\Apache2\htdocs\account22/applications/inventory.php:22 msgid "Inventory &Adjustments" msgstr "" -#: c:\Apache2\htdocs\account21/applications/inventory.php:24 +#: c:\Apache2\htdocs\account22/applications/inventory.php:26 msgid "Inventory Item &Movements" msgstr "" -#: c:\Apache2\htdocs\account21/applications/inventory.php:25 +#: c:\Apache2\htdocs\account22/applications/inventory.php:28 msgid "Inventory Item &Status" msgstr "" -#: c:\Apache2\htdocs\account21/applications/inventory.php:26 +#: c:\Apache2\htdocs\account22/applications/inventory.php:30 msgid "Inventory &Reports" msgstr "" -#: c:\Apache2\htdocs\account21/applications/inventory.php:29 +#: c:\Apache2\htdocs\account22/applications/inventory.php:34 msgid "&Items" msgstr "" -#: c:\Apache2\htdocs\account21/applications/inventory.php:30 +#: c:\Apache2\htdocs\account22/applications/inventory.php:36 msgid "&Foreign Item Codes" msgstr "" -#: c:\Apache2\htdocs\account21/applications/inventory.php:31 +#: c:\Apache2\htdocs\account22/applications/inventory.php:38 msgid "Sales &Kits" msgstr "" -#: c:\Apache2\htdocs\account21/applications/inventory.php:32 +#: c:\Apache2\htdocs\account22/applications/inventory.php:40 msgid "Item &Categories" msgstr "" -#: c:\Apache2\htdocs\account21/applications/inventory.php:33 +#: c:\Apache2\htdocs\account22/applications/inventory.php:42 msgid "Inventory &Locations" msgstr "" -#: c:\Apache2\htdocs\account21/applications/inventory.php:34 +#: c:\Apache2\htdocs\account22/applications/inventory.php:44 msgid "Inventory &Movement Types" msgstr "" -#: c:\Apache2\htdocs\account21/applications/inventory.php:35 -msgid "Item Ta&x Types" -msgstr "" - -#: c:\Apache2\htdocs\account21/applications/inventory.php:36 +#: c:\Apache2\htdocs\account22/applications/inventory.php:46 msgid "&Units of Measure" msgstr "" -#: c:\Apache2\htdocs\account21/applications/inventory.php:37 +#: c:\Apache2\htdocs\account22/applications/inventory.php:48 msgid "&Reorder Levels" msgstr "" -#: c:\Apache2\htdocs\account21/applications/inventory.php:39 +#: c:\Apache2\htdocs\account22/applications/inventory.php:51 msgid "Pricing and Costs" msgstr "" -#: c:\Apache2\htdocs\account21/applications/inventory.php:40 +#: c:\Apache2\htdocs\account22/applications/inventory.php:52 msgid "Sales &Pricing" msgstr "" -#: c:\Apache2\htdocs\account21/applications/inventory.php:41 +#: c:\Apache2\htdocs\account22/applications/inventory.php:54 msgid "Purchasing &Pricing" msgstr "" -#: c:\Apache2\htdocs\account21/applications/inventory.php:42 +#: c:\Apache2\htdocs\account22/applications/inventory.php:56 msgid "Standard &Costs" msgstr "" -#: c:\Apache2\htdocs\account21/applications/manufacturing.php:17 +#: c:\Apache2\htdocs\account22/applications/manufacturing.php:17 msgid "&Manufacturing" msgstr "" -#: c:\Apache2\htdocs\account21/applications/manufacturing.php:20 +#: c:\Apache2\htdocs\account22/applications/manufacturing.php:20 msgid "Work &Order Entry" msgstr "" -#: c:\Apache2\htdocs\account21/applications/manufacturing.php:21 +#: c:\Apache2\htdocs\account22/applications/manufacturing.php:22 msgid "&Outstanding Work Orders" msgstr "" -#: c:\Apache2\htdocs\account21/applications/manufacturing.php:24 +#: c:\Apache2\htdocs\account22/applications/manufacturing.php:26 msgid "Costed Bill Of Material Inquiry" msgstr "" -#: c:\Apache2\htdocs\account21/applications/manufacturing.php:25 +#: c:\Apache2\htdocs\account22/applications/manufacturing.php:28 msgid "Inventory Item Where Used &Inquiry" msgstr "" -#: c:\Apache2\htdocs\account21/applications/manufacturing.php:26 +#: c:\Apache2\htdocs\account22/applications/manufacturing.php:30 msgid "Work Order &Inquiry" msgstr "" -#: c:\Apache2\htdocs\account21/applications/manufacturing.php:27 +#: c:\Apache2\htdocs\account22/applications/manufacturing.php:32 msgid "Manufacturing &Reports" msgstr "" -#: c:\Apache2\htdocs\account21/applications/manufacturing.php:30 +#: c:\Apache2\htdocs\account22/applications/manufacturing.php:36 msgid "&Bills Of Material" msgstr "" -#: c:\Apache2\htdocs\account21/applications/manufacturing.php:31 +#: c:\Apache2\htdocs\account22/applications/manufacturing.php:38 msgid "&Work Centres" msgstr "" -#: c:\Apache2\htdocs\account21/applications/setup.php:17 +#: c:\Apache2\htdocs\account22/applications/setup.php:17 msgid "S&etup" msgstr "" -#: c:\Apache2\htdocs\account21/applications/setup.php:20 +#: c:\Apache2\htdocs\account22/applications/setup.php:20 msgid "&Company Setup" msgstr "" -#: c:\Apache2\htdocs\account21/applications/setup.php:21 +#: c:\Apache2\htdocs\account22/applications/setup.php:22 msgid "&User Accounts Setup" msgstr "" -#: c:\Apache2\htdocs\account21/applications/setup.php:23 +#: c:\Apache2\htdocs\account22/applications/setup.php:24 +msgid "&Access Setup" +msgstr "" + +#: c:\Apache2\htdocs\account22/applications/setup.php:26 msgid "&Display Setup" msgstr "" -#: c:\Apache2\htdocs\account21/applications/setup.php:24 +#: c:\Apache2\htdocs\account22/applications/setup.php:28 msgid "&Forms Setup" msgstr "" -#: c:\Apache2\htdocs\account21/applications/setup.php:25 +#: c:\Apache2\htdocs\account22/applications/setup.php:30 msgid "&Taxes" msgstr "" -#: c:\Apache2\htdocs\account21/applications/setup.php:26 +#: c:\Apache2\htdocs\account22/applications/setup.php:32 msgid "Tax &Groups" msgstr "" -#: c:\Apache2\htdocs\account21/applications/setup.php:28 +#: c:\Apache2\htdocs\account22/applications/setup.php:34 +msgid "Item Ta&x Types" +msgstr "" + +#: c:\Apache2\htdocs\account22/applications/setup.php:36 msgid "System and &General GL Setup" msgstr "" -#: c:\Apache2\htdocs\account21/applications/setup.php:29 +#: c:\Apache2\htdocs\account22/applications/setup.php:38 msgid "&Fiscal Years" msgstr "" -#: c:\Apache2\htdocs\account21/applications/setup.php:30 +#: c:\Apache2\htdocs\account22/applications/setup.php:40 msgid "&Print Profiles" msgstr "" -#: c:\Apache2\htdocs\account21/applications/setup.php:33 +#: c:\Apache2\htdocs\account22/applications/setup.php:44 msgid "Pa&yment Terms" msgstr "" -#: c:\Apache2\htdocs\account21/applications/setup.php:34 +#: c:\Apache2\htdocs\account22/applications/setup.php:46 msgid "Shi&pping Company" msgstr "" -#: c:\Apache2\htdocs\account21/applications/setup.php:35 +#: c:\Apache2\htdocs\account22/applications/setup.php:48 msgid "&Points of Sale" msgstr "" -#: c:\Apache2\htdocs\account21/applications/setup.php:36 +#: c:\Apache2\htdocs\account22/applications/setup.php:50 msgid "&Printers" msgstr "" -#: c:\Apache2\htdocs\account21/applications/setup.php:39 +#: c:\Apache2\htdocs\account22/applications/setup.php:54 msgid "&Void a Transaction" msgstr "" -#: c:\Apache2\htdocs\account21/applications/setup.php:40 +#: c:\Apache2\htdocs\account22/applications/setup.php:56 msgid "View or &Print Transactions" msgstr "" -#: c:\Apache2\htdocs\account21/applications/setup.php:41 +#: c:\Apache2\htdocs\account22/applications/setup.php:58 msgid "&Attach Documents" msgstr "" -#: c:\Apache2\htdocs\account21/applications/setup.php:42 +#: c:\Apache2\htdocs\account22/applications/setup.php:60 msgid "&Backup and Restore" msgstr "" -#: c:\Apache2\htdocs\account21/applications/setup.php:43 +#: c:\Apache2\htdocs\account22/applications/setup.php:62 msgid "Create/Update &Companies" msgstr "" -#: c:\Apache2\htdocs\account21/applications/setup.php:44 +#: c:\Apache2\htdocs\account22/applications/setup.php:64 msgid "Install/Update &Languages" msgstr "" -#: c:\Apache2\htdocs\account21/applications/setup.php:45 -msgid "Install/Update &Modules" +#: c:\Apache2\htdocs\account22/applications/setup.php:66 +msgid "Install/Activate &Extensions" msgstr "" -#: c:\Apache2\htdocs\account21/applications/setup.php:46 +#: c:\Apache2\htdocs\account22/applications/setup.php:68 msgid "Software &Upgrade" msgstr "" -#: c:\Apache2\htdocs\account21/applications/suppliers.php:17 +#: c:\Apache2\htdocs\account22/applications/suppliers.php:17 msgid "&Purchases" msgstr "" -#: c:\Apache2\htdocs\account21/applications/suppliers.php:20 -#: c:\Apache2\htdocs\account21/applications/backup/organizer.php:12 -#: c:\Apache2\htdocs\account21/applications/backup/payroll.php:12 +#: c:\Apache2\htdocs\account22/applications/suppliers.php:20 msgid "Purchase &Order Entry" msgstr "" -#: c:\Apache2\htdocs\account21/applications/suppliers.php:21 -#: c:\Apache2\htdocs\account21/applications/backup/organizer.php:13 -#: c:\Apache2\htdocs\account21/applications/backup/payroll.php:13 +#: c:\Apache2\htdocs\account22/applications/suppliers.php:22 msgid "&Outstanding Purchase Orders Maintenance" msgstr "" -#: c:\Apache2\htdocs\account21/applications/suppliers.php:22 -#: c:\Apache2\htdocs\account21/applications/backup/organizer.php:14 -#: c:\Apache2\htdocs\account21/applications/backup/payroll.php:14 +#: c:\Apache2\htdocs\account22/applications/suppliers.php:24 msgid "&Payments to Suppliers" msgstr "" -#: c:\Apache2\htdocs\account21/applications/suppliers.php:24 -#: c:\Apache2\htdocs\account21/applications/backup/organizer.php:16 -#: c:\Apache2\htdocs\account21/applications/backup/payroll.php:16 +#: c:\Apache2\htdocs\account22/applications/suppliers.php:27 msgid "Supplier &Invoices" msgstr "" -#: c:\Apache2\htdocs\account21/applications/suppliers.php:25 -#: c:\Apache2\htdocs\account21/applications/backup/organizer.php:17 -#: c:\Apache2\htdocs\account21/applications/backup/payroll.php:17 +#: c:\Apache2\htdocs\account22/applications/suppliers.php:29 msgid "Supplier &Credit Notes" msgstr "" -#: c:\Apache2\htdocs\account21/applications/suppliers.php:26 -#: c:\Apache2\htdocs\account21/applications/backup/organizer.php:18 -#: c:\Apache2\htdocs\account21/applications/backup/payroll.php:18 +#: c:\Apache2\htdocs\account22/applications/suppliers.php:31 msgid "&Allocate Supplier Payments or Credit Notes" msgstr "" -#: c:\Apache2\htdocs\account21/applications/suppliers.php:29 -#: c:\Apache2\htdocs\account21/applications/backup/organizer.php:21 -#: c:\Apache2\htdocs\account21/applications/backup/payroll.php:21 +#: c:\Apache2\htdocs\account22/applications/suppliers.php:35 msgid "Purchase Orders &Inquiry" msgstr "" -#: c:\Apache2\htdocs\account21/applications/suppliers.php:30 -#: c:\Apache2\htdocs\account21/applications/backup/organizer.php:22 -#: c:\Apache2\htdocs\account21/applications/backup/payroll.php:22 +#: c:\Apache2\htdocs\account22/applications/suppliers.php:37 msgid "Supplier Transaction &Inquiry" msgstr "" -#: c:\Apache2\htdocs\account21/applications/suppliers.php:32 -#: c:\Apache2\htdocs\account21/applications/backup/organizer.php:24 -#: c:\Apache2\htdocs\account21/applications/backup/payroll.php:24 +#: c:\Apache2\htdocs\account22/applications/suppliers.php:40 msgid "Supplier Allocation &Inquiry" msgstr "" -#: c:\Apache2\htdocs\account21/applications/suppliers.php:34 -#: c:\Apache2\htdocs\account21/applications/backup/organizer.php:26 -#: c:\Apache2\htdocs\account21/applications/backup/payroll.php:26 +#: c:\Apache2\htdocs\account22/applications/suppliers.php:43 msgid "Supplier and Purchasing &Reports" msgstr "" -#: c:\Apache2\htdocs\account21/applications/suppliers.php:37 -#: c:\Apache2\htdocs\account21/applications/backup/organizer.php:29 -#: c:\Apache2\htdocs\account21/applications/backup/payroll.php:29 +#: c:\Apache2\htdocs\account22/applications/suppliers.php:47 msgid "&Suppliers" msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/dimension_entry.php:26 +#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:27 msgid "Dimension Entry" msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/dimension_entry.php:46 +#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:47 msgid "The dimension has been entered." msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/dimension_entry.php:57 +#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:58 msgid "The dimension has been updated." msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/dimension_entry.php:67 +#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:68 msgid "The dimension has been deleted." msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/dimension_entry.php:77 +#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:78 msgid "The dimension has been closed. There can be no more changes to it." msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/dimension_entry.php:87 +#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:88 +msgid "The dimension has been re-opened. " +msgstr "" + +#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:98 msgid "Enter a &new dimension" msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/dimension_entry.php:89 +#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:100 msgid "&Select an existing dimension" msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/dimension_entry.php:105 +#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:116 msgid "The dimension reference must be entered." msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/dimension_entry.php:112 -#: c:\Apache2\htdocs\account21/gl/bank_transfer.php:135 -#: c:\Apache2\htdocs\account21/gl/gl_bank.php:151 +#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:123 +#: c:\Apache2\htdocs\account22/gl/bank_transfer.php:146 msgid "The entered reference is already in use." msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/dimension_entry.php:120 +#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:131 msgid "The dimension name must be entered." msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/dimension_entry.php:127 +#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:138 msgid "The date entered is in an invalid format." msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/dimension_entry.php:134 +#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:145 msgid "The required by date entered is in an invalid format." msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/dimension_entry.php:177 +#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:190 msgid "This dimension cannot be deleted because it has already been processed." msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/dimension_entry.php:213 +#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:234 msgid "The dimension sent is not valid." msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/dimension_entry.php:220 -msgid "This dimension is closed and cannot be edited." -msgstr "" - -#: c:\Apache2\htdocs\account21/dimensions/dimension_entry.php:234 -#: c:\Apache2\htdocs\account21/dimensions/dimension_entry.php:240 +#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:261 +#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:268 msgid "Dimension Reference:" msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/dimension_entry.php:247 -#: c:\Apache2\htdocs\account21/dimensions/inquiry/search_dimensions.php:75 -#: c:\Apache2\htdocs\account21/dimensions/inquiry/search_dimensions.php:173 -#: c:\Apache2\htdocs\account21/dimensions/view/view_dimension.php:54 -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:187 -#: c:\Apache2\htdocs\account21/gl/bank_account_reconcile.php:255 +#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:275 +#: c:\Apache2\htdocs\account22/dimensions/inquiry/search_dimensions.php:75 +#: c:\Apache2\htdocs\account22/dimensions/inquiry/search_dimensions.php:173 +#: c:\Apache2\htdocs\account22/dimensions/view/view_dimension.php:54 +#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:258 msgid "Type" msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/dimension_entry.php:249 +#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:277 msgid "Start Date" msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/dimension_entry.php:251 +#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:279 msgid "Date Required By" msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/dimension_entry.php:260 +#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:281 +msgid "Tags:" +msgstr "" + +#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:288 +msgid "This Dimension is closed." +msgstr "" + +#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:293 msgid "Save changes to dimension" msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/dimension_entry.php:261 +#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:295 +msgid "Re-open This Dimension" +msgstr "" + +#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:295 +msgid "Mark this dimension as re-opened" +msgstr "" + +#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:297 msgid "Close This Dimension" msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/dimension_entry.php:261 +#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:297 msgid "Mark this dimension as closed" msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/dimension_entry.php:262 +#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:298 msgid "Delete This Dimension" msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/dimension_entry.php:262 +#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:298 msgid "Delete unused dimension" msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/dimension_entry.php:266 +#: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:302 msgid "Add" msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/inquiry/search_dimensions.php:29 +#: c:\Apache2\htdocs\account22/dimensions/inquiry/search_dimensions.php:29 msgid "Search Outstanding Dimensions" msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/inquiry/search_dimensions.php:34 +#: c:\Apache2\htdocs\account22/dimensions/inquiry/search_dimensions.php:34 msgid "Search Dimensions" msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/inquiry/search_dimensions.php:73 -#: c:\Apache2\htdocs\account21/gl/bank_transfer.php:88 +#: c:\Apache2\htdocs\account22/dimensions/inquiry/search_dimensions.php:73 +#: c:\Apache2\htdocs\account22/gl/bank_transfer.php:89 msgid "Reference:" msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/inquiry/search_dimensions.php:75 +#: c:\Apache2\htdocs\account22/dimensions/inquiry/search_dimensions.php:75 msgid "All" msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/inquiry/search_dimensions.php:76 +#: c:\Apache2\htdocs\account22/dimensions/inquiry/search_dimensions.php:76 msgid "From:" msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/inquiry/search_dimensions.php:77 +#: c:\Apache2\htdocs\account22/dimensions/inquiry/search_dimensions.php:77 msgid "To:" msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/inquiry/search_dimensions.php:79 +#: c:\Apache2\htdocs\account22/dimensions/inquiry/search_dimensions.php:79 msgid "Only Overdue:" msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/inquiry/search_dimensions.php:83 +#: c:\Apache2\htdocs\account22/dimensions/inquiry/search_dimensions.php:83 msgid "Only Open:" msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/inquiry/search_dimensions.php:174 -#: c:\Apache2\htdocs\account21/dimensions/view/view_dimension.php:54 -#: c:\Apache2\htdocs\account21/gl/bank_account_reconcile.php:258 +#: c:\Apache2\htdocs\account22/dimensions/inquiry/search_dimensions.php:174 +#: c:\Apache2\htdocs\account22/dimensions/view/view_dimension.php:54 +#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:261 msgid "Date" msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/inquiry/search_dimensions.php:175 -#: c:\Apache2\htdocs\account21/dimensions/view/view_dimension.php:54 +#: c:\Apache2\htdocs\account22/dimensions/inquiry/search_dimensions.php:175 +#: c:\Apache2\htdocs\account22/dimensions/view/view_dimension.php:54 msgid "Due Date" msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/inquiry/search_dimensions.php:177 +#: c:\Apache2\htdocs\account22/dimensions/inquiry/search_dimensions.php:177 msgid "Balance" msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/inquiry/search_dimensions.php:186 +#: c:\Apache2\htdocs\account22/dimensions/inquiry/search_dimensions.php:186 msgid "Marked dimensions are overdue." msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/view/view_dimension.php:20 +#: c:\Apache2\htdocs\account22/dimensions/view/view_dimension.php:20 msgid "View Dimension" msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/view/view_dimension.php:48 +#: c:\Apache2\htdocs\account22/dimensions/view/view_dimension.php:48 msgid "The dimension number sent is not valid." msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/view/view_dimension.php:72 +#: c:\Apache2\htdocs\account22/dimensions/view/view_dimension.php:72 msgid "This dimension is closed." msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/view/view_dimension.php:84 +#: c:\Apache2\htdocs\account22/dimensions/view/view_dimension.php:84 msgid "from:" msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/view/view_dimension.php:85 +#: c:\Apache2\htdocs\account22/dimensions/view/view_dimension.php:85 msgid "to:" msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/view/view_dimension.php:86 +#: c:\Apache2\htdocs\account22/dimensions/view/view_dimension.php:86 msgid "Show" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:16 -msgid "Quick Entries" +#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:33 +msgid "Reconcile Bank Account" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:58 -msgid "Add new" +#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:35 +#: c:\Apache2\htdocs\account22/gl/bank_transfer.php:30 +msgid "There are no bank accounts defined in the system." msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:73 -msgid "The Quick Entry description cannot be empty." +#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:39 +msgid "Invalid reconcile date format" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:79 -msgid "The base amount description cannot be empty." +#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:56 +msgid "Reconcile this transaction" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:99 -msgid "Selected quick entry has been updated" +#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:172 +msgid "Account:" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:105 -msgid "New quick entry has been added" +#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:174 +msgid "Bank Statement:" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:134 -msgid "Selected quick entry line has been updated" +#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:175 +msgid "New" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:140 -msgid "New quick entry line has been added" +#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:217 +msgid "Reconcile Date" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:152 -msgid "Selected quick entry has been deleted" +#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:217 +msgid "Beginning
      Balance" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:157 -msgid "The Quick Entry has Quick Entry Lines. Cannot be deleted." +#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:218 +msgid "Ending
      Balance" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:165 -msgid "Selected quick entry line has been deleted" +#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:218 +msgid "Account
      Total" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:173 -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:230 -msgid "Base Amount" +#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:218 +msgid "Reconciled
      Amount" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:228 -msgid "Entry Type" +#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:218 +msgid "Difference" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:230 -msgid "Base Amount Description" -msgstr "" - -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:232 -msgid "Default Base Amount" -msgstr "" - -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:243 -msgid "Quick Entry Lines" -msgstr "" - -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:249 -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:251 -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:253 -msgid "Post" -msgstr "" - -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:249 -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:251 -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:253 -msgid "Account/Tax Type" -msgstr "" - -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:249 -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:251 -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:253 -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:366 -msgid "Amount" -msgstr "" - -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:249 -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:251 -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:370 -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:372 -msgid "Dimension" -msgstr "" - -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:330 -msgid "Posted" -msgstr "" - -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:346 -msgid "Tax Types" -msgstr "" - -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:360 -msgid "Account" -msgstr "" - -#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:364 -msgid "Part" -msgstr "" - -#: c:\Apache2\htdocs\account21/gl/bank_account_reconcile.php:33 -msgid "Reconcile Bank Account" -msgstr "" - -#: c:\Apache2\htdocs\account21/gl/bank_account_reconcile.php:35 -#: c:\Apache2\htdocs\account21/gl/bank_transfer.php:30 -#: c:\Apache2\htdocs\account21/gl/gl_bank.php:41 -msgid "There are no bank accounts defined in the system." -msgstr "" - -#: c:\Apache2\htdocs\account21/gl/bank_account_reconcile.php:39 -msgid "Invalid reconcile date format" -msgstr "" - -#: c:\Apache2\htdocs\account21/gl/bank_account_reconcile.php:56 -msgid "Reconcile this transaction" -msgstr "" - -#: c:\Apache2\htdocs\account21/gl/bank_account_reconcile.php:169 -msgid "Account:" -msgstr "" - -#: c:\Apache2\htdocs\account21/gl/bank_account_reconcile.php:171 -msgid "Bank Statement:" -msgstr "" - -#: c:\Apache2\htdocs\account21/gl/bank_account_reconcile.php:172 -msgid "New" -msgstr "" - -#: c:\Apache2\htdocs\account21/gl/bank_account_reconcile.php:214 -msgid "Reconcile Date" -msgstr "" - -#: c:\Apache2\htdocs\account21/gl/bank_account_reconcile.php:214 -msgid "Beginning
      Balance" -msgstr "" - -#: c:\Apache2\htdocs\account21/gl/bank_account_reconcile.php:215 -msgid "Ending
      Balance" -msgstr "" - -#: c:\Apache2\htdocs\account21/gl/bank_account_reconcile.php:215 -msgid "Account
      Total" -msgstr "" - -#: c:\Apache2\htdocs\account21/gl/bank_account_reconcile.php:215 -msgid "Reconciled
      Amount" -msgstr "" - -#: c:\Apache2\htdocs\account21/gl/bank_account_reconcile.php:215 -msgid "Difference" -msgstr "" - -#: c:\Apache2\htdocs\account21/gl/bank_account_reconcile.php:219 +#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:222 msgid "Date of bank statement to reconcile" msgstr "" -#: c:\Apache2\htdocs\account21/gl/bank_account_reconcile.php:259 +#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:262 msgid "Debit" msgstr "" -#: c:\Apache2\htdocs\account21/gl/bank_account_reconcile.php:260 +#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:263 msgid "Credit" msgstr "" -#: c:\Apache2\htdocs\account21/gl/bank_account_reconcile.php:261 +#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:264 msgid "Person/Item" msgstr "" -#: c:\Apache2\htdocs\account21/gl/bank_account_reconcile.php:274 +#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:274 msgid "Reconcile" msgstr "" -#: c:\Apache2\htdocs\account21/gl/bank_transfer.php:28 +#: c:\Apache2\htdocs\account22/gl/bank_transfer.php:28 msgid "Transfer between Bank Accounts" msgstr "" -#: c:\Apache2\htdocs\account21/gl/bank_transfer.php:39 +#: c:\Apache2\htdocs\account22/gl/bank_transfer.php:39 msgid "Transfer has been entered" msgstr "" -#: c:\Apache2\htdocs\account21/gl/bank_transfer.php:41 +#: c:\Apache2\htdocs\account22/gl/bank_transfer.php:41 msgid "&View the GL Journal Entries for this Transfer" msgstr "" -#: c:\Apache2\htdocs\account21/gl/bank_transfer.php:43 +#: c:\Apache2\htdocs\account22/gl/bank_transfer.php:43 msgid "Enter &Another Transfer" msgstr "" -#: c:\Apache2\htdocs\account21/gl/bank_transfer.php:65 +#: c:\Apache2\htdocs\account22/gl/bank_transfer.php:66 msgid "From Account:" msgstr "" -#: c:\Apache2\htdocs\account21/gl/bank_transfer.php:67 +#: c:\Apache2\htdocs\account22/gl/bank_transfer.php:68 msgid "To Account:" msgstr "" -#: c:\Apache2\htdocs\account21/gl/bank_transfer.php:69 +#: c:\Apache2\htdocs\account22/gl/bank_transfer.php:70 msgid "Transfer Date:" msgstr "" -#: c:\Apache2\htdocs\account21/gl/bank_transfer.php:75 -#: c:\Apache2\htdocs\account21/gl/bank_transfer.php:81 +#: c:\Apache2\htdocs\account22/gl/bank_transfer.php:76 +#: c:\Apache2\htdocs\account22/gl/bank_transfer.php:83 msgid "Amount:" msgstr "" -#: c:\Apache2\htdocs\account21/gl/bank_transfer.php:97 +#: c:\Apache2\htdocs\account22/gl/bank_transfer.php:77 +#: c:\Apache2\htdocs\account22/gl/bank_transfer.php:84 +msgid "Bank Charge:" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/bank_transfer.php:95 msgid "Enter Transfer" msgstr "" -#: c:\Apache2\htdocs\account21/gl/bank_transfer.php:121 +#: c:\Apache2\htdocs\account22/gl/bank_transfer.php:121 +#: c:\Apache2\htdocs\account22/gl/bank_transfer.php:128 msgid "The entered amount is invalid or less than zero." msgstr "" -#: c:\Apache2\htdocs\account21/gl/bank_transfer.php:128 -#: c:\Apache2\htdocs\account21/gl/gl_bank.php:145 +#: c:\Apache2\htdocs\account22/gl/bank_transfer.php:133 +msgid "The Bank Charge Account has not been set in System and General GL Setup." +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/bank_transfer.php:139 msgid "You must enter a reference." msgstr "" -#: c:\Apache2\htdocs\account21/gl/bank_transfer.php:142 +#: c:\Apache2\htdocs\account22/gl/bank_transfer.php:153 msgid "The source and destination bank accouts cannot be the same." msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_bank.php:31 +#: c:\Apache2\htdocs\account22/gl/gl_bank.php:33 msgid "Bank Account Payment Entry" msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_bank.php:35 +#: c:\Apache2\htdocs\account22/gl/gl_bank.php:37 msgid "Bank Account Deposit Entry" msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_bank.php:82 +#: c:\Apache2\htdocs\account22/gl/gl_bank.php:67 msgid "Payment has been entered" msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_bank.php:84 +#: c:\Apache2\htdocs\account22/gl/gl_bank.php:69 msgid "&View the GL Postings for this Payment" msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_bank.php:86 +#: c:\Apache2\htdocs\account22/gl/gl_bank.php:71 msgid "Enter Another &Payment" msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_bank.php:88 +#: c:\Apache2\htdocs\account22/gl/gl_bank.php:73 msgid "Enter A &Deposit" msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_bank.php:98 +#: c:\Apache2\htdocs\account22/gl/gl_bank.php:83 msgid "Deposit has been entered" msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_bank.php:100 +#: c:\Apache2\htdocs\account22/gl/gl_bank.php:85 msgid "View the GL Postings for this Deposit" msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_bank.php:102 +#: c:\Apache2\htdocs\account22/gl/gl_bank.php:87 msgid "Enter Another Deposit" msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_bank.php:104 +#: c:\Apache2\htdocs\account22/gl/gl_bank.php:89 msgid "Enter A Payment" msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_bank.php:138 +#: c:\Apache2\htdocs\account22/gl/gl_bank.php:123 msgid "You must enter at least one payment line." msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_bank.php:157 +#: c:\Apache2\htdocs\account22/gl/gl_bank.php:142 msgid "The entered date for the payment is invalid." msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_bank.php:205 +#: c:\Apache2\htdocs\account22/gl/gl_bank.php:191 msgid "The source and destination accouts cannot be the same." msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_bank.php:287 +#: c:\Apache2\htdocs\account22/gl/gl_bank.php:273 msgid "Payment Items" msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_bank.php:287 +#: c:\Apache2\htdocs\account22/gl/gl_bank.php:273 msgid "Deposit Items" msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_bank.php:295 +#: c:\Apache2\htdocs\account22/gl/gl_bank.php:281 msgid "Process Payment" msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_bank.php:295 +#: c:\Apache2\htdocs\account22/gl/gl_bank.php:281 msgid "Process Deposit" msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_budget.php:18 +#: c:\Apache2\htdocs\account22/gl/gl_budget.php:18 msgid "Budget Entry" msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_budget.php:24 -#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:22 +#: c:\Apache2\htdocs\account22/gl/gl_budget.php:24 msgid "There are no account groups defined. Please define at least one account group before entering accounts." msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_budget.php:93 +#: c:\Apache2\htdocs\account22/gl/gl_budget.php:102 msgid "The Budget has been saved." msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_budget.php:95 +#: c:\Apache2\htdocs\account22/gl/gl_budget.php:104 msgid "The Budget has been deleted." msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_budget.php:112 -#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:242 -#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:248 +#: c:\Apache2\htdocs\account22/gl/gl_budget.php:121 msgid "Account Code:" msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_budget.php:132 -#: c:\Apache2\htdocs\account21/gl/manage/exchange_rates.php:135 +#: c:\Apache2\htdocs\account22/gl/gl_budget.php:128 +#: c:\Apache2\htdocs\account22/gl/gl_budget.php:129 +#: c:\Apache2\htdocs\account22/gl/gl_budget.php:133 +#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:80 +#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:82 +#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:135 +#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:137 +msgid "Dimension" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/gl_budget.php:141 +#: c:\Apache2\htdocs\account22/gl/manage/exchange_rates.php:136 msgid "Get" msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_budget.php:139 -#: c:\Apache2\htdocs\account21/gl/gl_budget.php:141 +#: c:\Apache2\htdocs\account22/gl/gl_budget.php:148 +#: c:\Apache2\htdocs\account22/gl/gl_budget.php:150 msgid "Period" msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_budget.php:139 +#: c:\Apache2\htdocs\account22/gl/gl_budget.php:148 +#: c:\Apache2\htdocs\account22/gl/gl_budget.php:150 +#: c:\Apache2\htdocs\account22/gl/inquiry/journal_inquiry.php:160 +#: c:\Apache2\htdocs\account22/gl/inquiry/tax_inquiry.php:85 +msgid "Amount" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/gl_budget.php:148 msgid "Dim. incl." msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_budget.php:139 -#: c:\Apache2\htdocs\account21/gl/gl_budget.php:141 +#: c:\Apache2\htdocs\account22/gl/gl_budget.php:148 +#: c:\Apache2\htdocs\account22/gl/gl_budget.php:150 msgid "Last Year" msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_budget.php:179 -#: c:\Apache2\htdocs\account21/gl/inquiry/gl_trial_balance.php:135 +#: c:\Apache2\htdocs\account22/gl/gl_budget.php:188 +#: c:\Apache2\htdocs\account22/gl/inquiry/gl_trial_balance.php:135 msgid "Total" msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_journal.php:31 +#: c:\Apache2\htdocs\account22/gl/gl_journal.php:32 +#, php-format +msgid "Modifying Journal Transaction # %d." +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/gl_journal.php:36 msgid "Journal Entry" msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_journal.php:47 +#: c:\Apache2\htdocs\account22/gl/gl_journal.php:54 msgid "Journal entry has been entered" msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_journal.php:49 +#: c:\Apache2\htdocs\account22/gl/gl_journal.php:56 +#: c:\Apache2\htdocs\account22/gl/gl_journal.php:69 msgid "&View this Journal Entry" msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_journal.php:51 -msgid "Enter &Another Journal Entry" +#: c:\Apache2\htdocs\account22/gl/gl_journal.php:59 +msgid "Enter &New Journal Entry" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/gl_journal.php:67 +msgid "Journal entry has been updated" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/gl_journal.php:71 +msgid "Return to Journal &Inquiry" msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_journal.php:83 +#: c:\Apache2\htdocs\account22/gl/gl_journal.php:84 +msgid "You can edit directly only journal entries created via Journal Entry page." +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/gl_journal.php:85 +msgid "Entry &New Journal Entry" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/gl_journal.php:141 msgid "You must enter at least one journal line." msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_journal.php:89 +#: c:\Apache2\htdocs\account22/gl/gl_journal.php:147 msgid "The journal must balance (debits equal to credits) before it can be processed." msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_journal.php:141 -#: c:\Apache2\htdocs\account21/gl/gl_journal.php:148 +#: c:\Apache2\htdocs\account22/gl/gl_journal.php:209 +#: c:\Apache2\htdocs\account22/gl/gl_journal.php:216 msgid "Dimension is closed." msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_journal.php:155 +#: c:\Apache2\htdocs\account22/gl/gl_journal.php:223 msgid "You must enter either a debit amount or a credit amount." msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_journal.php:162 +#: c:\Apache2\htdocs\account22/gl/gl_journal.php:230 msgid "The debit amount entered is not a valid number or is less than zero." msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_journal.php:167 +#: c:\Apache2\htdocs\account22/gl/gl_journal.php:235 msgid "The credit amount entered is not a valid number or is less than zero." msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_journal.php:173 +#: c:\Apache2\htdocs\account22/gl/gl_journal.php:241 msgid "Cannot post to GL account used by more than one tax type." msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_journal.php:180 +#: c:\Apache2\htdocs\account22/gl/gl_journal.php:248 msgid "You cannot make a journal entry for a bank account. Please use one of the banking functions for bank transactions." msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_journal.php:266 +#: c:\Apache2\htdocs\account22/gl/gl_journal.php:327 msgid "Rows" msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_journal.php:272 +#: c:\Apache2\htdocs\account22/gl/gl_journal.php:333 msgid "Process Journal Entry" msgstr "" -#: c:\Apache2\htdocs\account21/gl/gl_journal.php:273 +#: c:\Apache2\htdocs\account22/gl/gl_journal.php:334 msgid "Process journal entry only if debits equal to credits" msgstr "" -#: c:\Apache2\htdocs\account21/gl/inquiry/bank_inquiry.php:28 +#: c:\Apache2\htdocs\account22/gl/inquiry/bank_inquiry.php:28 msgid "Bank Statement" msgstr "" -#: c:\Apache2\htdocs\account21/gl/inquiry/bank_inquiry.php:84 -#: c:\Apache2\htdocs\account21/gl/inquiry/gl_account_inquiry.php:129 +#: c:\Apache2\htdocs\account22/gl/inquiry/bank_inquiry.php:85 +#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:163 msgid "Opening Balance" msgstr "" -#: c:\Apache2\htdocs\account21/gl/inquiry/bank_inquiry.php:123 -#: c:\Apache2\htdocs\account21/gl/inquiry/gl_account_inquiry.php:171 -#: c:\Apache2\htdocs\account21/gl/inquiry/gl_trial_balance.php:145 +#: c:\Apache2\htdocs\account22/gl/inquiry/bank_inquiry.php:124 +#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:212 +#: c:\Apache2\htdocs\account22/gl/inquiry/gl_trial_balance.php:145 msgid "Ending Balance" msgstr "" -#: c:\Apache2\htdocs\account21/gl/inquiry/gl_account_inquiry.php:30 -msgid "General Ledger Account Inquiry" +#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:30 +msgid "General Ledger Inquiry" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:84 +msgid "Amount min:" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:85 +msgid "Amount max:" msgstr "" -#: c:\Apache2\htdocs\account21/gl/inquiry/gl_account_inquiry.php:108 -#: c:\Apache2\htdocs\account21/gl/inquiry/gl_account_inquiry.php:111 -#: c:\Apache2\htdocs\account21/gl/inquiry/gl_account_inquiry.php:114 +#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:130 +#: c:\Apache2\htdocs\account22/gl/inquiry/gl_trial_balance.php:63 +msgid "Account" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:142 +#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:144 +#: c:\Apache2\htdocs\account22/gl/inquiry/journal_inquiry.php:161 msgid "Memo" msgstr "" -#: c:\Apache2\htdocs\account21/gl/inquiry/gl_account_inquiry.php:179 -msgid "No general ledger transactions have been created for this account on the selected dates." +#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:221 +msgid "No general ledger transactions have been created for the specified criteria." msgstr "" -#: c:\Apache2\htdocs\account21/gl/inquiry/gl_trial_balance.php:27 +#: c:\Apache2\htdocs\account22/gl/inquiry/gl_trial_balance.php:27 msgid "Trial Balance" msgstr "" -#: c:\Apache2\htdocs\account21/gl/inquiry/gl_trial_balance.php:46 +#: c:\Apache2\htdocs\account22/gl/inquiry/gl_trial_balance.php:46 msgid "No zero values" msgstr "" -#: c:\Apache2\htdocs\account21/gl/inquiry/gl_trial_balance.php:47 +#: c:\Apache2\htdocs\account22/gl/inquiry/gl_trial_balance.php:47 msgid "Only balances" msgstr "" -#: c:\Apache2\htdocs\account21/gl/inquiry/gl_trial_balance.php:64 -#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:113 +#: c:\Apache2\htdocs\account22/gl/inquiry/gl_trial_balance.php:64 +#: c:\Apache2\htdocs\account22/gl/manage/bank_accounts.php:115 msgid "Account Name" msgstr "" -#: c:\Apache2\htdocs\account21/gl/inquiry/gl_trial_balance.php:65 +#: c:\Apache2\htdocs\account22/gl/inquiry/gl_trial_balance.php:65 msgid "Brought Forward" msgstr "" -#: c:\Apache2\htdocs\account21/gl/inquiry/gl_trial_balance.php:66 +#: c:\Apache2\htdocs\account22/gl/inquiry/gl_trial_balance.php:66 msgid "This Period" msgstr "" -#: c:\Apache2\htdocs\account21/gl/inquiry/tax_inquiry.php:30 +#: c:\Apache2\htdocs\account22/gl/inquiry/journal_inquiry.php:27 +msgid "Journal Inquiry" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/inquiry/journal_inquiry.php:45 +msgid "Enter reference fragment or leave empty" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/inquiry/journal_inquiry.php:51 +msgid "Show closed:" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/inquiry/journal_inquiry.php:158 +msgid "Trans #" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/inquiry/journal_inquiry.php:162 +msgid "User" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/inquiry/tax_inquiry.php:30 msgid "Tax Inquiry" msgstr "" -#: c:\Apache2\htdocs\account21/gl/inquiry/tax_inquiry.php:85 +#: c:\Apache2\htdocs\account22/gl/inquiry/tax_inquiry.php:85 msgid "Outputs" msgstr "" -#: c:\Apache2\htdocs\account21/gl/inquiry/tax_inquiry.php:85 +#: c:\Apache2\htdocs\account22/gl/inquiry/tax_inquiry.php:85 msgid "Inputs" msgstr "" -#: c:\Apache2\htdocs\account21/gl/inquiry/tax_inquiry.php:103 +#: c:\Apache2\htdocs\account22/gl/inquiry/tax_inquiry.php:103 msgid "Charged on sales" msgstr "" -#: c:\Apache2\htdocs\account21/gl/inquiry/tax_inquiry.php:103 +#: c:\Apache2\htdocs\account22/gl/inquiry/tax_inquiry.php:103 msgid "Output Tax" msgstr "" -#: c:\Apache2\htdocs\account21/gl/inquiry/tax_inquiry.php:109 +#: c:\Apache2\htdocs\account22/gl/inquiry/tax_inquiry.php:109 msgid "Paid on purchases" msgstr "" -#: c:\Apache2\htdocs\account21/gl/inquiry/tax_inquiry.php:109 +#: c:\Apache2\htdocs\account22/gl/inquiry/tax_inquiry.php:109 msgid "Input Tax" msgstr "" -#: c:\Apache2\htdocs\account21/gl/inquiry/tax_inquiry.php:115 +#: c:\Apache2\htdocs\account22/gl/inquiry/tax_inquiry.php:115 msgid "Net payable or collectible" msgstr "" -#: c:\Apache2\htdocs\account21/gl/inquiry/tax_inquiry.php:122 +#: c:\Apache2\htdocs\account22/gl/inquiry/tax_inquiry.php:122 msgid "Total payable or refund" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:16 +#: c:\Apache2\htdocs\account22/gl/manage/bank_accounts.php:16 msgid "Bank Accounts" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:33 +#: c:\Apache2\htdocs\account22/gl/manage/bank_accounts.php:33 msgid "The bank account name cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:46 +#: c:\Apache2\htdocs\account22/gl/manage/bank_accounts.php:47 msgid "Bank account has been updated" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:55 +#: c:\Apache2\htdocs\account22/gl/manage/bank_accounts.php:56 msgid "New bank account has been added" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:74 +#: c:\Apache2\htdocs\account22/gl/manage/bank_accounts.php:75 msgid "Cannot delete this bank account because transactions have been created using this account." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:82 +#: c:\Apache2\htdocs\account22/gl/manage/bank_accounts.php:83 msgid "Cannot delete this bank account because POS definitions have been created using this account." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:87 +#: c:\Apache2\htdocs\account22/gl/manage/bank_accounts.php:88 msgid "Selected bank account has been deleted" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:113 +#: c:\Apache2\htdocs\account22/gl/manage/bank_accounts.php:115 msgid "Currency" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:113 +#: c:\Apache2\htdocs\account22/gl/manage/bank_accounts.php:115 msgid "GL Account" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:114 +#: c:\Apache2\htdocs\account22/gl/manage/bank_accounts.php:116 msgid "Bank" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:114 +#: c:\Apache2\htdocs\account22/gl/manage/bank_accounts.php:116 msgid "Number" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:114 +#: c:\Apache2\htdocs\account22/gl/manage/bank_accounts.php:116 msgid "Bank Address" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:164 +#: c:\Apache2\htdocs\account22/gl/manage/bank_accounts.php:116 +msgid "Dflt" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/manage/bank_accounts.php:172 msgid "Bank Account Name:" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:168 -#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:172 +#: c:\Apache2\htdocs\account22/gl/manage/bank_accounts.php:176 +#: c:\Apache2\htdocs\account22/gl/manage/bank_accounts.php:180 msgid "Account Type:" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:176 -#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:180 +#: c:\Apache2\htdocs\account22/gl/manage/bank_accounts.php:184 +#: c:\Apache2\htdocs\account22/gl/manage/bank_accounts.php:188 msgid "Bank Account Currency:" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:184 -#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:186 +#: c:\Apache2\htdocs\account22/gl/manage/bank_accounts.php:191 +msgid "Default currency account:" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/manage/bank_accounts.php:194 +#: c:\Apache2\htdocs\account22/gl/manage/bank_accounts.php:196 msgid "Bank Account GL Code:" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:188 +#: c:\Apache2\htdocs\account22/gl/manage/bank_accounts.php:198 msgid "Bank Name:" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:189 +#: c:\Apache2\htdocs\account22/gl/manage/bank_accounts.php:199 msgid "Bank Account Number:" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:190 +#: c:\Apache2\htdocs\account22/gl/manage/bank_accounts.php:200 msgid "Bank Address:" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/currencies.php:16 +#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:16 msgid "Currencies" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/currencies.php:29 +#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:29 msgid "The currency abbreviation must be entered." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/currencies.php:35 +#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:35 msgid "The currency name must be entered." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/currencies.php:41 +#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:41 msgid "The currency symbol must be entered." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/currencies.php:47 +#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:47 msgid "The hundredths name must be entered." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/currencies.php:69 +#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:69 msgid "Selected currency settings has been updated" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/currencies.php:76 +#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:76 msgid "New currency has been added" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/currencies.php:95 +#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:97 msgid "Cannot delete this currency, because customer accounts have been created referring to this currency." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/currencies.php:104 +#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:106 msgid "Cannot delete this currency, because supplier accounts have been created referring to this currency." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/currencies.php:113 +#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:115 msgid "Cannot delete this currency, because the company preferences uses this currency." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/currencies.php:123 +#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:125 msgid "Cannot delete this currency, because thre are bank accounts that use this currency." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/currencies.php:138 +#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:140 msgid "Selected currency has been deleted" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/currencies.php:154 +#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:155 msgid "Abbreviation" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/currencies.php:154 +#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:155 msgid "Symbol" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/currencies.php:154 +#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:155 msgid "Currency Name" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/currencies.php:155 +#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:156 msgid "Hundredths name" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/currencies.php:155 +#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:156 msgid "Country" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/currencies.php:186 +#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:156 +msgid "Auto update" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:191 msgid "The marked currency is the home currency which cannot be deleted." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/currencies.php:212 -#: c:\Apache2\htdocs\account21/gl/manage/currencies.php:216 +#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:217 +#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:222 msgid "Currency Abbreviation:" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/currencies.php:219 +#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:225 msgid "Currency Symbol:" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/currencies.php:220 +#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:226 msgid "Currency Name:" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/currencies.php:221 +#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:227 msgid "Hundredths Name:" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/currencies.php:222 +#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:228 msgid "Country:" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/exchange_rates.php:24 +#: c:\Apache2\htdocs\account22/gl/manage/currencies.php:229 +msgid "Automatic exchange rate update:" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/manage/exchange_rates.php:24 msgid "Exchange Rates" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/exchange_rates.php:39 +#: c:\Apache2\htdocs\account22/gl/manage/exchange_rates.php:39 msgid "The exchange rate cannot be zero or a negative number." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/exchange_rates.php:121 -#: c:\Apache2\htdocs\account21/gl/manage/exchange_rates.php:127 +#: c:\Apache2\htdocs\account22/gl/manage/exchange_rates.php:121 +#: c:\Apache2\htdocs\account22/gl/manage/exchange_rates.php:127 msgid "Date to Use From:" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/exchange_rates.php:134 +#: c:\Apache2\htdocs\account22/gl/manage/exchange_rates.php:135 msgid "Exchange Rate:" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/exchange_rates.php:135 +#: c:\Apache2\htdocs\account22/gl/manage/exchange_rates.php:136 msgid "Get current ECB rate" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/exchange_rates.php:142 +#: c:\Apache2\htdocs\account22/gl/manage/exchange_rates.php:143 msgid "Exchange rates are entered against the company currency." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/exchange_rates.php:173 +#: c:\Apache2\htdocs\account22/gl/manage/exchange_rates.php:174 msgid "Select a currency :" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/exchange_rates.php:192 +#: c:\Apache2\htdocs\account22/gl/manage/exchange_rates.php:193 msgid "Date to Use From" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/exchange_rates.php:193 +#: c:\Apache2\htdocs\account22/gl/manage/exchange_rates.php:194 msgid "Exchange Rate" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/exchange_rates.php:202 +#: c:\Apache2\htdocs\account22/gl/manage/exchange_rates.php:203 msgid "The selected currency is the company currency." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/exchange_rates.php:203 +#: c:\Apache2\htdocs\account22/gl/manage/exchange_rates.php:204 msgid "The company currency is the base currency so exchange rates cannot be set for it." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:16 +#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:16 msgid "Chart of Accounts" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:52 +#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:53 msgid "The account code must be entered." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:58 +#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:59 msgid "The account name cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:64 +#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:65 msgid "The account code must be numeric." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:75 +#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:86 msgid "Account data has been updated." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:81 +#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:95 msgid "New account has been added." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:99 +#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:117 msgid "Cannot delete this account because transactions have been created using this account." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:120 +#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:138 msgid "Cannot delete this account because it is used as one of the company default GL accounts." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:130 +#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:148 msgid "Cannot delete this account because it is used by a bank account." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:144 +#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:162 msgid "Cannot delete this account because it is used by one or more Items." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:154 +#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:172 msgid "Cannot delete this account because it is used by one or more Taxes." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:168 +#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:186 msgid "Cannot delete this account because it is used by one or more Customer Branches." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:181 +#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:199 msgid "Cannot delete this account because it is used by one or more suppliers." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:192 +#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:210 msgid "Cannot delete this account because it is used by one or more Quick Entry Lines." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:208 +#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:228 msgid "Selected account has been deleted" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:220 -msgid "Select an Account:" -msgstr "" - -#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:222 +#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:243 msgid "New account" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:251 +#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:289 msgid "Account Code 2:" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:253 +#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:291 msgid "Account Name:" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:255 +#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:293 msgid "Account Group:" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:261 +#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:295 +msgid "Account Tags:" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:297 +msgid "Account status:" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:302 msgid "Add Account" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:265 +#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:306 msgid "Update Account" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:266 +#: c:\Apache2\htdocs\account22/gl/manage/gl_accounts.php:307 msgid "Delete account" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:16 +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_classes.php:16 msgid "GL Account Classes" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:30 +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_classes.php:30 msgid "The account class ID must be numeric." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:36 +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_classes.php:36 msgid "The account class name cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:56 +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_classes.php:56 msgid "Selected account class settings has been updated" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:61 +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_classes.php:61 msgid "New account class has been added" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:79 +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_classes.php:80 msgid "Cannot delete this account class because GL account types have been created referring to it." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:95 +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_classes.php:96 msgid "Selected account class has been deleted" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:111 +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_classes.php:113 msgid "Class ID" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:111 +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_classes.php:113 msgid "Class Name" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:111 +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_classes.php:113 +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:131 msgid "Class Type" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:113 -#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:172 +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_classes.php:115 +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_classes.php:172 msgid "Balance Sheet" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:160 -#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:166 +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_classes.php:160 +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_classes.php:166 msgid "Class ID:" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:169 +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_classes.php:169 msgid "Class Name:" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:174 +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_classes.php:174 +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:190 msgid "Class Type:" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_account_types.php:16 +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:16 msgid "GL Account Groups" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_account_types.php:31 +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:31 msgid "The account id must be an integer and cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_account_types.php:37 +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:37 msgid "The account group name cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_account_types.php:44 +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:44 msgid "You cannot set an account group to be a subgroup of itself." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_account_types.php:62 +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:62 msgid "Selected account type has been updated" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_account_types.php:67 +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:67 msgid "New account type has been added" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_account_types.php:85 +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:88 msgid "Cannot delete this account group because GL accounts have been created referring to it." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_account_types.php:95 +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:98 msgid "Cannot delete this account group because GL account groups have been created referring to it." msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_account_types.php:127 +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:114 +msgid "Selected account group has been deleted" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:131 msgid "ID" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_account_types.php:127 +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:131 msgid "Subgroup Of" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_account_types.php:179 -#: c:\Apache2\htdocs\account21/gl/manage/gl_account_types.php:182 +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:182 +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:185 msgid "ID:" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_account_types.php:185 +#: c:\Apache2\htdocs\account22/gl/manage/gl_account_types.php:188 msgid "Subgroup Of:" msgstr "" -#: c:\Apache2\htdocs\account21/gl/manage/gl_quick_entries.php:306 +#: c:\Apache2\htdocs\account22/gl/manage/gl_quick_entries.php:16 +msgid "Quick Entries" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/manage/gl_quick_entries.php:58 +msgid "Add new" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/manage/gl_quick_entries.php:73 +msgid "The Quick Entry description cannot be empty." +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/manage/gl_quick_entries.php:79 +msgid "The base amount description cannot be empty." +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/manage/gl_quick_entries.php:99 +msgid "Selected quick entry has been updated" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/manage/gl_quick_entries.php:105 +msgid "New quick entry has been added" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/manage/gl_quick_entries.php:117 +msgid "Selected quick entry line has been updated" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/manage/gl_quick_entries.php:123 +msgid "New quick entry line has been added" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/manage/gl_quick_entries.php:135 +msgid "Selected quick entry has been deleted" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/manage/gl_quick_entries.php:140 +msgid "The Quick Entry has Quick Entry Lines. Cannot be deleted." +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/manage/gl_quick_entries.php:148 +msgid "Selected quick entry line has been deleted" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/manage/gl_quick_entries.php:156 +#: c:\Apache2\htdocs\account22/gl/manage/gl_quick_entries.php:213 +msgid "Base Amount" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/manage/gl_quick_entries.php:211 +msgid "Entry Type" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/manage/gl_quick_entries.php:213 +msgid "Base Amount Description" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/manage/gl_quick_entries.php:215 +msgid "Default Base Amount" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/manage/gl_quick_entries.php:226 +msgid "Quick Entry Lines" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/manage/gl_quick_entries.php:232 +#: c:\Apache2\htdocs\account22/gl/manage/gl_quick_entries.php:234 +#: c:\Apache2\htdocs\account22/gl/manage/gl_quick_entries.php:236 +msgid "Post" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/manage/gl_quick_entries.php:232 +#: c:\Apache2\htdocs\account22/gl/manage/gl_quick_entries.php:234 +#: c:\Apache2\htdocs\account22/gl/manage/gl_quick_entries.php:236 +msgid "Account/Tax Type" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/manage/gl_quick_entries.php:297 +msgid "Posted" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/manage/gl_quick_entries.php:306 msgid "Tax Type" msgstr "" -#: c:\Apache2\htdocs\account21/gl/view/bank_transfer_view.php:17 +#: c:\Apache2\htdocs\account22/gl/manage/gl_quick_entries.php:314 +msgid "Part" +msgstr "" + +#: c:\Apache2\htdocs\account22/gl/view/bank_transfer_view.php:17 msgid "View Bank Transfer" msgstr "" -#: c:\Apache2\htdocs\account21/gl/view/bank_transfer_view.php:67 -#: c:\Apache2\htdocs\account21/gl/view/gl_payment_view.php:62 +#: c:\Apache2\htdocs\account22/gl/view/bank_transfer_view.php:67 +#: c:\Apache2\htdocs\account22/gl/view/gl_payment_view.php:62 msgid "From Bank Account" msgstr "" -#: c:\Apache2\htdocs\account21/gl/view/bank_transfer_view.php:76 -#: c:\Apache2\htdocs\account21/gl/view/gl_deposit_view.php:64 +#: c:\Apache2\htdocs\account22/gl/view/bank_transfer_view.php:76 +#: c:\Apache2\htdocs\account22/gl/view/gl_deposit_view.php:64 msgid "To Bank Account" msgstr "" -#: c:\Apache2\htdocs\account21/gl/view/bank_transfer_view.php:84 +#: c:\Apache2\htdocs\account22/gl/view/bank_transfer_view.php:84 msgid "Transfer Type" msgstr "" -#: c:\Apache2\htdocs\account21/gl/view/bank_transfer_view.php:91 +#: c:\Apache2\htdocs\account22/gl/view/bank_transfer_view.php:92 msgid "This transfer has been voided." msgstr "" -#: c:\Apache2\htdocs\account21/gl/view/gl_deposit_view.php:17 +#: c:\Apache2\htdocs\account22/gl/view/gl_deposit_view.php:17 msgid "View Bank Deposit" msgstr "" -#: c:\Apache2\htdocs\account21/gl/view/gl_deposit_view.php:48 +#: c:\Apache2\htdocs\account22/gl/view/gl_deposit_view.php:48 msgid "GL Deposit" msgstr "" -#: c:\Apache2\htdocs\account21/gl/view/gl_deposit_view.php:71 +#: c:\Apache2\htdocs\account22/gl/view/gl_deposit_view.php:71 msgid "From" msgstr "" -#: c:\Apache2\htdocs\account21/gl/view/gl_deposit_view.php:72 +#: c:\Apache2\htdocs\account22/gl/view/gl_deposit_view.php:72 msgid "Deposit Type" msgstr "" -#: c:\Apache2\htdocs\account21/gl/view/gl_deposit_view.php:81 +#: c:\Apache2\htdocs\account22/gl/view/gl_deposit_view.php:81 msgid "This deposit has been voided." msgstr "" -#: c:\Apache2\htdocs\account21/gl/view/gl_deposit_view.php:87 +#: c:\Apache2\htdocs\account22/gl/view/gl_deposit_view.php:87 msgid "There are no items for this deposit." msgstr "" -#: c:\Apache2\htdocs\account21/gl/view/gl_deposit_view.php:92 +#: c:\Apache2\htdocs\account22/gl/view/gl_deposit_view.php:92 msgid "Items for this Deposit" msgstr "" -#: c:\Apache2\htdocs\account21/gl/view/gl_deposit_view.php:94 -#: c:\Apache2\htdocs\account21/gl/view/gl_payment_view.php:92 +#: c:\Apache2\htdocs\account22/gl/view/gl_deposit_view.php:94 +#: c:\Apache2\htdocs\account22/gl/view/gl_payment_view.php:92 msgid "Item Amounts are Shown in :" msgstr "" -#: c:\Apache2\htdocs\account21/gl/view/gl_deposit_view.php:97 -#: c:\Apache2\htdocs\account21/gl/view/gl_payment_view.php:96 -#: c:\Apache2\htdocs\account21/gl/view/gl_trans_view.php:65 -#: c:\Apache2\htdocs\account21/gl/view/gl_trans_view.php:68 -#: c:\Apache2\htdocs\account21/gl/view/gl_trans_view.php:71 +#: c:\Apache2\htdocs\account22/gl/view/gl_deposit_view.php:99 +#: c:\Apache2\htdocs\account22/gl/view/gl_deposit_view.php:102 +#: c:\Apache2\htdocs\account22/gl/view/gl_deposit_view.php:105 +#: c:\Apache2\htdocs\account22/gl/view/gl_payment_view.php:98 +#: c:\Apache2\htdocs\account22/gl/view/gl_payment_view.php:101 +#: c:\Apache2\htdocs\account22/gl/view/gl_payment_view.php:104 +#: c:\Apache2\htdocs\account22/gl/view/gl_trans_view.php:72 +#: c:\Apache2\htdocs\account22/gl/view/gl_trans_view.php:75 +#: c:\Apache2\htdocs\account22/gl/view/gl_trans_view.php:78 msgid "Account Code" msgstr "" -#: c:\Apache2\htdocs\account21/gl/view/gl_deposit_view.php:97 -#: c:\Apache2\htdocs\account21/gl/view/gl_payment_view.php:96 +#: c:\Apache2\htdocs\account22/gl/view/gl_deposit_view.php:99 +#: c:\Apache2\htdocs\account22/gl/view/gl_deposit_view.php:102 +#: c:\Apache2\htdocs\account22/gl/view/gl_deposit_view.php:105 +#: c:\Apache2\htdocs\account22/gl/view/gl_payment_view.php:98 +#: c:\Apache2\htdocs\account22/gl/view/gl_payment_view.php:101 +#: c:\Apache2\htdocs\account22/gl/view/gl_payment_view.php:104 msgid "Account Description" msgstr "" -#: c:\Apache2\htdocs\account21/gl/view/gl_payment_view.php:17 +#: c:\Apache2\htdocs\account22/gl/view/gl_payment_view.php:17 msgid "View Bank Payment" msgstr "" -#: c:\Apache2\htdocs\account21/gl/view/gl_payment_view.php:46 +#: c:\Apache2\htdocs\account22/gl/view/gl_payment_view.php:46 msgid "GL Payment" msgstr "" -#: c:\Apache2\htdocs\account21/gl/view/gl_payment_view.php:69 +#: c:\Apache2\htdocs\account22/gl/view/gl_payment_view.php:69 msgid "Pay To" msgstr "" -#: c:\Apache2\htdocs\account21/gl/view/gl_payment_view.php:70 +#: c:\Apache2\htdocs\account22/gl/view/gl_payment_view.php:70 msgid "Payment Type" msgstr "" -#: c:\Apache2\htdocs\account21/gl/view/gl_payment_view.php:79 +#: c:\Apache2\htdocs\account22/gl/view/gl_payment_view.php:79 msgid "This payment has been voided." msgstr "" -#: c:\Apache2\htdocs\account21/gl/view/gl_payment_view.php:85 +#: c:\Apache2\htdocs\account22/gl/view/gl_payment_view.php:85 msgid "There are no items for this payment." msgstr "" -#: c:\Apache2\htdocs\account21/gl/view/gl_payment_view.php:90 +#: c:\Apache2\htdocs\account22/gl/view/gl_payment_view.php:90 msgid "Items for this Payment" msgstr "" -#: c:\Apache2\htdocs\account21/gl/view/gl_trans_view.php:16 -#: c:\Apache2\htdocs\account21/gl/view/gl_trans_view.php:35 +#: c:\Apache2\htdocs\account22/gl/view/gl_trans_view.php:16 +#: c:\Apache2\htdocs\account22/gl/view/gl_trans_view.php:35 msgid "General Ledger Transaction Details" msgstr "" -#: c:\Apache2\htdocs\account21/gl/view/gl_trans_view.php:26 +#: c:\Apache2\htdocs\account22/gl/view/gl_trans_view.php:26 msgid "The script must be called with a valid transaction type and transaction number to review the general ledger postings for." msgstr "" -#: c:\Apache2\htdocs\account21/gl/view/gl_trans_view.php:56 +#: c:\Apache2\htdocs\account22/gl/view/gl_trans_view.php:63 msgid "No general ledger transactions have been created for" msgstr "" -#: c:\Apache2\htdocs\account21/gl/view/gl_trans_view.php:56 +#: c:\Apache2\htdocs\account22/gl/view/gl_trans_view.php:63 msgid "number" msgstr "" -#: c:\Apache2\htdocs\account21/gl/view/gl_trans_view.php:105 +#: c:\Apache2\htdocs\account22/gl/view/gl_trans_view.php:112 msgid "This transaction has been voided." msgstr "" -#: c:\Apache2\htdocs\account21/install/save.php:360 +#: c:\Apache2\htdocs\account22/install/save.php:354 msgid "Cannot create database" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/adjustments.php:28 +#: c:\Apache2\htdocs\account22/inventory/adjustments.php:28 msgid "Item Adjustments Note" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/adjustments.php:32 +#: c:\Apache2\htdocs\account22/inventory/adjustments.php:32 msgid "There are no inventory items defined in the system which can be adjusted (Purchased or Manufactured)." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/adjustments.php:34 -#: c:\Apache2\htdocs\account21/inventory/transfers.php:34 +#: c:\Apache2\htdocs\account22/inventory/adjustments.php:34 +#: c:\Apache2\htdocs\account22/inventory/transfers.php:34 msgid "There are no inventory movement types defined in the system. Please define at least one inventory adjustment type." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/adjustments.php:43 +#: c:\Apache2\htdocs\account22/inventory/adjustments.php:43 msgid "Items adjustment has been processed" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/adjustments.php:44 +#: c:\Apache2\htdocs\account22/inventory/adjustments.php:44 msgid "&View this adjustment" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/adjustments.php:46 +#: c:\Apache2\htdocs\account22/inventory/adjustments.php:46 msgid "View the GL &Postings for this Adjustment" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/adjustments.php:48 +#: c:\Apache2\htdocs\account22/inventory/adjustments.php:48 msgid "Enter &Another Adjustment" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/adjustments.php:86 -#: c:\Apache2\htdocs\account21/inventory/transfers.php:86 +#: c:\Apache2\htdocs\account22/inventory/adjustments.php:88 +#: c:\Apache2\htdocs\account22/inventory/transfers.php:87 msgid "You must enter at least one non empty item line." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/adjustments.php:106 -#: c:\Apache2\htdocs\account21/inventory/transfers.php:104 +#: c:\Apache2\htdocs\account22/inventory/adjustments.php:108 +#: c:\Apache2\htdocs\account22/inventory/transfers.php:105 msgid "The entered date for the adjustment is invalid." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/adjustments.php:120 +#: c:\Apache2\htdocs\account22/inventory/adjustments.php:122 msgid "The adjustment cannot be processed because an adjustment item would cause a negative inventory balance :" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/adjustments.php:150 +#: c:\Apache2\htdocs\account22/inventory/adjustments.php:152 msgid "The quantity entered is negative or invalid." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/adjustments.php:157 +#: c:\Apache2\htdocs\account22/inventory/adjustments.php:159 msgid "The entered standard cost is negative or invalid." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/adjustments.php:226 +#: c:\Apache2\htdocs\account22/inventory/adjustments.php:228 msgid "Adjustment Items" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/adjustments.php:232 +#: c:\Apache2\htdocs\account22/inventory/adjustments.php:234 msgid "Process Adjustment" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/cost_update.php:26 +#: c:\Apache2\htdocs\account22/inventory/cost_update.php:26 msgid "Inventory Item Cost Update" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/cost_update.php:30 +#: c:\Apache2\htdocs\account22/inventory/cost_update.php:30 msgid "There are no costable inventory items defined in the system (Purchased or manufactured items)." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/cost_update.php:51 +#: c:\Apache2\htdocs\account22/inventory/cost_update.php:51 msgid "The entered cost is not numeric." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/cost_update.php:57 +#: c:\Apache2\htdocs\account22/inventory/cost_update.php:57 msgid "The new cost is the same as the old cost. Cost was not updated." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/cost_update.php:67 +#: c:\Apache2\htdocs\account22/inventory/cost_update.php:67 msgid "Cost has been updated." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/cost_update.php:71 +#: c:\Apache2\htdocs\account22/inventory/cost_update.php:71 msgid "View the GL Journal Entries for this Cost Update" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/cost_update.php:85 -#: c:\Apache2\htdocs\account21/inventory/prices.php:56 -#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:124 -#: c:\Apache2\htdocs\account21/inventory/reorder_level.php:43 -#: c:\Apache2\htdocs\account21/inventory/inquiry/stock_movements.php:49 -#: c:\Apache2\htdocs\account21/inventory/inquiry/stock_status.php:41 +#: c:\Apache2\htdocs\account22/inventory/cost_update.php:85 +#: c:\Apache2\htdocs\account22/inventory/prices.php:56 +#: c:\Apache2\htdocs\account22/inventory/purchasing_data.php:117 +#: c:\Apache2\htdocs\account22/inventory/reorder_level.php:43 +#: c:\Apache2\htdocs\account22/inventory/inquiry/stock_movements.php:49 msgid "Item:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/cost_update.php:111 +#: c:\Apache2\htdocs\account22/inventory/cost_update.php:111 msgid "Standard Material Cost Per Unit" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/cost_update.php:116 +#: c:\Apache2\htdocs\account22/inventory/cost_update.php:116 msgid "Standard Labour Cost Per Unit" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/cost_update.php:118 +#: c:\Apache2\htdocs\account22/inventory/cost_update.php:118 msgid "Standard Overhead Cost Per Unit" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/prices.php:16 +#: c:\Apache2\htdocs\account22/inventory/prices.php:16 msgid "Inventory Item Sales prices" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/prices.php:27 -#: c:\Apache2\htdocs\account21/inventory/inquiry/stock_movements.php:30 -#: c:\Apache2\htdocs\account21/inventory/inquiry/stock_status.php:34 +#: c:\Apache2\htdocs\account22/inventory/prices.php:27 +#: c:\Apache2\htdocs\account22/inventory/inquiry/stock_movements.php:30 msgid "There are no items defined in the system." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/prices.php:29 +#: c:\Apache2\htdocs\account22/inventory/prices.php:29 msgid "There are no sales types in the system. Please set up sales types befor entering pricing." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/prices.php:70 +#: c:\Apache2\htdocs\account22/inventory/prices.php:70 msgid "The price entered must be numeric." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/prices.php:83 +#: c:\Apache2\htdocs\account22/inventory/prices.php:83 msgid "This price has been updated." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/prices.php:91 +#: c:\Apache2\htdocs\account22/inventory/prices.php:91 msgid "The new price has been added." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/prices.php:105 +#: c:\Apache2\htdocs\account22/inventory/prices.php:105 msgid "The selected price has been deleted." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/prices.php:133 +#: c:\Apache2\htdocs\account22/inventory/prices.php:133 msgid "Sales Type" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/prices.php:133 -#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:156 +#: c:\Apache2\htdocs\account22/inventory/prices.php:133 +#: c:\Apache2\htdocs\account22/inventory/purchasing_data.php:150 msgid "Price" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/prices.php:153 +#: c:\Apache2\htdocs\account22/inventory/prices.php:155 msgid "There are no prices set up for this part." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/prices.php:172 +#: c:\Apache2\htdocs\account22/inventory/prices.php:174 msgid "Currency:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/prices.php:174 +#: c:\Apache2\htdocs\account22/inventory/prices.php:176 msgid "Sales Type:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/prices.php:181 -#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:226 +#: c:\Apache2\htdocs\account22/inventory/prices.php:184 +#: c:\Apache2\htdocs\account22/inventory/purchasing_data.php:220 msgid "Price:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/prices.php:181 +#: c:\Apache2\htdocs\account22/inventory/prices.php:184 msgid "per" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:16 +#: c:\Apache2\htdocs\account22/inventory/prices.php:188 +msgid "The price is calculated." +msgstr "" + +#: c:\Apache2\htdocs\account22/inventory/purchasing_data.php:16 msgid "Supplier Purchasing Data" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:23 +#: c:\Apache2\htdocs\account22/inventory/purchasing_data.php:23 msgid "There are no purchasable inventory items defined in the system." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:24 +#: c:\Apache2\htdocs\account22/inventory/purchasing_data.php:24 msgid "There are no suppliers defined in the system." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:46 +#: c:\Apache2\htdocs\account22/inventory/purchasing_data.php:38 msgid "There is no item selected." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:52 +#: c:\Apache2\htdocs\account22/inventory/purchasing_data.php:44 msgid "The price entered was not numeric." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:58 +#: c:\Apache2\htdocs\account22/inventory/purchasing_data.php:50 msgid "The conversion factor entered was not numeric. The conversion factor is the number by which the price must be divided by to get the unit price in our unit of measure." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:74 +#: c:\Apache2\htdocs\account22/inventory/purchasing_data.php:67 msgid "This supplier purchasing data has been added." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:85 +#: c:\Apache2\htdocs\account22/inventory/purchasing_data.php:78 msgid "Supplier purchasing data has been updated." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:100 +#: c:\Apache2\htdocs\account22/inventory/purchasing_data.php:93 msgid "The purchasing data item has been sucessfully deleted." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:135 +#: c:\Apache2\htdocs\account22/inventory/purchasing_data.php:128 msgid "Entered item is not defined. Please re-enter." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:150 +#: c:\Apache2\htdocs\account22/inventory/purchasing_data.php:144 msgid "There is no purchasing data set up for the part selected" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:156 +#: c:\Apache2\htdocs\account22/inventory/purchasing_data.php:150 msgid "Supplier" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:157 +#: c:\Apache2\htdocs\account22/inventory/purchasing_data.php:151 msgid "Supplier's Unit" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:157 +#: c:\Apache2\htdocs\account22/inventory/purchasing_data.php:151 msgid "Conversion Factor" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:157 +#: c:\Apache2\htdocs\account22/inventory/purchasing_data.php:151 msgid "Supplier's Description" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:219 -#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:223 +#: c:\Apache2\htdocs\account22/inventory/purchasing_data.php:213 +#: c:\Apache2\htdocs\account22/inventory/purchasing_data.php:217 msgid "Supplier:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:227 +#: c:\Apache2\htdocs\account22/inventory/purchasing_data.php:221 msgid "Suppliers Unit of Measure:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:233 +#: c:\Apache2\htdocs\account22/inventory/purchasing_data.php:227 msgid "Conversion Factor (to our UOM):" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:235 +#: c:\Apache2\htdocs\account22/inventory/purchasing_data.php:229 msgid "Supplier's Code or Description:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/reorder_level.php:16 +#: c:\Apache2\htdocs\account22/inventory/reorder_level.php:16 msgid "Reorder Levels" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/reorder_level.php:24 -#: c:\Apache2\htdocs\account21/inventory/transfers.php:32 +#: c:\Apache2\htdocs\account22/inventory/reorder_level.php:24 +#: c:\Apache2\htdocs\account22/inventory/transfers.php:32 msgid "There are no inventory items defined in the system (Purchased or manufactured items)." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/reorder_level.php:57 -#: c:\Apache2\htdocs\account21/inventory/inquiry/stock_status.php:65 -#: c:\Apache2\htdocs\account21/inventory/inquiry/stock_status.php:69 +#: c:\Apache2\htdocs\account22/inventory/reorder_level.php:57 msgid "Location" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/reorder_level.php:57 -#: c:\Apache2\htdocs\account21/inventory/inquiry/stock_movements.php:78 -#: c:\Apache2\htdocs\account21/inventory/inquiry/stock_status.php:69 +#: c:\Apache2\htdocs\account22/inventory/reorder_level.php:57 +#: c:\Apache2\htdocs\account22/inventory/inquiry/stock_movements.php:78 msgid "Quantity On Hand" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/reorder_level.php:57 -#: c:\Apache2\htdocs\account21/inventory/inquiry/stock_status.php:69 +#: c:\Apache2\htdocs\account22/inventory/reorder_level.php:57 msgid "Re-Order Level" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/transfers.php:28 +#: c:\Apache2\htdocs\account22/inventory/transfers.php:28 msgid "Inventory Location Transfers" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/transfers.php:43 +#: c:\Apache2\htdocs\account22/inventory/transfers.php:43 msgid "Inventory transfer has been processed" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/transfers.php:44 +#: c:\Apache2\htdocs\account22/inventory/transfers.php:44 msgid "&View this transfer" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/transfers.php:46 +#: c:\Apache2\htdocs\account22/inventory/transfers.php:46 msgid "Enter &Another Inventory Transfer" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/transfers.php:116 +#: c:\Apache2\htdocs\account22/inventory/transfers.php:117 msgid "The locations to transfer from and to must be different." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/transfers.php:126 +#: c:\Apache2\htdocs\account22/inventory/transfers.php:127 msgid "The quantity entered is greater than the available quantity for this item at the source location :" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/transfers.php:159 +#: c:\Apache2\htdocs\account22/inventory/transfers.php:160 msgid "The quantity entered must be a positive number." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/transfers.php:229 +#: c:\Apache2\htdocs\account22/inventory/transfers.php:230 msgid "Items" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/transfers.php:236 +#: c:\Apache2\htdocs\account22/inventory/transfers.php:237 msgid "Process Transfer" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/inquiry/stock_movements.php:27 +#: c:\Apache2\htdocs\account22/inventory/inquiry/stock_movements.php:27 msgid "Inventory Item Movement" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/inquiry/stock_movements.php:51 +#: c:\Apache2\htdocs\account22/inventory/inquiry/stock_movements.php:51 msgid "From Location:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/inquiry/stock_movements.php:56 +#: c:\Apache2\htdocs\account22/inventory/inquiry/stock_movements.php:56 msgid "Show Movements" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/inquiry/stock_movements.php:56 +#: c:\Apache2\htdocs\account22/inventory/inquiry/stock_movements.php:56 msgid "Refresh Inquiry" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/inquiry/stock_movements.php:77 +#: c:\Apache2\htdocs\account22/inventory/inquiry/stock_movements.php:77 msgid "Detail" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/inquiry/stock_movements.php:78 +#: c:\Apache2\htdocs\account22/inventory/inquiry/stock_movements.php:78 msgid "Quantity In" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/inquiry/stock_movements.php:78 +#: c:\Apache2\htdocs\account22/inventory/inquiry/stock_movements.php:78 msgid "Quantity Out" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/inquiry/stock_movements.php:96 +#: c:\Apache2\htdocs\account22/inventory/inquiry/stock_movements.php:96 msgid "Quantity on hand before" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/inquiry/stock_movements.php:187 +#: c:\Apache2\htdocs\account22/inventory/inquiry/stock_movements.php:187 msgid "Quantity on hand after" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/inquiry/stock_status.php:18 -#: c:\Apache2\htdocs\account21/inventory/inquiry/stock_status.php:20 +#: c:\Apache2\htdocs\account22/inventory/inquiry/stock_status.php:18 +#: c:\Apache2\htdocs\account22/inventory/inquiry/stock_status.php:20 msgid "Inventory Item Status" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/inquiry/stock_status.php:55 +#: c:\Apache2\htdocs\account22/inventory/inquiry/stock_status.php:55 msgid "This is a service and cannot have a stock holding, only the total quantity on outstanding sales orders is shown." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/inquiry/stock_status.php:65 -#: c:\Apache2\htdocs\account21/inventory/inquiry/stock_status.php:70 +#: c:\Apache2\htdocs\account22/inventory/inquiry/stock_status.php:65 +#: c:\Apache2\htdocs\account22/inventory/inquiry/stock_status.php:70 msgid "Demand" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/inquiry/stock_status.php:70 +#: c:\Apache2\htdocs\account22/inventory/inquiry/stock_status.php:70 msgid "Available" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/inquiry/stock_status.php:70 +#: c:\Apache2\htdocs\account22/inventory/inquiry/stock_status.php:70 msgid "On Order" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:61 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:69 msgid "Only jpg files are supported - a file extension of .jpg is expected" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:93 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:100 msgid "There are no item categories defined in the system. At least one item category is required to add a item." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:95 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:102 msgid "There are no item tax types defined in the system. At least one item tax type is required to add a item." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:121 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:129 msgid "The item name must be entered." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:127 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:135 msgid "The item code cannot be empty" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:135 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:143 msgid "The item code cannot contain any of the following characters - & + OR a space OR quotes" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:142 -#: c:\Apache2\htdocs\account21/inventory/manage/item_codes.php:55 -#: c:\Apache2\htdocs\account21/inventory/manage/sales_kits.php:90 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:150 +#: c:\Apache2\htdocs\account22/inventory/manage/item_codes.php:55 +#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:90 msgid "This item code is already assigned to stock item or sale kit." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:164 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:179 msgid "Item has been updated." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:176 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:192 msgid "A new item has been added." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:193 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:216 msgid "Cannot delete this item because there are stock movements that refer to this item." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:202 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:219 msgid "Cannot delete this item record because there are bills of material that require this part as a component." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:211 -msgid "Cannot delete this item record because there are existing sales orders for this part." -msgstr "" - -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:220 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:222 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:225 msgid "Cannot delete this item because there are existing purchase order items for it." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:226 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:244 msgid "" "This item cannot be deleted because some code aliases \n" -"\t\t\tor foreign codes was entered for it, or there are kits defined \n" -"\t\t\tusing this item as component" +"\t\t\t\tor foreign codes was entered for it, or there are kits defined \n" +"\t\t\t\tusing this item as component" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:254 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:276 msgid "Selected item has been deleted." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:277 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:292 msgid "Select an item:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:278 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:293 msgid "New item" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:289 -#: c:\Apache2\htdocs\account21/inventory/view/view_adjustment.php:56 -#: c:\Apache2\htdocs\account21/inventory/view/view_transfer.php:39 -#: c:\Apache2\htdocs\account21/inventory/view/view_transfer.php:57 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:310 +#: c:\Apache2\htdocs\account22/inventory/view/view_adjustment.php:56 +#: c:\Apache2\htdocs\account22/inventory/view/view_transfer.php:39 +#: c:\Apache2\htdocs\account22/inventory/view/view_transfer.php:57 msgid "Item" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:298 -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:341 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:315 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:342 msgid "Item Code:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:348 -#: c:\Apache2\htdocs\account21/inventory/manage/item_codes.php:177 -#: c:\Apache2\htdocs\account21/inventory/manage/movement_types.php:133 -#: c:\Apache2\htdocs\account21/inventory/manage/sales_kits.php:207 -#: c:\Apache2\htdocs\account21/inventory/manage/sales_kits.php:231 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:349 +#: c:\Apache2\htdocs\account22/inventory/manage/item_codes.php:177 +#: c:\Apache2\htdocs\account22/inventory/manage/movement_types.php:134 +#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:207 +#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:231 msgid "Description:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:350 -#: c:\Apache2\htdocs\account21/inventory/manage/item_codes.php:178 -#: c:\Apache2\htdocs\account21/inventory/manage/sales_kits.php:208 -#: c:\Apache2\htdocs\account21/inventory/manage/sales_kits.php:232 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:351 +#: c:\Apache2\htdocs\account22/inventory/manage/item_codes.php:178 +#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:208 +#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:232 msgid "Category:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:352 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:372 +#: c:\Apache2\htdocs\account22/inventory/manage/item_categories.php:191 msgid "Item Tax Type:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:354 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:374 +#: c:\Apache2\htdocs\account22/inventory/manage/item_categories.php:193 msgid "Item Type:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:357 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:376 +#: c:\Apache2\htdocs\account22/inventory/manage/item_categories.php:195 msgid "Units of Measure:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:376 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:381 +msgid "Dimensions" +msgstr "" + +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:394 msgid "GL Accounts" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:399 -msgid "Picture" +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:417 +msgid "Other" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:402 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:420 msgid "Image File (.jpg)" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:417 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:435 msgid "No image" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:422 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:440 msgid "Delete Image:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:429 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:442 +#: c:\Apache2\htdocs\account22/inventory/manage/item_categories.php:197 +msgid "Exclude from sales:" +msgstr "" + +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:444 +msgid "Item status:" +msgstr "" + +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:450 msgid "Insert New Item" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:433 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:454 msgid "Update Item" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:434 -msgid "Return" +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:457 +msgid "Select this items and return to document entry." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:434 -msgid "Select this items and return to document entry." +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:458 +msgid "Clone This Item" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/items.php:435 +#: c:\Apache2\htdocs\account22/inventory/manage/items.php:459 msgid "Delete This Item" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/item_categories.php:16 +#: c:\Apache2\htdocs\account22/inventory/manage/item_categories.php:16 msgid "Item Categories" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/item_categories.php:34 +#: c:\Apache2\htdocs\account22/inventory/manage/item_categories.php:34 msgid "The item category description cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/item_categories.php:43 +#: c:\Apache2\htdocs\account22/inventory/manage/item_categories.php:48 msgid "Selected item category has been updated" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/item_categories.php:48 +#: c:\Apache2\htdocs\account22/inventory/manage/item_categories.php:58 msgid "New item category has been added" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/item_categories.php:65 +#: c:\Apache2\htdocs\account22/inventory/manage/item_categories.php:75 msgid "Cannot delete this item category because items have been created using this item category." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/item_categories.php:70 +#: c:\Apache2\htdocs\account22/inventory/manage/item_categories.php:80 msgid "Selected item category has been deleted" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/item_categories.php:124 +#: c:\Apache2\htdocs\account22/inventory/manage/item_categories.php:105 +msgid "Tax type" +msgstr "" + +#: c:\Apache2\htdocs\account22/inventory/manage/item_categories.php:105 +#: c:\Apache2\htdocs\account22/inventory/manage/item_codes.php:122 +#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:42 +#: c:\Apache2\htdocs\account22/inventory/view/view_adjustment.php:57 +#: c:\Apache2\htdocs\account22/inventory/view/view_transfer.php:57 +msgid "Units" +msgstr "" + +#: c:\Apache2\htdocs\account22/inventory/manage/item_categories.php:105 +msgid "Sales Act" +msgstr "" + +#: c:\Apache2\htdocs\account22/inventory/manage/item_categories.php:106 +msgid "Inventory Account" +msgstr "" + +#: c:\Apache2\htdocs\account22/inventory/manage/item_categories.php:106 +msgid "COGS Account" +msgstr "" + +#: c:\Apache2\htdocs\account22/inventory/manage/item_categories.php:106 +msgid "Adjustment Account" +msgstr "" + +#: c:\Apache2\htdocs\account22/inventory/manage/item_categories.php:107 +msgid "Assembly Account" +msgstr "" + +#: c:\Apache2\htdocs\account22/inventory/manage/item_categories.php:187 msgid "Category Name:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/item_codes.php:16 +#: c:\Apache2\htdocs\account22/inventory/manage/item_categories.php:189 +msgid "Default values for new items" +msgstr "" + +#: c:\Apache2\htdocs\account22/inventory/manage/item_codes.php:16 msgid "Foreign Item Codes" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/item_codes.php:23 +#: c:\Apache2\htdocs\account22/inventory/manage/item_codes.php:23 msgid "There are no inventory items defined in the system." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/item_codes.php:47 -#: c:\Apache2\htdocs\account21/inventory/manage/sales_kits.php:80 +#: c:\Apache2\htdocs\account22/inventory/manage/item_codes.php:47 +#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:80 msgid "Item code description cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/item_codes.php:67 +#: c:\Apache2\htdocs\account22/inventory/manage/item_codes.php:67 msgid "New item code has been added." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/item_codes.php:73 +#: c:\Apache2\htdocs\account22/inventory/manage/item_codes.php:73 msgid "Item code has been updated." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/item_codes.php:85 +#: c:\Apache2\htdocs\account22/inventory/manage/item_codes.php:85 msgid "Item code has been sucessfully deleted." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/item_codes.php:122 +#: c:\Apache2\htdocs\account22/inventory/manage/item_codes.php:122 msgid "EAN/UPC Code" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/item_codes.php:122 -#: c:\Apache2\htdocs\account21/inventory/manage/sales_kits.php:42 -#: c:\Apache2\htdocs\account21/inventory/view/view_adjustment.php:56 -#: c:\Apache2\htdocs\account21/inventory/view/view_transfer.php:57 +#: c:\Apache2\htdocs\account22/inventory/manage/item_codes.php:122 +#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:42 +#: c:\Apache2\htdocs\account22/inventory/view/view_adjustment.php:56 +#: c:\Apache2\htdocs\account22/inventory/view/view_transfer.php:57 msgid "Quantity" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/item_codes.php:122 -#: c:\Apache2\htdocs\account21/inventory/manage/sales_kits.php:42 -#: c:\Apache2\htdocs\account21/inventory/view/view_adjustment.php:57 -#: c:\Apache2\htdocs\account21/inventory/view/view_transfer.php:57 -msgid "Units" -msgstr "" - -#: c:\Apache2\htdocs\account21/inventory/manage/item_codes.php:123 +#: c:\Apache2\htdocs\account22/inventory/manage/item_codes.php:123 msgid "Category" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/item_codes.php:175 +#: c:\Apache2\htdocs\account22/inventory/manage/item_codes.php:175 msgid "UPC/EAN code:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/item_codes.php:176 -#: c:\Apache2\htdocs\account21/inventory/manage/sales_kits.php:244 +#: c:\Apache2\htdocs\account22/inventory/manage/item_codes.php:176 +#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:244 msgid "Quantity:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/item_units.php:16 +#: c:\Apache2\htdocs\account22/inventory/manage/item_units.php:16 msgid "Units of Measure" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/item_units.php:34 +#: c:\Apache2\htdocs\account22/inventory/manage/item_units.php:34 msgid "The unit of measure code cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/item_units.php:40 +#: c:\Apache2\htdocs\account22/inventory/manage/item_units.php:40 +msgid "The unit of measure code is too long." +msgstr "" + +#: c:\Apache2\htdocs\account22/inventory/manage/item_units.php:46 msgid "The unit of measure description cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/item_units.php:47 +#: c:\Apache2\htdocs\account22/inventory/manage/item_units.php:53 msgid "Selected unit has been updated" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/item_units.php:49 +#: c:\Apache2\htdocs\account22/inventory/manage/item_units.php:55 msgid "New unit has been added" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/item_units.php:63 +#: c:\Apache2\htdocs\account22/inventory/manage/item_units.php:69 msgid "Cannot delete this unit of measure because items have been created using this unit." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/item_units.php:69 +#: c:\Apache2\htdocs\account22/inventory/manage/item_units.php:75 msgid "Selected unit has been deleted" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/item_units.php:85 +#: c:\Apache2\htdocs\account22/inventory/manage/item_units.php:94 msgid "Unit" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/item_units.php:85 +#: c:\Apache2\htdocs\account22/inventory/manage/item_units.php:94 msgid "Decimals" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/item_units.php:97 -#: c:\Apache2\htdocs\account21/inventory/manage/item_units.php:134 +#: c:\Apache2\htdocs\account22/inventory/manage/item_units.php:107 +#: c:\Apache2\htdocs\account22/inventory/manage/item_units.php:142 msgid "User Quantity Decimals" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/item_units.php:128 -#: c:\Apache2\htdocs\account21/inventory/manage/item_units.php:131 +#: c:\Apache2\htdocs\account22/inventory/manage/item_units.php:136 +#: c:\Apache2\htdocs\account22/inventory/manage/item_units.php:139 msgid "Unit Abbreviation:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/item_units.php:132 +#: c:\Apache2\htdocs\account22/inventory/manage/item_units.php:140 msgid "Descriptive Name:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/item_units.php:134 +#: c:\Apache2\htdocs\account22/inventory/manage/item_units.php:142 msgid "Decimal Places:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/locations.php:16 +#: c:\Apache2\htdocs\account22/inventory/manage/locations.php:16 msgid "Inventory Locations" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/locations.php:39 -msgid "The location code must be five characters or less long." +#: c:\Apache2\htdocs\account22/inventory/manage/locations.php:39 +msgid "The location code must be five characters or less long (including converted special chars)." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/locations.php:45 +#: c:\Apache2\htdocs\account22/inventory/manage/locations.php:45 msgid "The location name must be entered." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/locations.php:56 +#: c:\Apache2\htdocs\account22/inventory/manage/locations.php:56 msgid "Selected location has been updated" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/locations.php:65 +#: c:\Apache2\htdocs\account22/inventory/manage/locations.php:65 msgid "New location has been added" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/locations.php:79 +#: c:\Apache2\htdocs\account22/inventory/manage/locations.php:79 msgid "Cannot delete this location because item movements have been created using this location." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/locations.php:88 +#: c:\Apache2\htdocs\account22/inventory/manage/locations.php:88 msgid "Cannot delete this location because it is used by some work orders records." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/locations.php:97 +#: c:\Apache2\htdocs\account22/inventory/manage/locations.php:97 msgid "Cannot delete this location because it is used by some branch records as the default location to deliver from." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/locations.php:106 -#: c:\Apache2\htdocs\account21/inventory/manage/locations.php:114 -#: c:\Apache2\htdocs\account21/inventory/manage/locations.php:122 -#: c:\Apache2\htdocs\account21/inventory/manage/locations.php:130 -#: c:\Apache2\htdocs\account21/inventory/manage/locations.php:138 +#: c:\Apache2\htdocs\account22/inventory/manage/locations.php:106 +#: c:\Apache2\htdocs\account22/inventory/manage/locations.php:114 +#: c:\Apache2\htdocs\account22/inventory/manage/locations.php:122 +#: c:\Apache2\htdocs\account22/inventory/manage/locations.php:130 +#: c:\Apache2\htdocs\account22/inventory/manage/locations.php:138 msgid "Cannot delete this location because it is used by some related records in other tables." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/locations.php:152 +#: c:\Apache2\htdocs\account22/inventory/manage/locations.php:152 msgid "Selected location has been deleted" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/locations.php:168 +#: c:\Apache2\htdocs\account22/inventory/manage/locations.php:171 msgid "Location Code" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/locations.php:168 +#: c:\Apache2\htdocs\account22/inventory/manage/locations.php:171 msgid "Location Name" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/locations.php:213 -#: c:\Apache2\htdocs\account21/inventory/manage/locations.php:217 +#: c:\Apache2\htdocs\account22/inventory/manage/locations.php:217 +#: c:\Apache2\htdocs\account22/inventory/manage/locations.php:221 msgid "Location Code:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/locations.php:220 +#: c:\Apache2\htdocs\account22/inventory/manage/locations.php:224 msgid "Location Name:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/locations.php:221 +#: c:\Apache2\htdocs\account22/inventory/manage/locations.php:225 msgid "Contact for deliveries:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/locations.php:225 +#: c:\Apache2\htdocs\account22/inventory/manage/locations.php:229 msgid "Telephone No:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/locations.php:226 +#: c:\Apache2\htdocs\account22/inventory/manage/locations.php:231 msgid "Facsimile No:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/locations.php:227 +#: c:\Apache2\htdocs\account22/inventory/manage/locations.php:232 msgid "E-mail:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/movement_types.php:16 +#: c:\Apache2\htdocs\account22/inventory/manage/movement_types.php:16 msgid "Inventory Movement Types" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/movement_types.php:34 +#: c:\Apache2\htdocs\account22/inventory/manage/movement_types.php:34 msgid "The inventory movement type name cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/movement_types.php:43 +#: c:\Apache2\htdocs\account22/inventory/manage/movement_types.php:43 msgid "Selected movement type has been updated" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/movement_types.php:48 +#: c:\Apache2\htdocs\account22/inventory/manage/movement_types.php:48 msgid "New movement type has been added" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/movement_types.php:65 +#: c:\Apache2\htdocs\account22/inventory/manage/movement_types.php:66 msgid "Cannot delete this inventory movement type because item transactions have been created referring to it." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/movement_types.php:80 +#: c:\Apache2\htdocs\account22/inventory/manage/movement_types.php:81 msgid "Selected movement type has been deleted" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/sales_kits.php:16 +#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:16 msgid "Sales Kits & Alias Codes" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/sales_kits.php:42 +#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:42 msgid "Stock Item" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/sales_kits.php:56 +#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:56 msgid "kit" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/sales_kits.php:74 +#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:74 msgid "The quantity entered must be numeric and greater than zero." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/sales_kits.php:95 +#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:95 msgid "Kit/alias code cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/sales_kits.php:103 +#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:103 msgid "The selected component contains directly or on any lower level the kit under edition. Recursive kits are not allowed." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/sales_kits.php:110 +#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:110 msgid "The selected component is already in this kit. You can modify it's quantity but it cannot appear more than once in the same kit." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/sales_kits.php:118 +#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:118 msgid "New alias code has been created." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/sales_kits.php:121 +#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:121 msgid "New component has been added to selected kit." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/sales_kits.php:131 +#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:131 msgid "Component of selected kit has been updated." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/sales_kits.php:141 +#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:141 msgid "Kit common properties has been updated" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/sales_kits.php:159 +#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:159 msgid "This item cannot be deleted because it is the last item in the kit used by following kits" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/sales_kits.php:170 +#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:170 msgid "The component item has been deleted from this bom" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/sales_kits.php:185 +#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:185 msgid "Select a sale kit:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/sales_kits.php:186 +#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:186 msgid "New kit" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/sales_kits.php:201 +#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:201 msgid "Alias/kit code:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/sales_kits.php:209 +#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:209 msgid "Update kit/alias name" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/sales_kits.php:224 +#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:224 msgid "Component:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/manage/sales_kits.php:236 +#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:236 msgid "kits" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/view/view_adjustment.php:17 +#: c:\Apache2\htdocs\account22/inventory/view/view_adjustment.php:17 msgid "View Inventory Adjustment" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/view/view_adjustment.php:43 +#: c:\Apache2\htdocs\account22/inventory/view/view_adjustment.php:43 msgid "At Location" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/view/view_adjustment.php:46 -#: c:\Apache2\htdocs\account21/inventory/view/view_transfer.php:46 +#: c:\Apache2\htdocs\account22/inventory/view/view_adjustment.php:46 +#: c:\Apache2\htdocs\account22/inventory/view/view_transfer.php:46 msgid "Adjustment Type" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/view/view_adjustment.php:57 +#: c:\Apache2\htdocs\account22/inventory/view/view_adjustment.php:57 msgid "Unit Cost" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/view/view_adjustment.php:73 +#: c:\Apache2\htdocs\account22/inventory/view/view_adjustment.php:73 msgid "This adjustment has been voided." msgstr "" -#: c:\Apache2\htdocs\account21/inventory/view/view_transfer.php:17 +#: c:\Apache2\htdocs\account22/inventory/view/view_transfer.php:17 msgid "View Inventory Transfer" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/view/view_transfer.php:40 +#: c:\Apache2\htdocs\account22/inventory/view/view_transfer.php:40 msgid "From Location" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/view/view_transfer.php:41 +#: c:\Apache2\htdocs\account22/inventory/view/view_transfer.php:41 msgid "To Location" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/search_work_orders.php:26 +#: c:\Apache2\htdocs\account22/manufacturing/search_work_orders.php:26 msgid "Search Outstanding Work Orders" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/search_work_orders.php:31 +#: c:\Apache2\htdocs\account22/manufacturing/search_work_orders.php:31 msgid "Search Work Orders" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/search_work_orders.php:69 +#: c:\Apache2\htdocs\account22/manufacturing/search_work_orders.php:69 msgid "at Location:" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/search_work_orders.php:76 +#: c:\Apache2\htdocs\account22/manufacturing/search_work_orders.php:76 msgid "for item:" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/search_work_orders.php:78 +#: c:\Apache2\htdocs\account22/manufacturing/search_work_orders.php:78 msgid "Select documents" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/search_work_orders.php:117 +#: c:\Apache2\htdocs\account22/manufacturing/search_work_orders.php:117 msgid "Release" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/search_work_orders.php:120 +#: c:\Apache2\htdocs\account22/manufacturing/search_work_orders.php:120 msgid "Issue" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/search_work_orders.php:127 +#: c:\Apache2\htdocs\account22/manufacturing/search_work_orders.php:127 msgid "Produce" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/search_work_orders.php:140 +#: c:\Apache2\htdocs\account22/manufacturing/search_work_orders.php:140 msgid "Costs" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/search_work_orders.php:212 +#: c:\Apache2\htdocs\account22/manufacturing/search_work_orders.php:212 msgid "Required" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/search_work_orders.php:213 +#: c:\Apache2\htdocs\account22/manufacturing/search_work_orders.php:213 msgid "Manufactured" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/search_work_orders.php:215 +#: c:\Apache2\htdocs\account22/manufacturing/search_work_orders.php:215 msgid "Required By" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/search_work_orders.php:224 +#: c:\Apache2\htdocs\account22/manufacturing/search_work_orders.php:224 msgid "Marked orders are overdue." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_add_finished.php:29 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_add_finished.php:29 msgid "Produce or Unassemble Finished Items From Work Order" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_add_finished.php:44 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_add_finished.php:44 msgid "The manufacturing process has been entered." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_add_finished.php:46 -#: c:\Apache2\htdocs\account21/manufacturing/work_order_costs.php:45 -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:56 -#: c:\Apache2\htdocs\account21/manufacturing/work_order_issue.php:37 -#: c:\Apache2\htdocs\account21/manufacturing/work_order_release.php:72 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_add_finished.php:46 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_costs.php:45 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:56 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_issue.php:37 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_release.php:72 msgid "View this Work Order" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_add_finished.php:48 -#: c:\Apache2\htdocs\account21/manufacturing/work_order_costs.php:47 -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:61 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_add_finished.php:48 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_costs.php:47 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:65 msgid "View the GL Journal Entries for this Work Order" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_add_finished.php:50 -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:63 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_add_finished.php:50 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:67 msgid "Print the GL Journal Entries for this Work Order" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_add_finished.php:52 -#: c:\Apache2\htdocs\account21/manufacturing/work_order_costs.php:51 -#: c:\Apache2\htdocs\account21/manufacturing/work_order_issue.php:39 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_add_finished.php:52 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_costs.php:51 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_issue.php:39 msgid "Select another &Work Order to Process" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_add_finished.php:64 -#: c:\Apache2\htdocs\account21/manufacturing/work_order_costs.php:63 -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:335 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_add_finished.php:64 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_costs.php:63 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:340 msgid "The order number sent is not valid." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_add_finished.php:90 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_add_finished.php:90 msgid "The quantity entered is not a valid number or less then zero." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_add_finished.php:109 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_add_finished.php:109 msgid "The production date cannot be before the release date of the work order." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_add_finished.php:122 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_add_finished.php:122 msgid "The unassembling cannot be processed because there is insufficient stock." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_add_finished.php:140 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_add_finished.php:140 msgid "The production cannot be processed because a required item would cause a negative inventory balance :" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_add_finished.php:198 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_add_finished.php:198 msgid "Produce Finished Items" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_add_finished.php:198 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_add_finished.php:198 msgid "Return Items to Work Order" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_add_finished.php:202 -#: c:\Apache2\htdocs\account21/manufacturing/work_order_costs.php:142 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_add_finished.php:202 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_costs.php:142 msgid "Date:" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_add_finished.php:208 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_add_finished.php:208 msgid "Process" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_add_finished.php:209 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_add_finished.php:209 msgid "Process And Close Order" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_costs.php:29 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_costs.php:29 msgid "Work Order Additional Costs" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_costs.php:43 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_costs.php:43 msgid "The additional cost has been entered." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_costs.php:49 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_costs.php:49 msgid "Enter another additional cost." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_costs.php:75 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_costs.php:75 msgid "The amount entered is not a valid number or less then zero." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_costs.php:94 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_costs.php:94 msgid "The additional cost date cannot be before the release date of the work order." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_costs.php:151 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_costs.php:151 msgid "Additional Costs:" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_costs.php:152 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_costs.php:152 msgid "Debit Account" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_costs.php:153 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_costs.php:153 msgid "Credit Account" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_costs.php:159 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_costs.php:159 msgid "Process Additional Cost" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:29 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:29 msgid "Work Order Entry" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:32 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:32 msgid "There are no manufacturable items defined in the system." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:54 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:54 msgid "The work order been added." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:75 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:62 +msgid "Print this Work Order" +msgstr "" + +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:64 +msgid "Email this Work Order" +msgstr "" + +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:79 msgid "The work order been updated." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:85 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:89 msgid "Work order has been deleted." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:95 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:99 msgid "This work order has been closed. There can be no more issues against it." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:105 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:109 msgid "Enter a new work order" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:106 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:110 msgid "Select an existing work order" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:142 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:146 msgid "The quantity entered is invalid or less than zero." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:164 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:168 msgid "The selected item to manufacture does not have a bom." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:173 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:177 msgid "The labour cost entered is invalid or less than zero." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:181 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:185 msgid "The cost entered is invalid or less than zero." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:204 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:208 msgid "The work order cannot be processed because there is an insufficient quantity for component:" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:205 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:209 msgid "Location:" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:218 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:222 msgid "The selected item cannot be unassembled because there is insufficient stock." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:244 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:248 msgid "The quantity cannot be changed to be less than the quantity already manufactured for this order." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:292 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:297 msgid "This work order cannot be deleted because it has already been processed." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:343 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:348 msgid "This work order is closed and cannot be edited." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:390 -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:398 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:395 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:403 msgid "Destination Location:" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:409 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:414 msgid "Quantity Required:" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:411 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:416 msgid "Quantity Manufactured:" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:430 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:435 msgid "Credit Labour Account" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:437 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:442 msgid "Credit Overhead Account" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:442 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:447 msgid "Released On:" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:452 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:457 msgid "Save changes to work order" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:455 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:460 msgid "Close This Work Order" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:457 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:462 msgid "Delete This Work Order" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_entry.php:463 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_entry.php:468 msgid "Add Workorder" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_issue.php:29 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_issue.php:29 msgid "Issue Items to Work Order" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_issue.php:35 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_issue.php:35 msgid "The work order issue has been entered." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_issue.php:74 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_issue.php:76 msgid "The entered date for the issue is invalid." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_issue.php:101 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_issue.php:103 msgid "The issue cannot be processed because an entered item would cause a negative inventory balance :" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_issue.php:119 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_issue.php:121 msgid "The process cannot be completed because there is an insufficient total quantity for a component." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_issue.php:120 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_issue.php:122 msgid "Component is :" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_issue.php:121 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_issue.php:123 msgid "From location :" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_issue.php:214 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_issue.php:216 msgid "Items to Issue" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_issue.php:220 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_issue.php:222 msgid "Process Issue" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_release.php:27 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_release.php:27 msgid "Work Order Release to Manufacturing" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_release.php:49 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_release.php:49 msgid "This work order has already been released." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_release.php:57 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_release.php:57 msgid "This Work Order cannot be released. The selected item to manufacture does not have a bom." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_release.php:70 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_release.php:70 msgid "The work order has been released to manufacturing." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_release.php:74 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_release.php:74 msgid "Select another &work order" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_release.php:94 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_release.php:94 msgid "Work Order #:" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_release.php:95 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_release.php:95 msgid "Work Order Reference:" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_release.php:97 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_release.php:97 msgid "Released Date" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/work_order_release.php:103 +#: c:\Apache2\htdocs\account22/manufacturing/work_order_release.php:103 msgid "Release Work Order" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/inquiry/bom_cost_inquiry.php:24 -#: c:\Apache2\htdocs\account21/manufacturing/manage/bom_edit.php:24 +#: c:\Apache2\htdocs\account22/manufacturing/inquiry/bom_cost_inquiry.php:24 +#: c:\Apache2\htdocs\account22/manufacturing/manage/bom_edit.php:24 msgid "There are no manufactured or kit items defined in the system." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/inquiry/bom_cost_inquiry.php:35 -#: c:\Apache2\htdocs\account21/manufacturing/manage/bom_edit.php:220 +#: c:\Apache2\htdocs\account22/manufacturing/inquiry/bom_cost_inquiry.php:35 +#: c:\Apache2\htdocs\account22/manufacturing/manage/bom_edit.php:220 msgid "Select a manufacturable item:" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/inquiry/bom_cost_inquiry.php:38 +#: c:\Apache2\htdocs\account22/manufacturing/inquiry/bom_cost_inquiry.php:38 msgid "All Costs Are In:" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/inquiry/where_used_inquiry.php:17 +#: c:\Apache2\htdocs\account22/manufacturing/inquiry/where_used_inquiry.php:17 msgid "Inventory Item Where Used Inquiry" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/inquiry/where_used_inquiry.php:28 +#: c:\Apache2\htdocs\account22/manufacturing/inquiry/where_used_inquiry.php:28 msgid "Select an item to display its parent item(s)." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/inquiry/where_used_inquiry.php:56 +#: c:\Apache2\htdocs\account22/manufacturing/inquiry/where_used_inquiry.php:56 msgid "Parent Item" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/inquiry/where_used_inquiry.php:57 -#: c:\Apache2\htdocs\account21/manufacturing/manage/bom_edit.php:104 +#: c:\Apache2\htdocs\account22/manufacturing/inquiry/where_used_inquiry.php:57 +#: c:\Apache2\htdocs\account22/manufacturing/manage/bom_edit.php:104 msgid "Work Centre" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/inquiry/where_used_inquiry.php:59 +#: c:\Apache2\htdocs\account22/manufacturing/inquiry/where_used_inquiry.php:59 msgid "Quantity Required" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/manage/bom_edit.php:16 +#: c:\Apache2\htdocs\account22/manufacturing/manage/bom_edit.php:16 msgid "Bill Of Materials" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/manage/bom_edit.php:26 +#: c:\Apache2\htdocs\account22/manufacturing/manage/bom_edit.php:26 msgid "There are no work centres defined in the system. BOMs require at least one work centre be defined." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/manage/bom_edit.php:103 +#: c:\Apache2\htdocs\account22/manufacturing/manage/bom_edit.php:103 msgid "Code" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/manage/bom_edit.php:150 +#: c:\Apache2\htdocs\account22/manufacturing/manage/bom_edit.php:150 msgid "Selected component has been updated" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/manage/bom_edit.php:180 +#: c:\Apache2\htdocs\account22/manufacturing/manage/bom_edit.php:180 msgid "A new component part has been added to the bill of material for this item." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/manage/bom_edit.php:186 +#: c:\Apache2\htdocs\account22/manufacturing/manage/bom_edit.php:186 msgid "The selected component is already on this bom. You can modify it's quantity but it cannot appear more than once on the same bom." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/manage/bom_edit.php:192 +#: c:\Apache2\htdocs\account22/manufacturing/manage/bom_edit.php:192 msgid "The selected component is a parent of the current item. Recursive BOMs are not allowed." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/manage/bom_edit.php:280 +#: c:\Apache2\htdocs\account22/manufacturing/manage/bom_edit.php:279 msgid "Location to Draw From:" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/manage/bom_edit.php:281 +#: c:\Apache2\htdocs\account22/manufacturing/manage/bom_edit.php:280 msgid "Work Centre Added:" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/manage/work_centres.php:16 +#: c:\Apache2\htdocs\account22/manufacturing/manage/work_centres.php:16 msgid "Work Centres" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/manage/work_centres.php:34 +#: c:\Apache2\htdocs\account22/manufacturing/manage/work_centres.php:34 msgid "The work centre name cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/manage/work_centres.php:44 +#: c:\Apache2\htdocs\account22/manufacturing/manage/work_centres.php:44 msgid "Selected work center has been updated" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/manage/work_centres.php:49 +#: c:\Apache2\htdocs\account22/manufacturing/manage/work_centres.php:49 msgid "New work center has been added" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/manage/work_centres.php:64 +#: c:\Apache2\htdocs\account22/manufacturing/manage/work_centres.php:64 msgid "Cannot delete this work centre because BOMs have been created referring to it." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/manage/work_centres.php:73 +#: c:\Apache2\htdocs\account22/manufacturing/manage/work_centres.php:73 msgid "Cannot delete this work centre because work order requirements have been created referring to it." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/manage/work_centres.php:89 +#: c:\Apache2\htdocs\account22/manufacturing/manage/work_centres.php:89 msgid "Selected work center has been deleted" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/manage/work_centres.php:105 +#: c:\Apache2\htdocs\account22/manufacturing/manage/work_centres.php:107 msgid "description" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/view/work_order_view.php:26 +#: c:\Apache2\htdocs\account22/manufacturing/view/work_order_view.php:26 msgid "View Work Order" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/view/work_order_view.php:51 +#: c:\Apache2\htdocs\account22/manufacturing/view/work_order_view.php:51 msgid "BOM for item:" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/view/work_order_view.php:56 +#: c:\Apache2\htdocs\account22/manufacturing/view/work_order_view.php:56 msgid "Work Order Requirements" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/view/work_order_view.php:61 +#: c:\Apache2\htdocs\account22/manufacturing/view/work_order_view.php:61 msgid "Issues" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/view/work_order_view.php:64 +#: c:\Apache2\htdocs\account22/manufacturing/view/work_order_view.php:64 msgid "Productions" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/view/work_order_view.php:67 -#: c:\Apache2\htdocs\account21/manufacturing/view/work_order_view.php:74 +#: c:\Apache2\htdocs\account22/manufacturing/view/work_order_view.php:67 +#: c:\Apache2\htdocs\account22/manufacturing/view/work_order_view.php:74 msgid "Additional Costs" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/view/work_order_view.php:82 +#: c:\Apache2\htdocs\account22/manufacturing/view/work_order_view.php:82 msgid "This work order has been voided." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/view/wo_issue_view.php:19 +#: c:\Apache2\htdocs\account22/manufacturing/view/wo_issue_view.php:19 msgid "View Work Order Issue" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/view/wo_issue_view.php:45 +#: c:\Apache2\htdocs\account22/manufacturing/view/wo_issue_view.php:45 msgid "Issue #" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/view/wo_issue_view.php:45 -#: c:\Apache2\htdocs\account21/manufacturing/view/wo_production_view.php:46 +#: c:\Apache2\htdocs\account22/manufacturing/view/wo_issue_view.php:45 +#: c:\Apache2\htdocs\account22/manufacturing/view/wo_production_view.php:46 msgid "For Work Order #" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/view/wo_issue_view.php:46 +#: c:\Apache2\htdocs\account22/manufacturing/view/wo_issue_view.php:46 msgid "To Work Centre" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/view/wo_issue_view.php:46 +#: c:\Apache2\htdocs\account22/manufacturing/view/wo_issue_view.php:46 msgid "Date of Issue" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/view/wo_issue_view.php:63 +#: c:\Apache2\htdocs\account22/manufacturing/view/wo_issue_view.php:63 msgid "This issue has been voided." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/view/wo_issue_view.php:76 +#: c:\Apache2\htdocs\account22/manufacturing/view/wo_issue_view.php:76 msgid "There are no items for this issue." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/view/wo_issue_view.php:81 +#: c:\Apache2\htdocs\account22/manufacturing/view/wo_issue_view.php:81 msgid "Component" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/view/wo_issue_view.php:118 +#: c:\Apache2\htdocs\account22/manufacturing/view/wo_issue_view.php:118 msgid "Items for this Issue" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/view/wo_production_view.php:20 +#: c:\Apache2\htdocs\account22/manufacturing/view/wo_production_view.php:20 msgid "View Work Order Production" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/view/wo_production_view.php:46 +#: c:\Apache2\htdocs\account22/manufacturing/view/wo_production_view.php:46 msgid "Production #" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/view/wo_production_view.php:47 +#: c:\Apache2\htdocs\account22/manufacturing/view/wo_production_view.php:47 msgid "Quantity Manufactured" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/view/wo_production_view.php:63 +#: c:\Apache2\htdocs\account22/manufacturing/view/wo_production_view.php:63 msgid "This production has been voided." msgstr "" -#: c:\Apache2\htdocs\account21/modules/osc_orders/osCommerce.php:525 -msgid "Configuration" -msgstr "" - -#: c:\Apache2\htdocs\account21/modules/osc_orders/osCommerce.php:528 -msgid "&Customer Import" -msgstr "" - -#: c:\Apache2\htdocs\account21/modules/osc_orders/osCommerce.php:531 -msgid "&Order Import" -msgstr "" - -#: c:\Apache2\htdocs\account21/modules/osc_orders/osCommerce.php:561 -#: c:\Apache2\htdocs\account21/modules/osc_orders/osCommerce.php:606 -msgid "Default Tax Group:" -msgstr "" - -#: c:\Apache2\htdocs\account21/purchasing/po_entry_items.php:27 +#: c:\Apache2\htdocs\account22/purchasing/po_entry_items.php:27 msgid "Modify Purchase Order #" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_entry_items.php:31 +#: c:\Apache2\htdocs\account22/purchasing/po_entry_items.php:31 msgid "Purchase Order Entry" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_entry_items.php:68 +#: c:\Apache2\htdocs\account22/purchasing/po_entry_items.php:48 msgid "Purchase Order has been entered" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_entry_items.php:70 +#: c:\Apache2\htdocs\account22/purchasing/po_entry_items.php:50 msgid "Purchase Order has been updated" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_entry_items.php:71 +#: c:\Apache2\htdocs\account22/purchasing/po_entry_items.php:51 msgid "&View this order" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_entry_items.php:73 +#: c:\Apache2\htdocs\account22/purchasing/po_entry_items.php:53 msgid "&Print This Order" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_entry_items.php:75 +#: c:\Apache2\htdocs\account22/purchasing/po_entry_items.php:55 +msgid "&Email This Order" +msgstr "" + +#: c:\Apache2\htdocs\account22/purchasing/po_entry_items.php:57 msgid "&Receive Items on this Purchase Order" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_entry_items.php:77 +#: c:\Apache2\htdocs\account22/purchasing/po_entry_items.php:59 msgid "Enter &Another Purchase Order" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_entry_items.php:79 +#: c:\Apache2\htdocs\account22/purchasing/po_entry_items.php:61 msgid "Select An &Outstanding Purchase Order" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_entry_items.php:134 +#: c:\Apache2\htdocs\account22/purchasing/po_entry_items.php:116 msgid "This item cannot be deleted because some of it has already been received." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_entry_items.php:149 +#: c:\Apache2\htdocs\account22/purchasing/po_entry_items.php:131 msgid "This order cannot be cancelled because some of it has already been received." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_entry_items.php:150 +#: c:\Apache2\htdocs\account22/purchasing/po_entry_items.php:132 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 "" -#: c:\Apache2\htdocs\account21/purchasing/po_entry_items.php:162 +#: c:\Apache2\htdocs\account22/purchasing/po_entry_items.php:147 msgid "This purchase order has been cancelled." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_entry_items.php:164 +#: c:\Apache2\htdocs\account22/purchasing/po_entry_items.php:149 msgid "Enter a new purchase order" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_entry_items.php:177 +#: c:\Apache2\htdocs\account22/purchasing/po_entry_items.php:162 msgid "The quantity of the order item must be numeric and not less than zero." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_entry_items.php:184 +#: c:\Apache2\htdocs\account22/purchasing/po_entry_items.php:169 msgid "The price entered must be numeric and not less than zero." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_entry_items.php:207 +#: c:\Apache2\htdocs\account22/purchasing/po_entry_items.php:192 msgid "You are attempting to make the quantity ordered a quantity less than has already been invoiced or received. This is prohibited." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_entry_items.php:208 +#: c:\Apache2\htdocs\account22/purchasing/po_entry_items.php:193 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 "" -#: c:\Apache2\htdocs\account21/purchasing/po_entry_items.php:238 +#: c:\Apache2\htdocs\account22/purchasing/po_entry_items.php:223 msgid "The selected item is already on this order." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_entry_items.php:267 +#: c:\Apache2\htdocs\account22/purchasing/po_entry_items.php:252 msgid "The selected item does not exist or it is a kit part and therefore cannot be purchased." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_entry_items.php:281 +#: c:\Apache2\htdocs\account22/purchasing/po_entry_items.php:268 msgid "The entered order date is invalid." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_entry_items.php:290 +#: c:\Apache2\htdocs\account22/purchasing/po_entry_items.php:277 msgid "There is no reference entered for this purchase order." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_entry_items.php:305 +#: c:\Apache2\htdocs\account22/purchasing/po_entry_items.php:292 msgid "There is no delivery address specified." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_entry_items.php:312 +#: c:\Apache2\htdocs\account22/purchasing/po_entry_items.php:299 msgid "There is no location specified to move any items into." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_entry_items.php:319 +#: c:\Apache2\htdocs\account22/purchasing/po_entry_items.php:306 msgid "The order cannot be placed because there are no lines entered on this order." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_entry_items.php:416 +#: c:\Apache2\htdocs\account22/purchasing/po_entry_items.php:403 msgid "Update Order" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_entry_items.php:418 +#: c:\Apache2\htdocs\account22/purchasing/po_entry_items.php:405 msgid "Place Order" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_entry_items.php:419 -#: c:\Apache2\htdocs\account21/purchasing/po_entry_items.php:422 +#: c:\Apache2\htdocs\account22/purchasing/po_entry_items.php:406 +#: c:\Apache2\htdocs\account22/purchasing/po_entry_items.php:409 msgid "Cancel Order" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_receive_items.php:25 +#: c:\Apache2\htdocs\account22/purchasing/po_receive_items.php:25 msgid "Receive Purchase Order Items" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_receive_items.php:34 +#: c:\Apache2\htdocs\account22/purchasing/po_receive_items.php:34 msgid "Purchase Order Delivery has been processed" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_receive_items.php:36 +#: c:\Apache2\htdocs\account22/purchasing/po_receive_items.php:36 msgid "&View this Delivery" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_receive_items.php:42 +#: c:\Apache2\htdocs\account22/purchasing/po_receive_items.php:38 +msgid "Entry purchase &invoice for this receival" +msgstr "" + +#: c:\Apache2\htdocs\account22/purchasing/po_receive_items.php:40 msgid "Select a different &purchase order for receiving items against" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_receive_items.php:52 +#: c:\Apache2\htdocs\account22/purchasing/po_receive_items.php:49 msgid "This page can only be opened if a purchase order has been selected. Please select a purchase order first." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_receive_items.php:63 +#: c:\Apache2\htdocs\account22/purchasing/po_receive_items.php:60 msgid "Item Code" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_receive_items.php:63 +#: c:\Apache2\htdocs\account22/purchasing/po_receive_items.php:60 msgid "Ordered" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_receive_items.php:63 +#: c:\Apache2\htdocs\account22/purchasing/po_receive_items.php:60 msgid "Received" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_receive_items.php:64 +#: c:\Apache2\htdocs\account22/purchasing/po_receive_items.php:61 msgid "Outstanding" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_receive_items.php:64 +#: c:\Apache2\htdocs\account22/purchasing/po_receive_items.php:61 msgid "This Delivery" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_receive_items.php:112 +#: c:\Apache2\htdocs\account22/purchasing/po_receive_items.php:109 msgid "Total value of items received" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_receive_items.php:161 -#: c:\Apache2\htdocs\account21/purchasing/po_receive_items.php:210 +#: c:\Apache2\htdocs\account22/purchasing/po_receive_items.php:160 +#: c:\Apache2\htdocs\account22/purchasing/po_receive_items.php:209 msgid "There is nothing to process. Please enter valid quantities greater than zero." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_receive_items.php:215 +#: c:\Apache2\htdocs\account22/purchasing/po_receive_items.php:214 msgid "Entered quantities cannot be greater than the quantity entered on the purchase order including the allowed over-receive percentage" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_receive_items.php:217 +#: c:\Apache2\htdocs\account22/purchasing/po_receive_items.php:216 msgid "Modify the ordered items on the purchase order if you wish to increase the quantities." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_receive_items.php:235 +#: c:\Apache2\htdocs\account22/purchasing/po_receive_items.php:234 msgid "This order has been changed or invoiced since this delivery was started to be actioned. Processing halted. To enter a delivery against this purchase order, it must be re-selected and re-read again to update the changes made by the other user." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_receive_items.php:237 +#: c:\Apache2\htdocs\account22/purchasing/po_receive_items.php:236 msgid "Select a different purchase order for receiving goods against" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_receive_items.php:239 +#: c:\Apache2\htdocs\account22/purchasing/po_receive_items.php:238 msgid "Re-Read the updated purchase order for receiving goods against" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_receive_items.php:308 +#: c:\Apache2\htdocs\account22/purchasing/po_receive_items.php:308 msgid "Items to Receive" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/po_receive_items.php:313 +#: c:\Apache2\htdocs\account22/purchasing/po_receive_items.php:313 msgid "Process Receive Items" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_credit.php:29 +#: c:\Apache2\htdocs\account22/purchasing/po_receive_items.php:313 +msgid "Clear all GL entry fields" +msgstr "" + +#: c:\Apache2\htdocs\account22/purchasing/supplier_credit.php:28 msgid "Supplier Credit Note" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_credit.php:56 +#: c:\Apache2\htdocs\account22/purchasing/supplier_credit.php:43 msgid "Supplier credit note has been processed." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_credit.php:57 +#: c:\Apache2\htdocs\account22/purchasing/supplier_credit.php:44 msgid "View this Credit Note" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_credit.php:59 +#: c:\Apache2\htdocs\account22/purchasing/supplier_credit.php:46 msgid "View the GL Journal Entries for this Credit Note" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_credit.php:61 +#: c:\Apache2\htdocs\account22/purchasing/supplier_credit.php:48 msgid "Enter Another Credit Note" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_credit.php:62 -#: c:\Apache2\htdocs\account21/purchasing/supplier_invoice.php:63 +#: c:\Apache2\htdocs\account22/purchasing/supplier_credit.php:49 +#: c:\Apache2\htdocs\account22/purchasing/supplier_invoice.php:52 msgid "Add an Attachment" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_credit.php:117 -#: c:\Apache2\htdocs\account21/purchasing/supplier_invoice.php:117 +#: c:\Apache2\htdocs\account22/purchasing/supplier_credit.php:104 +#: c:\Apache2\htdocs\account22/purchasing/supplier_invoice.php:106 msgid "The account code entered is not a valid code, this line cannot be added to the transaction." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_credit.php:127 -#: c:\Apache2\htdocs\account21/purchasing/supplier_invoice.php:127 +#: c:\Apache2\htdocs\account22/purchasing/supplier_credit.php:114 +#: c:\Apache2\htdocs\account22/purchasing/supplier_invoice.php:116 msgid "The amount entered is not numeric. This line cannot be added to the transaction." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_credit.php:157 +#: c:\Apache2\htdocs\account22/purchasing/supplier_credit.php:144 msgid "The credit note cannot be processed because the there are no items or values on the invoice. Credit notes are expected to have a charge." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_credit.php:164 +#: c:\Apache2\htdocs\account22/purchasing/supplier_credit.php:151 msgid "You must enter an credit note reference." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_credit.php:178 +#: c:\Apache2\htdocs\account22/purchasing/supplier_credit.php:165 msgid "You must enter a supplier's credit note reference." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_credit.php:185 +#: c:\Apache2\htdocs\account22/purchasing/supplier_credit.php:172 msgid "The credit note as entered cannot be processed because the date entered is not valid." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_credit.php:197 -#: c:\Apache2\htdocs\account21/purchasing/supplier_invoice.php:193 +#: c:\Apache2\htdocs\account22/purchasing/supplier_credit.php:184 +#: c:\Apache2\htdocs\account22/purchasing/supplier_invoice.php:184 msgid "The invoice as entered cannot be processed because the due date is in an incorrect format." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_credit.php:204 +#: c:\Apache2\htdocs\account22/purchasing/supplier_credit.php:191 msgid "The credit note total as entered is less than the sum of the the general ledger entires (if any) and the charges for goods received. There must be a mistake somewhere, the credit note as entered will not be processed." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_credit.php:242 +#: c:\Apache2\htdocs\account22/purchasing/supplier_credit.php:229 msgid "The quantity to credit must be numeric and greater than zero." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_credit.php:249 +#: c:\Apache2\htdocs\account22/purchasing/supplier_credit.php:236 msgid "The price is either not numeric or negative." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_credit.php:357 +#: c:\Apache2\htdocs\account22/purchasing/supplier_credit.php:344 msgid "Enter Credit Note" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_invoice.php:28 +#: c:\Apache2\htdocs\account22/purchasing/supplier_invoice.php:28 msgid "Enter Supplier Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_invoice.php:56 +#: c:\Apache2\htdocs\account22/purchasing/supplier_invoice.php:43 msgid "Supplier invoice has been processed." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_invoice.php:57 +#: c:\Apache2\htdocs\account22/purchasing/supplier_invoice.php:44 msgid "View this Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_invoice.php:59 +#: c:\Apache2\htdocs\account22/purchasing/supplier_invoice.php:46 msgid "View the GL Journal Entries for this Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_invoice.php:61 +#: c:\Apache2\htdocs\account22/purchasing/supplier_invoice.php:48 +msgid "Entry supplier &payment for this invoice" +msgstr "" + +#: c:\Apache2\htdocs\account22/purchasing/supplier_invoice.php:50 msgid "Enter Another Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_invoice.php:154 +#: c:\Apache2\htdocs\account22/purchasing/supplier_invoice.php:145 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 "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_invoice.php:160 +#: c:\Apache2\htdocs\account22/purchasing/supplier_invoice.php:151 msgid "You must enter an invoice reference." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_invoice.php:174 +#: c:\Apache2\htdocs\account22/purchasing/supplier_invoice.php:165 msgid "You must enter a supplier's invoice reference." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_invoice.php:181 +#: c:\Apache2\htdocs\account22/purchasing/supplier_invoice.php:172 msgid "The invoice as entered cannot be processed because the invoice date is in an incorrect format." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_invoice.php:208 +#: c:\Apache2\htdocs\account22/purchasing/supplier_invoice.php:199 msgid "This invoice number has already been entered. It cannot be entered again. (" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_invoice.php:245 +#: c:\Apache2\htdocs\account22/purchasing/supplier_invoice.php:236 msgid "The quantity to invoice must be numeric and greater than zero." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_invoice.php:252 +#: c:\Apache2\htdocs\account22/purchasing/supplier_invoice.php:243 msgid "The price is not numeric." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_invoice.php:264 +#: c:\Apache2\htdocs\account22/purchasing/supplier_invoice.php:256 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 "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_invoice.php:265 -#: c:\Apache2\htdocs\account21/purchasing/supplier_invoice.php:278 +#: c:\Apache2\htdocs\account22/purchasing/supplier_invoice.php:257 +#: c:\Apache2\htdocs\account22/purchasing/supplier_invoice.php:270 msgid "The over-charge percentage allowance is :" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_invoice.php:277 +#: c:\Apache2\htdocs\account22/purchasing/supplier_invoice.php:269 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 this. See the system administrator to modify the set up parameters if necessary." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_invoice.php:374 +#: c:\Apache2\htdocs\account22/purchasing/supplier_invoice.php:366 #, php-format msgid "All yet non-invoiced items on delivery line # %d has been removed." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_invoice.php:419 +#: c:\Apache2\htdocs\account22/purchasing/supplier_invoice.php:411 msgid "Enter Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:27 +#: c:\Apache2\htdocs\account22/purchasing/supplier_payment.php:31 msgid "Supplier Payment Entry" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:60 +#: c:\Apache2\htdocs\account22/purchasing/supplier_payment.php:70 msgid "Payment has been sucessfully entered" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:62 +#: c:\Apache2\htdocs\account22/purchasing/supplier_payment.php:72 msgid "View the GL &Journal Entries for this Payment" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:64 -msgid "&Allocate this Payment" -msgstr "" - -#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:66 +#: c:\Apache2\htdocs\account22/purchasing/supplier_payment.php:76 msgid "Enter another supplier &payment" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:90 -msgid "From Bank Account:" -msgstr "" - -#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:92 -msgid "Amount of Payment:" +#: c:\Apache2\htdocs\account22/purchasing/supplier_payment.php:116 +msgid "The exchange rate must be numeric and greater than zero." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:93 -msgid "Amount of Discount:" +#: c:\Apache2\htdocs\account22/purchasing/supplier_payment.php:128 +msgid "The entered discount is invalid or less than zero." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:95 -msgid "Date Paid" +#: c:\Apache2\htdocs\account22/purchasing/supplier_payment.php:135 +msgid "The total of the amount and the discount is zero or negative. Please enter positive values." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:99 +#: c:\Apache2\htdocs\account22/purchasing/supplier_payment.php:226 msgid "Payment To:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:117 -msgid "Enter Payment" +#: c:\Apache2\htdocs\account22/purchasing/supplier_payment.php:233 +msgid "From Bank Account:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:121 -msgid "The amount and discount are in the bank account's currency." +#: c:\Apache2\htdocs\account22/purchasing/supplier_payment.php:239 +msgid "Date Paid" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:145 -msgid "The exchange rate must be numeric and greater than zero." -msgstr "" - -#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:157 -msgid "The entered discount is invalid or less than zero." +#: c:\Apache2\htdocs\account22/purchasing/supplier_payment.php:262 +msgid "Amount of Discount:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:164 -msgid "The total of the amount and the discount is zero or negative. Please enter positive values." +#: c:\Apache2\htdocs\account22/purchasing/supplier_payment.php:263 +msgid "Amount of Payment:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/allocations/supplier_allocate.php:28 -msgid "Allocate Supplier Payment or Credit Note" +#: c:\Apache2\htdocs\account22/purchasing/supplier_payment.php:269 +msgid "The amount and discount are in the bank account's currency." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/allocations/supplier_allocate.php:51 -msgid "The entry for one or more amounts is invalid or negative." +#: c:\Apache2\htdocs\account22/purchasing/supplier_payment.php:272 +msgid "Enter Payment" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/allocations/supplier_allocate.php:70 -msgid "These allocations cannot be processed because the amount allocated is more than the total amount left to allocate." +#: c:\Apache2\htdocs\account22/purchasing/allocations/supplier_allocate.php:29 +msgid "Allocate Supplier Payment or Credit Note" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/allocations/supplier_allocate.php:190 +#: c:\Apache2\htdocs\account22/purchasing/allocations/supplier_allocate.php:50 msgid "Allocation of" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/allocations/supplier_allocate.php:195 +#: c:\Apache2\htdocs\account22/purchasing/allocations/supplier_allocate.php:55 msgid "Total:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/allocations/supplier_allocate.php:203 -#: c:\Apache2\htdocs\account21/purchasing/allocations/supplier_allocation_main.php:108 -msgid "Transaction Type" -msgstr "" - -#: c:\Apache2\htdocs\account21/purchasing/allocations/supplier_allocate.php:204 -msgid "Other Allocations" -msgstr "" - -#: c:\Apache2\htdocs\account21/purchasing/allocations/supplier_allocate.php:204 -msgid "This Allocation" -msgstr "" - -#: c:\Apache2\htdocs\account21/purchasing/allocations/supplier_allocate.php:204 -#: c:\Apache2\htdocs\account21/purchasing/allocations/supplier_allocate.php:245 -#: c:\Apache2\htdocs\account21/purchasing/allocations/supplier_allocation_main.php:115 -msgid "Left to Allocate" -msgstr "" - -#: c:\Apache2\htdocs\account21/purchasing/allocations/supplier_allocate.php:235 -msgid "Total Allocated" -msgstr "" - -#: c:\Apache2\htdocs\account21/purchasing/allocations/supplier_allocate.php:251 +#: c:\Apache2\htdocs\account22/purchasing/allocations/supplier_allocate.php:64 msgid "Refresh" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/allocations/supplier_allocate.php:251 +#: c:\Apache2\htdocs\account22/purchasing/allocations/supplier_allocate.php:64 msgid "Start again allocation of selected amount" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/allocations/supplier_allocate.php:252 +#: c:\Apache2\htdocs\account22/purchasing/allocations/supplier_allocate.php:65 msgid "Process allocations" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/allocations/supplier_allocate.php:253 -#: c:\Apache2\htdocs\account21/purchasing/allocations/supplier_allocate.php:259 +#: c:\Apache2\htdocs\account22/purchasing/allocations/supplier_allocate.php:66 +#: c:\Apache2\htdocs\account22/purchasing/allocations/supplier_allocate.php:72 msgid "Back to Allocations" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/allocations/supplier_allocate.php:254 -#: c:\Apache2\htdocs\account21/purchasing/allocations/supplier_allocate.php:260 +#: c:\Apache2\htdocs\account22/purchasing/allocations/supplier_allocate.php:67 +#: c:\Apache2\htdocs\account22/purchasing/allocations/supplier_allocate.php:73 msgid "Abandon allocations and return to selection of allocatable amounts" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/allocations/supplier_allocate.php:258 +#: c:\Apache2\htdocs\account22/purchasing/allocations/supplier_allocate.php:71 msgid "There are no unsettled transactions to allocate." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/allocations/supplier_allocation_main.php:26 +#: c:\Apache2\htdocs\account22/purchasing/allocations/supplier_allocation_main.php:26 msgid "Supplier Allocations" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/allocations/supplier_allocation_main.php:51 +#: c:\Apache2\htdocs\account22/purchasing/allocations/supplier_allocation_main.php:36 msgid "Select a Supplier: " msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/allocations/supplier_allocation_main.php:54 +#: c:\Apache2\htdocs\account22/purchasing/allocations/supplier_allocation_main.php:39 msgid "Show Settled Items:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/allocations/supplier_allocation_main.php:84 +#: c:\Apache2\htdocs\account22/purchasing/allocations/supplier_allocation_main.php:70 msgid "Allocate" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/allocations/supplier_allocation_main.php:125 +#: c:\Apache2\htdocs\account22/purchasing/allocations/supplier_allocation_main.php:94 +msgid "Transaction Type" +msgstr "" + +#: c:\Apache2\htdocs\account22/purchasing/allocations/supplier_allocation_main.php:101 +msgid "Left to Allocate" +msgstr "" + +#: c:\Apache2\htdocs\account22/purchasing/allocations/supplier_allocation_main.php:111 msgid "Marked items are settled." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/inquiry/po_search.php:25 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/po_search.php:25 msgid "Search Outstanding Purchase Orders" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/inquiry/po_search.php:62 -#: c:\Apache2\htdocs\account21/purchasing/inquiry/po_search_completed.php:60 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/po_search.php:62 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/po_search_completed.php:60 msgid "#:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/inquiry/po_search.php:95 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/po_search.php:93 msgid "Receive" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/inquiry/po_search.php:176 -#: c:\Apache2\htdocs\account21/purchasing/inquiry/po_search_completed.php:158 -#: c:\Apache2\htdocs\account21/purchasing/inquiry/supplier_inquiry.php:213 -#: c:\Apache2\htdocs\account21/purchasing/view/view_supp_credit.php:45 -#: c:\Apache2\htdocs\account21/purchasing/view/view_supp_invoice.php:48 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/po_search.php:173 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/po_search_completed.php:157 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:213 msgid "Supplier's Reference" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/inquiry/po_search.php:177 -#: c:\Apache2\htdocs\account21/purchasing/inquiry/po_search_completed.php:159 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/po_search.php:174 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/po_search_completed.php:158 msgid "Order Date" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/inquiry/po_search.php:179 -#: c:\Apache2\htdocs\account21/purchasing/inquiry/po_search_completed.php:161 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/po_search.php:176 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/po_search_completed.php:160 msgid "Order Total" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/inquiry/po_search.php:190 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/po_search.php:187 msgid "Marked orders have overdue items." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/inquiry/po_search_completed.php:24 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/po_search_completed.php:24 msgid "Search Purchase Orders" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/inquiry/po_search_completed.php:65 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/po_search_completed.php:65 msgid "into location:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/inquiry/supplier_allocation_inquiry.php:23 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_allocation_inquiry.php:23 msgid "Supplier Allocation Inquiry" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/inquiry/supplier_allocation_inquiry.php:48 -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:166 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_allocation_inquiry.php:48 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:178 msgid "Select a supplier: " msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/inquiry/supplier_allocation_inquiry.php:55 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_allocation_inquiry.php:55 msgid "show settled:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/inquiry/supplier_allocation_inquiry.php:98 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_allocation_inquiry.php:99 msgid "Allocations" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/inquiry/supplier_allocation_inquiry.php:177 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_allocation_inquiry.php:179 msgid "Supp Reference" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/inquiry/supplier_allocation_inquiry.php:183 -#: c:\Apache2\htdocs\account21/reporting/rep101.php:84 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_allocation_inquiry.php:185 msgid "Allocated" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/inquiry/supplier_allocation_inquiry.php:195 -#: c:\Apache2\htdocs\account21/purchasing/inquiry/supplier_inquiry.php:233 -#: c:\Apache2\htdocs\account21/purchasing/view/view_po.php:90 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_allocation_inquiry.php:197 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:233 msgid "Marked items are overdue." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/inquiry/supplier_inquiry.php:24 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:24 msgid "Supplier Inquiry" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/inquiry/supplier_inquiry.php:46 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:46 msgid "Select a supplier:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/inquiry/supplier_inquiry.php:68 -#: c:\Apache2\htdocs\account21/purchasing/inquiry/supplier_inquiry.php:69 -#: c:\Apache2\htdocs\account21/purchasing/inquiry/supplier_inquiry.php:70 -#: c:\Apache2\htdocs\account21/reporting/rep102.php:108 -#: c:\Apache2\htdocs\account21/reporting/rep102.php:109 -#: c:\Apache2\htdocs\account21/reporting/rep102.php:110 -#: c:\Apache2\htdocs\account21/reporting/rep102.php:225 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:67 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:68 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:69 msgid "Days" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/inquiry/supplier_inquiry.php:70 -#: c:\Apache2\htdocs\account21/reporting/rep102.php:110 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:69 msgid "Over" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/inquiry/supplier_inquiry.php:74 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:73 msgid "Terms" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/inquiry/supplier_inquiry.php:74 -#: c:\Apache2\htdocs\account21/reporting/rep102.php:113 -#: c:\Apache2\htdocs\account21/reporting/rep102.php:223 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:73 msgid "Current" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/inquiry/supplier_inquiry.php:75 -#: c:\Apache2\htdocs\account21/reporting/rep102.php:114 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:74 msgid "Total Balance" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/inquiry/supplier_inquiry.php:128 +#: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:128 msgid "Credit This" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:16 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:16 msgid "Suppliers" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:22 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:22 msgid "There are no tax groups defined in the system. At least one tax group is required before proceeding." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:44 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:44 msgid "The supplier name must be entered." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:77 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:51 +msgid "The supplier short name must be entered." +msgstr "" + +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:90 msgid "Supplier has been updated." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:110 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:125 msgid "A new supplier has been added." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:130 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:145 msgid "Cannot delete this supplier because there are transactions that refer to this supplier." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:141 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:156 msgid "Cannot delete the supplier record because purchase orders have been created against this supplier." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:167 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:179 msgid "New supplier" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:225 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:247 msgid "Name and Contact" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:227 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:249 msgid "Supplier Name:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:234 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:250 +msgid "Supplier Short Name:" +msgstr "" + +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:258 msgid "Website:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:235 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:259 msgid "Our Customer No:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:237 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:261 msgid "Addresses" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:238 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:262 msgid "Mailing Address:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:239 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:263 msgid "Physical Address:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:243 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:267 msgid "Purchasing" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:245 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:269 msgid "Bank Name/Account:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:246 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:270 msgid "Credit Limit:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:249 -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:254 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:273 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:278 msgid "Supplier's Currency:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:257 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:281 msgid "Tax Group:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:259 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:283 msgid "Payment Terms:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:261 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:285 msgid "Accounts" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:263 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:287 msgid "Accounts Payable Account:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:265 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:289 msgid "Purchase Account:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:282 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:306 msgid "General" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:283 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:307 msgid "General Notes:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:290 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:308 +msgid "Supplier status:" +msgstr "" + +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:315 msgid "Update Supplier" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:291 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:316 msgid "Update supplier data" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:292 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:317 msgid "Select this supplier and return to document entry." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:293 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:318 msgid "Delete Supplier" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:294 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:319 msgid "Delete supplier data if have been never used" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/manage/suppliers.php:298 +#: c:\Apache2\htdocs\account22/purchasing/manage/suppliers.php:323 msgid "Add New Supplier Details" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_grn.php:21 +#: c:\Apache2\htdocs\account22/purchasing/view/view_grn.php:21 msgid "View Purchase Order Delivery" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_grn.php:27 +#: c:\Apache2\htdocs\account22/purchasing/view/view_grn.php:27 msgid "This page must be called with a Purchase Order Delivery number to review." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_grn.php:33 +#: c:\Apache2\htdocs\account22/purchasing/view/view_grn.php:33 msgid "Purchase Order Delivery" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_grn.php:37 -#: c:\Apache2\htdocs\account21/purchasing/view/view_po.php:41 +#: c:\Apache2\htdocs\account22/purchasing/view/view_grn.php:37 +#: c:\Apache2\htdocs\account22/purchasing/view/view_po.php:41 msgid "Line Details" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_grn.php:40 -#: c:\Apache2\htdocs\account21/purchasing/view/view_po.php:45 +#: c:\Apache2\htdocs\account22/purchasing/view/view_grn.php:40 +#: c:\Apache2\htdocs\account22/purchasing/view/view_po.php:45 msgid "Item Description" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_grn.php:40 +#: c:\Apache2\htdocs\account22/purchasing/view/view_grn.php:40 msgid "Delivery Date" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_grn.php:41 -#: c:\Apache2\htdocs\account21/purchasing/view/view_po.php:46 +#: c:\Apache2\htdocs\account22/purchasing/view/view_grn.php:41 +#: c:\Apache2\htdocs\account22/purchasing/view/view_po.php:46 msgid "Line Total" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_grn.php:41 -#: c:\Apache2\htdocs\account21/purchasing/view/view_po.php:46 +#: c:\Apache2\htdocs\account22/purchasing/view/view_grn.php:41 +#: c:\Apache2\htdocs\account22/purchasing/view/view_po.php:46 msgid "Quantity Invoiced" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_grn.php:70 -#: c:\Apache2\htdocs\account21/purchasing/view/view_po.php:84 +#: c:\Apache2\htdocs\account22/purchasing/view/view_grn.php:70 +#: c:\Apache2\htdocs\account22/purchasing/view/view_po.php:84 msgid "Total Excluding Tax/Shipping" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_grn.php:75 +#: c:\Apache2\htdocs\account22/purchasing/view/view_grn.php:75 msgid "This delivery has been voided." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_po.php:22 +#: c:\Apache2\htdocs\account22/purchasing/view/view_po.php:22 msgid "View Purchase Order" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_po.php:27 +#: c:\Apache2\htdocs\account22/purchasing/view/view_po.php:27 msgid "This page must be called with a purchase order number to review." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_po.php:30 +#: c:\Apache2\htdocs\account22/purchasing/view/view_po.php:30 msgid "Purchase Order" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_po.php:46 +#: c:\Apache2\htdocs\account22/purchasing/view/view_po.php:46 msgid "Requested By" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_po.php:46 +#: c:\Apache2\htdocs\account22/purchasing/view/view_po.php:46 msgid "Quantity Received" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_po.php:103 +#: c:\Apache2\htdocs\account22/purchasing/view/view_po.php:103 msgid "Deliveries" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_po.php:105 +#: c:\Apache2\htdocs\account22/purchasing/view/view_po.php:105 msgid "Delivered On" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_po.php:128 +#: c:\Apache2\htdocs\account22/purchasing/view/view_po.php:128 msgid "Invoices/Credits" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_supp_credit.php:23 +#: c:\Apache2\htdocs\account22/purchasing/view/view_supp_credit.php:23 msgid "View Supplier Credit Note" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_supp_credit.php:39 +#: c:\Apache2\htdocs\account22/purchasing/view/view_supp_credit.php:39 msgid "SUPPLIER CREDIT NOTE" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_supp_credit.php:48 -#: c:\Apache2\htdocs\account21/purchasing/view/view_supp_invoice.php:51 +#: c:\Apache2\htdocs\account22/purchasing/view/view_supp_credit.php:48 +#: c:\Apache2\htdocs\account22/purchasing/view/view_supp_invoice.php:51 msgid "Invoice Date" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_supp_credit.php:61 -#: c:\Apache2\htdocs\account21/purchasing/view/view_supp_invoice.php:66 +#: c:\Apache2\htdocs\account22/purchasing/view/view_supp_credit.php:61 +#: c:\Apache2\htdocs\account22/purchasing/view/view_supp_invoice.php:66 msgid "Sub Total" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_supp_credit.php:67 +#: c:\Apache2\htdocs\account22/purchasing/view/view_supp_credit.php:67 msgid "TOTAL CREDIT NOTE" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_supp_credit.php:71 +#: c:\Apache2\htdocs\account22/purchasing/view/view_supp_credit.php:71 msgid "This credit note has been voided." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_supp_invoice.php:23 +#: c:\Apache2\htdocs\account22/purchasing/view/view_supp_invoice.php:23 msgid "View Supplier Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_supp_invoice.php:41 +#: c:\Apache2\htdocs\account22/purchasing/view/view_supp_invoice.php:41 msgid "SUPPLIER INVOICE" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_supp_invoice.php:73 +#: c:\Apache2\htdocs\account22/purchasing/view/view_supp_invoice.php:73 msgid "TOTAL INVOICE" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_supp_invoice.php:77 +#: c:\Apache2\htdocs\account22/purchasing/view/view_supp_invoice.php:77 msgid "This invoice has been voided." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_supp_payment.php:22 +#: c:\Apache2\htdocs\account22/purchasing/view/view_supp_payment.php:22 msgid "View Payment to Supplier" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_supp_payment.php:47 +#: c:\Apache2\htdocs\account22/purchasing/view/view_supp_payment.php:47 msgid "Payment to Supplier" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_supp_payment.php:53 +#: c:\Apache2\htdocs\account22/purchasing/view/view_supp_payment.php:53 msgid "To Supplier" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_supp_payment.php:59 +#: c:\Apache2\htdocs\account22/purchasing/view/view_supp_payment.php:59 msgid "Payment Currency" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/view/view_supp_payment.php:66 +#: c:\Apache2\htdocs\account22/purchasing/view/view_supp_payment.php:66 msgid "Supplier's Currency" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep101.php:76 -#: c:\Apache2\htdocs\account21/reporting/rep102.php:101 +#: c:\Apache2\htdocs\account22/reporting/rep101.php:116 +#: c:\Apache2\htdocs\account22/reporting/rep102.php:99 msgid "Balances in Home Currency" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep101.php:83 +#: c:\Apache2\htdocs\account22/reporting/rep101.php:123 msgid "Trans Type" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep101.php:83 +#: c:\Apache2\htdocs\account22/reporting/rep101.php:123 msgid "Charges" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep101.php:83 +#: c:\Apache2\htdocs\account22/reporting/rep101.php:123 msgid "Credits" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep101.php:89 -#: c:\Apache2\htdocs\account21/reporting/rep102.php:119 -msgid "End Date" -msgstr "" - -#: c:\Apache2\htdocs\account21/reporting/rep101.php:90 -#: c:\Apache2\htdocs\account21/reporting/rep102.php:113 -#: c:\Apache2\htdocs\account21/reporting/rep102.php:120 +#: c:\Apache2\htdocs\account22/reporting/rep101.php:130 +#: c:\Apache2\htdocs\account22/reporting/rep102.php:111 +#: c:\Apache2\htdocs\account22/reporting/rep102.php:118 +#: c:\Apache2\htdocs\account22/reporting/rep105.php:107 +#: c:\Apache2\htdocs\account22/reporting/rep106.php:81 msgid "Customer" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep101.php:93 +#: c:\Apache2\htdocs\account22/reporting/rep101.php:133 msgid "Customer Balances" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep101.php:175 -#: c:\Apache2\htdocs\account21/reporting/rep102.php:209 +#: c:\Apache2\htdocs\account22/reporting/rep101.php:231 +#: c:\Apache2\htdocs\account22/reporting/rep102.php:207 +#: c:\Apache2\htdocs\account22/reporting/rep106.php:177 msgid "Grand Total" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep102.php:95 +#: c:\Apache2\htdocs\account22/reporting/rep102.php:93 +#: c:\Apache2\htdocs\account22/reporting/rep106.php:91 msgid "Summary Only" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep102.php:97 +#: c:\Apache2\htdocs\account22/reporting/rep102.php:95 msgid "Detailed Report" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep102.php:126 +#: c:\Apache2\htdocs\account22/reporting/rep102.php:117 +msgid "End Date" +msgstr "" + +#: c:\Apache2\htdocs\account22/reporting/rep102.php:124 msgid "Aged Customer Analysis" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep103.php:118 +#: c:\Apache2\htdocs\account22/reporting/rep103.php:118 msgid "All Areas" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep103.php:122 +#: c:\Apache2\htdocs\account22/reporting/rep103.php:122 msgid "All Sales Folk" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep103.php:126 +#: c:\Apache2\htdocs\account22/reporting/rep103.php:126 msgid "Greater than " msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep103.php:130 +#: c:\Apache2\htdocs\account22/reporting/rep103.php:130 msgid "Less than " msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep103.php:139 +#: c:\Apache2\htdocs\account22/reporting/rep103.php:139 msgid "Customer Postal Address" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep103.php:139 +#: c:\Apache2\htdocs\account22/reporting/rep103.php:139 msgid "Price/Turnover" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep103.php:139 +#: c:\Apache2\htdocs\account22/reporting/rep103.php:139 msgid "Branch Contact Information" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep103.php:140 +#: c:\Apache2\htdocs\account22/reporting/rep103.php:140 msgid "Branch Delivery Address" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep103.php:145 +#: c:\Apache2\htdocs\account22/reporting/rep103.php:145 msgid "Activity Since" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep103.php:146 +#: c:\Apache2\htdocs\account22/reporting/rep103.php:146 msgid "Sales Areas" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep103.php:147 +#: c:\Apache2\htdocs\account22/reporting/rep103.php:147 msgid "Sales Folk" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep103.php:148 +#: c:\Apache2\htdocs\account22/reporting/rep103.php:148 msgid "Activity" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep103.php:150 +#: c:\Apache2\htdocs\account22/reporting/rep103.php:150 msgid "Customer Details Listing" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep103.php:178 +#: c:\Apache2\htdocs\account22/reporting/rep103.php:178 msgid "Customers in" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep103.php:202 +#: c:\Apache2\htdocs\account22/reporting/rep103.php:202 msgid "Price List" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep103.php:204 +#: c:\Apache2\htdocs\account22/reporting/rep103.php:204 msgid "Turnover" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep103.php:207 +#: c:\Apache2\htdocs\account22/reporting/rep103.php:207 msgid "Ph" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep103.php:208 +#: c:\Apache2\htdocs\account22/reporting/rep103.php:208 msgid "Fax" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep104.php:109 +#: c:\Apache2\htdocs\account22/reporting/rep104.php:109 msgid "Category/Items" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep104.php:109 +#: c:\Apache2\htdocs\account22/reporting/rep104.php:109 msgid "GP %" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep104.php:117 +#: c:\Apache2\htdocs\account22/reporting/rep104.php:117 msgid "Show GP %" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep104.php:124 +#: c:\Apache2\htdocs\account22/reporting/rep104.php:124 msgid "Price Listing" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep104.php:190 +#: c:\Apache2\htdocs\account22/reporting/rep104.php:190 msgid "Sales Kits" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep105.php:99 +#: c:\Apache2\htdocs\account22/reporting/rep105.php:101 msgid "All Orders" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep105.php:101 +#: c:\Apache2\htdocs\account22/reporting/rep105.php:103 msgid "Back Orders Only" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep105.php:105 -#: c:\Apache2\htdocs\account21/reporting/rep204.php:81 +#: c:\Apache2\htdocs\account22/reporting/rep105.php:107 msgid "Order" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep105.php:105 -#: c:\Apache2\htdocs\account21/reporting/rep106.php:81 +#: c:\Apache2\htdocs\account22/reporting/rep105.php:107 +#: c:\Apache2\htdocs\account22/reporting/rep106.php:81 msgid "Branch" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep105.php:105 -#: c:\Apache2\htdocs\account21/reporting/rep106.php:81 +#: c:\Apache2\htdocs\account22/reporting/rep105.php:107 +#: c:\Apache2\htdocs\account22/reporting/rep106.php:81 msgid "Customer Ref" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep105.php:106 +#: c:\Apache2\htdocs\account22/reporting/rep105.php:108 msgid "Ord Date" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep105.php:106 +#: c:\Apache2\htdocs\account22/reporting/rep105.php:108 msgid "Del Date" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep105.php:106 +#: c:\Apache2\htdocs\account22/reporting/rep105.php:108 msgid "Loc" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep105.php:110 +#: c:\Apache2\htdocs\account22/reporting/rep105.php:112 msgid "Invoiced" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep105.php:117 +#: c:\Apache2\htdocs\account22/reporting/rep105.php:119 msgid "Selection" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep105.php:122 +#: c:\Apache2\htdocs\account22/reporting/rep105.php:124 msgid "Order Status Listing" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep106.php:81 +#: c:\Apache2\htdocs\account22/reporting/rep106.php:81 msgid "Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep106.php:82 +#: c:\Apache2\htdocs\account22/reporting/rep106.php:82 msgid "Inv Date" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep106.php:82 -#: c:\Apache2\htdocs\account21/reporting/rep106.php:86 -#: c:\Apache2\htdocs\account21/reporting/rep106.php:87 +#: c:\Apache2\htdocs\account22/reporting/rep106.php:82 +#: c:\Apache2\htdocs\account22/reporting/rep106.php:86 +#: c:\Apache2\htdocs\account22/reporting/rep106.php:87 msgid "Provision" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep106.php:86 +#: c:\Apache2\htdocs\account22/reporting/rep106.php:86 msgid "Salesman" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep106.php:86 +#: c:\Apache2\htdocs\account22/reporting/rep106.php:86 msgid "Email" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep106.php:87 +#: c:\Apache2\htdocs\account22/reporting/rep106.php:87 msgid "Break Pt." msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep106.php:96 +#: c:\Apache2\htdocs\account22/reporting/rep106.php:96 msgid "Salesman Listing" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep107.php:68 -#: c:\Apache2\htdocs\account21/reporting/rep107.php:97 -#: c:\Apache2\htdocs\account21/reporting/rep107.php:108 +#: c:\Apache2\htdocs\account22/reporting/rep107.php:66 +#: c:\Apache2\htdocs\account22/reporting/rep107.php:98 +#: c:\Apache2\htdocs\account22/reporting/rep107.php:109 msgid "INVOICE" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep107.php:102 -#: c:\Apache2\htdocs\account21/reporting/rep107.php:108 +#: c:\Apache2\htdocs\account22/reporting/rep107.php:103 +#: c:\Apache2\htdocs\account22/reporting/rep107.php:109 msgid "CREDIT NOTE" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep108.php:81 -#: c:\Apache2\htdocs\account21/reporting/rep108.php:108 +#: c:\Apache2\htdocs\account22/reporting/rep108.php:77 +#: c:\Apache2\htdocs\account22/reporting/rep108.php:106 msgid "STATEMENT" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep109.php:66 -#: c:\Apache2\htdocs\account21/reporting/rep109.php:90 -#: c:\Apache2\htdocs\account21/reporting/rep109.php:96 +#: c:\Apache2\htdocs\account22/reporting/rep109.php:64 +#: c:\Apache2\htdocs\account22/reporting/rep109.php:90 +#: c:\Apache2\htdocs\account22/reporting/rep109.php:96 msgid "SALES ORDER" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep109.php:68 -#: c:\Apache2\htdocs\account21/reporting/rep109.php:85 -#: c:\Apache2\htdocs\account21/reporting/rep109.php:96 +#: c:\Apache2\htdocs\account22/reporting/rep109.php:66 +#: c:\Apache2\htdocs\account22/reporting/rep109.php:85 +#: c:\Apache2\htdocs\account22/reporting/rep109.php:96 msgid "QUOTE" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep110.php:64 +#: c:\Apache2\htdocs\account22/reporting/rep110.php:68 msgid "DELIVERY" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep110.php:82 -#: c:\Apache2\htdocs\account21/reporting/rep110.php:87 +#: c:\Apache2\htdocs\account22/reporting/rep110.php:70 +#: c:\Apache2\htdocs\account22/reporting/rep110.php:95 +msgid "PACKING SLIP" +msgstr "" + +#: c:\Apache2\htdocs\account22/reporting/rep110.php:90 +#: c:\Apache2\htdocs\account22/reporting/rep110.php:101 msgid "DELIVERY NOTE" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep201.php:74 +#: c:\Apache2\htdocs\account22/reporting/rep111.php:60 +#: c:\Apache2\htdocs\account22/reporting/rep111.php:80 +msgid "SALES QUOTATION" +msgstr "" + +#: c:\Apache2\htdocs\account22/reporting/rep201.php:107 msgid "Balances in Home currency" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep201.php:91 +#: c:\Apache2\htdocs\account22/reporting/rep201.php:124 msgid "Supplier Balances" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep202.php:126 +#: c:\Apache2\htdocs\account22/reporting/rep202.php:124 msgid "currency" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep202.php:127 +#: c:\Apache2\htdocs\account22/reporting/rep202.php:125 msgid "Aged Supplier Analysis" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep203.php:98 +#: c:\Apache2\htdocs\account22/reporting/rep203.php:95 msgid "Payment Report" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep204.php:81 +#: c:\Apache2\htdocs\account22/reporting/rep204.php:82 msgid "GRN" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep204.php:81 +#: c:\Apache2\htdocs\account22/reporting/rep204.php:82 msgid "Qty Recd" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep204.php:81 +#: c:\Apache2\htdocs\account22/reporting/rep204.php:82 msgid "qty Inv" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep204.php:82 +#: c:\Apache2\htdocs\account22/reporting/rep204.php:83 msgid "Std Cost" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep204.php:82 -#: c:\Apache2\htdocs\account21/reporting/rep301.php:98 +#: c:\Apache2\htdocs\account22/reporting/rep204.php:83 +#: c:\Apache2\htdocs\account22/reporting/rep301.php:98 msgid "Value" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep204.php:89 +#: c:\Apache2\htdocs\account22/reporting/rep204.php:90 msgid "Outstanding GRNs Report" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep209.php:86 -#: c:\Apache2\htdocs\account21/reporting/rep209.php:101 -#: c:\Apache2\htdocs\account21/reporting/rep209.php:106 +#: c:\Apache2\htdocs\account22/reporting/rep209.php:85 +#: c:\Apache2\htdocs\account22/reporting/rep209.php:102 +#: c:\Apache2\htdocs\account22/reporting/rep209.php:107 msgid "PURCHASE ORDER" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep301.php:106 +#: c:\Apache2\htdocs\account22/reporting/rep301.php:106 msgid "Inventory Valuation Report" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep302.php:123 +#: c:\Apache2\htdocs\account22/reporting/rep302.php:123 msgid "QOH" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep302.php:123 +#: c:\Apache2\htdocs\account22/reporting/rep302.php:123 msgid "Cust Ord" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep302.php:123 +#: c:\Apache2\htdocs\account22/reporting/rep302.php:123 msgid "Supp Ord" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep302.php:123 +#: c:\Apache2\htdocs\account22/reporting/rep302.php:123 msgid "Sugg Ord" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep302.php:132 +#: c:\Apache2\htdocs\account22/reporting/rep302.php:132 msgid "Inventory Planning Report" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep303.php:94 +#: c:\Apache2\htdocs\account22/reporting/rep303.php:94 msgid "Shortage" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep303.php:104 -#: c:\Apache2\htdocs\account21/reporting/rep303.php:110 +#: c:\Apache2\htdocs\account22/reporting/rep303.php:104 +#: c:\Apache2\htdocs\account22/reporting/rep303.php:110 +#: c:\Apache2\htdocs\account22/reporting/rep305.php:70 msgid "Stock ID" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep303.php:104 +#: c:\Apache2\htdocs\account22/reporting/rep303.php:104 msgid "Check" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep303.php:118 +#: c:\Apache2\htdocs\account22/reporting/rep303.php:118 msgid "Only Shortage" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep303.php:125 +#: c:\Apache2\htdocs\account22/reporting/rep303.php:125 msgid "Stock Check Sheets" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep304.php:114 +#: c:\Apache2\htdocs\account22/reporting/rep304.php:114 msgid "Qty" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep304.php:114 +#: c:\Apache2\htdocs\account22/reporting/rep304.php:114 +msgid "Sales" +msgstr "" + +#: c:\Apache2\htdocs\account22/reporting/rep304.php:114 msgid "Cost" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep304.php:114 +#: c:\Apache2\htdocs\account22/reporting/rep304.php:114 msgid "Contribution" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep304.php:126 +#: c:\Apache2\htdocs\account22/reporting/rep304.php:126 msgid "Inventory Sales Report" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep401.php:69 +#: c:\Apache2\htdocs\account22/reporting/rep305.php:70 +msgid "PO No" +msgstr "" + +#: c:\Apache2\htdocs\account22/reporting/rep305.php:70 +msgid "Qty Received" +msgstr "" + +#: c:\Apache2\htdocs\account22/reporting/rep305.php:70 +msgid "Unit Price" +msgstr "" + +#: c:\Apache2\htdocs\account22/reporting/rep305.php:70 +msgid "Actual Price" +msgstr "" + +#: c:\Apache2\htdocs\account22/reporting/rep305.php:77 +msgid "GRN Valuation Report" +msgstr "" + +#: c:\Apache2\htdocs\account22/reporting/rep401.php:69 msgid "Wrk Ctr" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep401.php:76 +#: c:\Apache2\htdocs\account22/reporting/rep401.php:76 msgid "Bill of Material Listing" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep501.php:85 +#: c:\Apache2\htdocs\account22/reporting/rep409.php:65 +#: c:\Apache2\htdocs\account22/reporting/rep409.php:82 +#: c:\Apache2\htdocs\account22/reporting/rep409.php:87 +msgid "WORK ORDER" +msgstr "" + +#: c:\Apache2\htdocs\account22/reporting/rep409.php:132 +msgid "Insufficient stock" +msgstr "" + +#: c:\Apache2\htdocs\account22/reporting/rep501.php:85 msgid "YTD" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep501.php:92 +#: c:\Apache2\htdocs\account22/reporting/rep501.php:92 msgid "Dimension Summary" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep601.php:83 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:78 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:90 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:97 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:131 +#: c:\Apache2\htdocs\account22/reporting/rep601.php:83 msgid "Bank Account" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep702.php:51 +#: c:\Apache2\htdocs\account22/reporting/rep702.php:51 msgid "Type/Account" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep702.php:51 +#: c:\Apache2\htdocs\account22/reporting/rep702.php:51 msgid "Date/Dim." msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep702.php:52 +#: c:\Apache2\htdocs\account22/reporting/rep702.php:52 msgid "Person/Item/Memo" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep702.php:61 +#: c:\Apache2\htdocs\account22/reporting/rep702.php:62 msgid "List of Journal Entries" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep704.php:66 +#: c:\Apache2\htdocs\account22/reporting/rep704.php:66 msgid "GL Account Transactions" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep705.php:147 -#: c:\Apache2\htdocs\account21/reporting/rep705.php:159 -#: c:\Apache2\htdocs\account21/reporting/rep705.php:169 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:216 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:259 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:297 -#: c:\Apache2\htdocs\account21/reporting/backup/rep705.php:147 -#: c:\Apache2\htdocs\account21/reporting/backup/rep705.php:159 -#: c:\Apache2\htdocs\account21/reporting/backup/rep705.php:169 +#: c:\Apache2\htdocs\account22/reporting/rep705.php:151 +#: c:\Apache2\htdocs\account22/reporting/rep705.php:163 +#: c:\Apache2\htdocs\account22/reporting/rep705.php:173 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:232 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:275 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:313 msgid "Year" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep705.php:153 -#: c:\Apache2\htdocs\account21/reporting/rep705.php:163 -#: c:\Apache2\htdocs\account21/reporting/rep705.php:171 -#: c:\Apache2\htdocs\account21/reporting/backup/rep705.php:153 -#: c:\Apache2\htdocs\account21/reporting/backup/rep705.php:163 -#: c:\Apache2\htdocs\account21/reporting/backup/rep705.php:171 +#: c:\Apache2\htdocs\account22/reporting/rep705.php:157 +#: c:\Apache2\htdocs\account22/reporting/rep705.php:167 +#: c:\Apache2\htdocs\account22/reporting/rep705.php:175 msgid "Info" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep705.php:153 -#: c:\Apache2\htdocs\account21/reporting/rep705.php:163 -#: c:\Apache2\htdocs\account21/reporting/rep705.php:171 -#: c:\Apache2\htdocs\account21/reporting/backup/rep705.php:153 -#: c:\Apache2\htdocs\account21/reporting/backup/rep705.php:163 -#: c:\Apache2\htdocs\account21/reporting/backup/rep705.php:171 +#: c:\Apache2\htdocs\account22/reporting/rep705.php:157 +#: c:\Apache2\htdocs\account22/reporting/rep705.php:167 +#: c:\Apache2\htdocs\account22/reporting/rep705.php:175 msgid "Amounts in thousands" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep705.php:175 -#: c:\Apache2\htdocs\account21/reporting/backup/rep705.php:175 +#: c:\Apache2\htdocs\account22/reporting/rep705.php:179 msgid "Annual Expense Breakdown" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep705.php:361 -#: c:\Apache2\htdocs\account21/reporting/rep706.php:319 -#: c:\Apache2\htdocs\account21/reporting/rep706.php:325 -#: c:\Apache2\htdocs\account21/reporting/rep707.php:335 -#: c:\Apache2\htdocs\account21/reporting/rep707.php:341 -#: c:\Apache2\htdocs\account21/reporting/backup/rep705.php:355 -#: c:\Apache2\htdocs\account21/reporting/backup/rep706.php:289 -#: c:\Apache2\htdocs\account21/reporting/backup/rep706.php:295 +#: c:\Apache2\htdocs\account22/reporting/rep705.php:365 +#: c:\Apache2\htdocs\account22/reporting/rep706.php:319 +#: c:\Apache2\htdocs\account22/reporting/rep706.php:325 +#: c:\Apache2\htdocs\account22/reporting/rep707.php:336 +#: c:\Apache2\htdocs\account22/reporting/rep707.php:342 msgid "Calculated Return" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep706.php:77 -#: c:\Apache2\htdocs\account21/reporting/backup/rep706.php:77 -msgid "Open Balance" -msgstr "" - -#: c:\Apache2\htdocs\account21/reporting/rep706.php:78 -#: c:\Apache2\htdocs\account21/reporting/backup/rep706.php:78 +#: c:\Apache2\htdocs\account22/reporting/rep706.php:78 msgid "Close Balance" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep706.php:341 +#: c:\Apache2\htdocs\account22/reporting/rep706.php:341 msgid "Liabilities" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep706.php:341 +#: c:\Apache2\htdocs\account22/reporting/rep706.php:341 msgid " and " msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep706.php:341 +#: c:\Apache2\htdocs\account22/reporting/rep706.php:341 msgid "Equities" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep706.php:356 -#: c:\Apache2\htdocs\account21/reporting/rep707.php:357 -#: c:\Apache2\htdocs\account21/reporting/backup/rep706.php:314 +#: c:\Apache2\htdocs\account22/reporting/rep706.php:356 +#: c:\Apache2\htdocs\account22/reporting/rep707.php:358 msgid "Group" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep707.php:92 +#: c:\Apache2\htdocs\account22/reporting/rep707.php:92 msgid "Accumulated" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep707.php:92 +#: c:\Apache2\htdocs\account22/reporting/rep707.php:92 msgid "Achieved %" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep707.php:125 +#: c:\Apache2\htdocs\account22/reporting/rep707.php:125 msgid "Budget" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep707.php:134 +#: c:\Apache2\htdocs\account22/reporting/rep707.php:134 msgid "Period Y-1" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep707.php:137 +#: c:\Apache2\htdocs\account22/reporting/rep707.php:137 msgid "Profit and Loss Statement" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep709.php:88 +#: c:\Apache2\htdocs\account22/reporting/rep709.php:85 msgid "Tax Report" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep709.php:106 +#: c:\Apache2\htdocs\account22/reporting/rep709.php:103 msgid "Ref" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep709.php:106 +#: c:\Apache2\htdocs\account22/reporting/rep709.php:103 msgid "Branch Name" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep709.php:107 +#: c:\Apache2\htdocs\account22/reporting/rep709.php:104 msgid "Net" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep709.php:107 +#: c:\Apache2\htdocs\account22/reporting/rep709.php:104 msgid "Rate" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep709.php:107 +#: c:\Apache2\htdocs\account22/reporting/rep709.php:104 msgid "Tax" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep709.php:161 +#: c:\Apache2\htdocs\account22/reporting/rep709.php:160 msgid "Tax Rate" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/rep709.php:161 +#: c:\Apache2\htdocs\account22/reporting/rep709.php:160 msgid "Net Tax" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:23 +#: c:\Apache2\htdocs\account22/reporting/rep710.php:75 +msgid "Time" +msgstr "" + +#: c:\Apache2\htdocs\account22/reporting/rep710.php:75 +msgid "Trans Date" +msgstr "" + +#: c:\Apache2\htdocs\account22/reporting/rep710.php:76 +msgid "Action" +msgstr "" + +#: c:\Apache2\htdocs\account22/reporting/rep710.php:87 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:342 +msgid "Audit Trail" +msgstr "" + +#: c:\Apache2\htdocs\account22/reporting/rep710.php:107 +msgid "Changed" +msgstr "" + +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:23 msgid "Reports and Analysis" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:30 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:30 msgid "Customer &Balances" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:33 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:39 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:53 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:77 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:89 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:96 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:106 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:112 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:120 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:130 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:34 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:40 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:54 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:78 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:90 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:96 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:103 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:112 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:118 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:126 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:136 msgid "Currency Filter" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:34 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:42 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:50 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:58 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:66 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:72 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:81 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:86 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:92 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:100 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:107 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:115 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:121 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:125 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:133 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:140 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:145 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:153 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:161 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:168 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:177 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:188 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:194 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:200 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:213 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:219 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:227 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:236 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:245 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:256 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:261 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:268 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:276 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:284 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:294 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:298 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:304 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:311 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:318 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:325 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:35 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:43 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:51 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:59 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:67 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:73 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:81 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:87 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:92 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:99 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:105 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:113 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:121 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:127 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:131 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:138 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:145 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:150 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:158 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:166 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:171 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:178 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:184 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:192 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:203 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:209 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:215 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:229 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:235 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:243 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:252 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:261 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:272 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:277 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:284 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:292 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:300 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:310 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:314 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:320 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:327 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:334 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:341 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:347 msgid "Comments" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:35 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:43 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:51 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:59 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:67 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:73 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:108 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:116 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:122 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:126 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:141 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:146 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:154 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:162 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:169 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:178 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:189 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:195 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:201 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:214 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:220 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:228 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:237 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:246 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:257 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:262 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:269 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:277 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:285 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:295 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:299 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:305 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:312 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:319 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:36 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:44 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:52 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:60 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:68 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:74 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:114 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:122 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:128 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:132 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:146 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:151 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:159 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:167 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:172 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:179 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:193 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:204 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:210 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:216 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:230 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:236 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:244 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:253 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:262 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:273 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:278 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:285 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:293 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:301 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:311 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:315 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:321 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:328 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:335 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:348 msgid "Destination" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:36 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:37 msgid "&Aged Customer Analysis" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:41 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:114 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:226 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:235 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:267 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:275 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:303 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:310 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:42 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:120 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:242 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:251 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:283 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:291 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:319 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:326 msgid "Graphics" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:44 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:45 msgid "Customer &Detail Listing" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:48 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:49 msgid "Activity Greater Than" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:49 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:50 msgid "Activity Less Than" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:52 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:53 msgid "&Price Listing" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:54 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:63 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:137 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:143 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:148 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:158 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:55 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:64 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:142 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:148 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:153 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:163 msgid "Inventory Category" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:55 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:56 msgid "Sales Types" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:56 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:150 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:57 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:155 msgid "Show Pictures" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:60 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:61 msgid "&Order Status Listing" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:64 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:65 msgid "Stock Location" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:68 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:69 msgid "&Salesman Listing" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:74 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:75 msgid "Print &Invoices/Credit Notes" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:76 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:84 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:95 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:129 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:77 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:84 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:95 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:102 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:135 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:182 msgid "To" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:79 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:85 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:79 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:85 msgid "email Customers" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:80 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:80 msgid "Payment Link" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:82 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:82 msgid "Print &Deliveries" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:87 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:86 +msgid "Print as Packing Slip" +msgstr "" + +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:88 msgid "Print &Statements" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:91 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:98 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:132 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:91 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:97 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:104 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:137 msgid "Email Customers" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:93 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:93 msgid "&Print Sales Orders" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:99 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:98 msgid "Print as Quote" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:103 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:100 +msgid "&Print Sales Quotations" +msgstr "" + +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:108 msgid "Supplier &Balances" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:109 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:115 msgid "&Aged Supplier Analyses" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:117 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:123 msgid "&Payment Report" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:123 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:129 msgid "Outstanding &GRNs Report" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:127 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:133 msgid "Print Purchase &Orders" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:136 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:141 msgid "Inventory &Valuation Report" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:142 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:147 msgid "Inventory &Planning Report" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:147 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:152 msgid "Stock &Check Sheets" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:151 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:156 msgid "Inventory Column" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:152 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:157 msgid "Show Shortage" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:155 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:160 msgid "Inventory &Sales Report" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:164 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:165 -msgid "Manufactoring" +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:168 +msgid "&GRN Valuation Report" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:165 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:174 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:175 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:180 +msgid "Manufacturing" +msgstr "" + +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:175 msgid "&Bill of Material Listing" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:166 -msgid "From component" +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:176 +msgid "From product" +msgstr "" + +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:177 +msgid "To product" +msgstr "" + +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:180 +msgid "Print &Work Orders" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:167 -msgid "To component" +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:183 +msgid "Email Locations" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:173 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:188 msgid "Dimension &Summary" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:174 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:189 msgid "From Dimension" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:175 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:190 msgid "To Dimension" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:176 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:191 msgid "Show Balance" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:183 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:184 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:198 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:199 msgid "Banking" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:184 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:199 msgid "Bank &Statement" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:191 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:192 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:196 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:206 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:215 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:221 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:229 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:238 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:250 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:258 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:263 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:270 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:278 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:289 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:296 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:300 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:306 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:313 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:321 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:206 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:207 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:211 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:222 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:231 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:237 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:245 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:254 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:266 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:274 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:279 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:286 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:294 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:305 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:312 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:316 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:322 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:329 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:337 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:342 msgid "General Ledger" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:192 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:207 msgid "Chart of &Accounts" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:193 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:208 msgid "Show Balances" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:196 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:211 msgid "List of &Journal Entries" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:206 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:250 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:289 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:222 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:266 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:305 msgid "GL Account &Transactions" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:209 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:253 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:292 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:225 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:269 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:308 msgid "From Account" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:210 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:254 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:293 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:226 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:270 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:309 msgid "To Account" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:215 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:258 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:296 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:231 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:274 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:312 msgid "Annual &Expense Breakdown" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:221 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:263 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:300 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:237 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:279 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:316 msgid "&Balance Sheet" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:229 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:270 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:306 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:245 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:286 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:322 msgid "&Profit and Loss Statement" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:232 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:273 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:309 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:248 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:289 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:325 msgid "Compare to" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:241 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:281 -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:316 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:257 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:297 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:332 msgid "Zero values" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/reports_main.php:321 +#: c:\Apache2\htdocs\account22/reporting/reports_main.php:337 msgid "Ta&x Report" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/backup/gl_accounts.php:248 -msgid "Tax Type:" -msgstr "" - -#: c:\Apache2\htdocs\account21/reporting/backup/gl_accounts.php:248 -msgid "No Tax" -msgstr "" - -#: c:\Apache2\htdocs\account21/reporting/backup/gl_accounts.php:250 -msgid "Purchase Tax?" -msgstr "" - -#: c:\Apache2\htdocs\account21/reporting/backup/rep709.php:341 -msgid "Total Outputs" -msgstr "" - -#: c:\Apache2\htdocs\account21/reporting/backup/rep709.php:385 -msgid "Total Inputs" -msgstr "" - -#: c:\Apache2\htdocs\account21/reporting/backup/rep709.php:450 -msgid "No tax specified" -msgstr "" - -#: c:\Apache2\htdocs\account21/reporting/backup/rep709.php:490 -msgid "Calc. Outputs/Inputs" -msgstr "" - -#: c:\Apache2\htdocs\account21/sales/create_recurrent_invoices.php:24 +#: c:\Apache2\htdocs\account22/sales/create_recurrent_invoices.php:24 msgid "Create and Print Recurrent Invoices" msgstr "" -#: c:\Apache2\htdocs\account21/sales/create_recurrent_invoices.php:108 +#: c:\Apache2\htdocs\account22/sales/create_recurrent_invoices.php:112 msgid "Template No" msgstr "" -#: c:\Apache2\htdocs\account21/sales/create_recurrent_invoices.php:108 +#: c:\Apache2\htdocs\account22/sales/create_recurrent_invoices.php:112 msgid "Monthly" msgstr "" -#: c:\Apache2\htdocs\account21/sales/create_recurrent_invoices.php:108 +#: c:\Apache2\htdocs\account22/sales/create_recurrent_invoices.php:112 msgid "Begin" msgstr "" -#: c:\Apache2\htdocs\account21/sales/create_recurrent_invoices.php:108 +#: c:\Apache2\htdocs\account22/sales/create_recurrent_invoices.php:112 msgid "End" msgstr "" -#: c:\Apache2\htdocs\account21/sales/create_recurrent_invoices.php:108 +#: c:\Apache2\htdocs\account22/sales/create_recurrent_invoices.php:112 msgid "Last Created" msgstr "" -#: c:\Apache2\htdocs\account21/sales/create_recurrent_invoices.php:152 +#: c:\Apache2\htdocs\account22/sales/create_recurrent_invoices.php:156 msgid "Create Invoices" msgstr "" -#: c:\Apache2\htdocs\account21/sales/create_recurrent_invoices.php:159 +#: c:\Apache2\htdocs\account22/sales/create_recurrent_invoices.php:163 msgid "Marked items are due." msgstr "" -#: c:\Apache2\htdocs\account21/sales/create_recurrent_invoices.php:161 +#: c:\Apache2\htdocs\account22/sales/create_recurrent_invoices.php:165 msgid "No recurrent invoices are due." msgstr "" -#: c:\Apache2\htdocs\account21/sales/credit_note_entry.php:37 +#: c:\Apache2\htdocs\account22/sales/credit_note_entry.php:37 msgid "Customer Credit Note" msgstr "" -#: c:\Apache2\htdocs\account21/sales/credit_note_entry.php:40 +#: c:\Apache2\htdocs\account22/sales/credit_note_entry.php:40 #, php-format msgid "Modifying Customer Credit Note #%d" msgstr "" -#: c:\Apache2\htdocs\account21/sales/credit_note_entry.php:42 -msgid "Modifying Customer Credit Note" -msgstr "" - -#: c:\Apache2\htdocs\account21/sales/credit_note_entry.php:51 -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:491 +#: c:\Apache2\htdocs\account22/sales/credit_note_entry.php:51 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:597 msgid "There are no customers, or there are no customers with branches. Please define customers and customer branches." msgstr "" -#: c:\Apache2\htdocs\account21/sales/credit_note_entry.php:71 +#: c:\Apache2\htdocs\account22/sales/credit_note_entry.php:66 #, php-format msgid "Credit Note # %d has been processed" msgstr "" -#: c:\Apache2\htdocs\account21/sales/credit_note_entry.php:73 +#: c:\Apache2\htdocs\account22/sales/credit_note_entry.php:68 msgid "&View this credit note" msgstr "" -#: c:\Apache2\htdocs\account21/sales/credit_note_entry.php:75 +#: c:\Apache2\htdocs\account22/sales/credit_note_entry.php:70 msgid "&Print This Credit Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/sales/credit_note_entry.php:77 -#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:59 -#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:73 +#: c:\Apache2\htdocs\account22/sales/credit_note_entry.php:71 +msgid "&Email This Credit Invoice" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/credit_note_entry.php:73 +#: c:\Apache2\htdocs\account22/sales/customer_credit_invoice.php:59 +#: c:\Apache2\htdocs\account22/sales/customer_credit_invoice.php:73 msgid "View the GL &Journal Entries for this Credit Note" msgstr "" -#: c:\Apache2\htdocs\account21/sales/credit_note_entry.php:79 +#: c:\Apache2\htdocs\account22/sales/credit_note_entry.php:75 msgid "Enter Another &Credit Note" msgstr "" -#: c:\Apache2\htdocs\account21/sales/credit_note_entry.php:156 +#: c:\Apache2\htdocs\account22/sales/credit_note_entry.php:153 msgid "The entered date for the credit note is invalid." msgstr "" -#: c:\Apache2\htdocs\account21/sales/credit_note_entry.php:173 +#: c:\Apache2\htdocs\account22/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 "" -#: c:\Apache2\htdocs\account21/sales/credit_note_entry.php:174 +#: c:\Apache2\htdocs\account22/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 "" -#: c:\Apache2\htdocs\account21/sales/credit_note_entry.php:193 +#: c:\Apache2\htdocs\account22/sales/credit_note_entry.php:191 msgid "The quantity must be greater than zero." msgstr "" -#: c:\Apache2\htdocs\account21/sales/credit_note_entry.php:198 +#: c:\Apache2\htdocs\account22/sales/credit_note_entry.php:196 msgid "The entered price is negative or invalid." msgstr "" -#: c:\Apache2\htdocs\account21/sales/credit_note_entry.php:203 +#: c:\Apache2\htdocs\account22/sales/credit_note_entry.php:201 msgid "The entered discount percent is negative, greater than 100 or invalid." msgstr "" -#: c:\Apache2\htdocs\account21/sales/credit_note_entry.php:271 +#: c:\Apache2\htdocs\account22/sales/credit_note_entry.php:269 msgid "Credit Note Items" msgstr "" -#: c:\Apache2\htdocs\account21/sales/credit_note_entry.php:281 -#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:391 +#: c:\Apache2\htdocs\account22/sales/credit_note_entry.php:279 +#: c:\Apache2\htdocs\account22/sales/customer_credit_invoice.php:393 msgid "Process Credit Note" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:38 +#: c:\Apache2\htdocs\account22/sales/customer_credit_invoice.php:38 #, php-format msgid "Modifying Credit Invoice # %d." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:39 -msgid "Modifying Credit Invoice" -msgstr "" - -#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:42 +#: c:\Apache2\htdocs\account22/sales/customer_credit_invoice.php:42 msgid "Credit all or part of an Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:53 +#: c:\Apache2\htdocs\account22/sales/customer_credit_invoice.php:53 msgid "Credit Note has been processed" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:55 -#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:69 +#: c:\Apache2\htdocs\account22/sales/customer_credit_invoice.php:55 +#: c:\Apache2\htdocs\account22/sales/customer_credit_invoice.php:69 msgid "&View This Credit Note" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:57 -#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:71 +#: c:\Apache2\htdocs\account22/sales/customer_credit_invoice.php:57 +#: c:\Apache2\htdocs\account22/sales/customer_credit_invoice.php:71 msgid "&Print This Credit Note" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:67 +#: c:\Apache2\htdocs\account22/sales/customer_credit_invoice.php:67 msgid "Credit Note has been updated" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:108 +#: c:\Apache2\htdocs\account22/sales/customer_credit_invoice.php:110 msgid "The entered shipping cost is invalid or less than zero." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:113 -#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:148 +#: c:\Apache2\htdocs\account22/sales/customer_credit_invoice.php:115 +#: c:\Apache2\htdocs\account22/sales/customer_credit_invoice.php:150 msgid "Selected quantity cannot be less than zero nor more than quantity not credited yet." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:146 +#: c:\Apache2\htdocs\account22/sales/customer_credit_invoice.php:148 msgid "This page can only be opened if an invoice has been selected for crediting." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:258 +#: c:\Apache2\htdocs\account22/sales/customer_credit_invoice.php:260 msgid "Crediting Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:279 +#: c:\Apache2\htdocs\account22/sales/customer_credit_invoice.php:281 msgid "Credit Note Date" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:289 +#: c:\Apache2\htdocs\account22/sales/customer_credit_invoice.php:291 msgid "Invoiced Quantity" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:290 +#: c:\Apache2\htdocs\account22/sales/customer_credit_invoice.php:292 msgid "Credit Quantity" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:290 +#: c:\Apache2\htdocs\account22/sales/customer_credit_invoice.php:292 msgid "Discount %" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:324 +#: c:\Apache2\htdocs\account22/sales/customer_credit_invoice.php:326 msgid "Credit Shipping Cost" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:331 -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:448 -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:498 +#: c:\Apache2\htdocs\account22/sales/customer_credit_invoice.php:333 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:462 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:504 msgid "Sub-total" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:339 +#: c:\Apache2\htdocs\account22/sales/customer_credit_invoice.php:341 msgid "Credit Note Total" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:357 +#: c:\Apache2\htdocs\account22/sales/customer_credit_invoice.php:359 msgid "Credit Note Type" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:365 +#: c:\Apache2\htdocs\account22/sales/customer_credit_invoice.php:367 msgid "Items Returned to Location" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:370 +#: c:\Apache2\htdocs\account22/sales/customer_credit_invoice.php:372 msgid "Write off the cost of the items to" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:389 +#: c:\Apache2\htdocs\account22/sales/customer_credit_invoice.php:391 msgid "Update credit value for quantities entered" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:37 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:37 #, php-format msgid "Modifying Delivery Note # %d." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:38 -msgid "Modifying Delivery Note" -msgstr "" - -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:41 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:41 msgid "Deliver Items for a Sales Order" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:50 -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:109 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:50 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:173 #, php-format msgid "Delivery # %d has been entered." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:52 -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:111 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:52 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:175 msgid "&View This Delivery" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:54 -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:113 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:54 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:75 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:177 msgid "&Print Delivery Note" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:56 -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:115 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:55 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:76 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:178 +msgid "&Email Delivery Note" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:56 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:77 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:179 +msgid "P&rint as Packing Slip" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:57 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:78 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:180 +msgid "E&mail as Packing Slip" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:59 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:183 msgid "View the GL Journal Entries for this Dispatch" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:58 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:61 msgid "Invoice This Delivery" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:60 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:63 msgid "Select Another Order For Dispatch" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:68 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:71 #, php-format msgid "Delivery Note # %d has been updated." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:70 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:73 msgid "View this delivery" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:72 -msgid "Print this delivery" -msgstr "" - -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:74 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:80 msgid "Confirm Delivery and Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:76 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:82 msgid "Select A Different Delivery" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:90 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:96 msgid "Select a different sales order to delivery" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:91 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:97 msgid "This order has no items. There is nothing to delivery." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:109 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:115 msgid "Select a different delivery" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:110 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:116 msgid "This delivery has all items invoiced. There is nothing to modify." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:120 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:126 msgid "This page can only be opened if an order or delivery note has been selected. Please select it first." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:122 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:128 msgid "Select a Sales Order to Delivery" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:131 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:137 msgid "Selected quantity cannot be less than quantity invoiced nor more than quantity\tnot dispatched on sales order." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:134 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:140 msgid "Freight cost cannot be less than zero" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:143 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:151 msgid "The entered date of delivery is invalid." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:149 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:157 msgid "The entered date of delivery is not in fiscal year." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:155 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:163 msgid "The entered dead-line for invoice is invalid." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:178 -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:281 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:186 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:284 msgid "The entered shipping value is not numeric." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:184 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:192 msgid "There are no item quantities on this delivery note." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:189 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:197 msgid "" "Selected quantity cannot be less than quantity invoiced nor more than quantity\n" "\t\tnot dispatched on sales order." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:273 -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:347 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:283 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:435 msgid "The delivery cannot be processed because there is an insufficient quantity for item:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:333 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:344 msgid "For Sales Order" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:342 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:353 msgid "Delivery From" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:370 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:381 msgid "Invoice Dead-line" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:379 -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:393 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:390 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:398 msgid "The selected customer account is currently on hold. Please contact the credit control personnel to discuss." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:384 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:395 msgid "Delivery Items" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:387 -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:403 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:398 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:408 msgid "Delivered" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:388 -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:404 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:399 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:409 msgid "Discount" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:442 -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:488 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:454 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:493 msgid "Shipping Cost" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:455 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:469 msgid "Amount Total" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:460 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:474 msgid "Marked items have insufficient quantities in stock as on day of delivery." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:464 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:478 msgid "Action For Balance" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:471 -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:516 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:485 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:522 msgid "Refresh document page" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:472 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:486 msgid "Process Dispatch" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:473 -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:518 -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:533 +#: c:\Apache2\htdocs\account22/sales/customer_delivery.php:487 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:524 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:646 msgid "Check entered data and save document" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:37 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:37 #, php-format msgid "Modifying Sales Invoice # %d." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:38 -msgid "Modifying Sales Invoice" -msgstr "" - -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:40 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:40 msgid "Issue an Invoice for Delivery Note" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:42 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:42 msgid "Issue Batch Invoice for Delivery Notes" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:55 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:55 msgid "Selected deliveries has been processed" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:57 -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:73 -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:133 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:57 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:74 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:202 msgid "&View This Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:59 -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:75 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:59 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:76 msgid "&Print This Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:61 -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:137 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:60 +msgid "&Email This Invoice" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:62 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:208 msgid "View the GL &Journal Entries for this Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:63 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:64 msgid "Select Another &Delivery For Invoicing" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:71 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:72 #, php-format msgid "Sales Invoice # %d has been updated." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:77 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:78 msgid "Select A Different &Invoice to Modify" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:115 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:116 msgid "Select a different delivery to invoice" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:116 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:117 msgid "There are no delivered items with a quantity left to invoice. There is nothing left to invoice." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:131 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:132 msgid "" "There are no delivery notes for this invoice.
      \n" "\t\tMost likely this invoice was created in Front Accounting version prior to 2.0\n" "\t\tand therefore can not be modified." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:140 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:141 msgid "All quantities on this invoice has been credited. There is nothing to modify on this invoice" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:146 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:147 msgid "This page can only be opened after delivery selection. Please select delivery to invoicing first." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:148 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:149 msgid "Select Delivery to Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:153 -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:292 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:154 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:295 msgid "Selected quantity cannot be less than quantity credited nor more than quantity not invoiced yet." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:245 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:248 msgid "The entered invoice date is invalid." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:251 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:254 msgid "The entered invoice date is not in fiscal year." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:257 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:260 msgid "The entered invoice due date is invalid." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:287 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:290 msgid "There are no item quantities on this invoice." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:358 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:362 msgid "Delivery Notes:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:399 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:404 msgid "Invoice Items" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:404 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:409 msgid "This Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:407 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:412 msgid "DN" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:412 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:417 msgid "Credited" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:458 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:463 msgid "Remove" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:505 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:511 msgid "Invoice Total" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:517 +#: c:\Apache2\htdocs\account22/sales/customer_invoice.php:523 msgid "Process Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_payments.php:28 +#: c:\Apache2\htdocs\account22/sales/customer_payments.php:32 msgid "Customer Payment Entry" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_payments.php:32 +#: c:\Apache2\htdocs\account22/sales/customer_payments.php:36 msgid "There are no customers defined in the system." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_payments.php:52 +#: c:\Apache2\htdocs\account22/sales/customer_payments.php:61 msgid "The customer payment has been successfully entered." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_payments.php:54 +#: c:\Apache2\htdocs\account22/sales/customer_payments.php:63 msgid "&View the GL Journal Entries for this Customer Payment" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_payments.php:56 -msgid "&Allocate this Customer Payment" -msgstr "" - -#: c:\Apache2\htdocs\account21/sales/customer_payments.php:58 +#: c:\Apache2\htdocs\account22/sales/customer_payments.php:67 msgid "Enter Another &Customer Payment" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_payments.php:69 +#: c:\Apache2\htdocs\account22/sales/customer_payments.php:80 msgid "The entered date is invalid. Please enter a valid date for the payment." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_payments.php:91 +#: c:\Apache2\htdocs\account22/sales/customer_payments.php:102 +#: c:\Apache2\htdocs\account22/sales/customer_payments.php:108 msgid "The entered amount is invalid or negative and cannot be processed." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_payments.php:109 +#: c:\Apache2\htdocs\account22/sales/customer_payments.php:134 msgid "The entered discount is not a valid number." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_payments.php:115 +#: c:\Apache2\htdocs\account22/sales/customer_payments.php:140 msgid "The balance of the amount and discout is zero or negative. Please enter valid amounts." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_payments.php:193 +#: c:\Apache2\htdocs\account22/sales/customer_payments.php:225 msgid "From Customer:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_payments.php:195 +#: c:\Apache2\htdocs\account22/sales/customer_payments.php:230 msgid "Branch:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_payments.php:205 +#: c:\Apache2\htdocs\account22/sales/customer_payments.php:240 msgid "This customer account is on hold." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_payments.php:213 -msgid "Customer prompt payment discount :" +#: c:\Apache2\htdocs\account22/sales/customer_payments.php:246 +msgid "Into Bank Account:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_payments.php:215 +#: c:\Apache2\htdocs\account22/sales/customer_payments.php:253 msgid "Date of Deposit:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_payments.php:219 -msgid "Into Bank Account:" +#: c:\Apache2\htdocs\account22/sales/customer_payments.php:277 +msgid "Customer prompt payment discount :" msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_payments.php:236 +#: c:\Apache2\htdocs\account22/sales/customer_payments.php:286 msgid "Amount and discount are in customer's currency." msgstr "" -#: c:\Apache2\htdocs\account21/sales/customer_payments.php:240 +#: c:\Apache2\htdocs\account22/sales/customer_payments.php:290 msgid "Add Payment" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:50 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:56 msgid "Direct Sales Delivery" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:55 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:61 msgid "Direct Sales Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:60 -msgid "Modifying Sales Order" +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:67 +#, php-format +msgid "Modifying Sales Order # %d" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:61 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:73 #, php-format -msgid "Modifying Sales Order # %d" +msgid "Modifying Sales Quotation # %d" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:66 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:78 msgid "New Sales Order Entry" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:76 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:82 +msgid "New Sales Quotation Entry" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:85 +msgid "Sales Order Entry" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:101 #, php-format msgid "Order # %d has been entered." msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:78 -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:94 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:103 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:121 msgid "&View This Order" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:83 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:109 msgid "Make &Delivery Against This Order" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:85 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:112 msgid "Enter a &New Order" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:92 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:119 #, php-format msgid "Order # %d has been updated." msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:99 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:127 msgid "Confirm Order Quantities and Make &Delivery" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:102 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:130 msgid "Select A Different &Order" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:118 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:137 +#, php-format +msgid "Quotation # %d has been entered." +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:139 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:157 +msgid "&View This Quotation" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:141 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:159 +msgid "&Print This Quotation" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:142 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:160 +msgid "&Email This Quotation" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:145 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:163 +msgid "Make &Sales Order Against This Quotation" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:148 +msgid "Enter a New &Quotation" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:155 +#, php-format +msgid "Quotation # %d has been updated." +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:166 +msgid "Select A Different &Quotation" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:185 msgid "Make &Invoice Against This Delivery" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:122 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:189 msgid "Enter a New Template &Delivery" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:124 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:192 msgid "Enter a &New Delivery" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:131 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:200 #, php-format msgid "Invoice # %d has been entered." msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:135 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:204 msgid "&Print Sales Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:141 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:205 +msgid "&Email Sales Invoice" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:211 msgid "Enter a &New Template Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:143 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:214 msgid "Enter a &New Direct Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:244 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:315 msgid "The entered date is not in fiscal year" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:255 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:326 msgid "You must enter the person or company to whom delivery should be made to." msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:261 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:332 msgid "You should enter the street address in the box provided. Orders cannot be accepted without a valid street address." msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:270 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:341 msgid "The shipping cost entered is expected to be numeric." msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:275 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:347 +msgid "The Valid date is invalid." +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:349 msgid "The delivery date is invalid." msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:281 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:356 +msgid "The requested valid date is before the date of the quotation." +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:358 msgid "The requested delivery date is before the date of the order." msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:326 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:414 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 "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:330 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:418 msgid "Price for item must be entered and can not be less than 0" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:337 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:425 msgid "You attempting to make the quantity ordered a quantity less than has already been delivered. The quantity delivered cannot be modified retrospectively." msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:376 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:464 msgid "This item cannot be deleted because some of it has already been delivered." msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:403 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:491 msgid "Direct delivery entry has been cancelled as requested." msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:405 -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:409 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:492 msgid "Enter a New Sales Delivery" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:407 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:495 msgid "Direct invoice entry has been cancelled as requested." msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:413 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:496 +msgid "Enter a New Sales Invoice" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:500 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 "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:417 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:505 +msgid "This sales quotation has been cancelled as requested." +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:506 +msgid "Enter a New Sales Quotation" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:510 msgid "This sales order has been cancelled as requested." msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:419 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:511 msgid "Enter a New Sales Order" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:494 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:543 +msgid "Sales Quotation" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:600 msgid "Invoice Date:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:495 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:601 msgid "Sales Invoice Items" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:496 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:602 msgid "Enter Delivery Details and Confirm Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:497 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:603 msgid "Cancel Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:498 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:604 msgid "Place Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:500 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:606 msgid "Delivery Date:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:501 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:607 msgid "Delivery Note Items" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:502 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:608 msgid "Enter Delivery Details and Confirm Dispatch" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:503 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:609 msgid "Cancel Delivery" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:504 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:610 msgid "Place Delivery" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:506 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:612 +msgid "Quotation Date:" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:613 +msgid "Sales Quotation Items" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:614 +msgid "Enter Delivery Details and Confirm Quotation" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:615 +msgid "Cancel Quotation" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:616 +msgid "Place Quotation" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:617 +msgid "Commit Quotations Changes" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:619 msgid "Order Date:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:507 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:620 msgid "Sales Order Items" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:508 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:621 msgid "Enter Delivery Details and Confirm Order" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:511 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:624 msgid "Commit Order Changes" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:534 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:647 msgid "" -"You are about to void this Sales Order.\\n" +"You are about to void this Document.\\n" "Do you want to continue?" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:537 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:650 msgid "Validate changes and update document" msgstr "" -#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:541 +#: c:\Apache2\htdocs\account22/sales/sales_order_entry.php:654 msgid "Cancels document entry or removes sales order when editing an old document" msgstr "" -#: c:\Apache2\htdocs\account21/sales/allocations/customer_allocate.php:27 +#: c:\Apache2\htdocs\account22/sales/allocations/customer_allocate.php:28 msgid "Allocate Customer Payment or Credit Note" msgstr "" -#: c:\Apache2\htdocs\account21/sales/allocations/customer_allocate.php:59 -msgid "The entry for an amount to allocate was negative. A positive allocation amount is expected." -msgstr "" - -#: c:\Apache2\htdocs\account21/sales/allocations/customer_allocate.php:189 +#: c:\Apache2\htdocs\account22/sales/allocations/customer_allocate.php:67 #, php-format msgid "Allocation of %s # %d" msgstr "" -#: c:\Apache2\htdocs\account21/sales/allocations/customer_allocation_main.php:22 +#: c:\Apache2\htdocs\account22/sales/allocations/customer_allocation_main.php:22 msgid "Customer Allocations" msgstr "" -#: c:\Apache2\htdocs\account21/sales/allocations/customer_allocation_main.php:44 +#: c:\Apache2\htdocs\account22/sales/allocations/customer_allocation_main.php:32 msgid "Select a customer: " msgstr "" -#: c:\Apache2\htdocs\account21/sales/inquiry/customer_allocation_inquiry.php:25 +#: c:\Apache2\htdocs\account22/sales/inquiry/customer_allocation_inquiry.php:25 msgid "Customer Allocation Inquiry" msgstr "" -#: c:\Apache2\htdocs\account21/sales/inquiry/customer_allocation_inquiry.php:95 +#: c:\Apache2\htdocs\account22/sales/inquiry/customer_allocation_inquiry.php:96 msgid "Allocation" msgstr "" -#: c:\Apache2\htdocs\account21/sales/inquiry/customer_inquiry.php:26 +#: c:\Apache2\htdocs\account22/sales/inquiry/customer_inquiry.php:26 msgid "Customer Transactions" msgstr "" -#: c:\Apache2\htdocs\account21/sales/inquiry/customer_inquiry.php:70 +#: c:\Apache2\htdocs\account22/sales/inquiry/customer_inquiry.php:70 msgid "CUSTOMER ACCOUNT IS ON HOLD" msgstr "" -#: c:\Apache2\htdocs\account21/sales/inquiry/sales_deliveries_view.php:29 +#: c:\Apache2\htdocs\account22/sales/inquiry/customer_inquiry.php:291 +#: c:\Apache2\htdocs\account22/sales/inquiry/customer_inquiry.php:304 +msgid "RB" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/inquiry/sales_deliveries_view.php:29 msgid "Search Not Invoiced Deliveries" msgstr "" -#: c:\Apache2\htdocs\account21/sales/inquiry/sales_deliveries_view.php:34 +#: c:\Apache2\htdocs\account22/sales/inquiry/sales_deliveries_view.php:34 msgid "Search All Deliveries" msgstr "" -#: c:\Apache2\htdocs\account21/sales/inquiry/sales_deliveries_view.php:70 +#: c:\Apache2\htdocs\account22/sales/inquiry/sales_deliveries_view.php:70 msgid "" "For batch invoicing you should\n" "\t\t select at least one delivery. All items must be dispatched to\n" "\t\t the same customer branch." msgstr "" -#: c:\Apache2\htdocs\account21/sales/inquiry/sales_deliveries_view.php:229 +#: c:\Apache2\htdocs\account22/sales/inquiry/sales_deliveries_view.php:229 msgid "Delivery #" msgstr "" -#: c:\Apache2\htdocs\account21/sales/inquiry/sales_deliveries_view.php:233 -#: c:\Apache2\htdocs\account21/sales/manage/customer_branches.php:198 +#: c:\Apache2\htdocs\account22/sales/inquiry/sales_deliveries_view.php:233 +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:245 msgid "Contact" msgstr "" -#: c:\Apache2\htdocs\account21/sales/inquiry/sales_deliveries_view.php:235 +#: c:\Apache2\htdocs\account22/sales/inquiry/sales_deliveries_view.php:235 msgid "Cust Ref" msgstr "" -#: c:\Apache2\htdocs\account21/sales/inquiry/sales_deliveries_view.php:237 +#: c:\Apache2\htdocs\account22/sales/inquiry/sales_deliveries_view.php:237 msgid "Due By" msgstr "" -#: c:\Apache2\htdocs\account21/sales/inquiry/sales_deliveries_view.php:238 +#: c:\Apache2\htdocs\account22/sales/inquiry/sales_deliveries_view.php:238 msgid "Delivery Total" msgstr "" -#: c:\Apache2\htdocs\account21/sales/inquiry/sales_deliveries_view.php:240 +#: c:\Apache2\htdocs\account22/sales/inquiry/sales_deliveries_view.php:240 msgid "Batch" msgstr "" -#: c:\Apache2\htdocs\account21/sales/inquiry/sales_deliveries_view.php:240 +#: c:\Apache2\htdocs\account22/sales/inquiry/sales_deliveries_view.php:240 msgid "Batch Invoicing" msgstr "" -#: c:\Apache2\htdocs\account21/sales/inquiry/sales_orders_view.php:29 +#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:46 msgid "Search Outstanding Sales Orders" msgstr "" -#: c:\Apache2\htdocs\account21/sales/inquiry/sales_orders_view.php:34 +#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:51 msgid "Search Template for Invoicing" msgstr "" -#: c:\Apache2\htdocs\account21/sales/inquiry/sales_orders_view.php:39 +#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:56 msgid "Select Template for Delivery" msgstr "" -#: c:\Apache2\htdocs\account21/sales/inquiry/sales_orders_view.php:44 +#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:61 msgid "Search All Sales Orders" msgstr "" -#: c:\Apache2\htdocs\account21/sales/inquiry/sales_orders_view.php:99 +#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:67 +msgid "Search All Sales Quotations" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:131 msgid "Dispatch" msgstr "" -#: c:\Apache2\htdocs\account21/sales/inquiry/sales_orders_view.php:111 +#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:134 +#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:156 +msgid "Sales Order" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:150 msgid "Delivery" msgstr "" -#: c:\Apache2\htdocs\account21/sales/inquiry/sales_orders_view.php:123 +#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:171 msgid "Set this order as a template for direct deliveries/invoices" msgstr "" -#: c:\Apache2\htdocs\account21/sales/inquiry/sales_orders_view.php:261 +#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:236 +msgid "Show All:" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:318 msgid "Order #" msgstr "" -#: c:\Apache2\htdocs\account21/sales/inquiry/sales_orders_view.php:264 +#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:322 +#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:336 msgid "Cust Order Ref" msgstr "" -#: c:\Apache2\htdocs\account21/sales/inquiry/sales_orders_view.php:267 +#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:325 +#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:339 msgid "Delivery To" msgstr "" -#: c:\Apache2\htdocs\account21/sales/inquiry/sales_orders_view.php:289 +#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:332 +msgid "Quote #" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:337 +msgid "Quote Date" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:338 +msgid "Valid until" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:340 +msgid "Quote Total" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/inquiry/sales_orders_view.php:365 msgid "Tmpl" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/credit_status.php:16 +#: c:\Apache2\htdocs\account22/sales/manage/credit_status.php:16 msgid "Credit Status" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/credit_status.php:30 +#: c:\Apache2\htdocs\account22/sales/manage/credit_status.php:30 msgid "The credit status description cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/credit_status.php:44 +#: c:\Apache2\htdocs\account22/sales/manage/credit_status.php:44 msgid "New credit status has been added" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/credit_status.php:52 +#: c:\Apache2\htdocs\account22/sales/manage/credit_status.php:52 msgid "Selected credit status has been updated" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/credit_status.php:67 +#: c:\Apache2\htdocs\account22/sales/manage/credit_status.php:67 msgid "Cannot delete this credit status because customer accounts have been created referring to it." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/credit_status.php:83 +#: c:\Apache2\htdocs\account22/sales/manage/credit_status.php:83 msgid "Selected credit status has been deleted" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/credit_status.php:99 +#: c:\Apache2\htdocs\account22/sales/manage/credit_status.php:101 msgid "Dissallow Invoices" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/credit_status.php:110 +#: c:\Apache2\htdocs\account22/sales/manage/credit_status.php:113 msgid "Invoice OK" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/credit_status.php:114 +#: c:\Apache2\htdocs\account22/sales/manage/credit_status.php:117 msgid "NO INVOICING" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/credit_status.php:149 +#: c:\Apache2\htdocs\account22/sales/manage/credit_status.php:151 msgid "Dissallow invoicing ?" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customers.php:16 +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:16 msgid "Customers" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customers.php:33 +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:33 msgid "The customer name cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customers.php:40 +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:40 +msgid "The customer short name cannot be empty." +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:47 msgid "The credit limit must be numeric and not less than zero." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customers.php:47 +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:54 msgid "The payment discount must be numeric and is expected to be less than 100% and greater than or equal to 0." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customers.php:54 +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:61 msgid "The discount percentage must be numeric and is expected to be less than 100% and greater than or equal to 0." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customers.php:90 +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:104 msgid "Customer has been updated." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customers.php:112 +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:127 msgid "A new customer has been added." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customers.php:147 +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:155 msgid "This customer cannot be deleted because there are transactions that refer to it." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customers.php:157 +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:165 msgid "Cannot delete the customer record because orders have been created against it." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customers.php:167 +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:175 msgid "Cannot delete this customer because there are branch records set up against it." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customers.php:178 +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:186 msgid "Selected customer has been deleted." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customers.php:185 +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:193 msgid "There are no sales types defined. Please define at least one sales type before adding a customer." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customers.php:193 +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:202 msgid "New customer" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customers.php:241 +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:259 msgid "Name and Address" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customers.php:243 +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:261 msgid "Customer Name:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customers.php:252 -#: c:\Apache2\htdocs\account21/sales/manage/customers.php:256 +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:262 +msgid "Customer Short Name:" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:271 +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:275 msgid "Customer's Currency:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customers.php:264 +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:278 msgid "Sales Type/Price List:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customers.php:265 +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:284 msgid "Discount Percent:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customers.php:266 +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:285 msgid "Prompt Payment Discount Percent:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customers.php:270 +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:289 msgid "Credit Status:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customers.php:283 +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:302 msgid "Customer branches" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customers.php:285 +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:304 msgid "Select or &Add" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customers.php:285 +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:304 msgid "&Add or Edit " msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customers.php:295 +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:311 +msgid "Customer status:" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:317 msgid "Add New Customer" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customers.php:299 +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:321 msgid "Update Customer" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customers.php:300 +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:322 msgid "Update customer data" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customers.php:301 +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:323 msgid "Select this customer and return to document entry." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customers.php:302 +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:324 msgid "Delete Customer" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customers.php:303 +#: c:\Apache2\htdocs\account22/sales/manage/customers.php:325 msgid "Delete customer data if have been never used" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customer_branches.php:16 +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:18 msgid "Customer Branches" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customer_branches.php:22 +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:24 msgid "There are no customers defined in the system. Please define a customer to add customer branches." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customer_branches.php:24 +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:26 msgid "There are no sales people defined in the system. At least one sales person is required before proceeding." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customer_branches.php:26 +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:28 msgid "There are no sales areas defined in the system. At least one sales area is required before proceeding." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customer_branches.php:28 +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:30 msgid "There are no shipping companies defined in the system. At least one shipping company is required before proceeding." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customer_branches.php:67 +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:63 msgid "The Branch name cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customer_branches.php:99 +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:70 +msgid "The Branch short name cannot be empty." +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:105 msgid "Selected customer branch has been updated" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customer_branches.php:123 +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:132 msgid "New customer branch has been added" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customer_branches.php:144 +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:156 msgid "Cannot delete this branch because customer transactions have been created to this branch." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customer_branches.php:155 +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:167 msgid "Cannot delete this branch because sales orders exist for it. Purge old sales orders first." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customer_branches.php:161 +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:173 msgid "Selected customer branch has been deleted" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customer_branches.php:198 +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:203 +msgid "Select" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:243 +msgid "Short Name" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:246 msgid "Sales Person" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customer_branches.php:198 +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:247 msgid "Area" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customer_branches.php:199 +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:248 msgid "Phone No" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customer_branches.php:199 +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:249 msgid "Fax No" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customer_branches.php:199 +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:251 msgid "Tax Group" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customer_branches.php:215 -msgid "Select" +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:252 +msgid "Inactive" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customer_branches.php:224 +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:270 msgid "The selected customer does not have any branches. Please create at least one branch." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customer_branches.php:271 +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:322 msgid "Main Branch" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customer_branches.php:295 +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:347 msgid "Branch Name:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customer_branches.php:305 +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:348 +msgid "Branch Short Name:" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:359 msgid "Sales Person:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customer_branches.php:307 +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:361 msgid "Sales Area:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customer_branches.php:309 -#: c:\Apache2\htdocs\account21/sales/manage/recurrent_invoices.php:179 +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:363 +#: c:\Apache2\htdocs\account22/sales/manage/recurrent_invoices.php:179 msgid "Sales Group:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customer_branches.php:311 +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:365 msgid "Default Inventory Location:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customer_branches.php:313 +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:367 msgid "Default Shipping Company:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customer_branches.php:317 +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:371 msgid "Disable this Branch:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customer_branches.php:328 +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:382 msgid "Accounts Receivable Account:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/customer_branches.php:336 +#: c:\Apache2\htdocs\account22/sales/manage/customer_branches.php:390 msgid "Billing Address:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/recurrent_invoices.php:23 +#: c:\Apache2\htdocs\account22/sales/manage/recurrent_invoices.php:23 msgid "Recurrent Invoices" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/recurrent_invoices.php:35 -#: c:\Apache2\htdocs\account21/sales/manage/sales_areas.php:30 -#: c:\Apache2\htdocs\account21/sales/manage/sales_groups.php:30 +#: c:\Apache2\htdocs\account22/sales/manage/recurrent_invoices.php:35 +#: c:\Apache2\htdocs\account22/sales/manage/sales_areas.php:30 +#: c:\Apache2\htdocs\account22/sales/manage/sales_groups.php:30 msgid "The area description cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/recurrent_invoices.php:53 +#: c:\Apache2\htdocs\account22/sales/manage/recurrent_invoices.php:53 msgid "Selected recurrent invoice has been updated" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/recurrent_invoices.php:62 +#: c:\Apache2\htdocs\account22/sales/manage/recurrent_invoices.php:62 msgid "New recurrent invoice has been added" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/recurrent_invoices.php:81 +#: c:\Apache2\htdocs\account22/sales/manage/recurrent_invoices.php:81 msgid "Selected recurrent invoice has been deleted" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/recurrent_invoices.php:172 +#: c:\Apache2\htdocs\account22/sales/manage/recurrent_invoices.php:172 msgid "Template:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/recurrent_invoices.php:174 +#: c:\Apache2\htdocs\account22/sales/manage/recurrent_invoices.php:174 msgid "Customer:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/recurrent_invoices.php:181 +#: c:\Apache2\htdocs\account22/sales/manage/recurrent_invoices.php:181 msgid "Days:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/recurrent_invoices.php:183 +#: c:\Apache2\htdocs\account22/sales/manage/recurrent_invoices.php:183 msgid "Monthly:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/recurrent_invoices.php:185 +#: c:\Apache2\htdocs\account22/sales/manage/recurrent_invoices.php:185 msgid "Begin:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/recurrent_invoices.php:187 +#: c:\Apache2\htdocs\account22/sales/manage/recurrent_invoices.php:187 msgid "End:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_areas.php:39 +#: c:\Apache2\htdocs\account22/sales/manage/sales_areas.php:39 msgid "Selected sales area has been updated" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_areas.php:44 +#: c:\Apache2\htdocs\account22/sales/manage/sales_areas.php:44 msgid "New sales area has been added" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_areas.php:66 +#: c:\Apache2\htdocs\account22/sales/manage/sales_areas.php:66 msgid "Cannot delete this area because customer branches have been created using this area." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_areas.php:73 +#: c:\Apache2\htdocs\account22/sales/manage/sales_areas.php:73 msgid "Selected sales area has been deleted" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_areas.php:90 +#: c:\Apache2\htdocs\account22/sales/manage/sales_areas.php:95 msgid "Area Name" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_areas.php:130 +#: c:\Apache2\htdocs\account22/sales/manage/sales_areas.php:137 msgid "Area Name:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_groups.php:16 +#: c:\Apache2\htdocs\account22/sales/manage/sales_groups.php:16 msgid "Sales Groups" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_groups.php:39 +#: c:\Apache2\htdocs\account22/sales/manage/sales_groups.php:39 msgid "Selected sales group has been updated" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_groups.php:44 +#: c:\Apache2\htdocs\account22/sales/manage/sales_groups.php:44 msgid "New sales group has been added" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_groups.php:66 +#: c:\Apache2\htdocs\account22/sales/manage/sales_groups.php:66 msgid "Cannot delete this group because customers have been created using this group." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_groups.php:73 +#: c:\Apache2\htdocs\account22/sales/manage/sales_groups.php:73 msgid "Selected sales group has been deleted" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_groups.php:90 +#: c:\Apache2\htdocs\account22/sales/manage/sales_groups.php:94 msgid "Group Name" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_groups.php:130 +#: c:\Apache2\htdocs\account22/sales/manage/sales_groups.php:135 msgid "Group Name:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_people.php:16 +#: c:\Apache2\htdocs\account22/sales/manage/sales_people.php:16 msgid "Sales Persons" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_people.php:32 +#: c:\Apache2\htdocs\account22/sales/manage/sales_people.php:32 msgid "The sales person name cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_people.php:38 +#: c:\Apache2\htdocs\account22/sales/manage/sales_people.php:38 msgid "Salesman provision cannot be less than 0 or more than 100%." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_people.php:43 +#: c:\Apache2\htdocs\account22/sales/manage/sales_people.php:43 msgid "Salesman provision breakpoint must be numeric and not less than 0." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_people.php:77 +#: c:\Apache2\htdocs\account22/sales/manage/sales_people.php:77 msgid "Selected sales person data have been updated" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_people.php:79 +#: c:\Apache2\htdocs\account22/sales/manage/sales_people.php:79 msgid "New sales person data have been added" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_people.php:100 +#: c:\Apache2\htdocs\account22/sales/manage/sales_people.php:100 msgid "Selected sales person data have been deleted" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_people.php:176 +#: c:\Apache2\htdocs\account22/sales/manage/sales_people.php:179 msgid "Sales person name:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_people.php:177 +#: c:\Apache2\htdocs\account22/sales/manage/sales_people.php:180 msgid "Telephone number:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_people.php:178 +#: c:\Apache2\htdocs\account22/sales/manage/sales_people.php:181 msgid "Fax number:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_people.php:181 +#: c:\Apache2\htdocs\account22/sales/manage/sales_people.php:184 msgid "Break Pt.:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:16 +#: c:\Apache2\htdocs\account22/sales/manage/sales_points.php:16 msgid "POS settings" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:28 +#: c:\Apache2\htdocs\account22/sales/manage/sales_points.php:28 msgid "The POS name cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:34 +#: c:\Apache2\htdocs\account22/sales/manage/sales_points.php:34 msgid "You must allow cash or credit sale." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:48 +#: c:\Apache2\htdocs\account22/sales/manage/sales_points.php:48 msgid "New point of sale has been added" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:59 +#: c:\Apache2\htdocs\account22/sales/manage/sales_points.php:59 msgid "Selected point of sale has been updated" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:70 +#: c:\Apache2\htdocs\account22/sales/manage/sales_points.php:70 msgid "Cannot delete this POS because it is used in users setup." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:73 +#: c:\Apache2\htdocs\account22/sales/manage/sales_points.php:73 msgid "Selected point of sale has been deleted" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:90 +#: c:\Apache2\htdocs\account22/sales/manage/sales_points.php:92 msgid "POS Name" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:90 +#: c:\Apache2\htdocs\account22/sales/manage/sales_points.php:92 msgid "Credit sale" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:90 +#: c:\Apache2\htdocs\account22/sales/manage/sales_points.php:92 msgid "Cash sale" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:90 +#: c:\Apache2\htdocs\account22/sales/manage/sales_points.php:92 msgid "Default account" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:117 +#: c:\Apache2\htdocs\account22/sales/manage/sales_points.php:118 msgid "To have cash POS first define at least one cash bank account." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:136 +#: c:\Apache2\htdocs\account22/sales/manage/sales_points.php:137 msgid "Point of Sale Name" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:138 +#: c:\Apache2\htdocs\account22/sales/manage/sales_points.php:139 msgid "Allowed credit sale" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:139 +#: c:\Apache2\htdocs\account22/sales/manage/sales_points.php:140 msgid "Allowed cash sale" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:140 +#: c:\Apache2\htdocs\account22/sales/manage/sales_points.php:141 msgid "Default cash account" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:147 +#: c:\Apache2\htdocs\account22/sales/manage/sales_points.php:148 msgid "POS location" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_types.php:28 +#: c:\Apache2\htdocs\account22/sales/manage/sales_types.php:28 msgid "The sales type description cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_types.php:35 +#: c:\Apache2\htdocs\account22/sales/manage/sales_types.php:35 msgid "Calculation factor must be valid positive number." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_types.php:48 +#: c:\Apache2\htdocs\account22/sales/manage/sales_types.php:48 msgid "New sales type has been added" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_types.php:59 +#: c:\Apache2\htdocs\account22/sales/manage/sales_types.php:59 msgid "Selected sales type has been updated" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_types.php:76 +#: c:\Apache2\htdocs\account22/sales/manage/sales_types.php:76 msgid "Cannot delete this sale type because customer transactions have been created using this sales type." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_types.php:89 +#: c:\Apache2\htdocs\account22/sales/manage/sales_types.php:89 msgid "Cannot delete this sale type because customers are currently set up to use this sales type." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_types.php:94 +#: c:\Apache2\htdocs\account22/sales/manage/sales_types.php:94 msgid "Selected sales type has been deleted" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_types.php:112 +#: c:\Apache2\htdocs\account22/sales/manage/sales_types.php:114 msgid "Type Name" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_types.php:112 +#: c:\Apache2\htdocs\account22/sales/manage/sales_types.php:114 msgid "Factor" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_types.php:112 +#: c:\Apache2\htdocs\account22/sales/manage/sales_types.php:114 msgid "Tax Incl" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_types.php:125 +#: c:\Apache2\htdocs\account22/sales/manage/sales_types.php:128 msgid "Base" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_types.php:135 +#: c:\Apache2\htdocs\account22/sales/manage/sales_types.php:139 msgid "Marked sales type is the company base pricelist for prices calculations." msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_types.php:162 +#: c:\Apache2\htdocs\account22/sales/manage/sales_types.php:165 msgid "Sales Type Name" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_types.php:163 +#: c:\Apache2\htdocs\account22/sales/manage/sales_types.php:166 msgid "Calculation factor" msgstr "" -#: c:\Apache2\htdocs\account21/sales/manage/sales_types.php:164 +#: c:\Apache2\htdocs\account22/sales/manage/sales_types.php:167 msgid "Tax included" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_credit.php:24 +#: c:\Apache2\htdocs\account22/sales/view/view_credit.php:24 msgid "View Credit Note" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_credit.php:39 +#: c:\Apache2\htdocs\account22/sales/view/view_credit.php:39 #, php-format msgid "CREDIT NOTE #%d" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_credit.php:126 +#: c:\Apache2\htdocs\account22/sales/view/view_credit.php:126 msgid "There are no line items on this credit note." msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_credit.php:138 -#: c:\Apache2\htdocs\account21/sales/view/view_dispatch.php:156 -#: c:\Apache2\htdocs\account21/sales/view/view_invoice.php:158 -#: c:\Apache2\htdocs\account21/sales/view/view_sales_order.php:211 +#: c:\Apache2\htdocs\account22/sales/view/view_credit.php:138 +#: c:\Apache2\htdocs\account22/sales/view/view_dispatch.php:156 +#: c:\Apache2\htdocs\account22/sales/view/view_invoice.php:158 +#: c:\Apache2\htdocs\account22/sales/view/view_sales_order.php:230 msgid "Shipping" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_credit.php:143 +#: c:\Apache2\htdocs\account22/sales/view/view_credit.php:143 msgid "TOTAL CREDIT" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_dispatch.php:23 +#: c:\Apache2\htdocs\account22/sales/view/view_dispatch.php:23 msgid "View Sales Dispatch" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_dispatch.php:43 +#: c:\Apache2\htdocs\account22/sales/view/view_dispatch.php:43 #, php-format msgid "DISPATCH NOTE #%d" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_dispatch.php:51 -#: c:\Apache2\htdocs\account21/sales/view/view_invoice.php:51 +#: c:\Apache2\htdocs\account22/sales/view/view_dispatch.php:51 +#: c:\Apache2\htdocs\account22/sales/view/view_invoice.php:51 msgid "Charge To" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_dispatch.php:65 -#: c:\Apache2\htdocs\account21/sales/view/view_invoice.php:65 +#: c:\Apache2\htdocs\account22/sales/view/view_dispatch.php:65 +#: c:\Apache2\htdocs\account22/sales/view/view_invoice.php:65 msgid "Charge Branch" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_dispatch.php:74 -#: c:\Apache2\htdocs\account21/sales/view/view_invoice.php:74 +#: c:\Apache2\htdocs\account22/sales/view/view_dispatch.php:74 +#: c:\Apache2\htdocs\account22/sales/view/view_invoice.php:74 msgid "Delivered To" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_dispatch.php:87 -#: c:\Apache2\htdocs\account21/sales/view/view_invoice.php:87 +#: c:\Apache2\htdocs\account22/sales/view/view_dispatch.php:87 +#: c:\Apache2\htdocs\account22/sales/view/view_invoice.php:87 msgid "Our Order No" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_dispatch.php:91 -#: c:\Apache2\htdocs\account21/sales/view/view_invoice.php:91 -#: c:\Apache2\htdocs\account21/sales/view/view_sales_order.php:52 +#: c:\Apache2\htdocs\account22/sales/view/view_dispatch.php:91 +#: c:\Apache2\htdocs\account22/sales/view/view_invoice.php:91 +#: c:\Apache2\htdocs\account22/sales/view/view_sales_order.php:62 msgid "Customer Order Ref." msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_dispatch.php:96 +#: c:\Apache2\htdocs\account22/sales/view/view_dispatch.php:96 msgid "Dispatch Date" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_dispatch.php:148 +#: c:\Apache2\htdocs\account22/sales/view/view_dispatch.php:148 msgid "There are no line items on this dispatch." msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_dispatch.php:163 +#: c:\Apache2\htdocs\account22/sales/view/view_dispatch.php:163 msgid "TOTAL VALUE" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_dispatch.php:167 +#: c:\Apache2\htdocs\account22/sales/view/view_dispatch.php:167 msgid "This dispatch has been voided." msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_invoice.php:23 +#: c:\Apache2\htdocs\account22/sales/view/view_invoice.php:23 msgid "View Sales Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_invoice.php:43 +#: c:\Apache2\htdocs\account22/sales/view/view_invoice.php:43 #, php-format msgid "SALES INVOICE #%d" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_invoice.php:150 +#: c:\Apache2\htdocs\account22/sales/view/view_invoice.php:150 msgid "There are no line items on this invoice." msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_receipt.php:24 +#: c:\Apache2\htdocs\account22/sales/view/view_receipt.php:24 msgid "View Customer Payment" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_receipt.php:33 +#: c:\Apache2\htdocs\account22/sales/view/view_receipt.php:33 #, php-format msgid "Customer Payment #%d" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_receipt.php:38 +#: c:\Apache2\htdocs\account22/sales/view/view_receipt.php:38 msgid "From Customer" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_receipt.php:39 +#: c:\Apache2\htdocs\account22/sales/view/view_receipt.php:39 msgid "Into Bank Account" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_receipt.php:40 +#: c:\Apache2\htdocs\account22/sales/view/view_receipt.php:40 msgid "Date of Deposit" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_receipt.php:56 +#: c:\Apache2\htdocs\account22/sales/view/view_receipt.php:56 msgid "This customer payment has been voided." msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_sales_order.php:26 +#: c:\Apache2\htdocs\account22/sales/view/view_sales_order.php:28 +msgid "View Sales Quotation" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/view/view_sales_order.php:29 +#, php-format +msgid "Sales Quotation #%d" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/view/view_sales_order.php:33 msgid "View Sales Order" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_sales_order.php:28 +#: c:\Apache2\htdocs\account22/sales/view/view_sales_order.php:34 #, php-format msgid "Sales Order #%d" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_sales_order.php:39 +#: c:\Apache2\htdocs\account22/sales/view/view_sales_order.php:46 msgid "Order Information" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_sales_order.php:49 +#: c:\Apache2\htdocs\account22/sales/view/view_sales_order.php:59 msgid "Customer Name" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_sales_order.php:53 +#: c:\Apache2\htdocs\account22/sales/view/view_sales_order.php:63 msgid "Deliver To Branch" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_sales_order.php:56 +#: c:\Apache2\htdocs\account22/sales/view/view_sales_order.php:66 msgid "Ordered On" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_sales_order.php:57 +#: c:\Apache2\htdocs\account22/sales/view/view_sales_order.php:70 msgid "Requested Delivery" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_sales_order.php:60 +#: c:\Apache2\htdocs\account22/sales/view/view_sales_order.php:73 msgid "Order Currency" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_sales_order.php:61 +#: c:\Apache2\htdocs\account22/sales/view/view_sales_order.php:74 msgid "Deliver From Location" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_sales_order.php:64 +#: c:\Apache2\htdocs\account22/sales/view/view_sales_order.php:77 msgid "Delivery Address" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_sales_order.php:66 +#: c:\Apache2\htdocs\account22/sales/view/view_sales_order.php:80 msgid "Telephone" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_sales_order.php:75 +#: c:\Apache2\htdocs\account22/sales/view/view_sales_order.php:91 msgid "Delivery Notes" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_sales_order.php:108 +#: c:\Apache2\htdocs\account22/sales/view/view_sales_order.php:125 msgid "Sales Invoices" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_sales_order.php:139 +#: c:\Apache2\htdocs\account22/sales/view/view_sales_order.php:156 msgid "Credit Notes" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_sales_order.php:182 +#: c:\Apache2\htdocs\account22/sales/view/view_sales_order.php:196 +msgid "This Sales Order is used as a Template." +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/view/view_sales_order.php:201 msgid "Quantity Delivered" msgstr "" -#: c:\Apache2\htdocs\account21/sales/view/view_sales_order.php:213 +#: c:\Apache2\htdocs\account22/sales/view/view_sales_order.php:232 msgid "Total Order Value" msgstr "" -#: c:\Apache2\htdocs\account21/sql/alter2.1.php:31 +#: c:\Apache2\htdocs\account22/sql/alter2.1.php:18 +msgid "Upgrade from version 2.0 to 2.1" +msgstr "" + +#: c:\Apache2\htdocs\account22/sql/alter2.1.php:35 msgid "Cannot retrieve bank accounts codes" msgstr "" -#: c:\Apache2\htdocs\account21/sql/alter2.1.php:39 +#: c:\Apache2\htdocs\account22/sql/alter2.1.php:43 msgid "Cannot update bank transactions" msgstr "" -#: c:\Apache2\htdocs\account21/sql/alter2.1.php:48 +#: c:\Apache2\htdocs\account22/sql/alter2.1.php:52 msgid "Cannot select stock identificators" msgstr "" -#: c:\Apache2\htdocs\account21/sql/alter2.1.php:59 +#: c:\Apache2\htdocs\account22/sql/alter2.1.php:63 msgid "Cannot insert stock id into item_codes" msgstr "" -#: c:\Apache2\htdocs\account21/sql/alter2.1.php:135 +#: c:\Apache2\htdocs\account22/sql/alter2.1.php:139 msgid "" "Seems that system upgrade to version 2.1 has \n" "\t\t\tbeen performed for this company already.
      If something has gone \n" @@ -8120,1550 +8780,2304 @@ msgid "" "\t\t\tdatabase restore from last backup file first." msgstr "" -#: c:\Apache2\htdocs\account21/taxes/item_tax_types.php:17 +#: c:\Apache2\htdocs\account22/sql/alter2.2.php:23 +msgid "Upgrade from version 2.1/2.2beta to 2.2" +msgstr "" + +#: c:\Apache2\htdocs\account22/sql/alter2.2.php:84 +msgid "Cannot query max sales order number." +msgstr "" + +#: c:\Apache2\htdocs\account22/sql/alter2.2.php:95 +msgid "Cannot store next sales order reference." +msgstr "" + +#: c:\Apache2\htdocs\account22/sql/alter2.2.php:246 +msgid "Cannot upgrade extensions system: file /modules/installed_modules.php is not writeable" +msgstr "" + +#: c:\Apache2\htdocs\account22/taxes/item_tax_types.php:17 msgid "Item Tax Types" msgstr "" -#: c:\Apache2\htdocs\account21/taxes/item_tax_types.php:35 +#: c:\Apache2\htdocs\account22/taxes/item_tax_types.php:35 msgid "The item tax type description cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account21/taxes/item_tax_types.php:60 +#: c:\Apache2\htdocs\account22/taxes/item_tax_types.php:60 msgid "Selected item tax type has been updated" msgstr "" -#: c:\Apache2\htdocs\account21/taxes/item_tax_types.php:65 +#: c:\Apache2\htdocs\account22/taxes/item_tax_types.php:65 msgid "New item tax type has been added" msgstr "" -#: c:\Apache2\htdocs\account21/taxes/item_tax_types.php:80 +#: c:\Apache2\htdocs\account22/taxes/item_tax_types.php:80 msgid "Cannot delete this item tax type because items have been created referring to it." msgstr "" -#: c:\Apache2\htdocs\account21/taxes/item_tax_types.php:96 +#: c:\Apache2\htdocs\account22/taxes/item_tax_types.php:96 msgid "Selected item tax type has been deleted" msgstr "" -#: c:\Apache2\htdocs\account21/taxes/item_tax_types.php:112 +#: c:\Apache2\htdocs\account22/taxes/item_tax_types.php:115 msgid "Tax exempt" msgstr "" -#: c:\Apache2\htdocs\account21/taxes/item_tax_types.php:173 +#: c:\Apache2\htdocs\account22/taxes/item_tax_types.php:173 msgid "Is Fully Tax-exempt:" msgstr "" -#: c:\Apache2\htdocs\account21/taxes/item_tax_types.php:180 +#: c:\Apache2\htdocs\account22/taxes/item_tax_types.php:180 msgid "Select which taxes this item tax type is exempt from." msgstr "" -#: c:\Apache2\htdocs\account21/taxes/item_tax_types.php:183 +#: c:\Apache2\htdocs\account22/taxes/item_tax_types.php:183 msgid "Tax Name" msgstr "" -#: c:\Apache2\htdocs\account21/taxes/item_tax_types.php:183 +#: c:\Apache2\htdocs\account22/taxes/item_tax_types.php:183 msgid "Is exempt" msgstr "" -#: c:\Apache2\htdocs\account21/taxes/tax_groups.php:17 +#: c:\Apache2\htdocs\account22/taxes/tax_groups.php:17 msgid "Tax Groups" msgstr "" -#: c:\Apache2\htdocs\account21/taxes/tax_groups.php:27 +#: c:\Apache2\htdocs\account22/taxes/tax_groups.php:27 msgid "There are no tax types defined. Define tax types before defining tax groups." msgstr "" -#: c:\Apache2\htdocs\account21/taxes/tax_groups.php:40 +#: c:\Apache2\htdocs\account22/taxes/tax_groups.php:40 msgid "The tax group name cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account21/taxes/tax_groups.php:52 -msgid "An entered tax rate is invalid or less than zero." -msgstr "" - -#: c:\Apache2\htdocs\account21/taxes/tax_groups.php:81 +#: c:\Apache2\htdocs\account22/taxes/tax_groups.php:84 msgid "Selected tax group has been updated" msgstr "" -#: c:\Apache2\htdocs\account21/taxes/tax_groups.php:86 +#: c:\Apache2\htdocs\account22/taxes/tax_groups.php:89 msgid "New tax group has been added" msgstr "" -#: c:\Apache2\htdocs\account21/taxes/tax_groups.php:104 +#: c:\Apache2\htdocs\account22/taxes/tax_groups.php:107 msgid "Cannot delete this tax group because customer branches been created referring to it." msgstr "" -#: c:\Apache2\htdocs\account21/taxes/tax_groups.php:113 +#: c:\Apache2\htdocs\account22/taxes/tax_groups.php:116 msgid "Cannot delete this tax group because suppliers been created referring to it." msgstr "" -#: c:\Apache2\htdocs\account21/taxes/tax_groups.php:130 +#: c:\Apache2\htdocs\account22/taxes/tax_groups.php:133 msgid "Selected tax group has been deleted" msgstr "" -#: c:\Apache2\htdocs\account21/taxes/tax_groups.php:146 +#: c:\Apache2\htdocs\account22/taxes/tax_groups.php:151 msgid "Tax Shipping" msgstr "" -#: c:\Apache2\htdocs\account21/taxes/tax_groups.php:204 +#: c:\Apache2\htdocs\account22/taxes/tax_groups.php:209 msgid "Tax Shipping:" msgstr "" -#: c:\Apache2\htdocs\account21/taxes/tax_groups.php:208 +#: c:\Apache2\htdocs\account22/taxes/tax_groups.php:213 msgid "Select the taxes that are included in this group." msgstr "" -#: c:\Apache2\htdocs\account21/taxes/tax_groups.php:211 -#: c:\Apache2\htdocs\account21/taxes/tax_types.php:116 -msgid "Default Rate (%)" +#: c:\Apache2\htdocs\account22/taxes/tax_groups.php:218 +msgid "Rate (%)" msgstr "" -#: c:\Apache2\htdocs\account21/taxes/tax_groups.php:211 -msgid "Rate (%)" +#: c:\Apache2\htdocs\account22/taxes/tax_types.php:16 +msgid "Tax Types" msgstr "" -#: c:\Apache2\htdocs\account21/taxes/tax_types.php:30 +#: c:\Apache2\htdocs\account22/taxes/tax_types.php:30 msgid "The tax type name cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account21/taxes/tax_types.php:36 +#: c:\Apache2\htdocs\account22/taxes/tax_types.php:36 msgid "The default tax rate must be numeric and not less than zero." msgstr "" -#: c:\Apache2\htdocs\account21/taxes/tax_types.php:42 +#: c:\Apache2\htdocs\account22/taxes/tax_types.php:42 msgid "Selected GL Accounts cannot be used by another tax type." msgstr "" -#: c:\Apache2\htdocs\account21/taxes/tax_types.php:56 +#: c:\Apache2\htdocs\account22/taxes/tax_types.php:56 msgid "New tax type has been added" msgstr "" -#: c:\Apache2\htdocs\account21/taxes/tax_types.php:67 +#: c:\Apache2\htdocs\account22/taxes/tax_types.php:67 msgid "Selected tax type has been updated" msgstr "" -#: c:\Apache2\htdocs\account21/taxes/tax_types.php:80 +#: c:\Apache2\htdocs\account22/taxes/tax_types.php:80 msgid "Cannot delete this tax type because tax groups been created referring to it." msgstr "" -#: c:\Apache2\htdocs\account21/taxes/tax_types.php:97 +#: c:\Apache2\htdocs\account22/taxes/tax_types.php:97 msgid "Selected tax type has been deleted" msgstr "" -#: c:\Apache2\htdocs\account21/taxes/tax_types.php:113 +#: c:\Apache2\htdocs\account22/taxes/tax_types.php:115 msgid "To avoid problems with manual journal entry all tax types should have unique Sales/Purchasing GL accounts." msgstr "" -#: c:\Apache2\htdocs\account21/taxes/tax_types.php:117 +#: c:\Apache2\htdocs\account22/taxes/tax_types.php:118 +msgid "Default Rate (%)" +msgstr "" + +#: c:\Apache2\htdocs\account22/taxes/tax_types.php:119 msgid "Sales GL Account" msgstr "" -#: c:\Apache2\htdocs\account21/taxes/tax_types.php:117 +#: c:\Apache2\htdocs\account22/taxes/tax_types.php:119 msgid "Purchasing GL Account" msgstr "" -#: c:\Apache2\htdocs\account21/taxes/tax_types.php:163 +#: c:\Apache2\htdocs\account22/taxes/tax_types.php:162 msgid "Default Rate:" msgstr "" -#: c:\Apache2\htdocs\account21/taxes/tax_types.php:165 +#: c:\Apache2\htdocs\account22/taxes/tax_types.php:164 msgid "Sales GL Account:" msgstr "" -#: c:\Apache2\htdocs\account21/taxes/tax_types.php:166 +#: c:\Apache2\htdocs\account22/taxes/tax_types.php:165 msgid "Purchasing GL Account:" msgstr "" -#: c:\Apache2\htdocs\account21/themes/aqua/renderer.php:16 -#: c:\Apache2\htdocs\account21/themes/cool/renderer.php:16 +#: c:\Apache2\htdocs\account22/themes/aqua/renderer.php:16 +#: c:\Apache2\htdocs\account22/themes/cool/renderer.php:16 +#: c:\Apache2\htdocs\account22/themes/default/renderer.php:17 +#: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:17 +#: c:\Apache2\htdocs\account22/themes/fancy/renderer.php:17 +#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:17 +#: c:\Apache2\htdocs\account22/themes/go/themes/fancy/renderer.php:17 +#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:17 +#: c:\Apache2\htdocs\account22/themes/go/themes/newwave/renderer.php:6 +#: c:\Apache2\htdocs\account22/themes/modern/renderer.php:17 +#: c:\Apache2\htdocs\account22/themes/newwave/renderer.php:6 msgid "Main Menu" msgstr "" -#: c:\Apache2\htdocs\account21/themes/aqua/renderer.php:46 -#: c:\Apache2\htdocs\account21/themes/aqua/renderer.php:70 -#: c:\Apache2\htdocs\account21/themes/cool/renderer.php:46 -#: c:\Apache2\htdocs\account21/themes/cool/renderer.php:70 +#: c:\Apache2\htdocs\account22/themes/aqua/renderer.php:46 +#: c:\Apache2\htdocs\account22/themes/aqua/renderer.php:70 +#: c:\Apache2\htdocs\account22/themes/cool/renderer.php:46 +#: c:\Apache2\htdocs\account22/themes/cool/renderer.php:70 +#: c:\Apache2\htdocs\account22/themes/default/renderer.php:47 +#: c:\Apache2\htdocs\account22/themes/default/renderer.php:71 +#: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:45 +#: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:52 +#: c:\Apache2\htdocs\account22/themes/fancy/renderer.php:43 +#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:45 +#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:52 +#: c:\Apache2\htdocs\account22/themes/go/themes/fancy/renderer.php:43 +#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:40 +#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:47 +#: c:\Apache2\htdocs\account22/themes/go/themes/newwave/renderer.php:37 +#: c:\Apache2\htdocs\account22/themes/modern/renderer.php:40 +#: c:\Apache2\htdocs\account22/themes/modern/renderer.php:47 +#: c:\Apache2\htdocs\account22/themes/newwave/renderer.php:37 msgid "Help" msgstr "" -#: c:\Apache2\htdocs\account21/themes/aqua/renderer.php:65 -#: c:\Apache2\htdocs\account21/themes/cool/renderer.php:65 +#: c:\Apache2\htdocs\account22/themes/aqua/renderer.php:65 +#: c:\Apache2\htdocs\account22/themes/cool/renderer.php:65 +#: c:\Apache2\htdocs\account22/themes/default/renderer.php:66 +#: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:48 +#: c:\Apache2\htdocs\account22/themes/fancy/renderer.php:40 +#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:48 +#: c:\Apache2\htdocs\account22/themes/go/themes/fancy/renderer.php:40 +#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:43 +#: c:\Apache2\htdocs\account22/themes/go/themes/newwave/renderer.php:48 +#: c:\Apache2\htdocs\account22/themes/modern/renderer.php:43 +#: c:\Apache2\htdocs\account22/themes/newwave/renderer.php:48 msgid "Preferences" msgstr "" -#: c:\Apache2\htdocs\account21/themes/elegant/renderer.php:71 +#: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:76 +#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:76 msgid "Shortcuts" msgstr "" -#: c:\Apache2\htdocs\account21/themes/elegant/renderer.php:75 -#: c:\Apache2\htdocs\account21/themes/modern/renderer.php:68 -msgid "Sales Order" -msgstr "" - -#: c:\Apache2\htdocs\account21/themes/elegant/renderer.php:76 -#: c:\Apache2\htdocs\account21/themes/modern/renderer.php:69 +#: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:81 +#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:81 +#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:69 +#: c:\Apache2\htdocs\account22/themes/modern/renderer.php:69 msgid "Direct Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/themes/elegant/renderer.php:77 -#: c:\Apache2\htdocs\account21/themes/elegant/renderer.php:88 -#: c:\Apache2\htdocs\account21/themes/elegant/renderer.php:113 -#: c:\Apache2\htdocs\account21/themes/modern/renderer.php:70 -#: c:\Apache2\htdocs\account21/themes/modern/renderer.php:81 -#: c:\Apache2\htdocs\account21/themes/modern/renderer.php:106 +#: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:82 +#: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:93 +#: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:118 +#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:82 +#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:93 +#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:118 +#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:70 +#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:81 +#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:106 +#: c:\Apache2\htdocs\account22/themes/modern/renderer.php:70 +#: c:\Apache2\htdocs\account22/themes/modern/renderer.php:81 +#: c:\Apache2\htdocs\account22/themes/modern/renderer.php:106 msgid "Payments" msgstr "" -#: c:\Apache2\htdocs\account21/themes/elegant/renderer.php:78 -#: c:\Apache2\htdocs\account21/themes/modern/renderer.php:71 +#: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:83 +#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:83 +#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:71 +#: c:\Apache2\htdocs\account22/themes/modern/renderer.php:71 msgid "Sales Order Inquiry" msgstr "" -#: c:\Apache2\htdocs\account21/themes/elegant/renderer.php:87 -#: c:\Apache2\htdocs\account21/themes/modern/renderer.php:80 +#: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:92 +#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:92 +#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:80 +#: c:\Apache2\htdocs\account22/themes/modern/renderer.php:80 msgid "Supplier Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/themes/elegant/renderer.php:94 -#: c:\Apache2\htdocs\account21/themes/modern/renderer.php:87 +#: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:99 +#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:99 +#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:87 +#: c:\Apache2\htdocs\account22/themes/modern/renderer.php:87 msgid "Inventory Adjustments" msgstr "" -#: c:\Apache2\htdocs\account21/themes/elegant/renderer.php:95 +#: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:100 +#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:100 msgid "Inventory Movements" msgstr "" -#: c:\Apache2\htdocs\account21/themes/elegant/renderer.php:97 -#: c:\Apache2\htdocs\account21/themes/modern/renderer.php:90 +#: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:102 +#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:102 +#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:90 +#: c:\Apache2\htdocs\account22/themes/modern/renderer.php:90 msgid "Sales Pricing" msgstr "" -#: c:\Apache2\htdocs\account21/themes/elegant/renderer.php:102 -#: c:\Apache2\htdocs\account21/themes/modern/renderer.php:95 +#: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:107 +#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:107 +#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:95 +#: c:\Apache2\htdocs\account22/themes/modern/renderer.php:95 msgid "Ourstanding Work Orders" msgstr "" -#: c:\Apache2\htdocs\account21/themes/elegant/renderer.php:103 -#: c:\Apache2\htdocs\account21/themes/modern/renderer.php:96 +#: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:108 +#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:108 +#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:96 +#: c:\Apache2\htdocs\account22/themes/modern/renderer.php:96 msgid "Work Order Inquiry" msgstr "" -#: c:\Apache2\htdocs\account21/themes/elegant/renderer.php:104 -#: c:\Apache2\htdocs\account21/themes/modern/renderer.php:97 +#: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:109 +#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:109 +#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:97 +#: c:\Apache2\htdocs\account22/themes/modern/renderer.php:97 msgid "Bills Of Material" msgstr "" -#: c:\Apache2\htdocs\account21/themes/elegant/renderer.php:109 -#: c:\Apache2\htdocs\account21/themes/modern/renderer.php:102 +#: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:114 +#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:114 +#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:102 +#: c:\Apache2\htdocs\account22/themes/modern/renderer.php:102 msgid "Dimension Inquiry" msgstr "" -#: c:\Apache2\htdocs\account21/themes/elegant/renderer.php:114 -#: c:\Apache2\htdocs\account21/themes/modern/renderer.php:107 +#: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:119 +#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:119 +#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:107 +#: c:\Apache2\htdocs\account22/themes/modern/renderer.php:107 msgid "Deposits" msgstr "" -#: c:\Apache2\htdocs\account21/themes/elegant/renderer.php:116 -#: c:\Apache2\htdocs\account21/themes/modern/renderer.php:109 +#: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:121 +#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:121 +#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:109 +#: c:\Apache2\htdocs\account22/themes/modern/renderer.php:109 msgid "Bank Account Inquiry" msgstr "" -#: c:\Apache2\htdocs\account21/themes/elegant/renderer.php:117 -#: c:\Apache2\htdocs\account21/themes/modern/renderer.php:110 +#: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:122 +#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:122 +#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:110 +#: c:\Apache2\htdocs\account22/themes/modern/renderer.php:110 msgid "GL Account Inquiry" msgstr "" -#: c:\Apache2\htdocs\account21/themes/elegant/renderer.php:126 -#: c:\Apache2\htdocs\account21/themes/modern/renderer.php:119 +#: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:131 +#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:131 +#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:119 +#: c:\Apache2\htdocs\account22/themes/modern/renderer.php:119 msgid "Taxes" msgstr "" -#: c:\Apache2\htdocs\account21/themes/modern/renderer.php:88 +#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:88 +#: c:\Apache2\htdocs\account22/themes/modern/renderer.php:88 msgid "Inventory Item Movements" msgstr "" -#: c:\Apache2\htdocs\account21/admin/db/maintenance_db.inc:238 +#: c:\Apache2\htdocs\account22/admin/db/maintenance_db.inc:184 #, php-format -msgid "SQL script execution failed in line %d: %s" +msgid "Cannot open the extension setup file '%s' for writing." msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/includes/dimensions_ui.inc:31 -msgid "There are no transactions for this dimension for the selected period." +#: c:\Apache2\htdocs\account22/admin/db/maintenance_db.inc:192 +#, php-format +msgid "Cannot write to the extensions setup file '%s'." msgstr "" -#: c:\Apache2\htdocs\account21/dimensions/includes/dimensions_ui.inc:35 -msgid "Balance for this Dimension" +#: c:\Apache2\htdocs\account22/admin/db/maintenance_db.inc:248 +msgid "Cannot open the languages file - " msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:337 -msgid "Date Voided:" +#: c:\Apache2\htdocs\account22/admin/db/maintenance_db.inc:255 +msgid "Cannot write to the language file - " msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:424 -#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:440 -#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:458 -msgid "Included" +#: c:\Apache2\htdocs\account22/admin/db/maintenance_db.inc:265 +msgid "The language files folder " msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:494 -msgid "Total Amount" -msgstr "" +#: c:\Apache2\htdocs\account22/admin/db/maintenance_db.inc:431 +#, php-format +msgid "SQL script execution failed in line %d: %s" +msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:518 -msgid "Total Allocated:" +#: c:\Apache2\htdocs\account22/admin/db/users_db.inc:216 +msgid "user online" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:522 -msgid "Left to Allocate:" +#: c:\Apache2\htdocs\account22/admin/db/users_db.inc:216 +msgid "users online" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:558 -msgid "No Quick Entries are defined." +#: c:\Apache2\htdocs\account22/admin/db/voiding_db.inc:109 +msgid "Voided." msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:743 -msgid "January" +#: c:\Apache2\htdocs\account22/dimensions/includes/dimensions_ui.inc:31 +msgid "There are no transactions for this dimension for the selected period." msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:743 -msgid "February" +#: c:\Apache2\htdocs\account22/dimensions/includes/dimensions_ui.inc:35 +msgid "Balance for this Dimension" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:743 -msgid "March" +#: c:\Apache2\htdocs\account22/gl/includes/db/gl_db_banking.inc:35 +#: c:\Apache2\htdocs\account22/gl/includes/db/gl_db_banking.inc:38 +msgid "Exchange Variance" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:743 -msgid "April" +#: c:\Apache2\htdocs\account22/gl/includes/db/gl_db_rates.inc:127 +msgid "Cannot retrieve currency rate from ECB page. Please set the rate manually." msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:743 -msgid "May" +#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_bank_ui.inc:50 +msgid "Pay To:" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:743 -msgid "June" +#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_bank_ui.inc:55 +msgid "To the Order of:" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:743 -msgid "July" +#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_bank_ui.inc:87 +#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_journal_ui.inc:53 +msgid "Go" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:743 -msgid "August" +#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_bank_ui.inc:159 +msgid "Edit document line" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:743 -msgid "September" +#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_bank_ui.inc:161 +msgid "Remove line from document" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:743 -msgid "October" +#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_bank_ui.inc:250 +#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_journal_ui.inc:213 +msgid "Confirm changes" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:743 -msgid "November" +#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_bank_ui.inc:252 +#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_journal_ui.inc:215 +msgid "Cancel changes" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:743 -msgid "December" +#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_bank_ui.inc:257 +#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_journal_ui.inc:219 +msgid "Add Item" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:744 -msgid "Su" +#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_bank_ui.inc:258 +msgid "Add new item to document" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:744 -msgid "Mo" +#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_journal_ui.inc:38 +msgid "Reverse Transaction:" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:744 -msgid "Tu" +#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_journal_ui.inc:46 +msgid "Quick Entry" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:744 -msgid "We" +#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_journal_ui.inc:114 +msgid "Edit journal line" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:744 -msgid "Th" +#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_journal_ui.inc:116 +msgid "Remove line from journal" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:744 -msgid "Fr" +#: c:\Apache2\htdocs\account22/gl/includes/ui/gl_journal_ui.inc:220 +msgid "Add new line to journal" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:744 -msgid "Sa" +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:56 +msgid "System administration" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:745 -msgid "W" +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:57 +msgid "Company setup" msgstr "" -#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:746 -msgid "Back" +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:58 +msgid "Special maintenance" msgstr "" -#: c:\Apache2\htdocs\account21/gl/includes/db/gl_db_banking.inc:35 -#: c:\Apache2\htdocs\account21/gl/includes/db/gl_db_banking.inc:38 -msgid "Exchange Variance" +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:59 +msgid "Sales configuration" msgstr "" -#: c:\Apache2\htdocs\account21/gl/includes/db/gl_db_rates.inc:114 -msgid "Cannot retrieve currency rate from ECB page. Please set the rate manually." +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:60 +msgid "Sales transactions" msgstr "" -#: c:\Apache2\htdocs\account21/gl/includes/ui/gl_bank_ui.inc:48 -msgid "Pay To:" +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:61 +msgid "Sales related reports" msgstr "" -#: c:\Apache2\htdocs\account21/gl/includes/ui/gl_bank_ui.inc:53 -msgid "To the Order of:" +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:62 +msgid "Purchase configuration" msgstr "" -#: c:\Apache2\htdocs\account21/gl/includes/ui/gl_bank_ui.inc:84 -#: c:\Apache2\htdocs\account21/gl/includes/ui/gl_journal_ui.inc:50 -msgid "Go" +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:63 +msgid "Purchase transactions" msgstr "" -#: c:\Apache2\htdocs\account21/gl/includes/ui/gl_bank_ui.inc:156 -msgid "Edit document line" +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:64 +msgid "Purchase analytics" msgstr "" -#: c:\Apache2\htdocs\account21/gl/includes/ui/gl_bank_ui.inc:158 -msgid "Remove line from document" +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:65 +msgid "Inventory configuration" msgstr "" -#: c:\Apache2\htdocs\account21/gl/includes/ui/gl_bank_ui.inc:249 -#: c:\Apache2\htdocs\account21/gl/includes/ui/gl_journal_ui.inc:209 -msgid "Confirm changes" +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:66 +msgid "Inventory operations" msgstr "" -#: c:\Apache2\htdocs\account21/gl/includes/ui/gl_bank_ui.inc:251 -#: c:\Apache2\htdocs\account21/gl/includes/ui/gl_journal_ui.inc:211 -msgid "Cancel changes" +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:67 +msgid "Inventory analytics" msgstr "" -#: c:\Apache2\htdocs\account21/gl/includes/ui/gl_bank_ui.inc:256 -#: c:\Apache2\htdocs\account21/gl/includes/ui/gl_journal_ui.inc:215 -msgid "Add Item" +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:68 +msgid "Manufacturing configuration" msgstr "" -#: c:\Apache2\htdocs\account21/gl/includes/ui/gl_bank_ui.inc:257 -msgid "Add new item to document" +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:69 +msgid "Manufacturing transations" msgstr "" -#: c:\Apache2\htdocs\account21/gl/includes/ui/gl_journal_ui.inc:37 -msgid "Reverse Transaction:" +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:70 +msgid "Manufacturing analytics" msgstr "" -#: c:\Apache2\htdocs\account21/gl/includes/ui/gl_journal_ui.inc:43 -msgid "Quick Entry" +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:71 +msgid "Dimensions configuration" msgstr "" -#: c:\Apache2\htdocs\account21/gl/includes/ui/gl_journal_ui.inc:111 -msgid "Edit journal line" +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:73 +msgid "Banking & GL configuration" msgstr "" -#: c:\Apache2\htdocs\account21/gl/includes/ui/gl_journal_ui.inc:113 -msgid "Remove line from journal" +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:74 +msgid "Banking & GL transactions" msgstr "" -#: c:\Apache2\htdocs\account21/gl/includes/ui/gl_journal_ui.inc:216 -msgid "Add new line to journal" +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:75 +msgid "Banking & GL analytics" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:93 +msgid "Install/update companies" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:94 +msgid "Install/update languages" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:95 +msgid "Install/upgrade modules" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:96 +msgid "Software upgrades" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:100 +msgid "Company parameters" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:101 +msgid "Access levels edition" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:102 +msgid "Users setup" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:103 +msgid "Point of sales definitions" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:104 +msgid "Printers configuration" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:105 +msgid "Print profiles" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:106 +msgid "Payment terms" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:107 +msgid "Shipping ways" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:108 +msgid "Credit status definitions changes" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:109 +msgid "Inventory locations changes" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:110 +msgid "Inventory movement types" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:111 +msgid "Manufacture work centres" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:112 +msgid "Forms setup" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:116 +msgid "Voiding transactions" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:117 +msgid "Database backup/restore" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:118 +msgid "Common view/print transactions interface" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:119 +msgid "Attaching documents" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:120 +msgid "Display preferences" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:121 +msgid "Password changes" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:126 +msgid "Sales types" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:127 +msgid "Sales prices edition" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:128 +msgid "Sales staff maintenance" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:129 +msgid "Sales areas maintenance" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:130 +msgid "Sales groups changes" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:131 +msgid "Sales templates" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:132 +msgid "Recurrent invoices definitions" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:134 +msgid "Sales transactions view" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:135 +msgid "Sales customer and branches changes" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:136 +msgid "Sales quotations" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:137 +msgid "Sales orders edition" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:138 +msgid "Sales deliveries edition" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:139 +msgid "Sales invoices edition" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:140 +msgid "Sales credit notes against invoice" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:141 +msgid "Sales freehand credit notes" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:142 +msgid "Customer payments entry" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:143 +msgid "Customer payments allocation" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:145 +msgid "Sales analytical reports" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:146 +msgid "Sales document bulk reports" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:147 +msgid "Sales prices listing" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:148 +msgid "Sales staff listing" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:149 +msgid "Customer bulk listing" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:150 +msgid "Customer status report" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:151 +msgid "Customer payments report" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:156 +msgid "Purchase price changes" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:158 +msgid "Supplier transactions view" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:159 +msgid "Suppliers changes" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:160 +msgid "Purchase order entry" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:161 +msgid "Purchase receive" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:162 +msgid "Supplier invoices" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:163 +msgid "Deleting GRN items during invoice entry" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:164 +msgid "Supplier credit notes" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:165 +msgid "Supplier payments" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:166 +msgid "Supplier payments allocations" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:168 +msgid "Supplier analytical reports" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:169 +msgid "Supplier document bulk reports" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:170 +msgid "Supplier payments report" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:174 +msgid "Stock items add/edit" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:175 +msgid "Sales kits" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:176 +msgid "Item categories" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:177 +msgid "Units of measure" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:179 +msgid "Stock status view" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:180 +msgid "Stock transactions view" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:181 +msgid "Foreign item codes entry" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:182 +msgid "Inventory location transfers" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:183 +msgid "Inventory adjustments" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:185 +msgid "Reorder levels" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:186 +msgid "Items analytical reports and inquiries" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:187 +msgid "Inventory valuation report" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:192 +msgid "Bill of Materials" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:194 +msgid "Manufacturing operations view" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:195 +msgid "Work order entry" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:196 +msgid "Material issues entry" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:197 +msgid "Final product receive" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:198 +msgid "Work order releases" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:200 +msgid "Work order analytical reports and inquiries" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:201 +msgid "Manufacturing cost inquiry" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:202 +msgid "Work order bulk reports" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:203 +msgid "Bill of materials reports" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:207 +msgid "Dimension tags" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:209 +msgid "Dimension view" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:211 +msgid "Dimension entry" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:213 +msgid "Dimension reports" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:217 +msgid "Item tax type definitions" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:218 +msgid "GL accounts edition" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:219 +msgid "GL account groups" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:220 +msgid "GL account classes" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:221 +msgid "Quick GL entry definitions" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:223 +msgid "Bank accounts" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:224 +msgid "Tax rates" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:225 +msgid "Tax groups" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:226 +msgid "Fiscal years maintenance" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:227 +msgid "Company GL setup" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:228 +msgid "GL Account tags" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:230 +msgid "Bank transactions view" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:231 +msgid "GL postings view" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:232 +msgid "Exchange rate table changes" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:233 +msgid "Bank payments" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:234 +msgid "Bank deposits" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:235 +msgid "Bank account transfers" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:236 +msgid "Bank reconciliation" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:237 +msgid "Manual journal entries" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:238 +msgid "Journal entries to bank related accounts" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:239 +msgid "Budget edition" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:240 +msgid "Item standard costs" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:242 +msgid "GL analytical reports and inquiries" msgstr "" -#: c:\Apache2\htdocs\account21/includes/banking.inc:107 +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:243 +msgid "Tax reports and inquiries" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:244 +msgid "Bank reports and inquiries" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/access_levels.inc:245 +msgid "GL reports and inquiries" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/banking.inc:107 #, php-format msgid "Cannot retrieve exchange rate for currency %s as of %s. Please add exchange rate manually on Exchange Rates page." msgstr "" -#: c:\Apache2\htdocs\account21/includes/current_user.inc:338 +#: c:\Apache2\htdocs\account22/includes/current_user.inc:75 +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 "" + +#: c:\Apache2\htdocs\account22/includes/current_user.inc:76 +msgid "Back" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/current_user.inc:86 +msgid "System is available for site admin only until full database upgrade" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/current_user.inc:408 msgid "Requesting data..." msgstr "" -#: c:\Apache2\htdocs\account21/includes/errors.inc:62 +#: c:\Apache2\htdocs\account22/includes/errors.inc:70 msgid "in file" msgstr "" -#: c:\Apache2\htdocs\account21/includes/errors.inc:62 +#: c:\Apache2\htdocs\account22/includes/errors.inc:70 msgid "at line " msgstr "" -#: c:\Apache2\htdocs\account21/includes/errors.inc:103 +#: c:\Apache2\htdocs\account22/includes/errors.inc:109 +msgid "Debug mode database warning:" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/errors.inc:111 msgid "DATABASE ERROR :" msgstr "" -#: c:\Apache2\htdocs\account21/includes/errors.inc:130 +#: c:\Apache2\htdocs\account22/includes/errors.inc:139 msgid "The entered information is a duplicate. Please go back and enter different values." msgstr "" -#: c:\Apache2\htdocs\account21/includes/main.inc:41 -#: c:\Apache2\htdocs\account21/includes/backup/main.inc:41 +#: c:\Apache2\htdocs\account22/includes/main.inc:43 msgid "This page is usable only with javascript enabled browsers." msgstr "" -#: c:\Apache2\htdocs\account21/includes/session.inc:37 -#: c:\Apache2\htdocs\account21/includes/backup/session.inc:37 +#: c:\Apache2\htdocs\account22/includes/session.inc:39 msgid "Incorrect Password" msgstr "" -#: c:\Apache2\htdocs\account21/includes/session.inc:38 -#: c:\Apache2\htdocs\account21/includes/backup/session.inc:38 +#: c:\Apache2\htdocs\account22/includes/session.inc:40 msgid "The user and password combination is not valid for the system." msgstr "" -#: c:\Apache2\htdocs\account21/includes/session.inc:40 -#: c:\Apache2\htdocs\account21/includes/backup/session.inc:40 +#: c:\Apache2\htdocs\account22/includes/session.inc:42 msgid "If you are not an authorized user, please contact your system administrator to obtain an account to enable you to use the system." msgstr "" -#: c:\Apache2\htdocs\account21/includes/session.inc:55 -#: c:\Apache2\htdocs\account21/includes/backup/session.inc:55 +#: c:\Apache2\htdocs\account22/includes/session.inc:43 +msgid "Try again" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/session.inc:58 msgid "Security settings have not been defined for your user account." msgstr "" -#: c:\Apache2\htdocs\account21/includes/session.inc:56 -#: c:\Apache2\htdocs\account21/includes/backup/session.inc:56 +#: c:\Apache2\htdocs\account22/includes/session.inc:59 msgid "Please contact your system administrator." msgstr "" -#: c:\Apache2\htdocs\account21/includes/session.inc:67 -#: c:\Apache2\htdocs\account21/includes/backup/session.inc:64 -msgid "Access denied" +#: c:\Apache2\htdocs\account22/includes/session.inc:60 +msgid "Please remove $security_groups and $security_headings arrays from config.php file!" msgstr "" -#: c:\Apache2\htdocs\account21/includes/session.inc:70 -#: c:\Apache2\htdocs\account21/includes/backup/session.inc:66 +#: c:\Apache2\htdocs\account22/includes/session.inc:72 msgid "The security settings on your account do not permit you to access this function" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:16 -#: c:\Apache2\htdocs\account21/includes/types.inc:368 +#: c:\Apache2\htdocs\account22/includes/types.inc:47 +#: c:\Apache2\htdocs\account22/includes/types.inc:251 msgid "Bank Payment" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:17 -#: c:\Apache2\htdocs\account21/includes/types.inc:367 +#: c:\Apache2\htdocs\account22/includes/types.inc:48 +#: c:\Apache2\htdocs\account22/includes/types.inc:250 msgid "Bank Deposit" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:18 +#: c:\Apache2\htdocs\account22/includes/types.inc:49 msgid "Funds Transfer" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:19 +#: c:\Apache2\htdocs\account22/includes/types.inc:50 msgid "Sales Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:21 +#: c:\Apache2\htdocs\account22/includes/types.inc:52 msgid "Customer Payment" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:22 +#: c:\Apache2\htdocs\account22/includes/types.inc:53 msgid "Delivery Note" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:23 +#: c:\Apache2\htdocs\account22/includes/types.inc:54 msgid "Location Transfer" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:24 +#: c:\Apache2\htdocs\account22/includes/types.inc:55 msgid "Inventory Adjustment" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:28 +#: c:\Apache2\htdocs\account22/includes/types.inc:59 msgid "Supplier Payment" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:30 -#: c:\Apache2\htdocs\account21/includes/types.inc:158 +#: c:\Apache2\htdocs\account22/includes/types.inc:61 +#: c:\Apache2\htdocs\account22/includes/types.inc:108 msgid "Work Order" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:31 +#: c:\Apache2\htdocs\account22/includes/types.inc:62 msgid "Work Order Issue" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:32 +#: c:\Apache2\htdocs\account22/includes/types.inc:63 msgid "Work Order Production" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:34 +#: c:\Apache2\htdocs\account22/includes/types.inc:66 msgid "Cost Update" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:122 +#: c:\Apache2\htdocs\account22/includes/types.inc:79 msgid "Savings Account" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:122 -msgid "Transfer" +#: c:\Apache2\htdocs\account22/includes/types.inc:80 +msgid "Chequing Account" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:123 -msgid "Chequing Account" +#: c:\Apache2\htdocs\account22/includes/types.inc:82 +msgid "Cash Account" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:123 -msgid "Cheque" +#: c:\Apache2\htdocs\account22/includes/types.inc:86 +msgid "Transfer" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:125 -msgid "Cash Account" +#: c:\Apache2\htdocs\account22/includes/types.inc:87 +msgid "Cheque" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:125 +#: c:\Apache2\htdocs\account22/includes/types.inc:89 msgid "Cash" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:276 +#: c:\Apache2\htdocs\account22/includes/types.inc:184 msgid "Assemble" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:277 +#: c:\Apache2\htdocs\account22/includes/types.inc:185 msgid "Unassemble" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:278 +#: c:\Apache2\htdocs\account22/includes/types.inc:186 msgid "Advanced Manufacture" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:321 +#: c:\Apache2\htdocs\account22/includes/types.inc:193 +msgid "Labour Cost" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/types.inc:194 +msgid "Overhead Cost" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/types.inc:209 msgid "Assets" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:323 +#: c:\Apache2\htdocs\account22/includes/types.inc:211 msgid "Equity" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:324 +#: c:\Apache2\htdocs\account22/includes/types.inc:212 msgid "Income" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:325 +#: c:\Apache2\htdocs\account22/includes/types.inc:213 msgid "Cost of Goods Sold" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:326 +#: c:\Apache2\htdocs\account22/includes/types.inc:214 msgid "Expense" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:341 -msgid "Labour Cost" -msgstr "" - -#: c:\Apache2\htdocs\account21/includes/types.inc:342 -msgid "Overhead Cost" -msgstr "" - -#: c:\Apache2\htdocs\account21/includes/types.inc:346 +#: c:\Apache2\htdocs\account22/includes/types.inc:229 msgid "Remainder" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:348 +#: c:\Apache2\htdocs\account22/includes/types.inc:231 msgid "Amount, increase base" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:349 +#: c:\Apache2\htdocs\account22/includes/types.inc:232 msgid "Amount, reduce base" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:350 +#: c:\Apache2\htdocs\account22/includes/types.inc:233 msgid "% amount of base" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:351 +#: c:\Apache2\htdocs\account22/includes/types.inc:234 msgid "% amount of base, increase base" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:352 +#: c:\Apache2\htdocs\account22/includes/types.inc:235 msgid "% amount of base, reduce base" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:353 +#: c:\Apache2\htdocs\account22/includes/types.inc:236 msgid "Taxes added" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:354 +#: c:\Apache2\htdocs\account22/includes/types.inc:237 msgid "Taxes added, increase base" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:355 +#: c:\Apache2\htdocs\account22/includes/types.inc:238 msgid "Taxes added, reduce base" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:356 +#: c:\Apache2\htdocs\account22/includes/types.inc:239 msgid "Taxes included" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:357 +#: c:\Apache2\htdocs\account22/includes/types.inc:240 msgid "Taxes included, increase base" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:358 +#: c:\Apache2\htdocs\account22/includes/types.inc:241 msgid "Taxes included, reduce base" msgstr "" -#: c:\Apache2\htdocs\account21/includes/types.inc:370 +#: c:\Apache2\htdocs\account22/includes/types.inc:253 msgid "Supplier Invoice/Credit" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/db_pager_view.inc:163 +#: c:\Apache2\htdocs\account22/includes/types.inc:269 +msgid "Purchased" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/types.inc:270 +msgid "Service" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/db/audit_trail_db.inc:93 +msgid "Some transactions journal GL postings were not indexed due to lack of audit trail record." +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/allocation_cart.inc:259 +msgid "Other Allocations" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/allocation_cart.inc:259 +#: c:\Apache2\htdocs\account22/includes/ui/ui_view.inc:453 +msgid "This Allocation" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/allocation_cart.inc:288 +msgid "Total Allocated" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/allocation_cart.inc:323 +msgid "The entry for one or more amounts is invalid or negative." +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/allocation_cart.inc:346 +msgid "These allocations cannot be processed because the amount allocated is more than the total amount left to allocate." +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/db_pager_view.inc:166 +#: c:\Apache2\htdocs\account22/includes/ui/ui_input.inc:836 +msgid "Show also Inactive" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/db_pager_view.inc:175 msgid "First" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/db_pager_view.inc:164 +#: c:\Apache2\htdocs\account22/includes/ui/db_pager_view.inc:176 msgid "Prev" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/db_pager_view.inc:165 +#: c:\Apache2\htdocs\account22/includes/ui/db_pager_view.inc:177 msgid "Next" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/db_pager_view.inc:166 +#: c:\Apache2\htdocs\account22/includes/ui/db_pager_view.inc:178 msgid "Last" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/db_pager_view.inc:175 +#: c:\Apache2\htdocs\account22/includes/ui/db_pager_view.inc:187 #, php-format msgid "Records %d-%d of %d" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/db_pager_view.inc:178 +#: c:\Apache2\htdocs\account22/includes/ui/db_pager_view.inc:191 msgid "No records" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/ui_controls.inc:97 +#: c:\Apache2\htdocs\account22/includes/ui/ui_controls.inc:97 msgid "You should automatically be forwarded." msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/ui_controls.inc:98 +#: c:\Apache2\htdocs\account22/includes/ui/ui_controls.inc:98 msgid "If this does not happen" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/ui_controls.inc:98 +#: c:\Apache2\htdocs\account22/includes/ui/ui_controls.inc:98 msgid "click here" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/ui_controls.inc:98 +#: c:\Apache2\htdocs\account22/includes/ui/ui_controls.inc:98 msgid "to continue" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/ui_input.inc:531 +#: c:\Apache2\htdocs\account22/includes/ui/ui_controls.inc:334 +msgid "Branches" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_input.inc:195 +msgid "Submit changes" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_input.inc:196 +msgid "Clone" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_input.inc:197 +msgid "Edit new record with current data" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_input.inc:198 +msgid "Cancel edition" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_input.inc:590 msgid "Click Here to Pick up the date" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:18 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:17 msgid "Set filter" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:83 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:85 msgid "Press Space tab for search pattern entry" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:87 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:89 msgid "Enter code fragment to search or * for all" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:88 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:90 msgid "Enter description fragment to search or * for all" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:372 -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:1291 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:393 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1307 msgid "All Suppliers" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:376 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:397 msgid "Press Space tab to filter by name fragment" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:377 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:398 msgid "Select supplier" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:413 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:442 msgid "All Customers" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:418 -msgid "Press Space tab to filter by name fragment; F4 - entry new customer" +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:446 +msgid "Press Space tab to filter by name fragment; F2 - entry new customer" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:419 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:447 msgid "Select customer" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:455 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:490 msgid "All branches" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:458 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:493 msgid "Select customer branch" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:491 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:528 msgid "All Locations" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:571 -msgid "Active" -msgstr "" - -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:648 -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:710 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:681 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:746 msgid "All Items" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:856 -msgid "Purchased" -msgstr "" - -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:857 -msgid "Service" -msgstr "" - -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:1196 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1214 msgid "All Sales Types" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:1397 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1408 msgid "Delayed" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:1512 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1524 msgid "Use Item Sales Accounts" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:1820 -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:1838 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1832 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1849 msgid "All Types" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:1822 -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:1840 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1834 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1851 msgid "Overdue Invoices" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:1839 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1850 msgid "Invoices" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:1843 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1854 msgid "Overdue Credit Notes" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:1856 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1866 msgid "Automatically put balance on back order" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:1857 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1867 msgid "Cancel any quantites not delivered" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:1875 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1884 msgid "Items Returned to Inventory Location" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/ui_lists.inc:1876 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:1885 msgid "Items Written Off" msgstr "" -#: c:\Apache2\htdocs\account21/includes/ui/ui_msgs.inc:63 +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:2053 +msgid "New role" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:2111 +msgid "No tags defined." +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:2111 +msgid "No active tags defined." +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:2149 +#, php-format +msgid "Activated for '%s'" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_lists.inc:2152 +msgid "Installed on system" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_msgs.inc:63 msgid "in units of : " msgstr "" -#: c:\Apache2\htdocs\account21/inventory/includes/item_adjustments_ui.inc:20 -#: c:\Apache2\htdocs\account21/inventory/includes/stock_transfers_ui.inc:20 +#: c:\Apache2\htdocs\account22/includes/ui/ui_view.inc:294 +msgid "Date Voided:" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_view.inc:382 +#: c:\Apache2\htdocs\account22/includes/ui/ui_view.inc:398 +#: c:\Apache2\htdocs\account22/includes/ui/ui_view.inc:416 +msgid "Included" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_view.inc:452 +msgid "Total Amount" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_view.inc:476 +msgid "Total Allocated:" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_view.inc:480 +msgid "Left to Allocate:" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_view.inc:516 +msgid "No Quick Entries are defined." +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_view.inc:712 +msgid "January" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_view.inc:712 +msgid "February" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_view.inc:712 +msgid "March" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_view.inc:712 +msgid "April" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_view.inc:712 +msgid "May" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_view.inc:712 +msgid "June" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_view.inc:712 +msgid "July" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_view.inc:712 +msgid "August" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_view.inc:712 +msgid "September" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_view.inc:712 +msgid "October" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_view.inc:712 +msgid "November" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_view.inc:712 +msgid "December" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_view.inc:713 +msgid "Su" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_view.inc:713 +msgid "Mo" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_view.inc:713 +msgid "Tu" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_view.inc:713 +msgid "We" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_view.inc:713 +msgid "Th" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_view.inc:713 +msgid "Fr" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_view.inc:713 +msgid "Sa" +msgstr "" + +#: c:\Apache2\htdocs\account22/includes/ui/ui_view.inc:714 +msgid "W" +msgstr "" + +#: c:\Apache2\htdocs\account22/inventory/includes/item_adjustments_ui.inc:20 +#: c:\Apache2\htdocs\account22/inventory/includes/stock_transfers_ui.inc:20 msgid "For Part :" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/includes/item_adjustments_ui.inc:43 +#: c:\Apache2\htdocs\account22/inventory/includes/item_adjustments_ui.inc:43 msgid "Detail:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/includes/item_adjustments_ui.inc:48 +#: c:\Apache2\htdocs\account22/inventory/includes/item_adjustments_ui.inc:48 msgid "Positive Adjustment" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/includes/item_adjustments_ui.inc:48 +#: c:\Apache2\htdocs\account22/inventory/includes/item_adjustments_ui.inc:48 msgid "Negative Adjustment" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/includes/stock_transfers_ui.inc:36 +#: c:\Apache2\htdocs\account22/inventory/includes/stock_transfers_ui.inc:36 msgid "To Location:" msgstr "" -#: c:\Apache2\htdocs\account21/inventory/includes/stock_transfers_ui.inc:46 +#: c:\Apache2\htdocs\account22/inventory/includes/stock_transfers_ui.inc:46 msgid "Transfer Type:" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/includes/manufacturing_ui.inc:24 +#: c:\Apache2\htdocs\account22/manufacturing/includes/manufacturing_ui.inc:24 msgid "The bill of material for this item is empty." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/includes/manufacturing_ui.inc:31 -#: c:\Apache2\htdocs\account21/manufacturing/includes/manufacturing_ui.inc:63 +#: c:\Apache2\htdocs\account22/manufacturing/includes/manufacturing_ui.inc:31 +#: c:\Apache2\htdocs\account22/manufacturing/includes/manufacturing_ui.inc:63 msgid "Total Cost" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/includes/manufacturing_ui.inc:79 +#: c:\Apache2\htdocs\account22/manufacturing/includes/manufacturing_ui.inc:79 msgid "There are no Requirements for this Order." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/includes/manufacturing_ui.inc:86 +#: c:\Apache2\htdocs\account22/manufacturing/includes/manufacturing_ui.inc:86 msgid "Unit Quantity" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/includes/manufacturing_ui.inc:86 +#: c:\Apache2\htdocs\account22/manufacturing/includes/manufacturing_ui.inc:86 msgid "Total Quantity" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/includes/manufacturing_ui.inc:86 +#: c:\Apache2\htdocs\account22/manufacturing/includes/manufacturing_ui.inc:86 msgid "Units Issued" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/includes/manufacturing_ui.inc:86 +#: c:\Apache2\htdocs\account22/manufacturing/includes/manufacturing_ui.inc:86 msgid "On Hand" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/includes/manufacturing_ui.inc:140 +#: c:\Apache2\htdocs\account22/manufacturing/includes/manufacturing_ui.inc:140 msgid "Marked items have insufficient quantities in stock." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/includes/manufacturing_ui.inc:154 +#: c:\Apache2\htdocs\account22/manufacturing/includes/manufacturing_ui.inc:154 msgid "There are no Productions for this Order." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/includes/manufacturing_ui.inc:197 +#: c:\Apache2\htdocs\account22/manufacturing/includes/manufacturing_ui.inc:197 msgid "There are no Issues for this Order." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/includes/manufacturing_ui.inc:234 +#: c:\Apache2\htdocs\account22/manufacturing/includes/manufacturing_ui.inc:234 msgid "There are no additional costs for this Order." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/includes/manufacturing_ui.inc:272 -#: c:\Apache2\htdocs\account21/manufacturing/includes/manufacturing_ui.inc:328 +#: c:\Apache2\htdocs\account22/manufacturing/includes/manufacturing_ui.inc:272 +#: c:\Apache2\htdocs\account22/manufacturing/includes/manufacturing_ui.inc:328 msgid "The work order number sent is not valid." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/includes/manufacturing_ui.inc:279 -#: c:\Apache2\htdocs\account21/manufacturing/includes/manufacturing_ui.inc:283 -#: c:\Apache2\htdocs\account21/manufacturing/includes/manufacturing_ui.inc:334 +#: c:\Apache2\htdocs\account22/manufacturing/includes/manufacturing_ui.inc:279 +#: c:\Apache2\htdocs\account22/manufacturing/includes/manufacturing_ui.inc:283 +#: c:\Apache2\htdocs\account22/manufacturing/includes/manufacturing_ui.inc:334 msgid "Manufactured Item" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/includes/manufacturing_ui.inc:280 -#: c:\Apache2\htdocs\account21/manufacturing/includes/manufacturing_ui.inc:284 -#: c:\Apache2\htdocs\account21/manufacturing/includes/manufacturing_ui.inc:335 +#: c:\Apache2\htdocs\account22/manufacturing/includes/manufacturing_ui.inc:280 +#: c:\Apache2\htdocs\account22/manufacturing/includes/manufacturing_ui.inc:284 +#: c:\Apache2\htdocs\account22/manufacturing/includes/manufacturing_ui.inc:335 msgid "Into Location" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/includes/manufacturing_ui.inc:314 -#: c:\Apache2\htdocs\account21/manufacturing/includes/manufacturing_ui.inc:359 +#: c:\Apache2\htdocs\account22/manufacturing/includes/manufacturing_ui.inc:314 +#: c:\Apache2\htdocs\account22/manufacturing/includes/manufacturing_ui.inc:359 msgid "This work order is closed." msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/includes/work_order_issue_ui.inc:156 +#: c:\Apache2\htdocs\account22/manufacturing/includes/work_order_issue_ui.inc:158 msgid "Return Items to Location" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/includes/work_order_issue_ui.inc:156 +#: c:\Apache2\htdocs\account22/manufacturing/includes/work_order_issue_ui.inc:158 msgid "Issue Items to Work order" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/includes/work_order_issue_ui.inc:159 +#: c:\Apache2\htdocs\account22/manufacturing/includes/work_order_issue_ui.inc:161 msgid "To Work Centre:" msgstr "" -#: c:\Apache2\htdocs\account21/manufacturing/includes/work_order_issue_ui.inc:161 +#: c:\Apache2\htdocs\account22/manufacturing/includes/work_order_issue_ui.inc:163 msgid "Issue Date:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/db/invoice_db.inc:246 -#: c:\Apache2\htdocs\account21/purchasing/includes/db/invoice_db.inc:250 +#: c:\Apache2\htdocs\account22/manufacturing/includes/db/work_orders_db.inc:152 +msgid "Updated." +msgstr "" + +#: c:\Apache2\htdocs\account22/manufacturing/includes/db/work_orders_db.inc:171 +msgid "Canceled." +msgstr "" + +#: c:\Apache2\htdocs\account22/manufacturing/includes/db/work_orders_db.inc:247 +msgid "Released." +msgstr "" + +#: c:\Apache2\htdocs\account22/manufacturing/includes/db/work_orders_quick_db.inc:83 +msgid "Quick production." +msgstr "" + +#: c:\Apache2\htdocs\account22/manufacturing/includes/db/work_order_produce_items_db.inc:60 +msgid "Production." +msgstr "" + +#: c:\Apache2\htdocs\account22/purchasing/includes/db/invoice_db.inc:253 +#: c:\Apache2\htdocs\account22/purchasing/includes/db/invoice_db.inc:257 msgid "Cost diff." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/grn_ui.inc:25 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/grn_ui.inc:25 msgid "For Purchase Order" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/grn_ui.inc:41 -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/grn_ui.inc:53 -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/po_ui.inc:252 -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/po_ui.inc:257 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/grn_ui.inc:41 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/grn_ui.inc:53 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/po_ui.inc:252 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/po_ui.inc:257 msgid "Deliver Into Location" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/grn_ui.inc:47 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/grn_ui.inc:47 msgid "Date Items Received" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/grn_ui.inc:63 -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/po_ui.inc:270 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/grn_ui.inc:63 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/po_ui.inc:270 msgid "Order Comments" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:99 -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:102 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:99 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:102 msgid "Supplier's Ref.:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:117 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:117 msgid "Terms:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:145 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:145 msgid "Sub-total:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:153 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:153 msgid "Invoice Total:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:187 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:187 msgid "Add GL Line" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:188 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:188 msgid "Reset" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:189 -msgid "Clear all GL entry fields" -msgstr "" - -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:209 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:209 msgid "GL Items for this Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:211 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:211 msgid "GL Items for this Credit Note" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:221 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:221 msgid "Quick Entry:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:390 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:390 msgid "Add to Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:392 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:392 msgid "Add to Credit Note" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:394 -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:429 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:394 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:429 msgid "WARNING! Be careful with removal. The operation is executed immediately and cannot be undone !!!" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:396 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:396 #, php-format msgid "You are about to remove all yet non-invoiced items from delivery line #%d. This operation also irreversibly changes related order line. Do you want to continue ?" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:427 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:427 msgid "Items Received Yet to be Invoiced" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:432 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:432 msgid "Delivery Item Selected For Adding To A Supplier Credit Note" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:437 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:437 msgid "Received Items Charged on this Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:439 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:439 msgid "Received Items Credited on this Note" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:451 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:451 msgid "Received between" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:452 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:452 msgid "and" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:463 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:463 msgid "Add All Items" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:472 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:472 msgid "Sequence #" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:472 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:472 msgid "P.O." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:473 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:473 msgid "Received On" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:474 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:474 msgid "Qty Yet To Invoice" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:474 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:474 msgid "Order Price" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:479 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:479 msgid "Qty Yet To Credit" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:484 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:484 msgid "Line Value" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:550 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:550 msgid "There are no outstanding items received from this supplier that have not been invoiced by them." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:553 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:553 msgid "There are no received items for the selected supplier that have been invoiced." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:554 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/invoice_ui.inc:554 msgid "Credits can only be applied to invoiced items." msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/po_ui.inc:87 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/po_ui.inc:87 msgid "Supplier Currency:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/po_ui.inc:118 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/po_ui.inc:118 msgid "Supplier's Reference:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/po_ui.inc:120 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/po_ui.inc:120 msgid "Receive Into:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/po_ui.inc:148 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/po_ui.inc:148 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 "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/po_ui.inc:152 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/po_ui.inc:152 msgid "Deliver to:" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/po_ui.inc:163 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/po_ui.inc:163 msgid "Order Items" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/po_ui.inc:170 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/po_ui.inc:170 msgid "Required Delivery Date" msgstr "" -#: c:\Apache2\htdocs\account21/purchasing/includes/ui/po_ui.inc:217 +#: c:\Apache2\htdocs\account22/purchasing/includes/ui/po_ui.inc:217 msgid "Total Excluding Shipping/Tax" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/backup/excel_report.inc:187 -msgid "Print Out Date" -msgstr "" - -#: c:\Apache2\htdocs\account21/reporting/backup/excel_report.inc:194 -msgid "Fiscal Year" -msgstr "" - -#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:14 +#: c:\Apache2\htdocs\account22/reporting/includes/doctext.inc:14 msgid "Cust no" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:18 +#: c:\Apache2\htdocs\account22/reporting/includes/doctext.inc:18 msgid "Order To" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:31 +#: c:\Apache2\htdocs\account22/reporting/includes/doctext.inc:33 msgid "Your Ref" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:32 +#: c:\Apache2\htdocs\account22/reporting/includes/doctext.inc:45 msgid "Our Ref." msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:33 +#: c:\Apache2\htdocs\account22/reporting/includes/doctext.inc:46 msgid "Your VAT no." msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:34 -msgid "Our VAT No." +#: c:\Apache2\htdocs\account22/reporting/includes/doctext.inc:48 +msgid "Customers Reference" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:36 -msgid "Customers Reference" +#: c:\Apache2\htdocs\account22/reporting/includes/doctext.inc:51 +msgid "Our VAT No." msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:38 +#: c:\Apache2\htdocs\account22/reporting/includes/doctext.inc:52 msgid "Domicile" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:41 +#: c:\Apache2\htdocs\account22/reporting/includes/doctext.inc:55 msgid "All amounts stated in" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:45 +#: c:\Apache2\htdocs\account22/reporting/includes/doctext.inc:59 msgid "Please quote Invoice no. when paying. All amounts stated in" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:46 +#: c:\Apache2\htdocs\account22/reporting/includes/doctext.inc:60 msgid "Please quote Credit no. when paying. All amounts stated in" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:49 +#: c:\Apache2\htdocs\account22/reporting/includes/doctext.inc:63 msgid "Phone/Fax/Email" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:52 -#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:84 +#: c:\Apache2\htdocs\account22/reporting/includes/doctext.inc:66 +#: c:\Apache2\htdocs\account22/reporting/includes/doctext.inc:105 msgid "You can pay through" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:75 +#: c:\Apache2\htdocs\account22/reporting/includes/doctext.inc:96 msgid "DueDate" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:81 +#: c:\Apache2\htdocs\account22/reporting/includes/doctext.inc:102 msgid "Dear" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:82 +#: c:\Apache2\htdocs\account22/reporting/includes/doctext.inc:103 msgid "Attached you will find " msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:83 +#: c:\Apache2\htdocs\account22/reporting/includes/doctext.inc:104 msgid "Kindest regards" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:88 -#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:90 +#: c:\Apache2\htdocs\account22/reporting/includes/doctext.inc:109 +#: c:\Apache2\htdocs\account22/reporting/includes/doctext.inc:111 msgid "Delivery Note No." msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:88 -#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:91 +#: c:\Apache2\htdocs\account22/reporting/includes/doctext.inc:109 +#: c:\Apache2\htdocs\account22/reporting/includes/doctext.inc:112 msgid "Order no." msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:89 +#: c:\Apache2\htdocs\account22/reporting/includes/doctext.inc:110 msgid "Invoice No." msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:89 +#: c:\Apache2\htdocs\account22/reporting/includes/doctext.inc:110 +msgid "Word Order No" +msgstr "" + +#: c:\Apache2\htdocs\account22/reporting/includes/doctext.inc:110 msgid "Credit No." msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:102 +#: c:\Apache2\htdocs\account22/reporting/includes/doctext.inc:123 msgid "TOTAL ORDER EX VAT" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:103 +#: c:\Apache2\htdocs\account22/reporting/includes/doctext.inc:124 msgid "TOTAL PO EX VAT" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:104 +#: c:\Apache2\htdocs\account22/reporting/includes/doctext.inc:125 msgid "TOTAL DELIVERY INCL. VAT" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:108 +#: c:\Apache2\htdocs\account22/reporting/includes/doctext.inc:129 msgid "Outstanding Transactions" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:111 +#: c:\Apache2\htdocs\account22/reporting/includes/doctext.inc:132 msgid "Statement" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:112 +#: c:\Apache2\htdocs\account22/reporting/includes/doctext.inc:133 msgid "as of" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/header2.inc:133 -#: c:\Apache2\htdocs\account21/reporting/includes/pdf_report.inc:238 +#: c:\Apache2\htdocs\account22/reporting/includes/excel_report.inc:61 +#: c:\Apache2\htdocs\account22/reporting/includes/pdf_report.inc:56 +msgid "The security settings on your account do not permit you to print this report" +msgstr "" + +#: c:\Apache2\htdocs\account22/reporting/includes/excel_report.inc:206 +#: c:\Apache2\htdocs\account22/reporting/includes/pdf_report.inc:209 +msgid "Print Out Date" +msgstr "" + +#: c:\Apache2\htdocs\account22/reporting/includes/excel_report.inc:212 +#: c:\Apache2\htdocs\account22/reporting/includes/pdf_report.inc:218 +msgid "Fiscal Year" +msgstr "" + +#: c:\Apache2\htdocs\account22/reporting/includes/header2.inc:150 +#: c:\Apache2\htdocs\account22/reporting/includes/pdf_report.inc:245 msgid "Page" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/pdf_report.inc:452 +#: c:\Apache2\htdocs\account22/reporting/includes/pdf_report.inc:459 msgid "Sending document by email failed" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/pdf_report.inc:455 +#: c:\Apache2\htdocs\account22/reporting/includes/pdf_report.inc:462 msgid "has been sent by email." msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/pdf_report.inc:494 +#: c:\Apache2\htdocs\account22/reporting/includes/pdf_report.inc:502 msgid "Report has been sent to network printer " msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/printer_class.inc:39 +#: c:\Apache2\htdocs\account22/reporting/includes/printer_class.inc:39 msgid "Cannot open connection to printer" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/printer_class.inc:50 +#: c:\Apache2\htdocs\account22/reporting/includes/printer_class.inc:50 msgid "Printer does not acept the job" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/printer_class.inc:61 +#: c:\Apache2\htdocs\account22/reporting/includes/printer_class.inc:61 msgid "Error sending print job control file" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/printer_class.inc:68 +#: c:\Apache2\htdocs\account22/reporting/includes/printer_class.inc:68 msgid "Print control file not accepted" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/printer_class.inc:76 +#: c:\Apache2\htdocs\account22/reporting/includes/printer_class.inc:76 msgid "Cannot send report to printer" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/printer_class.inc:86 +#: c:\Apache2\htdocs\account22/reporting/includes/printer_class.inc:86 msgid "No ack after report printout" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/printer_class.inc:100 +#: c:\Apache2\htdocs\account22/reporting/includes/printer_class.inc:100 msgid "Cannot flush printing queue" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/reports_classes.inc:41 +#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:44 msgid "Report Classes:" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/reports_classes.inc:49 +#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:53 msgid "Reports For Class: " msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/reports_classes.inc:64 +#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:69 msgid "Display: " msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/reports_classes.inc:92 +#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:98 msgid "Invalid date format" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/reports_classes.inc:135 +#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:134 +msgid "Unknown report parameter type:" +msgstr "" + +#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:159 msgid "No Currency Filter" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/reports_classes.inc:181 -msgid "No Payment Link" +#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:204 +msgid "No payment Link" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/reports_classes.inc:185 +#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:208 msgid "PDF/Printer" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/reports_classes.inc:193 +#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:216 msgid "No Graphics" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/reports_classes.inc:193 +#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:216 msgid "Vertical bars" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/reports_classes.inc:193 +#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:216 msgid "Horizontal bars" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/reports_classes.inc:193 +#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:217 msgid "Dots" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/reports_classes.inc:193 +#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:217 msgid "Lines" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/reports_classes.inc:193 +#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:217 msgid "Pie" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/reports_classes.inc:193 +#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:217 msgid "Donut" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/reports_classes.inc:197 +#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:221 +#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:224 msgid "No Type Filter" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/reports_classes.inc:207 +#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:235 msgid "No Account Group Filter" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/reports_classes.inc:223 -#: c:\Apache2\htdocs\account21/reporting/includes/reports_classes.inc:231 -#: c:\Apache2\htdocs\account21/reporting/includes/reports_classes.inc:239 +#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:250 +#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:256 +#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:262 msgid "No Dimension Filter" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/reports_classes.inc:245 +#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:268 msgid "No Customer Filter" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/reports_classes.inc:253 +#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:279 msgid "No Supplier Filter" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/reports_classes.inc:258 +#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:287 msgid "IV" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/reports_classes.inc:259 +#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:288 msgid "CN" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/reports_classes.inc:298 +#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:338 msgid "No Location Filter" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/reports_classes.inc:302 +#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:341 msgid "No Category Filter" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/reports_classes.inc:310 -msgid "No Area Filter" +#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:350 +msgid "No Sales Folk Filter" +msgstr "" + +#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:360 +msgid "No Users Filter" msgstr "" -#: c:\Apache2\htdocs\account21/reporting/includes/reports_classes.inc:314 -msgid "No Sales Folk Filter" +#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:368 +msgid "No tags" msgstr "" -#: c:\Apache2\htdocs\account21/sales/includes/sales_ui.inc:48 +#: c:\Apache2\htdocs\account22/sales/includes/sales_ui.inc:48 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 "" -#: c:\Apache2\htdocs\account21/sales/includes/db/sales_invoice_db.inc:181 +#: c:\Apache2\htdocs\account22/sales/includes/db/sales_invoice_db.inc:182 msgid "Cash invoice" msgstr "" -#: c:\Apache2\htdocs\account21/sales/includes/db/sales_order_db.inc:98 -#: c:\Apache2\htdocs\account21/sales/includes/db/sales_order_db.inc:237 +#: c:\Apache2\htdocs\account22/sales/includes/db/sales_order_db.inc:101 +#: c:\Apache2\htdocs\account22/sales/includes/db/sales_order_db.inc:248 msgid "Stocks below Re-Order Level at " msgstr "" -#: c:\Apache2\htdocs\account21/sales/includes/db/sales_order_db.inc:101 -#: c:\Apache2\htdocs\account21/sales/includes/db/sales_order_db.inc:242 +#: c:\Apache2\htdocs\account22/sales/includes/db/sales_order_db.inc:104 +#: c:\Apache2\htdocs\account22/sales/includes/db/sales_order_db.inc:253 msgid "Below" msgstr "" -#: c:\Apache2\htdocs\account21/sales/includes/db/sales_order_db.inc:102 -#: c:\Apache2\htdocs\account21/sales/includes/db/sales_order_db.inc:243 +#: c:\Apache2\htdocs\account22/sales/includes/db/sales_order_db.inc:105 +#: c:\Apache2\htdocs\account22/sales/includes/db/sales_order_db.inc:254 msgid "Please reorder" msgstr "" -#: c:\Apache2\htdocs\account21/sales/includes/ui/sales_credit_ui.inc:94 -#: c:\Apache2\htdocs\account21/sales/includes/ui/sales_order_ui.inc:351 +#: c:\Apache2\htdocs\account22/sales/includes/db/sales_order_db.inc:130 +msgid "Deleted." +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_credit_ui.inc:94 +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:368 msgid "Customer Currency:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/includes/ui/sales_credit_ui.inc:112 -#: c:\Apache2\htdocs\account21/sales/includes/ui/sales_order_ui.inc:600 +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_credit_ui.inc:112 +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:619 msgid "Shipping Company:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/includes/ui/sales_credit_ui.inc:114 -#: c:\Apache2\htdocs\account21/sales/includes/ui/sales_order_ui.inc:390 +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_credit_ui.inc:114 +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:407 msgid "Customer Discount:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/includes/ui/sales_order_ui.inc:61 -msgid "This item is already on this order. You have been warned." +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:61 +msgid "This item is already on this document. You have been warned." msgstr "" -#: c:\Apache2\htdocs\account21/sales/includes/ui/sales_order_ui.inc:101 +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:101 msgid "The selected customer and branch are not valid, or the customer does not have any branches." msgstr "" -#: c:\Apache2\htdocs\account21/sales/includes/ui/sales_order_ui.inc:220 -msgid "Total Excluding Shipping" +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:224 +msgid "Shipping Charge" msgstr "" -#: c:\Apache2\htdocs\account21/sales/includes/ui/sales_order_ui.inc:280 +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:299 msgid "No customer found for entered text." msgstr "" -#: c:\Apache2\htdocs\account21/sales/includes/ui/sales_order_ui.inc:344 +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:362 msgid "Reference number unique for this document type" msgstr "" -#: c:\Apache2\htdocs\account21/sales/includes/ui/sales_order_ui.inc:358 +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:375 msgid "Payment:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/includes/ui/sales_order_ui.inc:380 +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:397 msgid "Price List:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/includes/ui/sales_order_ui.inc:400 +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:416 msgid "Date of order receive" msgstr "" -#: c:\Apache2\htdocs\account21/sales/includes/ui/sales_order_ui.inc:546 +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:563 msgid "Cash payment" msgstr "" -#: c:\Apache2\htdocs\account21/sales/includes/ui/sales_order_ui.inc:548 -#: c:\Apache2\htdocs\account21/sales/includes/ui/sales_order_ui.inc:575 +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:565 +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:597 msgid "Deliver from Location:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/includes/ui/sales_order_ui.inc:551 +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:568 msgid "Cash account:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/includes/ui/sales_order_ui.inc:558 +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:575 msgid "Delivery Details" msgstr "" -#: c:\Apache2\htdocs\account21/sales/includes/ui/sales_order_ui.inc:563 +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:580 msgid "Invoice Delivery Details" msgstr "" -#: c:\Apache2\htdocs\account21/sales/includes/ui/sales_order_ui.inc:564 +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:581 msgid "Invoice before" msgstr "" -#: c:\Apache2\htdocs\account21/sales/includes/ui/sales_order_ui.inc:568 +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:585 +msgid "Quotation Delivery Details" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:590 msgid "Order Delivery Details" msgstr "" -#: c:\Apache2\htdocs\account21/sales/includes/ui/sales_order_ui.inc:581 +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:604 msgid "Enter requested day of delivery" msgstr "" -#: c:\Apache2\htdocs\account21/sales/includes/ui/sales_order_ui.inc:583 +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:604 +msgid "Enter Valid until Date" +msgstr "" + +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:605 msgid "Deliver To:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/includes/ui/sales_order_ui.inc:584 +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:606 msgid "Additional identifier for delivery e.g. name of receiving person" msgstr "" -#: c:\Apache2\htdocs\account21/sales/includes/ui/sales_order_ui.inc:587 +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:609 msgid "Delivery address. Default is address of customer branch" msgstr "" -#: c:\Apache2\htdocs\account21/sales/includes/ui/sales_order_ui.inc:588 +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:613 msgid "Contact Phone Number:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/includes/ui/sales_order_ui.inc:589 +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:614 msgid "Phone number of ordering person. Defaults to branch phone number" msgstr "" -#: c:\Apache2\htdocs\account21/sales/includes/ui/sales_order_ui.inc:593 +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:615 msgid "Customer Reference:" msgstr "" -#: c:\Apache2\htdocs\account21/sales/includes/ui/sales_order_ui.inc:594 +#: c:\Apache2\htdocs\account22/sales/includes/ui/sales_order_ui.inc:616 msgid "Customer reference number for this order (if any)" msgstr "" -#: c:\Apache2\htdocs\account21/sales/includes/ui/sales_order_ui.inc:597 -msgid "Shipping Charge:" -msgstr "" - diff --git a/manufacturing/includes/db/work_centres_db.inc b/manufacturing/includes/db/work_centres_db.inc index 31736af5..18adc74f 100644 --- a/manufacturing/includes/db/work_centres_db.inc +++ b/manufacturing/includes/db/work_centres_db.inc @@ -25,9 +25,10 @@ function update_work_centre($type_id, $name, $description) db_query($sql, "could not update work centre"); } -function get_all_work_centres() +function get_all_work_centres($all=false) { $sql = "SELECT * FROM ".TB_PREF."workcentres"; + if (!$all) $sql .= " WHERE !inactive"; return db_query($sql, "could not get all work centres"); } diff --git a/manufacturing/includes/db/work_order_issues_db.inc b/manufacturing/includes/db/work_order_issues_db.inc index 23d07caa..2bdffa26 100644 --- a/manufacturing/includes/db/work_order_issues_db.inc +++ b/manufacturing/includes/db/work_order_issues_db.inc @@ -14,6 +14,8 @@ function add_work_order_issue($woid, $ref, $to_work_order, $items, $location, $workcentre, $date_, $memo_) { + global $Refs; + begin_transaction(); $details = get_work_order($woid); @@ -47,7 +49,7 @@ function add_work_order_issue($woid, $ref, $to_work_order, $items, $location, $w $item->quantity = -$item->quantity; // insert a -ve stock move for each item - add_stock_move(28, $item->stock_id, $number, + add_stock_move(ST_MANUISSUE, $item->stock_id, $number, $location, $date_, $memo_, -$item->quantity, 0); $sql = "INSERT INTO ".TB_PREF."wo_issue_items (issue_id, stock_id, qty_issued) @@ -57,9 +59,10 @@ function add_work_order_issue($woid, $ref, $to_work_order, $items, $location, $w } if ($memo_) - add_comments(28, $number, $date_, $memo_); + add_comments(ST_MANUISSUE, $number, $date_, $memo_); - references::save_last($ref, 28); + $Refs->save(ST_MANUISSUE, $number, $ref); + add_audit_trail(ST_MANUISSUE, $number, $date_); commit_transaction(); } @@ -136,10 +139,10 @@ function void_work_order_issue($type_no) db_query($sql,"A work order issue item could not be voided"); // void all related stock moves - void_stock_move(28, $type_no); + void_stock_move(ST_MANUISSUE, $type_no); // void any related gl trans - void_gl_trans(28, $type_no, true); + void_gl_trans(ST_MANUISSUE, $type_no, true); commit_transaction(); } diff --git a/manufacturing/includes/db/work_order_produce_items_db.inc b/manufacturing/includes/db/work_order_produce_items_db.inc index d95ec1bd..6f5c001f 100644 --- a/manufacturing/includes/db/work_order_produce_items_db.inc +++ b/manufacturing/includes/db/work_order_produce_items_db.inc @@ -11,6 +11,8 @@ ***********************************************************************/ function work_order_produce($woid, $ref, $quantity, $date_, $memo_, $close_wo) { + global $Refs; + begin_transaction(); $details = get_work_order($woid); @@ -45,16 +47,17 @@ function work_order_produce($woid, $ref, $quantity, $date_, $memo_, $close_wo) // ------------------------------------------------------------------------- // insert a +ve stock move for the item being manufactured // negative means "unproduce" or unassemble - add_stock_move(29, $details["stock_id"], $id, + add_stock_move(ST_MANURECEIVE, $details["stock_id"], $id, $details["loc_code"], $date_, $memo_, $quantity, 0); // update wo quantity and close wo if requested work_order_update_finished_quantity($woid, $quantity, $close_wo); if ($memo_) - add_comments(29, $id, $date_, $memo_); + add_comments(ST_MANURECEIVE, $id, $date_, $memo_); - references::save_last($ref, 29); + $Refs->save(ST_MANURECEIVE, $id, $ref); + add_audit_trail(ST_MANURECEIVE, $id, $date_, _("Production.")); commit_transaction(); } @@ -109,10 +112,10 @@ function void_work_order_produce($type_no) db_query($sql, "Cannot void a wo production"); // void all related stock moves - void_stock_move(29, $type_no); + void_stock_move(ST_MANURECEIVE, $type_no); // void any related gl trans - void_gl_trans(29, $type_no, true); + void_gl_trans(ST_MANURECEIVE, $type_no, true); commit_transaction(); } diff --git a/manufacturing/includes/db/work_orders_db.inc b/manufacturing/includes/db/work_orders_db.inc index 8ca45b93..f97f87a5 100644 --- a/manufacturing/includes/db/work_orders_db.inc +++ b/manufacturing/includes/db/work_orders_db.inc @@ -96,7 +96,9 @@ function add_issue_cost($stock_id, $qty, $date_, $costs) function add_work_order($wo_ref, $loc_code, $units_reqd, $stock_id, $type, $date_, $required_by, $memo_, $costs, $cr_acc, $labour, $cr_lab_acc) { - if (!($type == wo_types::advanced())) + global $Refs; + + if (!($type == WO_ADVANCED)) return add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type, $date_, $memo_, $costs, $cr_acc, $labour, $cr_lab_acc); begin_transaction(); @@ -115,9 +117,10 @@ function add_work_order($wo_ref, $loc_code, $units_reqd, $stock_id, $woid = db_insert_id(); - add_comments(systypes::work_order(), $woid, $required_by, $memo_); + add_comments(ST_WORKORDER, $woid, $required_by, $memo_); - references::save_last($wo_ref, systypes::work_order()); + $Refs->save(ST_WORKORDER, $woid, $wo_ref); + add_audit_trail(ST_WORKORDER, $woid, $date_); commit_transaction(); @@ -145,7 +148,8 @@ function update_work_order($woid, $loc_code, $units_reqd, $stock_id, db_query($sql, "could not update work order"); - update_comments(systypes::work_order(), $woid, null, $memo_); + update_comments(ST_WORKORDER, $woid, null, $memo_); + add_audit_trail(ST_WORKORDER, $woid, $date_, _("Updated.")); commit_transaction(); } @@ -163,7 +167,8 @@ function delete_work_order($woid) $sql = "DELETE FROM ".TB_PREF."workorders WHERE id=".db_escape($woid); db_query($sql,"The work order could not be deleted"); - delete_comments(systypes::work_order(), $woid); + delete_comments(ST_WORKORDER, $woid); + add_audit_trail(ST_WORKORDER, $woid, $_POST['date_'], _("Canceled.")); commit_transaction(); } @@ -173,7 +178,7 @@ function delete_work_order($woid) function get_work_order($woid, $allow_null=false) { $sql = "SELECT ".TB_PREF."workorders.*, ".TB_PREF."stock_master.description As StockItemName, - ".TB_PREF."locations.location_name + ".TB_PREF."locations.location_name, ".TB_PREF."locations.delivery_address FROM ".TB_PREF."workorders, ".TB_PREF."stock_master, ".TB_PREF."locations WHERE ".TB_PREF."stock_master.stock_id=".TB_PREF."workorders.stock_id AND ".TB_PREF."locations.loc_code=".TB_PREF."workorders.loc_code @@ -238,7 +243,8 @@ function release_work_order($woid, $releaseDate, $memo_) // create Work Order Requirements based on the bom create_wo_requirements($woid, $stock_id); - add_comments(systypes::work_order(), $woid, $releaseDate, $memo_); + add_comments(ST_WORKORDER, $woid, $releaseDate, $memo_); + add_audit_trail(ST_WORKORDER, $woid, $releaseDate,_("Released.")); commit_transaction(); } @@ -278,7 +284,7 @@ function void_work_order($woid) { $work_order = get_work_order($woid); - if (!($work_order["type"] == wo_types::advanced())) + if (!($work_order["type"] == WO_ADVANCED)) { begin_transaction(); @@ -287,10 +293,10 @@ function void_work_order($woid) db_query($sql, "The work order couldn't be voided"); // void all related stock moves - void_stock_move(systypes::work_order(), $woid); + void_stock_move(ST_WORKORDER, $woid); // void any related gl trans - void_gl_trans(systypes::work_order(), $woid, true); + void_gl_trans(ST_WORKORDER, $woid, true); // clear the requirements units received void_wo_requirements($woid); diff --git a/manufacturing/includes/db/work_orders_quick_db.inc b/manufacturing/includes/db/work_orders_quick_db.inc index 152c586d..1b254f75 100644 --- a/manufacturing/includes/db/work_orders_quick_db.inc +++ b/manufacturing/includes/db/work_orders_quick_db.inc @@ -13,10 +13,12 @@ function add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type, $date_, $memo_, $costs, $cr_acc, $labour, $cr_lab_acc) { + global $Refs; + begin_transaction(); // if unassembling, reverse the stock movements - if ($type == wo_types::unassemble()) + if ($type == WO_UNASSEMBLY) $units_reqd = -$units_reqd; add_material_cost($stock_id, $units_reqd, $date_); @@ -58,7 +60,7 @@ function add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type, db_query($sql, "The work order requirements could not be added"); // insert a -ve stock move for each item - add_stock_move(systypes::work_order(), $bom_item["component"], $woid, + add_stock_move(ST_WORKORDER, $bom_item["component"], $woid, $bom_item["loc_code"], $date_, $wo_ref, -$item_quantity, 0); } @@ -66,7 +68,7 @@ function add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type, // ------------------------------------------------------------------------- // insert a +ve stock move for the item being manufactured - add_stock_move(systypes::work_order(), $stock_id, $woid, $loc_code, $date_, + add_stock_move(ST_WORKORDER, $stock_id, $woid, $loc_code, $date_, $wo_ref, $units_reqd, 0); // ------------------------------------------------------------------------- @@ -75,10 +77,10 @@ function add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type, // ------------------------------------------------------------------------- - add_comments(systypes::work_order(), $woid, $date_, $memo_); - - references::save_last($wo_ref, systypes::work_order()); + add_comments(ST_WORKORDER, $woid, $date_, $memo_); + $Refs->save(ST_WORKORDER, $woid, $wo_ref); + add_audit_trail(ST_WORKORDER, $woid, $date_,_("Quick production.")); commit_transaction(); return $woid; } @@ -102,10 +104,10 @@ function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $advanced if ($advanced) { // insert a -ve stock move for each item - add_stock_move(systypes::work_order(), $bom_item["component"], $woid, + add_stock_move(ST_WORKORDER, $bom_item["component"], $woid, $bom_item["loc_code"], $date_, "", -$bom_item["quantity"] * $units_reqd, 0); } - $total_cost += add_gl_trans_std_cost(systypes::work_order(), $woid, $date_, $bom_accounts["inventory_account"], 0, 0, + $total_cost += add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $bom_accounts["inventory_account"], 0, 0, null, -$bom_cost); } @@ -120,7 +122,7 @@ function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $advanced $standard_cost = get_standard_cost($item['stock_id']); $issue_cost = $standard_cost * $item['qty_issued'] * $units_reqd / $wo['units_reqd']; $issue = get_stock_gl_code($item['stock_id']); - $total_cost += add_gl_trans_std_cost(systypes::work_order(), $woid, $date_, $issue["inventory_account"], 0, 0, + $total_cost += add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $issue["inventory_account"], 0, 0, null, -$issue_cost); $issue_total += $issue_cost; } @@ -141,38 +143,38 @@ function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $advanced $item_accounts = get_stock_gl_code($stock_id); if ($costs != 0.0) { - add_gl_trans_std_cost(systypes::work_order(), $woid, $date_, $cr_acc, - 0, 0, $wo_cost_types[WO_OVERHEAD], -$costs, payment_person_types::WorkOrder(), WO_OVERHEAD); + add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $cr_acc, + 0, 0, $wo_cost_types[WO_OVERHEAD], -$costs, PT_WORKORDER, WO_OVERHEAD); $is_bank_to = is_bank_account($cr_acc); if ($is_bank_to) { - add_bank_trans(systypes::work_order(), $woid, $is_bank_to, "", - $date_, -$costs, payment_person_types::WorkOrder(), WO_OVERHEAD, get_company_currency(), + add_bank_trans(ST_WORKORDER, $woid, $is_bank_to, "", + $date_, -$costs, PT_WORKORDER, WO_OVERHEAD, get_company_currency(), "Cannot insert a destination bank transaction"); } - add_gl_trans_std_cost(systypes::work_order(), $woid, $date_, $item_accounts["assembly_account"], + add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $item_accounts["assembly_account"], $item_accounts["dimension_id"], $item_accounts["dimension2_id"], $wo_cost_types[WO_OVERHEAD], $costs, - payment_person_types::WorkOrder(), WO_OVERHEAD); + PT_WORKORDER, WO_OVERHEAD); } if ($labour != 0.0) { - add_gl_trans_std_cost(systypes::work_order(), $woid, $date_, $cr_lab_acc, - 0, 0, $wo_cost_types[WO_LABOUR], -$labour, payment_person_types::WorkOrder(), WO_LABOUR); + add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $cr_lab_acc, + 0, 0, $wo_cost_types[WO_LABOUR], -$labour, PT_WORKORDER, WO_LABOUR); $is_bank_to = is_bank_account($cr_lab_acc); if ($is_bank_to) { - add_bank_trans(systypes::work_order(), $woid, $is_bank_to, "", - $date_, -$labour, payment_person_types::WorkOrder(), WO_LABOUR, get_company_currency(), + add_bank_trans(ST_WORKORDER, $woid, $is_bank_to, "", + $date_, -$labour, PT_WORKORDER, WO_LABOUR, get_company_currency(), "Cannot insert a destination bank transaction"); } - add_gl_trans_std_cost(systypes::work_order(), $woid, $date_, $item_accounts["assembly_account"], + add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $item_accounts["assembly_account"], $item_accounts["dimension_id"], $item_accounts["dimension2_id"], $wo_cost_types[WO_LABOUR], $labour, - payment_person_types::WorkOrder(), WO_LABOUR); + PT_WORKORDER, WO_LABOUR); } // debit total components $total_cost - add_gl_trans_std_cost(systypes::work_order(), $woid, $date_, $item_accounts["inventory_account"], + add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $item_accounts["inventory_account"], 0, 0, null, -$total_cost); } diff --git a/manufacturing/includes/manufacturing_ui.inc b/manufacturing/includes/manufacturing_ui.inc index e5eaf8cc..426356d9 100644 --- a/manufacturing/includes/manufacturing_ui.inc +++ b/manufacturing/includes/manufacturing_ui.inc @@ -70,7 +70,7 @@ function display_bom($item_check) function display_wo_requirements($woid, $quantity, $show_qoh=false, $date=null) { - global $table_style; + global $table_style, $SysPrefs; $result = get_wo_requirements($woid); @@ -106,7 +106,7 @@ function display_wo_requirements($woid, $quantity, $show_qoh=false, $date=null) $qoh = get_qoh_on_date($myrow["stock_id"], $myrow["loc_code"], $date); if ($show_qoh && ($myrow["units_req"] * $quantity > $qoh) && - !sys_prefs::allow_negative_stock()) + !$SysPrefs->allow_negative_stock()) { // oops, we don't have enough of one of the component items start_row("class='stockmankobg'"); @@ -226,7 +226,7 @@ function display_wo_payments($woid) { global $path_to_root, $table_style, $wo_cost_types; - //$result = get_bank_trans(null, null, payment_person_types::WorkOrder(), $woid); + //$result = get_bank_trans(null, null, PT_WORKORDER, $woid); $result = get_gl_wo_cost_trans($woid); if (db_num_rows($result) == 0) @@ -247,7 +247,7 @@ function display_wo_payments($woid) alt_table_row_color($k); - label_cell(get_gl_view_str(systypes::work_order(), $myrow["type_no"], $myrow["type_no"])); + label_cell(get_gl_view_str(ST_WORKORDER, $myrow["type_no"], $myrow["type_no"])); label_cell($wo_cost_types[$myrow['person_id']]); $date = sql2date($myrow["tran_date"]); label_cell($date); @@ -263,7 +263,7 @@ function display_wo_payments($woid) function display_wo_details($woid, $suppress_view_link=false) { - global $table_style; + global $table_style, $wo_types_array; $myrow = get_work_order($woid); @@ -288,9 +288,9 @@ function display_wo_details($woid, $suppress_view_link=false) if ($suppress_view_link) label_cell($myrow["id"]); else - label_cell(get_trans_view_str(systypes::work_order(), $myrow["id"])); + label_cell(get_trans_view_str(ST_WORKORDER, $myrow["id"])); label_cell($myrow["wo_ref"]); - label_cell(wo_types::name($myrow["type"])); + label_cell($wo_types_array[$myrow["type"]]); view_stock_status_cell($myrow["stock_id"], $myrow["StockItemName"]); label_cell($myrow["location_name"]); label_cell(sql2date($myrow["date_"])); @@ -305,7 +305,7 @@ function display_wo_details($woid, $suppress_view_link=false) } end_row(); - comments_display_row(systypes::work_order(), $woid); + comments_display_row(ST_WORKORDER, $woid); end_table(); @@ -319,7 +319,7 @@ function display_wo_details($woid, $suppress_view_link=false) function display_wo_details_quick($woid, $suppress_view_link=false) { - global $table_style; + global $table_style, $wo_types_array; $myrow = get_work_order($woid); @@ -339,9 +339,9 @@ function display_wo_details_quick($woid, $suppress_view_link=false) if ($suppress_view_link) label_cell($myrow["id"]); else - label_cell(get_trans_view_str(systypes::work_order(), $myrow["id"])); + label_cell(get_trans_view_str(ST_WORKORDER, $myrow["id"])); label_cell($myrow["wo_ref"]); - label_cell(wo_types::name($myrow["type"])); + label_cell($wo_types_array[$myrow["type"]]); view_stock_status_cell($myrow["stock_id"], $myrow["StockItemName"]); label_cell($myrow["location_name"]); label_cell(sql2date($myrow["date_"])); @@ -350,7 +350,7 @@ function display_wo_details_quick($woid, $suppress_view_link=false) end_row(); - comments_display_row(systypes::work_order(), $woid); + comments_display_row(ST_WORKORDER, $woid); end_table(); diff --git a/manufacturing/includes/work_order_issue_ui.inc b/manufacturing/includes/work_order_issue_ui.inc index dad39a9c..5924f2cc 100644 --- a/manufacturing/includes/work_order_issue_ui.inc +++ b/manufacturing/includes/work_order_issue_ui.inc @@ -145,9 +145,11 @@ function issue_edit_item_controls(&$order, $line_no=-1) function issue_options_controls() { + global $Refs; + echo "
      "; start_table(); - ref_row(_("Reference:"), 'ref', '', references::get_next(28)); + ref_row(_("Reference:"), 'ref', '', $Refs->get_next(28)); if (!isset($_POST['IssueType'])) $_POST['IssueType'] = 0; diff --git a/manufacturing/inquiry/bom_cost_inquiry.php b/manufacturing/inquiry/bom_cost_inquiry.php index 8faae1cc..9b311a7d 100644 --- a/manufacturing/inquiry/bom_cost_inquiry.php +++ b/manufacturing/inquiry/bom_cost_inquiry.php @@ -9,11 +9,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; -$path_to_root="../.."; +$page_security = 'SA_WORKORDERCOST'; +$path_to_root = "../.."; include_once($path_to_root . "/includes/session.inc"); -page(_("Costed Bill Of Material Inquiry")); +page(_($help_context = "Costed Bill Of Material Inquiry")); include_once($path_to_root . "/manufacturing/includes/manufacturing_ui.inc"); include_once($path_to_root . "/includes/manufacturing.inc"); diff --git a/manufacturing/inquiry/where_used_inquiry.php b/manufacturing/inquiry/where_used_inquiry.php index c8ee4125..14286c0a 100644 --- a/manufacturing/inquiry/where_used_inquiry.php +++ b/manufacturing/inquiry/where_used_inquiry.php @@ -9,12 +9,12 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; -$path_to_root="../.."; +$page_security = 'SA_WORKORDERANALYTIC'; +$path_to_root = "../.."; include($path_to_root . "/includes/db_pager.inc"); include($path_to_root . "/includes/session.inc"); -page(_("Inventory Item Where Used Inquiry")); +page(_($help_context = "Inventory Item Where Used Inquiry")); include($path_to_root . "/includes/ui.inc"); @@ -26,7 +26,7 @@ if (!isset($_POST['stock_id'])) $_POST['stock_id'] = get_global_stock_item(); echo "
      " . _("Select an item to display its parent item(s).") . " "; -stock_items_list('stock_id', $_POST['stock_id'], false, true); +echo stock_items_list('stock_id', $_POST['stock_id'], false, true); echo "
      "; set_global_stock_item($_POST['stock_id']); @@ -61,9 +61,6 @@ $sql = "SELECT $table =& new_db_pager('usage_table', $sql, $cols); -if (get_post('_stock_id_update')) - $table->set_sql($sql); - $table->width = "80%"; display_db_pager($table); diff --git a/manufacturing/manage/bom_edit.php b/manufacturing/manage/bom_edit.php index e771878c..742c2b1a 100644 --- a/manufacturing/manage/bom_edit.php +++ b/manufacturing/manage/bom_edit.php @@ -9,11 +9,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 9; -$path_to_root="../.."; +$page_security = 'SA_BOM'; +$path_to_root = "../.."; include_once($path_to_root . "/includes/session.inc"); -page(_("Bill Of Materials")); +page(_($help_context = "Bill Of Materials")); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); @@ -213,7 +213,7 @@ if ($Mode == 'RESET') //-------------------------------------------------------------------------------------------------- -start_form(false, true); +start_form(); start_form(false, true); start_table("class='tablestyle_noborder'"); @@ -235,10 +235,8 @@ if (get_post('stock_id') != '') start_form(); display_bom_items($selected_parent); -//end_form(); //-------------------------------------------------------------------------------------- echo '
      '; -// start_form(false, true); start_table($table_style2); @@ -268,7 +266,7 @@ start_form(); label_cell(_("Component:")); echo ""; - stock_component_items_list('component', $selected_parent, null, false, true); + echo stock_component_items_list('component', $selected_parent, null, false, true); if (get_post('_component_update')) { $Ajax->activate('quantity'); @@ -285,7 +283,7 @@ start_form(); qty_row(_("Quantity:"), 'quantity', null, null, null, $dec); end_table(1); - submit_add_or_update_center($selected_id == -1, '', true); + submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); } // ---------------------------------------------------------------------------------- diff --git a/manufacturing/manage/work_centres.php b/manufacturing/manage/work_centres.php index 017b96c8..03014572 100644 --- a/manufacturing/manage/work_centres.php +++ b/manufacturing/manage/work_centres.php @@ -9,11 +9,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 3; -$path_to_root="../.."; +$page_security = 'SA_WORKCENTRES'; +$path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("Work Centres")); +page(_($help_context = "Work Centres")); include($path_to_root . "/manufacturing/includes/manufacturing_db.inc"); @@ -94,15 +94,18 @@ if ($Mode == 'Delete') if ($Mode == 'RESET') { $selected_id = -1; + $sav = get_post('show_inactive'); unset($_POST); + $_POST['show_inactive'] = $sav; } //----------------------------------------------------------------------------------- -$result = get_all_work_centres(); +$result = get_all_work_centres(check_value('show_inactive')); start_form(); start_table("$table_style width=50%"); $th = array(_("Name"), _("description"), "", ""); +inactive_control_column($th); table_header($th); $k = 0; @@ -113,18 +116,16 @@ while ($myrow = db_fetch($result)) label_cell($myrow["name"]); label_cell($myrow["description"]); + inactive_control_cell($myrow["id"], $myrow["inactive"], 'workcentres', 'id'); edit_button_cell("Edit".$myrow['id'], _("Edit")); delete_button_cell("Delete".$myrow['id'], _("Delete")); end_row(); } -end_table(); -end_form(); -echo '
      '; +inactive_control_row($th); +end_table(1); //----------------------------------------------------------------------------------- -start_form(); - start_table($table_style2); if ($selected_id != -1) @@ -144,7 +145,7 @@ text_row_ex(_("Description:"), 'description', 50); end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); diff --git a/manufacturing/search_work_orders.php b/manufacturing/search_work_orders.php index 447dbd07..3fdbf1df 100644 --- a/manufacturing/search_work_orders.php +++ b/manufacturing/search_work_orders.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; -$path_to_root=".."; +$page_security = 'SA_MANUFTRANSVIEW'; +$path_to_root = ".."; include($path_to_root . "/includes/db_pager.inc"); include_once($path_to_root . "/includes/session.inc"); @@ -23,12 +23,12 @@ if (isset($_GET['outstanding_only']) && ($_GET['outstanding_only'] == true)) { // curently outstanding simply means not closed $outstanding_only = 1; - page(_("Search Outstanding Work Orders"), false, false, "", $js); + page(_($help_context = "Search Outstanding Work Orders"), false, false, "", $js); } else { $outstanding_only = 0; - page(_("Search Work Orders"), false, false, "", $js); + page(_($help_context = "Search Work Orders"), false, false, "", $js); } //----------------------------------------------------------------------------------- // Ajax updates @@ -60,7 +60,7 @@ if (isset($_GET["stock_id"])) //-------------------------------------------------------------------------------------- -start_form(false, false, $_SERVER['PHP_SELF'] ."?outstanding_only=" . $outstanding_only .SID); +start_form(false, false, $_SERVER['PHP_SELF'] ."?outstanding_only=$outstanding_only"); start_table("class='tablestyle_noborder'"); start_row(); @@ -75,22 +75,20 @@ if ($outstanding_only==0) stock_manufactured_items_list_cells(_("for item:"), 'SelectedStockItem', null, true); -submit_cells('SearchOrders', _("Search"),'',_('Select documents'), true); +submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default'); end_row(); end_table(); -end_form(); - //----------------------------------------------------------------------------- function check_overdue($row) { return (!$row["closed"] - && date_diff(Today(), sql2date($row["required_by"]), "d") > 0); + && date_diff2(Today(), sql2date($row["required_by"]), "d") > 0); } function view_link($dummy, $order_no) { - return get_trans_view_str(systypes::work_order(), $order_no); + return get_trans_view_str(ST_WORKORDER, $order_no); } function view_stock($row) @@ -100,7 +98,9 @@ function view_stock($row) function wo_type_name($dummy, $type) { - return wo_types::name($type); + global $wo_types_array; + + return $wo_types_array[$type]; } function edit_link($row) @@ -134,7 +134,7 @@ function costs_link($row) return $row["closed"] || !$row["released"] ? '' : pager_link(_('Costs'), "/gl/gl_bank.php?NewPayment=1&PayType=" - .payment_person_types::WorkOrder(). "&PayPerson=" .$row["id"]); + .PT_WORKORDER. "&PayPerson=" .$row["id"]); */ return $row["closed"] || !$row["released"] ? '' : pager_link(_('Costs'), @@ -145,7 +145,7 @@ function view_gl_link($row) { if ($row['closed'] == 0) return ''; - return get_gl_view_str(systypes::work_order(), $row['id']); + return get_gl_view_str(ST_WORKORDER, $row['id']); } function dec_amount($row, $amount) @@ -223,12 +223,7 @@ $cols = array( $table =& new_db_pager('orders_tbl', $sql, $cols); $table->set_marker('check_overdue', _("Marked orders are overdue.")); -if (get_post('SearchOrders')) { - $table->set_sql($sql); - $table->set_columns($cols); -} $table->width = "90%"; -start_form(); display_db_pager($table); diff --git a/manufacturing/view/wo_issue_view.php b/manufacturing/view/wo_issue_view.php index 80f624c4..d8cda6eb 100644 --- a/manufacturing/view/wo_issue_view.php +++ b/manufacturing/view/wo_issue_view.php @@ -9,14 +9,14 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 10; -$path_to_root="../.."; +$page_security = 'SA_MANUFTRANSVIEW'; +$path_to_root = "../.."; include_once($path_to_root . "/includes/session.inc"); $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 500); -page(_("View Work Order Issue"), true, false, "", $js); +page(_($help_context = "View Work Order Issue"), true, false, "", $js); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/manufacturing.inc"); @@ -49,7 +49,7 @@ function display_wo_issue($issue_no) start_row(); label_cell($myrow["issue_no"]); label_cell($myrow["reference"]); - label_cell(get_trans_view_str(systypes::work_order(),$myrow["workorder_id"])); + label_cell(get_trans_view_str(ST_WORKORDER,$myrow["workorder_id"])); label_cell($myrow["stock_id"] . " - " . $myrow["description"]); label_cell($myrow["location_name"]); label_cell($myrow["WorkCentreName"]); @@ -111,7 +111,7 @@ function display_wo_issue_details($issue_no) //------------------------------------------------------------------------------------------------- -display_heading(systypes::name(28) . " # " . $wo_issue_no); +display_heading($systypes_array[ST_MANUISSUE] . " # " . $wo_issue_no); display_wo_issue($wo_issue_no); diff --git a/manufacturing/view/wo_production_view.php b/manufacturing/view/wo_production_view.php index 1ab3e442..3017ac31 100644 --- a/manufacturing/view/wo_production_view.php +++ b/manufacturing/view/wo_production_view.php @@ -9,15 +9,15 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 10; -$path_to_root="../.."; +$page_security = 'SA_MANUFTRANSVIEW'; +$path_to_root = "../.."; include_once($path_to_root . "/includes/session.inc"); $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 500); -page(_("View Work Order Production"), true, false, "", $js); +page(_($help_context = "View Work Order Production"), true, false, "", $js); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/manufacturing.inc"); @@ -50,22 +50,22 @@ function display_wo_production($prod_id) start_row(); label_cell($myrow["id"]); label_cell($myrow["reference"]); - label_cell(get_trans_view_str(systypes::work_order(),$myrow["workorder_id"])); + label_cell(get_trans_view_str(ST_WORKORDER,$myrow["workorder_id"])); label_cell($myrow["stock_id"] . " - " . $myrow["StockDescription"]); qty_cell($myrow["quantity"], false, get_qty_dec($myrow["stock_id"])); label_cell(sql2date($myrow["date_"])); end_row(); - comments_display_row(29, $prod_id); + comments_display_row(ST_MANURECEIVE, $prod_id); end_table(1); - is_voided_display(29, $prod_id, _("This production has been voided.")); + is_voided_display(ST_MANURECEIVE, $prod_id, _("This production has been voided.")); } //------------------------------------------------------------------------------------------------- -display_heading(systypes::name(29) . " # " . $wo_production); +display_heading($systypes_array[ST_MANURECEIVE] . " # " . $wo_production); display_wo_production($wo_production); diff --git a/manufacturing/view/work_order_view.php b/manufacturing/view/work_order_view.php index 60daf028..61dfbf3c 100644 --- a/manufacturing/view/work_order_view.php +++ b/manufacturing/view/work_order_view.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 10; -$path_to_root="../.."; +$page_security = 'SA_MANUFTRANSVIEW'; +$path_to_root = "../.."; include_once($path_to_root . "/includes/session.inc"); @@ -23,7 +23,7 @@ include_once($path_to_root . "/manufacturing/includes/manufacturing_ui.inc"); $js = ""; if ($use_popup_windows) $js .= get_js_open_window(800, 500); -page(_("View Work Order"), true, false, "", $js); +page(_($help_context = "View Work Order"), true, false, "", $js); //------------------------------------------------------------------------------------------------- $woid = 0; @@ -32,12 +32,12 @@ if ($_GET['trans_no'] != "") $woid = $_GET['trans_no']; } -display_heading(systypes::name(systypes::work_order()) . " # " . $woid); +display_heading($systypes_array[ST_WORKORDER] . " # " . $woid); br(1); $myrow = get_work_order($woid); -if ($myrow["type"] == wo_types::advanced()) +if ($myrow["type"] == WO_ADVANCED) display_wo_details($woid, true); else display_wo_details_quick($woid, true); @@ -55,7 +55,7 @@ else { display_heading2(_("Work Order Requirements")); display_wo_requirements($woid, $myrow["units_reqd"]); - if ($myrow["type"] == wo_types::advanced()) + if ($myrow["type"] == WO_ADVANCED) { echo "
      "; display_heading2(_("Issues")); @@ -79,7 +79,7 @@ else echo "
      "; -is_voided_display(systypes::work_order(), $woid, _("This work order has been voided.")); +is_voided_display(ST_WORKORDER, $woid, _("This work order has been voided.")); end_page(true); diff --git a/manufacturing/work_order_add_finished.php b/manufacturing/work_order_add_finished.php index f94970ba..a5e03ecb 100644 --- a/manufacturing/work_order_add_finished.php +++ b/manufacturing/work_order_add_finished.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 10; -$path_to_root=".."; +$page_security = 'SA_MANUFRECEIVE'; +$path_to_root = ".."; include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/includes/date_functions.inc"); @@ -26,7 +26,7 @@ if ($use_popup_windows) $js .= get_js_open_window(900, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Produce or Unassemble Finished Items From Work Order"), false, false, "", $js); +page(_($help_context = "Produce or Unassemble Finished Items From Work Order"), false, false, "", $js); if (isset($_GET['trans_no']) && $_GET['trans_no'] != "") { @@ -39,7 +39,7 @@ if (isset($_GET['AddedID'])) { include_once($path_to_root . "/reporting/includes/reporting.inc"); $id = $_GET['AddedID']; - $stype = systypes::work_order(); + $stype = ST_WORKORDER; display_notification(_("The manufacturing process has been entered.")); @@ -69,9 +69,9 @@ if (strlen($wo_details[0]) == 0) function can_process() { - global $wo_details; + global $wo_details, $SysPrefs, $Refs; - if (!references::is_valid($_POST['ref'])) + if (!$Refs->is_valid($_POST['ref'])) { display_error(_("You must enter a reference.")); set_focus('ref'); @@ -104,7 +104,7 @@ function can_process() set_focus('date_'); return false; } - if (date_diff(sql2date($wo_details["released_date"]), $_POST['date_'], "d") > 0) + if (date_diff2(sql2date($wo_details["released_date"]), $_POST['date_'], "d") > 0) { display_error(_("The production date cannot be before the release date of the work order.")); set_focus('date_'); @@ -112,7 +112,7 @@ function can_process() } // if unassembling we need to check the qoh - if (($_POST['ProductionType'] == 0) && !sys_prefs::allow_negative_stock()) + if (($_POST['ProductionType'] == 0) && !$SysPrefs->allow_negative_stock()) { $wo_details = get_work_order($_POST['selected_id']); @@ -126,7 +126,7 @@ function can_process() } // if production we need to check the qoh of the wo requirements - if (($_POST['ProductionType'] == 1) && !sys_prefs::allow_negative_stock()) + if (($_POST['ProductionType'] == 1) && !$SysPrefs->allow_negative_stock()) { $err = false; $result = get_wo_requirements($_POST['selected_id']); @@ -189,7 +189,7 @@ if (!isset($_POST['quantity']) || $_POST['quantity'] == '') start_table($table_style2); br(); -ref_row(_("Reference:"), 'ref', '', references::get_next(29)); +ref_row(_("Reference:"), 'ref', '', $Refs->get_next(29)); if (!isset($_POST['ProductionType'])) $_POST['ProductionType'] = 1; diff --git a/manufacturing/work_order_costs.php b/manufacturing/work_order_costs.php index 0d68a3f9..4e7f0537 100644 --- a/manufacturing/work_order_costs.php +++ b/manufacturing/work_order_costs.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 10; -$path_to_root=".."; +$page_security = 'SA_WORKORDERCOST'; +$path_to_root = ".."; include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/includes/date_functions.inc"); @@ -26,7 +26,7 @@ if ($use_popup_windows) $js .= get_js_open_window(900, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Work Order Additional Costs"), false, false, "", $js); +page(_($help_context = "Work Order Additional Costs"), false, false, "", $js); if (isset($_GET['trans_no']) && $_GET['trans_no'] != "") { @@ -38,7 +38,7 @@ if (isset($_GET['trans_no']) && $_GET['trans_no'] != "") if (isset($_GET['AddedID'])) { $id = $_GET['AddedID']; - $stype = systypes::work_order(); + $stype = ST_WORKORDER; display_notification(_("The additional cost has been entered.")); @@ -89,7 +89,7 @@ function can_process() set_focus('date_'); return false; } - if (date_diff(sql2date($wo_details["released_date"]), $_POST['date_'], "d") > 0) + if (date_diff2(sql2date($wo_details["released_date"]), $_POST['date_'], "d") > 0) { display_error(_("The additional cost date cannot be before the release date of the work order.")); set_focus('date_'); @@ -104,18 +104,18 @@ function can_process() if (isset($_POST['process']) && can_process() == true) { begin_transaction(); - add_gl_trans_std_cost(systypes::work_order(), $_POST['selected_id'], $_POST['date_'], $_POST['cr_acc'], - 0, 0, $wo_cost_types[$_POST['PaymentType']], -input_num('costs'), payment_person_types::WorkOrder(), $_POST['PaymentType']); + add_gl_trans_std_cost(ST_WORKORDER, $_POST['selected_id'], $_POST['date_'], $_POST['cr_acc'], + 0, 0, $wo_cost_types[$_POST['PaymentType']], -input_num('costs'), PT_WORKORDER, $_POST['PaymentType']); $is_bank_to = is_bank_account($_POST['cr_acc']); if ($is_bank_to) { - add_bank_trans(systypes::work_order(), $_POST['selected_id'], $is_bank_to, "", - $_POST['date_'], -input_num('costs'), payment_person_types::WorkOrder(), $_POST['PaymentType'], get_company_currency(), + add_bank_trans(ST_WORKORDER, $_POST['selected_id'], $is_bank_to, "", + $_POST['date_'], -input_num('costs'), PT_WORKORDER, $_POST['PaymentType'], get_company_currency(), "Cannot insert a destination bank transaction"); } - add_gl_trans_std_cost(systypes::work_order(), $_POST['selected_id'], $_POST['date_'], $_POST['db_acc'], - $_POST['dim1'], $_POST['dim2'], $wo_cost_types[$_POST['PaymentType']], input_num('costs'), payment_person_types::WorkOrder(), + add_gl_trans_std_cost(ST_WORKORDER, $_POST['selected_id'], $_POST['date_'], $_POST['db_acc'], + $_POST['dim1'], $_POST['dim2'], $wo_cost_types[$_POST['PaymentType']], input_num('costs'), PT_WORKORDER, $_POST['PaymentType']); commit_transaction(); diff --git a/manufacturing/work_order_entry.php b/manufacturing/work_order_entry.php index 659e9bec..d6bea933 100644 --- a/manufacturing/work_order_entry.php +++ b/manufacturing/work_order_entry.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 10; -$path_to_root=".."; +$page_security = 'SA_WORKORDERENTRY'; +$path_to_root = ".."; include_once($path_to_root . "/includes/session.inc"); @@ -26,7 +26,7 @@ if ($use_popup_windows) $js .= get_js_open_window(900, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Work Order Entry"), false, false, "", $js); +page(_($help_context = "Work Order Entry"), false, false, "", $js); check_db_has_manufacturable_items(_("There are no manufacturable items defined in the system.")); @@ -49,15 +49,19 @@ elseif(isset($_POST['selected_id'])) if (isset($_GET['AddedID'])) { $id = $_GET['AddedID']; - $stype = systypes::work_order(); + $stype = ST_WORKORDER; display_notification_centered(_("The work order been added.")); display_note(get_trans_view_str($stype, $id, _("View this Work Order"))); - if ($_GET['type'] != wo_types::advanced()) + if ($_GET['type'] != WO_ADVANCED) { include_once($path_to_root . "/reporting/includes/reporting.inc"); + $ar = array('PARAM_0' => $id, 'PARAM_1' => $id, 'PARAM_2' => 0); + display_note(print_link(_("Print this Work Order"), 409, $ar), 1); + $ar['PARAM_2'] = 1; + display_note(print_link(_("Email this Work Order"), 409, $ar), 1); display_note(get_gl_view_str($stype, $id, _("View the GL Journal Entries for this Work Order")), 1); $ar = array('PARAM_0' => $_GET['date'], 'PARAM_1' => $_GET['date'], 'PARAM_2' => $stype); display_note(print_link(_("Print the GL Journal Entries for this Work Order"), 702, $ar), 1); @@ -111,25 +115,25 @@ function safe_exit() //------------------------------------------------------------------------------------- if (!isset($_POST['date_'])) { - $_POST['date_'] = Today(); + $_POST['date_'] = new_doc_date(); if (!is_date_in_fiscalyear($_POST['date_'])) $_POST['date_'] = end_fiscalyear(); } function can_process() { - global $selected_id; + global $selected_id, $SysPrefs, $Refs; if (!isset($selected_id)) { - if (!references::is_valid($_POST['wo_ref'])) + if (!$Refs->is_valid($_POST['wo_ref'])) { display_error(_("You must enter a reference.")); set_focus('wo_ref'); return false; } - if (!is_new_reference($_POST['wo_ref'], systypes::work_order())) + if (!is_new_reference($_POST['wo_ref'], ST_WORKORDER)) { display_error(_("The entered reference is already in use.")); set_focus('wo_ref'); @@ -157,7 +161,7 @@ function can_process() return false; } // only check bom and quantites if quick assembly - if (!($_POST['type'] == wo_types::advanced())) + if (!($_POST['type'] == WO_ADVANCED)) { if (!has_bom($_POST['stock_id'])) { @@ -183,9 +187,9 @@ function can_process() return false; } - if (!sys_prefs::allow_negative_stock()) + if (!$SysPrefs->allow_negative_stock()) { - if ($_POST['type'] == wo_types::assemble()) + if ($_POST['type'] == WO_ASSEMBLY) { // check bom if assembling $result = get_bom($_POST['stock_id']); @@ -209,7 +213,7 @@ function can_process() } } } - elseif ($_POST['type'] == wo_types::unassemble()) + elseif ($_POST['type'] == WO_UNASSEMBLY) { // if unassembling, check item to unassemble $qoh = get_qoh_on_date($_POST['stock_id'], $_POST['StockLocation'], $_POST['date_']); @@ -262,6 +266,7 @@ if (isset($_POST['ADD_ITEM']) && can_process()) $_POST['stock_id'], $_POST['type'], $_POST['date_'], $_POST['RequDate'], $_POST['memo_'], input_num('Costs'), $_POST['cr_acc'], input_num('Labour'), $_POST['cr_lab_acc']); + new_doc_date($_POST['date_']); meta_forward($_SERVER['PHP_SELF'], "AddedID=$id&type=".$_POST['type']."&date=".$_POST['date_']); } @@ -272,7 +277,7 @@ if (isset($_POST['UPDATE_ITEM']) && can_process()) update_work_order($selected_id, $_POST['StockLocation'], input_num('quantity'), $_POST['stock_id'], $_POST['date_'], $_POST['RequDate'], $_POST['memo_']); - + new_doc_date($_POST['date_']); meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$selected_id"); } @@ -358,7 +363,7 @@ if (isset($selected_id)) $_POST['units_issued'] = $myrow["units_issued"]; $_POST['Costs'] = price_format($myrow["additional_costs"]); - $_POST['memo_'] = get_comments_string(systypes::work_order(), $selected_id); + $_POST['memo_'] = get_comments_string(ST_WORKORDER, $selected_id); hidden('wo_ref', $_POST['wo_ref']); hidden('units_issued', $_POST['units_issued']); @@ -369,13 +374,13 @@ if (isset($selected_id)) hidden('old_stk_id', $myrow["stock_id"]); label_row(_("Reference:"), $_POST['wo_ref']); - label_row(_("Type:"), wo_types::name($_POST['type'])); + label_row(_("Type:"), $wo_types_array[$_POST['type']]); hidden('type', $myrow["type"]); } else { $_POST['units_issued'] = $_POST['released'] = 0; - ref_row(_("Reference:"), 'wo_ref', '', references::get_next(systypes::work_order())); + ref_row(_("Reference:"), 'wo_ref', '', $Refs->get_next(ST_WORKORDER)); wo_types_list_row(_("Type:"), 'type', null); } @@ -404,18 +409,18 @@ else $_POST['quantity'] = qty_format($_POST['quantity'], $_POST['stock_id'], $dec); -if (get_post('type') == wo_types::advanced()) +if (get_post('type') == WO_ADVANCED) { qty_row(_("Quantity Required:"), 'quantity', null, null, null, $dec); if ($_POST['released']) label_row(_("Quantity Manufactured:"), number_format($_POST['units_issued'], get_qty_dec($_POST['stock_id']))); - date_row(_("Date") . ":", 'date_'); - date_row(_("Date Required By") . ":", 'RequDate', '', null, sys_prefs::default_wo_required_by()); + date_row(_("Date") . ":", 'date_', '', true); + date_row(_("Date Required By") . ":", 'RequDate', '', null, $SysPrefs->default_wo_required_by()); } else { qty_row(_("Quantity:"), 'quantity', null, null, null, $dec); - date_row(_("Date") . ":", 'date_'); + date_row(_("Date") . ":", 'date_', '', true); hidden('RequDate', ''); $sql = "SELECT DISTINCT account_code FROM ".TB_PREF."bank_accounts"; @@ -449,7 +454,7 @@ if (isset($selected_id)) { echo ""; - submit_cells('UPDATE_ITEM', _("Update"), '', _('Save changes to work order'), true); + submit_cells('UPDATE_ITEM', _("Update"), '', _('Save changes to work order'), 'default'); if (get_post('released')) { submit_cells('close', _("Close This Work Order"),'','',true); @@ -460,7 +465,7 @@ if (isset($selected_id)) } else { - submit_center('ADD_ITEM', _("Add Workorder"), true, '', true); + submit_center('ADD_ITEM', _("Add Workorder"), true, '', 'default'); } end_form(); diff --git a/manufacturing/work_order_issue.php b/manufacturing/work_order_issue.php index 0a014d06..1b129f35 100644 --- a/manufacturing/work_order_issue.php +++ b/manufacturing/work_order_issue.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 3; -$path_to_root=".."; +$page_security = 'SA_MANUFISSUE'; +$path_to_root = ".."; include_once($path_to_root . "/includes/ui/items_cart.inc"); include_once($path_to_root . "/includes/session.inc"); @@ -26,7 +26,7 @@ if ($use_popup_windows) $js .= get_js_open_window(800, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Issue Items to Work Order"), false, false, "", $js); +page(_($help_context = "Issue Items to Work Order"), false, false, "", $js); //----------------------------------------------------------------------------------------------- @@ -34,7 +34,7 @@ if (isset($_GET['AddedID'])) { display_notification(_("The work order issue has been entered.")); - display_note(get_trans_view_str(systypes::work_order(), $_GET['AddedID'], _("View this Work Order"))); + display_note(get_trans_view_str(ST_WORKORDER, $_GET['AddedID'], _("View this Work Order"))); hyperlink_no_params("search_work_orders.php", _("Select another &Work Order to Process")); @@ -69,6 +69,8 @@ function handle_new_order() function can_process() { + global $Refs; + if (!is_date($_POST['date_'])) { display_error(_("The entered date for the issue is invalid.")); @@ -81,7 +83,7 @@ function can_process() set_focus('date_'); return false; } - if (!references::is_valid($_POST['ref'])) + if (!$Refs->is_valid($_POST['ref'])) { display_error(_("You must enter a reference.")); set_focus('ref'); @@ -207,7 +209,7 @@ if (isset($_GET['trans_no'])) display_wo_details($_SESSION['issue_items']->order_id); echo "
      "; -start_form(false, true); +start_form(); start_table("$table_style width=90%", 10); echo "      "; end_table(); -submit_center('Process', _("Process Issue"), true, '', true); +submit_center('Process', _("Process Issue"), true, '', 'default'); end_form(); diff --git a/manufacturing/work_order_release.php b/manufacturing/work_order_release.php index b6d518ae..0d58b749 100644 --- a/manufacturing/work_order_release.php +++ b/manufacturing/work_order_release.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 10; -$path_to_root=".."; +$page_security = 'SA_MANUFRELEASE'; +$path_to_root = ".."; include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/includes/date_functions.inc"); @@ -24,7 +24,7 @@ if ($use_popup_windows) $js .= get_js_open_window(800, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Work Order Release to Manufacturing"), false, false, "", $js); +page(_($help_context = "Work Order Release to Manufacturing"), false, false, "", $js); if (isset($_GET["trans_no"])) { @@ -69,7 +69,7 @@ if (isset($_POST['release'])) display_notification(_("The work order has been released to manufacturing.")); - display_note(get_trans_view_str(systypes::work_order(), $selected_id, _("View this Work Order"))); + display_note(get_trans_view_str(ST_WORKORDER, $selected_id, _("View this Work Order"))); hyperlink_no_params("search_work_orders.php", _("Select another &work order")); @@ -100,7 +100,7 @@ if (can_process($myrow)) end_table(1); - submit_center('release', _("Release Work Order"), true, '', true); + submit_center('release', _("Release Work Order"), true, '', 'default'); hidden('selected_id', $selected_id); hidden('stock_id', $myrow['stock_id']); diff --git a/purchasing/allocations/supplier_allocate.php b/purchasing/allocations/supplier_allocate.php index 51d6a7b5..5f77c152 100644 --- a/purchasing/allocations/supplier_allocate.php +++ b/purchasing/allocations/supplier_allocate.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$path_to_root="../.."; -$page_security = 3; +$page_security = 'SA_SUPPLIERALLOC'; +$path_to_root = "../.."; include($path_to_root . "/includes/ui/allocation_cart.inc"); include_once($path_to_root . "/includes/session.inc"); @@ -18,6 +18,7 @@ include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); include_once($path_to_root . "/includes/banking.inc"); include_once($path_to_root . "/sales/includes/sales_db.inc"); +//include_once($path_to_root . "/purchasing/includes/ui/supp_alloc_ui.inc"); $js = ""; if ($use_popup_windows) @@ -25,7 +26,7 @@ if ($use_popup_windows) add_js_file('allocate.js'); -page(_("Allocate Supplier Payment or Credit Note"), false, false, "", $js); +page(_($help_context = "Allocate Supplier Payment or Credit Note"), false, false, "", $js); //-------------------------------------------------------------------------------- @@ -40,154 +41,13 @@ function clear_allocations() } //-------------------------------------------------------------------------------- -function check_data() -{ - $total_allocated = 0; - - for ($counter = 0; $counter < $_POST["TotalNumberOfAllocs"]; $counter++) - { - if (!check_num('amount' . $counter, 0)) - { - display_error(_("The entry for one or more amounts is invalid or negative.")); - set_focus('amount'.$counter); - return false; - } - - /*Now check to see that the AllocAmt is no greater than the - amount left to be allocated against the transaction under review */ - if (input_num('amount' . $counter) > $_POST['un_allocated' . $counter]) - { - //$_POST['amount' . $counter] = $_POST['un_allocated' . $counter]; - } - - $_SESSION['alloc']->allocs[$counter]->current_allocated = input_num('amount' . $counter); - - $total_allocated += input_num('amount' . $counter); - } - - if ($total_allocated + $_SESSION['alloc']->amount > sys_prefs::allocation_settled_allowance()) - { - display_error(_("These allocations cannot be processed because the amount allocated is more than the total amount left to allocate.")); - //echo _("Total allocated:") . " " . $total_allocated ; - //echo " " . _("Total amount that can be allocated:") . " " . -$_SESSION['alloc']->TransAmt . "
      "; - return false; - } - - return true; -} - -//----------------------------------------------------------------------------------- - -function handle_process() -{ - begin_transaction(); - - // clear all the allocations for this payment/credit - clear_supp_alloctions($_SESSION['alloc']->type, $_SESSION['alloc']->trans_no, $_SESSION['alloc']->date_); - - // now add the new allocations - $total_allocated = 0; - foreach ($_SESSION['alloc']->allocs as $alloc_item) - { - if ($alloc_item->current_allocated > 0) - { - add_supp_allocation($alloc_item->current_allocated, - $_SESSION['alloc']->type, $_SESSION['alloc']->trans_no, - $alloc_item->type, $alloc_item->type_no, $_SESSION['alloc']->date_); - - update_supp_trans_allocation($alloc_item->type, $alloc_item->type_no, - $alloc_item->current_allocated); - - // Exchange Variations Joe Hunt 2008-09-20 //////////////////////////////////////// - - exchange_variation($_SESSION['alloc']->type, $_SESSION['alloc']->trans_no, - $alloc_item->type, $alloc_item->type_no, $_SESSION['alloc']->date_, - $alloc_item->current_allocated, payment_person_types::supplier()); - - /////////////////////////////////////////////////////////////////////////// - $total_allocated += $alloc_item->current_allocated; - } - - } /*end of the loop through the array of allocations made */ - update_supp_trans_allocation($_SESSION['alloc']->type, - $_SESSION['alloc']->trans_no, $total_allocated); - - commit_transaction(); - - clear_allocations(); -} - -//-------------------------------------------------------------------------------- - -if (isset($_POST['Process'])) -{ - if (check_data()) - { - handle_process(); - $_POST['Cancel'] = 1; - } -} - -//-------------------------------------------------------------------------------- - -if (isset($_POST['Cancel'])) -{ - clear_allocations(); - meta_forward($path_to_root . "/purchasing/allocations/supplier_allocation_main.php"); -} -//-------------------------------------------------------------------------------- - -function get_allocations_for_transaction($type, $trans_no) -{ - clear_allocations(); - - $supptrans = get_supp_trans($trans_no, $type); - - $_SESSION['alloc'] = new allocation($trans_no, $type, - $supptrans["supplier_id"], $supptrans["supplier_name"], - $supptrans["Total"], sql2date($supptrans["tran_date"])); - - /* Now populate the array of possible (and previous actual) allocations for this supplier */ - /*First get the transactions that have outstanding balances ie Total-alloc >0 */ - - $trans_items = get_allocatable_to_supp_transactions($_SESSION['alloc']->person_id); - - while ($myrow = db_fetch($trans_items)) - { - $_SESSION['alloc']->add_item($myrow["type"], $myrow["trans_no"], - sql2date($myrow["tran_date"]), - sql2date($myrow["due_date"]), - $myrow["Total"], // trans total - $myrow["alloc"], // trans total allocated - 0); // this allocation - } - - - /* Now get trans that might have previously been allocated to by this trans - NB existing entries where still some of the trans outstanding entered from - above logic will be overwritten with the prev alloc detail below */ - - $trans_items = get_allocatable_to_supp_transactions($_SESSION['alloc']->person_id, $trans_no, $type); - - while ($myrow = db_fetch($trans_items)) - { - $_SESSION['alloc']->add_or_update_item ($myrow["type"], $myrow["trans_no"], - sql2date($myrow["tran_date"]), - sql2date($myrow["due_date"]), - $myrow["Total"], - $myrow["alloc"] - $myrow["amt"], $myrow["amt"]); - } -} - -//-------------------------------------------------------------------------------- - function edit_allocations_for_transaction($type, $trans_no) { - global $table_style; + global $systypes_array; - start_form(false, true); + start_form(); - display_heading(_("Allocation of") . " " . systypes::name($_SESSION['alloc']->type) . " # " . $_SESSION['alloc']->trans_no); + display_heading(_("Allocation of") . " " . $systypes_array[$_SESSION['alloc']->type] . " # " . $_SESSION['alloc']->trans_no); display_heading($_SESSION['alloc']->person_name); @@ -199,83 +59,53 @@ function edit_allocations_for_transaction($type, $trans_no) div_start('alloc_tbl'); if (count($_SESSION['alloc']->allocs) > 0) { - start_table($table_style); - $th = array(_("Transaction Type"), _("#"), _("Date"), _("Due Date"), _("Amount"), - _("Other Allocations"), _("This Allocation"), _("Left to Allocate"),'',''); - table_header($th); - - $k = $counter = $total_allocated = 0; - - foreach ($_SESSION['alloc']->allocs as $alloc_item) - { - alt_table_row_color($k); - - label_cell(systypes::name($alloc_item->type)); - label_cell(get_trans_view_str($alloc_item->type, $alloc_item->type_no)); - label_cell($alloc_item->date_, "align=right"); - label_cell($alloc_item->due_date, "align=right"); - amount_cell($alloc_item->amount); - amount_cell($alloc_item->amount_allocated); - - $_POST['amount' . $counter] = price_format($alloc_item->current_allocated); - amount_cells(null, "amount" . $counter, price_format('amount' . $counter)); - - $un_allocated = round($alloc_item->amount - $alloc_item->amount_allocated, 6); - amount_cell($un_allocated); - label_cell("" - . _("All") . ""); - label_cell("" - . _("None") . "".hidden("un_allocated" . $counter, $un_allocated, false)); - end_row(); - - $total_allocated += input_num('amount' . $counter); - $counter++; - } - - label_row(_("Total Allocated"), number_format2($total_allocated,user_price_dec()), - "colspan=6 align=right", "align=right id='total_allocated'", 3); - if (-$_SESSION['alloc']->amount - $total_allocated < 0) - { - $font1 = ""; - $font2 = ""; - } - else - $font1 = $font2 = ""; - $left_to_allocate = price_format(-$_SESSION['alloc']->amount - $total_allocated); - label_row(_("Left to Allocate"), $font1 . $left_to_allocate . $font2, "colspan=6 align=right", - "nowrap align=right id='left_to_allocate'", 3); - end_table(); - - hidden('TotalNumberOfAllocs', $counter); + show_allocatable(true); submit_center_first('UpdateDisplay', _("Refresh"), _('Start again allocation of selected amount'), true); - submit('Process', _("Process"), true, _('Process allocations'), true); + submit('Process', _("Process"), true, _('Process allocations'), 'default'); submit_center_last('Cancel', _("Back to Allocations"), - _('Abandon allocations and return to selection of allocatable amounts'), true); + _('Abandon allocations and return to selection of allocatable amounts'), 'cancel'); } else { display_note(_("There are no unsettled transactions to allocate."), 0, 1); submit_center('Cancel', _("Back to Allocations"), true, - _('Abandon allocations and return to selection of allocatable amounts'), true); + _('Abandon allocations and return to selection of allocatable amounts'), 'cancel'); } div_end(); end_form(); } +//-------------------------------------------------------------------------------- + +if (isset($_POST['Process'])) +{ + if (check_allocations()) + { + $_SESSION['alloc']->write(); + clear_allocations(); + $_POST['Cancel'] = 1; + } +} + +//-------------------------------------------------------------------------------- + +if (isset($_POST['Cancel'])) +{ + clear_allocations(); + meta_forward($path_to_root . "/purchasing/allocations/supplier_allocation_main.php"); +} //-------------------------------------------------------------------------------- if (isset($_GET['trans_no']) && isset($_GET['trans_type'])) { - get_allocations_for_transaction($_GET['trans_type'], $_GET['trans_no']); + $_SESSION['alloc'] = new allocation($_GET['trans_type'], $_GET['trans_no']); } -if(get_post('UpdateDisplay')) + +if (get_post('UpdateDisplay')) { - $trans_no = $_SESSION['alloc']->trans_no; - $type = $_SESSION['alloc']->type; - clear_allocations(); - get_allocations_for_transaction($type, $trans_no); + $_SESSION['alloc']->read(); $Ajax->activate('alloc_tbl'); } diff --git a/purchasing/allocations/supplier_allocation_main.php b/purchasing/allocations/supplier_allocation_main.php index 4c731d6e..34877675 100644 --- a/purchasing/allocations/supplier_allocation_main.php +++ b/purchasing/allocations/supplier_allocation_main.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$path_to_root="../.."; -$page_security = 3; +$page_security = 'SA_SUPPLIERALLOC'; +$path_to_root = "../.."; include($path_to_root . "/includes/db_pager.inc"); include_once($path_to_root . "/includes/session.inc"); @@ -23,40 +23,24 @@ include_once($path_to_root . "/sales/includes/sales_db.inc"); $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 500); -page(_("Supplier Allocations"), false, false, "", $js); - -//-------------------------------------------------------------------------------- -if ($ret = context_restore()) { - if(isset($ret['supplier_id'])) - $_POST['supplier_id'] = $ret['supplier_id']; -} -if (isset($_POST['_supplier_id_editor'])) { - context_call($path_to_root.'/purchasing/manage/suppliers.php?supplier_id='.$_POST['supplier_id'] ); -} +page(_($help_context = "Supplier Allocations"), false, false, "", $js); //-------------------------------------------------------------------------------- start_form(); /* show all outstanding receipts and credits to be allocated */ - /*Clear any previous allocation records */ - if (isset($_SESSION['alloc'])) - { - unset($_SESSION['alloc']->allocs); - unset($_SESSION['alloc']); - } if (!isset($_POST['supplier_id'])) $_POST['supplier_id'] = get_global_supplier(); echo "
      " . _("Select a Supplier: ") . "  "; - supplier_list('supplier_id', $_POST['supplier_id'], true, true); + echo supplier_list('supplier_id', $_POST['supplier_id'], true, true); echo "
      "; check(_("Show Settled Items:"), 'ShowSettled', null, true); echo "


      "; - end_form(); set_global_supplier($_POST['supplier_id']); - if (isset($_POST['supplier_id']) && ($_POST['supplier_id'] == reserved_words::get_all())) + if (isset($_POST['supplier_id']) && ($_POST['supplier_id'] == ALL_TEXT)) { unset($_POST['supplier_id']); } @@ -71,7 +55,9 @@ start_form(); //-------------------------------------------------------------------------------- function systype_name($dummy, $type) { - return systypes::name($type); + global $systypes_array; + + return $systypes_array[$type]; } function trans_view($trans) @@ -124,12 +110,7 @@ if (isset($_POST['customer_id'])) { $table =& new_db_pager('alloc_tbl', $sql, $cols); $table->set_marker('check_settled', _("Marked items are settled."), 'settledbg', 'settledfg'); -if (get_post('_ShowSettled_update') || get_post('_supplier_id_update') ) { - $table->set_sql($sql); - $table->set_columns($cols); -} $table->width = "80%"; -start_form(); display_db_pager($table); diff --git a/purchasing/includes/db/grn_db.inc b/purchasing/includes/db/grn_db.inc index 48d941b2..84a2f938 100644 --- a/purchasing/includes/db/grn_db.inc +++ b/purchasing/includes/db/grn_db.inc @@ -26,7 +26,7 @@ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date, $myrow = db_fetch($result); $material_cost = $myrow['material_cost']; if ($adj_only) - $exclude = 13; + $exclude = ST_CUSTDELIVERY; else $exclude = 0; $qoh = get_qoh_on_date($stock_id, null, $date, $exclude); @@ -53,6 +53,8 @@ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date, function add_grn(&$po, $date_, $reference, $location) { + global $Refs; + begin_transaction(); $grn = add_grn_batch($po->order_no, $po->supplier_id, $reference, $location, $date_); @@ -86,14 +88,16 @@ function add_grn(&$po, $date_, $reference, $location) $order_line->standard_cost, $order_line->receive_qty, $order_line->price); /* Update location stock records - NB a po cannot be entered for a service/kit parts */ - add_stock_move(25, $order_line->stock_id, $grn, $location, $date_, "", + add_stock_move(ST_SUPPRECEIVE, $order_line->stock_id, $grn, $location, $date_, "", $order_line->receive_qty, $order_line->standard_cost, $po->supplier_id, 1, $order_line->price); } /*quantity received is != 0 */ } /*end of order_line loop */ - references::save_last($reference, 25); + $Refs->save(ST_SUPPRECEIVE, $grn, $reference); + + add_audit_trail(ST_SUPPRECEIVE, $grn, $date_); commit_transaction(); @@ -184,7 +188,7 @@ function set_grn_item_credited(&$entered_grn, $supplier, $transno, $date) ." WHERE id=".db_escape($entered_grn->id); db_query($sql); - add_stock_move(21, $entered_grn->item_code, $transno, $myrow['loc_code'], $date, "", + add_stock_move(ST_SUPPCREDIT, $entered_grn->item_code, $transno, $myrow['loc_code'], $date, "", $entered_grn->this_quantity_inv, $mcost, $supplier, 1, $entered_grn->chg_price); } @@ -201,7 +205,7 @@ function get_grn_items($grn_batch_id=0, $supplier_id="", $outstanding_only=false $sql .= " WHERE ".TB_PREF."grn_items.grn_batch_id=".TB_PREF."grn_batch.id AND ".TB_PREF."grn_items.po_detail_item=".TB_PREF."purch_order_details.po_detail_item"; if ($invoice_no != 0) - $sql .= " AND ".TB_PREF."supp_invoice_items.supp_trans_type=20 AND + $sql .= " AND ".TB_PREF."supp_invoice_items.supp_trans_type=".ST_SUPPINVOICE." AND ".TB_PREF."supp_invoice_items.supp_trans_no=$invoice_no AND ".TB_PREF."grn_items.id=".TB_PREF."supp_invoice_items.grn_item_id"; $sql .= " AND ".TB_PREF."stock_master.stock_id=".TB_PREF."grn_items.item_code "; @@ -348,8 +352,8 @@ function void_grn($grn_batch) begin_transaction(); - void_bank_trans(25, $grn_batch, true); - void_gl_trans(25, $grn_batch, true); + void_bank_trans(ST_SUPPRECEIVE, $grn_batch, true); + void_gl_trans(ST_SUPPRECEIVE, $grn_batch, true); // clear the quantities of the grn items in the POs and invoices $result = get_grn_items($grn_batch); @@ -375,7 +379,7 @@ function void_grn($grn_batch) db_query($sql, "A grn detail item could not be voided."); // clear the stock move items - void_stock_move(25, $grn_batch); + void_stock_move(ST_SUPPRECEIVE, $grn_batch); commit_transaction(); diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc index cc5c8549..ffdb8c17 100644 --- a/purchasing/includes/db/invoice_db.inc +++ b/purchasing/includes/db/invoice_db.inc @@ -103,8 +103,9 @@ function get_deliveries_between($stock_id, $from, $to) $from = date2sql($from); $to = date2sql($to); $sql = "SELECT SUM(-qty), SUM(-qty*standard_cost) FROM ".TB_PREF."stock_moves - WHERE type=13 AND stock_id=".db_escape($stock_id)." AND + WHERE type=".ST_CUSTDELIVERY." AND stock_id=".db_escape($stock_id)." AND tran_date>='$from' AND tran_date<='$to' GROUP BY stock_id"; + $result = db_query($sql, "The deliveries could not be updated"); return db_fetch_row($result); } @@ -120,6 +121,8 @@ function get_diff_in_home_currency($supplier, $old_date, $date, $amount1, $amoun function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref because we change locally { + global $Refs; + //$company_currency = get_company_currency(); /*Start an sql transaction */ begin_transaction(); @@ -136,10 +139,10 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b $invoice_items_total = $supp_trans->get_total_charged($supp_trans->tax_group_id); if ($supp_trans->is_invoice) - $trans_type = 20; + $trans_type = ST_SUPPINVOICE; else { - $trans_type = 21; + $trans_type = ST_SUPPCREDIT; // let's negate everything because it's a credit note $invoice_items_total = -$invoice_items_total; $tax_total = -$tax_total; @@ -208,8 +211,8 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b $line_taxfree = $entered_grn->taxfree_charge_price($supp_trans->tax_group_id); $line_tax = $entered_grn->full_charge_price($supp_trans->tax_group_id) - $line_taxfree; $stock_gl_code = get_stock_gl_code($entered_grn->item_code); - - $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $stock_gl_code["inventory_account"], + $iv_act = (is_inventory_item($entered_grn->item_code) ? $stock_gl_code["inventory_account"] : $stock_gl_code["cogs_account"]); + $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $iv_act, $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $entered_grn->this_quantity_inv * $line_taxfree, $supp_trans->supplier_id); // -------------- if price changed since po received. 16 Aug 2008 Joe Hunt @@ -250,13 +253,13 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], _("Cost diff."), $amt, null, null, null, "The general ledger transaction could not be added for the price variance of the inventory item"); - add_gl_trans($trans_type, $invoice_id, $date_, $stock_gl_code["inventory_account"], + add_gl_trans($trans_type, $invoice_id, $date_, $iv_act, 0, 0, _("Cost diff."), -$amt, null, null, null, "The general ledger transaction could not be added for the price variance of the inventory item"); } - update_stock_move_pid(13, $entered_grn->item_code, $old_date, $date_, 0, $mat_cost); + update_stock_move_pid(ST_CUSTDELIVERY, $entered_grn->item_code, $old_date, $date_, 0, $mat_cost); } - update_stock_move_pid(25, $entered_grn->item_code, $old_date, $old_date, $supp_trans->supplier_id, $mat_cost); + update_stock_move_pid(ST_SUPPRECEIVE, $entered_grn->item_code, $old_date, $old_date, $supp_trans->supplier_id, $mat_cost); //} } // ---------------------------------------------------------------------- @@ -292,33 +295,33 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b } /*Post a balance post if $total != 0 */ - add_gl_balance($trans_type, $invoice_id, $date_, -$total, payment_person_types::supplier(), $supp_trans->supplier_id); + add_gl_balance($trans_type, $invoice_id, $date_, -$total, PT_SUPPLIER, $supp_trans->supplier_id); add_comments($trans_type, $invoice_id, $date_, $supp_trans->Comments); - references::save_last($supp_trans->reference, $trans_type); + $Refs->save($trans_type, $invoice_id, $supp_trans->reference); if ($invoice_no != 0) { - $invoice_alloc_balance = get_supp_trans_allocation_balance(20, $invoice_no); + $invoice_alloc_balance = get_supp_trans_allocation_balance(ST_SUPPINVOICE, $invoice_no); if ($invoice_alloc_balance > 0) { //the invoice is not already fully allocated - $trans = get_supp_trans($invoice_no, 20); + $trans = get_supp_trans($invoice_no, ST_SUPPINVOICE); $total = $trans['Total']; $allocate_amount = ($invoice_alloc_balance > $total) ? $total : $invoice_alloc_balance; /*Now insert the allocation record if > 0 */ if ($allocate_amount != 0) { - update_supp_trans_allocation(20, $invoice_no, $allocate_amount); - update_supp_trans_allocation(21, $invoice_id, $allocate_amount); // *** - add_supp_allocation($allocate_amount, 21, $invoice_id, 20, $invoice_no, + update_supp_trans_allocation(ST_SUPPINVOICE, $invoice_no, $allocate_amount); + update_supp_trans_allocation(ST_SUPPCREDIT, $invoice_id, $allocate_amount); // *** + add_supp_allocation($allocate_amount, ST_SUPPCREDIT, $invoice_id, ST_SUPPINVOICE, $invoice_no, $date_); // Exchange Variations Joe Hunt 2008-09-20 //////////////////////////////////////// - exchange_variation(21, $invoice_id, 20, $invoice_no, $date_, - $allocate_amount, payment_person_types::supplier()); + exchange_variation(ST_SUPPCREDIT, $invoice_id, ST_SUPPINVOICE, $invoice_no, $date_, + $allocate_amount, PT_SUPPLIER); /////////////////////////////////////////////////////////////////////////// } @@ -415,7 +418,7 @@ function read_supp_invoice($trans_no, $trans_type, &$supp_trans) function get_matching_invoice_item($stock_id, $po_item_id) { $sql = "SELECT *, tran_date FROM ".TB_PREF."supp_invoice_items, ".TB_PREF."supp_trans - WHERE supp_trans_type = 20 AND stock_id = " + WHERE supp_trans_type = ".ST_SUPPINVOICE." AND stock_id = " .db_escape($stock_id)." AND po_detail_item_id = ".db_escape($po_item_id)." AND supp_trans_no = trans_no"; $result = db_query($sql, "Cannot retreive supplier transaction detail records"); @@ -455,7 +458,7 @@ function void_supp_invoice($type, $type_no) $batch = get_grn_batch_from_item($details_row["grn_item_id"]); $grn = get_grn_batch($batch); - if ($type == 21) // credit note 2009-06-14 Joe Hunt Must restore the po and grn + if ($type == ST_SUPPCREDIT) // credit note 2009-06-14 Joe Hunt Must restore the po and grn { // We must get the corresponding invoice item to check for price chg. $match = get_matching_invoice_item($details_row["stock_id"], $details_row["po_detail_item_id"]); if ($match !== false) @@ -486,15 +489,15 @@ function void_supp_invoice($type, $type_no) $deliveries = get_deliveries_between($details_row["stock_id"], $old_date, $date_); if ($deliveries[0] != 0) // have deliveries been done during the period? { - update_stock_move_pid(13, $details_row["stock_id"], $old_date, $date_, 0, $mat_cost); + update_stock_move_pid(ST_CUSTDELIVERY, $details_row["stock_id"], $old_date, $date_, 0, $mat_cost); } - update_stock_move_pid(25, $details_row["stock_id"], $old_date, $old_date, $grn['supplier_id'], $mat_cost); + update_stock_move_pid(ST_SUPPRECEIVE, $details_row["stock_id"], $old_date, $old_date, $grn['supplier_id'], $mat_cost); } } } - if ($type == 21) // void the credits in stock moves - void_stock_move(21, $type_no); + if ($type == ST_SUPPCREDIT) // void the credits in stock moves + void_stock_move($type, $type_no); void_supp_invoice_items($type, $type_no); void_trans_tax_details($type, $type_no); diff --git a/purchasing/includes/db/po_db.inc b/purchasing/includes/db/po_db.inc index 0116e9fb..ee2b7d8e 100644 --- a/purchasing/includes/db/po_db.inc +++ b/purchasing/includes/db/po_db.inc @@ -24,6 +24,8 @@ function delete_po($po) function add_po(&$po_obj) { + global $Refs; + begin_transaction(); /*Insert to purchase order header record */ @@ -56,10 +58,11 @@ function add_po(&$po_obj) } } - references::save_last($po_obj->reference, systypes::po()); + $Refs->save(ST_PURCHORDER, $po_obj->order_no, $po_obj->reference); - //add_comments(systypes::po(), $po_obj->order_no, $po_obj->orig_order_date, $po_obj->Comments); + //add_comments(ST_PURCHORDER, $po_obj->order_no, $po_obj->orig_order_date, $po_obj->Comments); + add_audit_trail(ST_PURCHORDER, $po_obj->order_no, $po_obj->orig_order_date); commit_transaction(); return $po_obj->order_no; @@ -115,7 +118,7 @@ function update_po(&$po_obj) db_query($sql, "One of the purchase order detail records could not be updated"); } - //add_comments(systypes::po(), $po_obj->order_no, $po_obj->orig_order_date, $po_obj->Comments); + //add_comments(ST_PURCHORDER, $po_obj->order_no, $po_obj->orig_order_date, $po_obj->Comments); commit_transaction(); diff --git a/purchasing/includes/db/supp_payment_db.inc b/purchasing/includes/db/supp_payment_db.inc index 35e93db4..3d848ed6 100644 --- a/purchasing/includes/db/supp_payment_db.inc +++ b/purchasing/includes/db/supp_payment_db.inc @@ -10,8 +10,10 @@ See the License here . ***********************************************************************/ function add_supp_payment($supplier_id, $date_, $bank_account, - $amount, $discount, $ref, $memo_, $rate=0) + $amount, $discount, $ref, $memo_, $rate=0, $charge=0) { + global $Refs; + begin_transaction(); $supplier_currency = get_supplier_currency($supplier_id); @@ -22,16 +24,18 @@ function add_supp_payment($supplier_id, $date_, $bank_account, { $supp_amount = exchange_from_to($amount, $bank_account_currency, $supplier_currency, $date_); $supp_discount = exchange_from_to($discount, $bank_account_currency, $supplier_currency, $date_); + $supp_charge = exchange_from_to($charge, $bank_account_currency, $supplier_currency, $date_); } else { $supp_amount = round($amount / $rate, user_price_dec()); $supp_discount = round($discount / $rate, user_price_dec()); + $supp_charge = round($charge / $rate, user_price_dec()); } // it's a supplier payment - $trans_type = 22; + $trans_type = ST_SUPPAYMENT; /* Create a supp_trans entry for the supplier payment */ $payment_id = add_supp_trans($trans_type, $supplier_id, $date_, $date_, @@ -51,24 +55,31 @@ function add_supp_payment($supplier_id, $date_, $bank_account, -$supp_discount, $supplier_id, "", $rate); } + if ($supp_charge != 0) + { + $charge_act = get_company_pref('bank_charge_act'); + $total += add_gl_trans_supplier($trans_type, $payment_id, $date_, $charge_act, 0, 0, + $supp_charge, $supplier_id, "", $rate); + } + if ($supp_amount != 0) { $total += add_gl_trans_supplier($trans_type, $payment_id, $date_, $bank_gl_account, 0, 0, - -$supp_amount, $supplier_id, "", $rate); + -($supp_amount + $supp_charge), $supplier_id, "", $rate); } /*Post a balance post if $total != 0 */ - add_gl_balance($trans_type, $payment_id, $date_, -$total, payment_person_types::supplier(), $supplier_id); + add_gl_balance($trans_type, $payment_id, $date_, -$total, PT_SUPPLIER, $supplier_id); /*now enter the bank_trans entry */ add_bank_trans($trans_type, $payment_id, $bank_account, $ref, - $date_, -($amount), payment_person_types::supplier(), + $date_, -($amount + $supp_charge), PT_SUPPLIER, $supplier_id, $bank_account_currency, "Could not add the supplier payment bank transaction"); add_comments($trans_type, $payment_id, $date_, $memo_); - references::save_last($ref, $trans_type); + $Refs->save($trans_type, $payment_id, $ref); commit_transaction(); diff --git a/purchasing/includes/db/supp_trans_db.inc b/purchasing/includes/db/supp_trans_db.inc index 9c51f904..4ba8d7ba 100644 --- a/purchasing/includes/db/supp_trans_db.inc +++ b/purchasing/includes/db/supp_trans_db.inc @@ -39,6 +39,7 @@ function add_supp_trans($type, $supplier_id, $date_, $due_date, $reference, $sup $err_msg = "Cannot insert a supplier transaction record"; db_query($sql, $err_msg); + add_audit_trail($type, $trans_no, $date_); return $trans_no; } @@ -50,7 +51,7 @@ function get_supp_trans($trans_no, $trans_type=-1) $sql = "SELECT ".TB_PREF."supp_trans.*, (".TB_PREF."supp_trans.ov_amount+".TB_PREF."supp_trans.ov_gst+".TB_PREF."supp_trans.ov_discount) AS Total, ".TB_PREF."suppliers.supp_name AS supplier_name, ".TB_PREF."suppliers.curr_code AS SupplierCurrCode "; - if ($trans_type == 22) + if ($trans_type == ST_SUPPAYMENT) { // it's a payment so also get the bank account $sql .= ", ".TB_PREF."bank_accounts.bank_name, ".TB_PREF."bank_accounts.bank_account_name, ".TB_PREF."bank_accounts.bank_curr_code, @@ -60,7 +61,7 @@ function get_supp_trans($trans_no, $trans_type=-1) $sql .= " FROM ".TB_PREF."supp_trans, ".TB_PREF."suppliers "; - if ($trans_type == 22) + if ($trans_type == ST_SUPPAYMENT) { // it's a payment so also get the bank account $sql .= ", ".TB_PREF."bank_trans, ".TB_PREF."bank_accounts"; @@ -72,7 +73,7 @@ function get_supp_trans($trans_no, $trans_type=-1) if ($trans_type > 0) $sql .= " AND ".TB_PREF."supp_trans.type=".db_escape($trans_type); - if ($trans_type == 22) + if ($trans_type == ST_SUPPAYMENT) { // it's a payment so also get the bank account $sql .= " AND ".TB_PREF."bank_trans.trans_no =".db_escape($trans_no)." @@ -127,19 +128,19 @@ function void_supp_trans($type, $type_no) function post_void_supp_trans($type, $type_no) { - if ($type == 22) + if ($type == ST_SUPPAYMENT) { void_supp_payment($type, $type_no); return true; } - if ($type == 20 || $type == 21) + if ($type == ST_SUPPINVOICE || $type == ST_SUPPCREDIT) { void_supp_invoice($type, $type_no); return true; } - if ($type == 25) + if ($type == SUPPRECEIVE) { return void_grn($type_no); } diff --git a/purchasing/includes/db/suppalloc_db.inc b/purchasing/includes/db/suppalloc_db.inc index c11c7d16..987a640d 100644 --- a/purchasing/includes/db/suppalloc_db.inc +++ b/purchasing/includes/db/suppalloc_db.inc @@ -84,7 +84,7 @@ function clear_supp_alloctions($type, $type_no, $date="") // 2008-09-20 Joe Hunt if ($date != "") exchange_variation($type, $type_no, $row['trans_type_to'], $row['trans_no_to'], $date, - $row['amt'], payment_person_types::supplier(), true); + $row['amt'], PT_SUPPLIER, true); ////////////////////// } @@ -148,7 +148,7 @@ function get_allocatable_from_supp_sql($supplier_id, $settled) $supp_sql = " AND trans.supplier_id = ".db_escape($supplier_id); $sql = get_alloc_supp_sql("round(ABS(ov_amount+ov_gst+ov_discount)-alloc,6) <= 0 AS settled", - "(type=22 OR type=21 OR type=1) AND (ov_amount < 0) " . $settled_sql . $supp_sql); + "(type=".ST_SUPPAYMENT." OR type=".ST_SUPPCREDIT." OR type=".ST_BANKPAYMENT.") AND (ov_amount < 0) " . $settled_sql . $supp_sql); return $sql; } @@ -169,7 +169,7 @@ function get_allocatable_to_supp_transactions($supplier_id, $trans_no=null, $typ else { $sql = get_alloc_supp_sql(null, "round(ABS(ov_amount+ov_gst+ov_discount)-alloc,6) > 0 - AND trans.type != 22 + AND trans.type != ".ST_SUPPAYMENT." AND trans.supplier_id=$supplier_id"); } diff --git a/purchasing/includes/db/suppliers_db.inc b/purchasing/includes/db/suppliers_db.inc index 207d9942..dd72a6cf 100644 --- a/purchasing/includes/db/suppliers_db.inc +++ b/purchasing/includes/db/suppliers_db.inc @@ -21,7 +21,7 @@ function get_supplier_details($supplier_id, $to=null) // removed - supp_trans.alloc from all summations $value = "(".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount)"; - $due = "IF (".TB_PREF."supp_trans.type=20 OR ".TB_PREF."supp_trans.type=21,".TB_PREF."supp_trans.due_date,".TB_PREF."supp_trans.tran_date)"; + $due = "IF (".TB_PREF."supp_trans.type=".ST_SUPPINVOICE." OR ".TB_PREF."supp_trans.type=".ST_SUPPCREDIT.",".TB_PREF."supp_trans.due_date,".TB_PREF."supp_trans.tran_date)"; $sql = "SELECT ".TB_PREF."suppliers.supp_name, ".TB_PREF."suppliers.curr_code, ".TB_PREF."payment_terms.terms, Sum($value) AS Balance, diff --git a/purchasing/includes/purchasing_db.inc b/purchasing/includes/purchasing_db.inc index 01323db1..51b456a2 100644 --- a/purchasing/includes/purchasing_db.inc +++ b/purchasing/includes/purchasing_db.inc @@ -39,7 +39,7 @@ function add_gl_trans_supplier($type, $type_no, $date_, $account, $dimension, $d return add_gl_trans($type, $type_no, $date_, $account, $dimension, $dimension2, $memo, $amount, get_supplier_currency($supplier_id), - payment_person_types::supplier(), $supplier_id, $err_msg, $rate); + PT_SUPPLIER, $supplier_id, $err_msg, $rate); } //---------------------------------------------------------------------------------------- diff --git a/purchasing/includes/ui/grn_ui.inc b/purchasing/includes/ui/grn_ui.inc index 2fe18c15..a0fdae4b 100644 --- a/purchasing/includes/ui/grn_ui.inc +++ b/purchasing/includes/ui/grn_ui.inc @@ -13,7 +13,7 @@ function display_grn_summary(&$po, $editable=false) { - global $table_style2; + global $table_style2, $Refs; start_table("$table_style2 width=90%"); start_row(); @@ -22,7 +22,7 @@ function display_grn_summary(&$po, $editable=false) if (!is_company_currency($po->curr_code)) label_cells(_("Order Currency"), $po->curr_code, "class='tableheader2'"); - label_cells(_("For Purchase Order"), get_trans_view_str(systypes::po(), $po->order_no), + label_cells(_("For Purchase Order"), get_trans_view_str(ST_PURCHORDER, $po->order_no), "class='tableheader2'"); label_cells(_("Ordered On"), $po->orig_order_date, "class='tableheader2'"); @@ -33,7 +33,7 @@ function display_grn_summary(&$po, $editable=false) if ($editable) { if (!isset($_POST['ref'])) - $_POST['ref'] = references::get_next(25); + $_POST['ref'] = $Refs->get_next(ST_SUPPRECEIVE); ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'"); if (!isset($_POST['Location'])) @@ -42,9 +42,9 @@ function display_grn_summary(&$po, $editable=false) locations_list_cells(null, "Location", $_POST['Location']); if (!isset($_POST['DefaultReceivedDate'])) - $_POST['DefaultReceivedDate'] = Today(); + $_POST['DefaultReceivedDate'] = new_doc_date(); - date_cells(_("Date Items Received"), 'DefaultReceivedDate', '', null, 0, 0, 0, "class='tableheader2'"); + date_cells(_("Date Items Received"), 'DefaultReceivedDate', '', true, 0, 0, 0, "class='tableheader2'"); } else diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc index 57aa3670..baf2ceb5 100644 --- a/purchasing/includes/ui/invoice_ui.inc +++ b/purchasing/includes/ui/invoice_ui.inc @@ -55,7 +55,7 @@ function copy_to_trans(&$supp_trans) function invoice_header(&$supp_trans) { - global $Ajax, $table_style; + global $Ajax, $table_style, $Refs; // if vars have been lost, recopy if (!isset($_POST['tran_date'])) @@ -67,14 +67,14 @@ function invoice_header(&$supp_trans) if (isset($_POST['invoice_no'])) { - $trans = get_supp_trans($_POST['invoice_no'], 20); + $trans = get_supp_trans($_POST['invoice_no'], ST_SUPPINVOICE); $_POST['supplier_id'] = $trans['supplier_id']; $supp = $trans['supplier_name'] . " - " . $trans['SupplierCurrCode']; label_row(_("Supplier:"), $supp.hidden('supplier_id', $_POST['supplier_id'], false)); } else { - if (!isset($_POST['supplier_id']) && (get_global_supplier() != reserved_words::get_all())) + if (!isset($_POST['supplier_id']) && (get_global_supplier() != ALL_TEXT)) $_POST['supplier_id'] = get_global_supplier(); supplier_list_row(_("Supplier:"), 'supplier_id', $_POST['supplier_id'], false, true); @@ -90,9 +90,9 @@ function invoice_header(&$supp_trans) } if ($supp_trans->is_invoice) - ref_row(_("Reference:"), 'reference', '', references::get_next(20)); + ref_row(_("Reference:"), 'reference', '', $Refs->get_next(ST_SUPPINVOICE)); else - ref_row(_("Reference:"), 'reference', '', references::get_next(21)); + ref_row(_("Reference:"), 'reference', '', $Refs->get_next(ST_SUPPCREDIT)); if (isset($_POST['invoice_no'])) { @@ -103,7 +103,7 @@ function invoice_header(&$supp_trans) table_section(2, "33%"); - date_row(_("Date") . ":", 'tran_date', '', null, 0, 0, 0, "", true); + date_row(_("Date") . ":", 'tran_date', '', true, 0, 0, 0, "", true); if (isset($_POST['_tran_date_changed'])) { $Ajax->activate('_ex_rate'); $supp_trans->tran_date = $_POST['tran_date']; @@ -170,7 +170,7 @@ function display_gl_controls(&$supp_trans, $k) $_POST['gl_code'] = $accs['purchase_account']; alt_table_row_color($k); - gl_all_accounts_list('gl_code', null, true, true); + echo gl_all_accounts_list('gl_code', null, true, true); $dim = get_company_pref('use_dimension'); if ($dim >= 1) dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1); @@ -219,7 +219,7 @@ function display_gl_items(&$supp_trans, $mode=0) { echo "
      "; echo _("Quick Entry:")." "; - quick_entries_list('qid', null, QE_SUPPINV, true); + echo quick_entries_list('qid', null, QE_SUPPINV, true); $qid = get_quick_entry(get_post('qid')); if (list_updated('qid')) { unset($_POST['totamount']); // enable default @@ -308,7 +308,7 @@ function display_gl_items(&$supp_trans, $mode=0) display_gl_controls($supp_trans, $k); $colspan = ($dim == 2 ? 4 : ($dim == 1 ? 3 : 2)); label_row(_("Total"), price_format($total_gl_value), - "colspan=".$colspan." align=right", "nowrap align=right"); + "colspan=".$colspan." align=right", "nowrap align=right", ($mode==1?3:1)); end_table(); div_end(); @@ -367,7 +367,7 @@ function display_grn_items_for_selection(&$supp_trans, $k) hidden('order_price'.$n, $myrow['unit_price'], false). hidden('std_cost_unit'.$n, $myrow['std_cost_unit'], false). hidden('po_detail_item'.$n, $myrow['po_detail_item'], false)); - label_cell(get_trans_view_str(systypes::po(), $myrow["purch_order_no"])); + label_cell(get_trans_view_str(ST_PURCHORDER, $myrow["purch_order_no"])); label_cell($myrow["item_code"]); label_cell($myrow["description"]); label_cell(sql2date($myrow["delivery_date"])); @@ -390,7 +390,7 @@ function display_grn_items_for_selection(&$supp_trans, $k) submit_cells('grn_item_id'.$n, _("Add"), '', _("Add to Invoice"), true); else submit_cells('grn_item_id'.$n, _("Add"), '', _("Add to Credit Note"), true); - if ($supp_trans->is_invoice && $_SESSION["wa_current_user"]->access == 2) { // Added 2008-10-18 by Joe Hunt. Only admins can remove GRNs + if ($supp_trans->is_invoice && $_SESSION["wa_current_user"]->can_access('SA_GRNDELETE')) { // Added 2008-10-18 by Joe Hunt. Special access rights needed. submit_cells('void_item_id'.$n, _("Remove"), '', _("WARNING! Be careful with removal. The operation is executed immediately and cannot be undone !!!"), true); submit_js_confirm('void_item_id'.$n, sprintf(_('You are about to remove all yet non-invoiced items from delivery line #%d. This operation also irreversibly changes related order line. Do you want to continue ?'), $n)); @@ -425,7 +425,7 @@ function display_grn_items(&$supp_trans, $mode=0) if ($supp_trans->is_invoice) { $heading = _("Items Received Yet to be Invoiced"); - if ($_SESSION["wa_current_user"]->access == 2) // Added 2008-10-18 by Joe Hunt. Only admins can remove GRNs + if ($_SESSION["wa_current_user"]->can_access('SA_GRNDELETE')) // Added 2008-10-18 by Joe Hunt. Only admins can remove GRNs $heading2 = _("WARNING! Be careful with removal. The operation is executed immediately and cannot be undone !!!"); } else @@ -448,8 +448,8 @@ function display_grn_items(&$supp_trans, $mode=0) if (!$supp_trans->is_invoice && !isset($_POST['invoice_no'])) { echo ""; - date_cells(_("Received between"), 'receive_begin', "", null, -30); - date_cells(_("and"), 'receive_end', '', null, 1); + date_cells(_("Received between"), 'receive_begin', "", null, -30, 0, 0, "valign=middle"); + date_cells(_("and"), 'receive_end', '', null, 1, 0, 0, "valign=middle"); submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), true); echo "
      "; echo ""; table_section(3); @@ -214,8 +214,8 @@ function display_po_items(&$order, $editable=true) po_item_controls($order); $display_total = price_format($total); - label_row(_("Total Excluding Shipping/Tax"), $display_total, "colspan=6 align=right", - "nowrap align=right"); + label_row(_("Total Excluding Shipping/Tax"), $display_total, "colspan=7 align=right", + "nowrap align=right", 2); end_table(1); div_end(); @@ -238,7 +238,7 @@ function display_po_summary(&$po, $is_self=false, $editable=false) if (!$is_self) { - label_cells(_("Purchase Order"), get_trans_view_str(systypes::po(), $po->order_no), + label_cells(_("Purchase Order"), get_trans_view_str(ST_PURCHORDER, $po->order_no), "class='tableheader2'"); } end_row(); @@ -304,7 +304,7 @@ function po_item_controls(&$order, $stock_id=null) { hidden('line_no', ($_SESSION['PO']->lines_on_order + 1)); - stock_purchasable_items_list_cells(null, 'stock_id', null, false, true); + stock_purchasable_items_list_cells(null, 'stock_id', null, false, false, true); if (list_updated('stock_id')) { $Ajax->activate('price'); $Ajax->activate('units'); diff --git a/purchasing/inquiry/po_search.php b/purchasing/inquiry/po_search.php index 9b498c0b..b43a99ff 100644 --- a/purchasing/inquiry/po_search.php +++ b/purchasing/inquiry/po_search.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; -$path_to_root="../.."; +$page_security = 'SA_SUPPTRANSVIEW'; +$path_to_root = "../.."; include($path_to_root . "/includes/db_pager.inc"); include($path_to_root . "/includes/session.inc"); @@ -22,7 +22,7 @@ if ($use_popup_windows) $js .= get_js_open_window(900, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Search Outstanding Purchase Orders"), false, false, "", $js); +page(_($help_context = "Search Outstanding Purchase Orders"), false, false, "", $js); if (isset($_GET['order_number'])) { @@ -55,7 +55,7 @@ if (get_post('SearchOrders')) //--------------------------------------------------------------------------------------------- -start_form(false, true); +start_form(); start_table("class='tablestyle_noborder'"); start_row(); @@ -68,21 +68,19 @@ locations_list_cells(_("Location:"), 'StockLocation', null, true); stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true); -submit_cells('SearchOrders', _("Search"),'',_('Select documents'), true); +submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default'); end_row(); end_table(); -end_form(); //--------------------------------------------------------------------------------------------- function trans_view($trans) { - return get_trans_view_str(systypes::po(), $trans["order_no"]); + return get_trans_view_str(ST_PURCHORDER, $trans["order_no"]); } function edit_link($row) { return pager_link( _("Edit"), - "/purchasing/po_entry_items.php?" . SID - . "ModifyOrderNumber=" . $row["order_no"], ICON_EDIT); + "/purchasing/po_entry_items.php?ModifyOrderNumber=" . $row["order_no"], ICON_EDIT); } function prt_link($row) @@ -93,8 +91,7 @@ function prt_link($row) function receive_link($row) { return pager_link( _("Receive"), - "/purchasing/po_receive_items.php?" . SID - . "PONumber=" . $row["order_no"], ICON_RECEIVE); + "/purchasing/po_receive_items.php?PONumber=" . $row["order_no"], ICON_RECEIVE); } function check_overdue($row) @@ -189,12 +186,7 @@ if (get_post('StockLocation') != $all_items) { $table =& new_db_pager('orders_tbl', $sql, $cols); $table->set_marker('check_overdue', _("Marked orders have overdue items.")); -if (get_post('SearchOrders')) { - $table->set_sql($sql); - $table->set_columns($cols); -} $table->width = "80%"; -start_form(); display_db_pager($table); diff --git a/purchasing/inquiry/po_search_completed.php b/purchasing/inquiry/po_search_completed.php index c71c0cde..1632f5b4 100644 --- a/purchasing/inquiry/po_search_completed.php +++ b/purchasing/inquiry/po_search_completed.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_SUPPTRANSVIEW'; $path_to_root="../.."; include($path_to_root . "/includes/db_pager.inc"); include($path_to_root . "/includes/session.inc"); @@ -21,7 +21,7 @@ if ($use_popup_windows) $js .= get_js_open_window(900, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Search Purchase Orders"), false, false, "", $js); +page(_($help_context = "Search Purchase Orders"), false, false, "", $js); if (isset($_GET['order_number'])) { @@ -53,7 +53,7 @@ if (get_post('SearchOrders')) } //--------------------------------------------------------------------------------------------- -start_form(false, true); +start_form(); start_table("class='tablestyle_noborder'"); start_row(); @@ -66,10 +66,9 @@ locations_list_cells(_("into location:"), 'StockLocation', null, true); stock_items_list_cells(_("for item:"), 'SelectStockFromList', null, true); -submit_cells('SearchOrders', _("Search"),'',_('Select documents'), true); +submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default'); end_row(); end_table(); -end_form(); //--------------------------------------------------------------------------------------------- if (isset($_POST['order_number'])) { @@ -77,7 +76,7 @@ if (isset($_POST['order_number'])) } if (isset($_POST['SelectStockFromList']) && ($_POST['SelectStockFromList'] != "") && - ($_POST['SelectStockFromList'] != reserved_words::get_all())) + ($_POST['SelectStockFromList'] != ALL_TEXT)) { $selected_stock_item = $_POST['SelectStockFromList']; } @@ -89,7 +88,7 @@ else //--------------------------------------------------------------------------------------------- function trans_view($trans) { - return get_trans_view_str(systypes::po(), $trans["order_no"]); + return get_trans_view_str(ST_PURCHORDER, $trans["order_no"]); } function edit_link($row) @@ -137,7 +136,7 @@ else $sql .= " AND porder.ord_date >= '$data_after'"; $sql .= " AND porder.ord_date <= '$date_before'"; - if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != reserved_words::get_all()) + if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != ALL_TEXT) { $sql .= " AND porder.into_stock_location = ".db_escape($_POST['StockLocation']); } @@ -170,12 +169,7 @@ if (get_post('StockLocation') != $all_items) { $table =& new_db_pager('orders_tbl', $sql, $cols); -if (get_post('SearchOrders')) { - $table->set_sql($sql); - $table->set_columns($cols); -} $table->width = "80%"; -start_form(); display_db_pager($table); diff --git a/purchasing/inquiry/supplier_allocation_inquiry.php b/purchasing/inquiry/supplier_allocation_inquiry.php index 1782ef07..850dfc30 100644 --- a/purchasing/inquiry/supplier_allocation_inquiry.php +++ b/purchasing/inquiry/supplier_allocation_inquiry.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security=2; -$path_to_root="../.."; +$page_security = 'SA_SUPPLIERALLOC'; +$path_to_root = "../.."; include($path_to_root . "/includes/db_pager.inc"); include($path_to_root . "/includes/session.inc"); @@ -20,7 +20,7 @@ if ($use_popup_windows) $js .= get_js_open_window(900, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Supplier Allocation Inquiry"), false, false, "", $js); +page(_($help_context = "Supplier Allocation Inquiry"), false, false, "", $js); if (isset($_GET['supplier_id'])) { @@ -37,7 +37,7 @@ if (isset($_GET['ToDate'])) //------------------------------------------------------------------------------------------------ -start_form(false, true); +start_form(); if (!isset($_POST['supplier_id'])) $_POST['supplier_id'] = get_global_supplier(); @@ -54,13 +54,12 @@ supp_allocations_list_cell("filterType", null); check_cells(_("show settled:"), 'showSettled', null); -submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), true); +submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default'); set_global_supplier($_POST['supplier_id']); end_row(); end_table(); -end_form(); //------------------------------------------------------------------------------------------------ function check_overdue($row) { @@ -70,7 +69,9 @@ function check_overdue($row) function systype_name($dummy, $type) { - return systypes::name($type); + global $systypes_array; + + return $systypes_array[$type]; } function view_link($trans) @@ -80,13 +81,13 @@ function view_link($trans) function due_date($row) { - return (($row["type"] == 20) || ($row["type"]== 21)) + return (($row["type"] == ST_SUPPINVOICE) || ($row["type"]== ST_SUPPCREDIT)) ? $row["due_date"] : ""; } function fmt_balance($row) { - $value = ($row["type"] == 1 || $row["type"] == 21 || $row["type"] == 22) + $value = ($row["type"] == ST_BANKPAYMENT || $row["type"] == ST_SUPPCREDIT || $row["type"] == ST_SUPPAYMENT) ? -$row["TotalAmount"] - $row["Allocated"] : $row["TotalAmount"] - $row["Allocated"]; return $value; @@ -99,7 +100,7 @@ function alloc_link($row) "/purchasing/allocations/supplier_allocate.php?trans_no=" . $row["trans_no"]. "&trans_type=" . $row["type"], ICON_MONEY ); - return (($row["type"] == 1 || $row["type"] == 21 || $row["type"] == 22) + return (($row["type"] == ST_BANKPAYMENT || $row["type"] == ST_SUPPCREDIT || $row["type"] == ST_SUPPAYMENT) && (-$row["TotalAmount"] - $row["Allocated"]) > 0) ? $link : ''; } @@ -133,28 +134,29 @@ function fmt_credit($row) supplier.curr_code, (trans.ov_amount + trans.ov_gst + trans.ov_discount) AS TotalAmount, trans.alloc AS Allocated, - ((trans.type = 20 OR trans.type = 21) AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue + ((trans.type = ".ST_SUPPINVOICE." OR trans.type = ".ST_SUPPCREDIT.") AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue FROM " .TB_PREF."supp_trans as trans, " .TB_PREF."suppliers as supplier WHERE supplier.supplier_id = trans.supplier_id AND trans.tran_date >= '$date_after' AND trans.tran_date <= '$date_to'"; - if ($_POST['supplier_id'] != reserved_words::get_all()) + + if ($_POST['supplier_id'] != ALL_TEXT) $sql .= " AND trans.supplier_id = ".db_escape($_POST['supplier_id']); - if (isset($_POST['filterType']) && $_POST['filterType'] != reserved_words::get_all()) + if (isset($_POST['filterType']) && $_POST['filterType'] != ALL_TEXT) { if (($_POST['filterType'] == '1') || ($_POST['filterType'] == '2')) { - $sql .= " AND trans.type = 20 "; + $sql .= " AND trans.type = ".ST_SUPPINVOICE." "; } elseif ($_POST['filterType'] == '3') { - $sql .= " AND trans.type = 22 "; + $sql .= " AND trans.type = ".ST_SUPPAYMENT." "; } elseif (($_POST['filterType'] == '4') || ($_POST['filterType'] == '5')) { - $sql .= " AND trans.type = 21 "; + $sql .= " AND trans.type = ".ST_SUPPCREDIT." "; } if (($_POST['filterType'] == '2') || ($_POST['filterType'] == '5')) @@ -185,7 +187,7 @@ $cols = array( array('insert'=>true, 'fun'=>'alloc_link') ); -if ($_POST['supplier_id'] != reserved_words::get_all()) { +if ($_POST['supplier_id'] != ALL_TEXT) { $cols[_("Supplier")] = 'skip'; $cols[_("Currency")] = 'skip'; } @@ -194,12 +196,7 @@ if ($_POST['supplier_id'] != reserved_words::get_all()) { $table =& new_db_pager('doc_tbl', $sql, $cols); $table->set_marker('check_overdue', _("Marked items are overdue.")); -if (get_post('RefreshInquiry')) { - $table->set_sql($sql); - $table->set_columns($cols); -} $table->width = "90%"; -start_form(); display_db_pager($table); diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php index 138b2d64..264b5518 100644 --- a/purchasing/inquiry/supplier_inquiry.php +++ b/purchasing/inquiry/supplier_inquiry.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security=2; -$path_to_root="../.."; +$page_security = 'SA_SUPPTRANSVIEW'; +$path_to_root = "../.."; include($path_to_root . "/includes/db_pager.inc"); include($path_to_root . "/includes/session.inc"); @@ -21,7 +21,7 @@ if ($use_popup_windows) $js .= get_js_open_window(900, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Supplier Inquiry"), false, false, "", $js); +page(_($help_context = "Supplier Inquiry"), false, false, "", $js); if (isset($_GET['supplier_id'])){ $_POST['supplier_id'] = $_GET['supplier_id']; @@ -35,7 +35,7 @@ if (isset($_GET['ToDate'])){ //------------------------------------------------------------------------------------------------ -start_form(false, true); +start_form(); if (!isset($_POST['supplier_id'])) $_POST['supplier_id'] = get_global_supplier(); @@ -50,11 +50,10 @@ date_cells(_("To:"), 'TransToDate'); supp_allocations_list_cell("filterType", null); -submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), true); +submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default'); end_row(); end_table(); -end_form(); set_global_supplier($_POST['supplier_id']); //------------------------------------------------------------------------------------------------ @@ -89,7 +88,7 @@ function display_supplier_summary($supplier_record) //------------------------------------------------------------------------------------------------ div_start('totals_tbl'); -if (($_POST['supplier_id'] != "") && ($_POST['supplier_id'] != reserved_words::get_all())) +if (($_POST['supplier_id'] != "") && ($_POST['supplier_id'] != ALL_TEXT)) { $supplier_record = get_supplier_details($_POST['supplier_id']); display_supplier_summary($supplier_record); @@ -104,7 +103,8 @@ if(get_post('RefreshInquiry')) //------------------------------------------------------------------------------------------------ function systype_name($dummy, $type) { - return systypes::name($type); + global $systypes_array; + return $systypes_array[$type]; } function trans_view($trans) @@ -114,7 +114,7 @@ function trans_view($trans) function due_date($row) { - return ($row["type"]== 20) || ($row["type"]== 21) ? $row["due_date"] : ''; + return ($row["type"]== ST_SUPPINVOICE) || ($row["type"]== ST_SUPPCREDIT) ? $row["due_date"] : ''; } function gl_view($row) @@ -124,7 +124,7 @@ function gl_view($row) function credit_link($row) { - return $row['type'] == 20 && $row["TotalAmount"] - $row["Allocated"] > 0 ? + return $row['type'] == ST_SUPPINVOICE && $row["TotalAmount"] - $row["Allocated"] > 0 ? pager_link(_("Credit This"), "/purchasing/supplier_credit.php?New=1&invoice_no=". $row['trans_no'], ICON_CREDIT) @@ -170,32 +170,32 @@ function check_overdue($row) supplier.curr_code, (trans.ov_amount + trans.ov_gst + trans.ov_discount) AS TotalAmount, trans.alloc AS Allocated, - ((trans.type = 20 OR trans.type = 21) AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue, + ((trans.type = ".ST_SUPPINVOICE." OR trans.type = ".ST_SUPPCREDIT.") AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue, (ABS(trans.ov_amount + trans.ov_gst + trans.ov_discount - trans.alloc) <= 0.005) AS Settled FROM ".TB_PREF."supp_trans as trans, ".TB_PREF."suppliers as supplier WHERE supplier.supplier_id = trans.supplier_id AND trans.tran_date >= '$date_after' AND trans.tran_date <= '$date_to' AND trans.ov_amount != 0"; // exclude voided transactions - if ($_POST['supplier_id'] != reserved_words::get_all()) + if ($_POST['supplier_id'] != ALL_TEXT) $sql .= " AND trans.supplier_id = ".db_escape($_POST['supplier_id']); - if (isset($_POST['filterType']) && $_POST['filterType'] != reserved_words::get_all()) + if (isset($_POST['filterType']) && $_POST['filterType'] != ALL_TEXT) { if (($_POST['filterType'] == '1')) { - $sql .= " AND (trans.type = 20 OR trans.type = 2)"; + $sql .= " AND (trans.type = ".ST_SUPPINVOICE." OR trans.type = ".ST_BANKDEPOSIT.")"; } elseif (($_POST['filterType'] == '2')) { - $sql .= " AND trans.type = 20 "; + $sql .= " AND trans.type = ".ST_SUPPINVOICE." "; } elseif ($_POST['filterType'] == '3') { - $sql .= " AND (trans.type = 22 OR trans.type = 1) "; + $sql .= " AND (trans.type = ".ST_SUPPAYMENT." OR trans.type = ".ST_BANKPAYMENT.") "; } elseif (($_POST['filterType'] == '4') || ($_POST['filterType'] == '5')) { - $sql .= " AND trans.type = 21 "; + $sql .= " AND trans.type = ".ST_SUPPCREDIT." "; } if (($_POST['filterType'] == '2') || ($_POST['filterType'] == '5')) @@ -220,7 +220,7 @@ $cols = array( array('insert'=>true, 'fun'=>'credit_link') ); -if ($_POST['supplier_id'] != reserved_words::get_all()) +if ($_POST['supplier_id'] != ALL_TEXT) { $cols[_("Supplier")] = 'skip'; $cols[_("Currency")] = 'skip'; @@ -232,12 +232,7 @@ if ($_POST['supplier_id'] != reserved_words::get_all()) $table =& new_db_pager('trans_tbl', $sql, $cols); $table->set_marker('check_overdue', _("Marked items are overdue.")); -if (get_post('RefreshInquiry')) { - $table->set_sql($sql); - $table->set_columns($cols); -} $table->width = "85%"; -start_form(); display_db_pager($table); diff --git a/purchasing/manage/suppliers.php b/purchasing/manage/suppliers.php index 42b386be..0c94f251 100644 --- a/purchasing/manage/suppliers.php +++ b/purchasing/manage/suppliers.php @@ -9,11 +9,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security=5; -$path_to_root="../.."; +$page_security = 'SA_SUPPLIER'; +$path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("Suppliers")); +page(_($help_context = "Suppliers"), @$_REQUEST['popup']); //include($path_to_root . "/includes/date_functions.inc"); @@ -45,6 +45,13 @@ if (isset($_POST['submit'])) set_focus('supp_name'); } + if (strlen($_POST['supp_ref']) == 0 || $_POST['supp_ref'] == "") + { + $input_error = 1; + display_error(_("The supplier short name must be entered.")); + set_focus('supp_ref'); + } + if ($input_error !=1 ) { @@ -52,9 +59,11 @@ if (isset($_POST['submit'])) { $sql = "UPDATE ".TB_PREF."suppliers SET supp_name=".db_escape($_POST['supp_name']) . ", + supp_ref=".db_escape($_POST['supp_ref']) . ", address=".db_escape($_POST['address']) . ", supp_address=".db_escape($_POST['supp_address']) . ", phone=".db_escape($_POST['phone']) . ", + phone2=".db_escape($_POST['phone2']) . ", fax=".db_escape($_POST['fax']) . ", gst_no=".db_escape($_POST['gst_no']) . ", email=".db_escape($_POST['email']) . ", @@ -74,18 +83,24 @@ if (isset($_POST['submit'])) tax_group_id=".db_escape($_POST['tax_group_id']) . " WHERE supplier_id = ".db_escape($_POST['supplier_id']); db_query($sql,"The supplier could not be updated"); + update_record_status($_POST['supplier_id'], $_POST['inactive'], + 'suppliers', 'supplier_id'); + + $Ajax->activate('supplier_id'); // in case of status change display_notification(_("Supplier has been updated.")); } else { - $sql = "INSERT INTO ".TB_PREF."suppliers (supp_name, address, supp_address, phone, fax, gst_no, email, website, + $sql = "INSERT INTO ".TB_PREF."suppliers (supp_name, supp_ref, address, supp_address, phone, phone2, fax, gst_no, email, website, contact, supp_account_no, bank_account, credit_limit, dimension_id, dimension2_id, curr_code, payment_terms, payable_account, purchase_account, payment_discount_account, notes, tax_group_id) VALUES (".db_escape($_POST['supp_name']). ", " + .db_escape($_POST['supp_ref']). ", " .db_escape($_POST['address']) . ", " .db_escape($_POST['supp_address']) . ", " .db_escape($_POST['phone']). ", " + .db_escape($_POST['phone2']). ", " .db_escape($_POST['fax']). ", " .db_escape($_POST['gst_no']). ", " .db_escape($_POST['email']). ", " @@ -152,10 +167,6 @@ elseif (isset($_POST['delete']) && $_POST['delete'] != "") $Ajax->activate('_page_body'); } //end if Delete supplier } -elseif (isset($_POST['select'])) -{ - context_return(array('supplier_id' => $_POST['supplier_id'])); -} start_form(); @@ -163,9 +174,16 @@ if (db_has_suppliers()) { start_table("", 3); // start_table("class = 'tablestyle_noborder'"); - supplier_list_row(_("Select a supplier: "), 'supplier_id', null, - _('New supplier'), true); + start_row(); + supplier_list_cells(_("Select a supplier: "), 'supplier_id', null, + _('New supplier'), true, check_value('show_inactive')); + check_cells(_("Show inactive:"), 'show_inactive', null, true); + end_row(); end_table(); + if (get_post('_show_inactive_update')) { + $Ajax->activate('supplier_id'); + set_focus('supplier_id'); + } } else { @@ -182,9 +200,11 @@ if (!$new_supplier) $myrow = get_supplier($_POST['supplier_id']); $_POST['supp_name'] = $myrow["supp_name"]; + $_POST['supp_ref'] = $myrow["supp_ref"]; $_POST['address'] = $myrow["address"]; $_POST['supp_address'] = $myrow["supp_address"]; $_POST['phone'] = $myrow["phone"]; + $_POST['phone2'] = $myrow["phone2"]; $_POST['fax'] = $myrow["fax"]; $_POST['gst_no'] = $myrow["gst_no"]; $_POST['email'] = $myrow["email"]; @@ -202,16 +222,17 @@ if (!$new_supplier) $_POST['purchase_account'] = $myrow["purchase_account"]; $_POST['payment_discount_account'] = $myrow["payment_discount_account"]; $_POST['notes'] = $myrow["notes"]; - + $_POST['inactive'] = $myrow["inactive"]; } else { - $_POST['supp_name'] = $_POST['address'] = $_POST['supp_address'] = $_POST['tax_group_id'] = - $_POST['website'] = $_POST['supp_account_no'] = $_POST['notes'] = ''; + $_POST['supp_name'] = $_POST['supp_ref'] = $_POST['address'] = $_POST['supp_address'] = + $_POST['tax_group_id'] = $_POST['website'] = $_POST['supp_account_no'] = $_POST['notes'] = ''; $_POST['dimension_id'] = 0; $_POST['dimension2_id'] = 0; $_POST['sales_type'] = -1; - $_POST['email'] = $_POST['phone'] = $_POST['fax'] = $_POST['gst_no'] = $_POST['contact'] = $_POST['bank_account'] = ''; + $_POST['email'] = $_POST['phone'] = $_POST['phone2'] = $_POST['fax'] = + $_POST['gst_no'] = $_POST['contact'] = $_POST['bank_account'] = ''; $_POST['payment_terms'] = ''; $_POST['credit_limit'] = price_format(0); @@ -220,15 +241,18 @@ else $_POST['payable_account'] = $company_record["creditors_act"]; $_POST['purchase_account'] = $company_record["default_cogs_act"]; $_POST['payment_discount_account'] = $company_record['pyt_discount_act']; + $_POST['inactive'] = 0; } table_section_title(_("Name and Contact")); text_row(_("Supplier Name:"), 'supp_name', null, 42, 40); +text_row(_("Supplier Short Name:"), 'supp_ref', null, 30, 30); text_row(_("Contact Person:"), 'contact', null, 42, 40); -text_row(_("Phone Number:"), 'phone', null, 42, 40); -text_row(_("Fax Number:"), 'fax', null, 42, 40); +text_row(_("Phone Number:"), 'phone', null, 32, 30); +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); link_row(_("Website:"), 'website', null, 35, 55); @@ -281,6 +305,7 @@ if ($dim < 2) hidden('dimension2_id', 0); table_section_title(_("General")); textarea_row(_("General Notes:"), 'notes', null, 35, 5); +record_status_list_row(_("Supplier status:"), 'inactive'); end_outer_table(1); @@ -288,16 +313,17 @@ div_start('controls'); if (!$new_supplier) { submit_center_first('submit', _("Update Supplier"), - _('Update supplier data'), true); - submit_return('select', _("Return"), _("Select this supplier and return to document entry."), true); + _('Update supplier data'), @$_REQUEST['popup'] ? true : 'default'); + submit_return('select', get_post('supplier_id'), _("Select this supplier and return to document entry.")); submit_center_last('delete', _("Delete Supplier"), _('Delete supplier data if have been never used'), true); } else { - submit_center('submit', _("Add New Supplier Details"), true, '', true); + submit_center('submit', _("Add New Supplier Details"), true, '', 'default'); } div_end(); +hidden('popup', @$_REQUEST['popup']); end_form(); end_page(); diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php index 6f5fe76f..988c90fa 100644 --- a/purchasing/po_entry_items.php +++ b/purchasing/po_entry_items.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 4; -$path_to_root=".."; +$page_security = 'SA_PURCHASEORDER'; +$path_to_root = ".."; include_once($path_to_root . "/purchasing/includes/po_class.inc"); include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc"); @@ -24,11 +24,11 @@ if ($use_date_picker) if (isset($_GET['ModifyOrderNumber'])) { - page(_("Modify Purchase Order #") . $_GET['ModifyOrderNumber'], false, false, "", $js); + page(_($help_context = "Modify Purchase Order #") . $_GET['ModifyOrderNumber'], false, false, "", $js); } else { - page(_("Purchase Order Entry"), false, false, "", $js); + page(_($help_context = "Purchase Order Entry"), false, false, "", $js); } //--------------------------------------------------------------------------------------------------- @@ -38,39 +38,21 @@ check_db_has_suppliers(_("There are no suppliers defined in the system.")); check_db_has_purchasable_items(_("There are no purchasable inventory items defined in the system.")); //--------------------------------------------------------------------------------------------------------------- -if ($ret = context_restore()) { - // return from supplier/items editors - copy_from_cart(); - if(isset($ret['supplier_id'])) - $_POST['supplier_id'] = $ret['supplier_id']; - if(isset($ret['stock_id'])) { - $_POST['stock_id'] = $_POST['_stock_id_edit'] = $ret['stock_id']; - set_focus('qty'); - } -} -if (isset($_POST['_supplier_id_editor'])) { - copy_to_cart(); - context_call($path_to_root.'/purchasing/manage/suppliers.php?supplier_id='.$_POST['supplier_id'], 'PO'); -} - -if (isset($_POST['_stock_id_editor'])) { - copy_to_cart(); - context_call($path_to_root.'/inventory/manage/items.php?stock_id='.$_POST['stock_id'], 'PO'); -} -//------------------------------------------------------------------------------ if (isset($_GET['AddedID'])) { $order_no = $_GET['AddedID']; - $trans_type = systypes::po(); + $trans_type = ST_PURCHORDER; if (!isset($_GET['Updated'])) display_notification_centered(_("Purchase Order has been entered")); else display_notification_centered(_("Purchase Order has been updated") . " #$order_no"); - display_note(get_trans_view_str($trans_type, $order_no, _("&View this order"))); - echo '
      '; - display_note(print_document_link($order_no, _("&Print This Order"), true, $trans_type)); + display_note(get_trans_view_str($trans_type, $order_no, _("&View this order")), 0, 1); + + display_note(print_document_link($order_no, _("&Print This Order"), true, $trans_type), 0, 1); + + display_note(print_document_link($order_no, _("&Email This Order"), true, $trans_type, false, "", "", 1)); hyperlink_params($path_to_root . "/purchasing/po_receive_items.php", _("&Receive Items on this Purchase Order"), "PONumber=$order_no"); @@ -154,12 +136,15 @@ function handle_cancel_po() if($_SESSION['PO']->order_no != 0) { delete_po($_SESSION['PO']->order_no); - } + } else { + unset($_SESSION['PO']); + meta_forward($path_to_root.'/index.php','application=AP'); + } $_SESSION['PO']->clear_items(); $_SESSION['PO'] = new purch_order; - display_note(_("This purchase order has been cancelled."), 0, 1); + display_notification(_("This purchase order has been cancelled.")); hyperlink_params($path_to_root . "/purchasing/po_entry_items.php", _("Enter a new purchase order"), "NewOrder=Yes"); echo "
      "; @@ -276,6 +261,8 @@ function handle_add_new_item() function can_commit() { + global $Refs; + if (!is_date($_POST['OrderDate'])) { display_error(_("The entered order date is invalid.")); @@ -285,14 +272,14 @@ function can_commit() if (!$_SESSION['PO']->order_no) { - if (!references::is_valid(get_post('ref'))) + if (!$Refs->is_valid(get_post('ref'))) { display_error(_("There is no reference entered for this purchase order.")); set_focus('ref'); return false; } - if (!is_new_reference(get_post('ref'), systypes::po())) + if (!is_new_reference(get_post('ref'), ST_PURCHORDER)) { display_error(_("The entered reference is already in use.")); set_focus('ref'); @@ -337,7 +324,7 @@ function handle_commit_order() /*its a new order to be inserted */ $order_no = add_po($_SESSION['PO']); - + new_doc_date($_SESSION['PO']->orig_order_date); unset($_SESSION['PO']); meta_forward($_SERVER['PHP_SELF'], "AddedID=$order_no"); @@ -384,7 +371,7 @@ if (isset($_GET['ModifyOrderNumber']) && $_GET['ModifyOrderNumber'] != "") /*read in all the selected order into the Items cart */ read_po($_SESSION['PO']->order_no, $_SESSION['PO']); - + copy_from_cart(); } @@ -397,7 +384,7 @@ if (isset($_GET['NewOrder'])) //--------------------------------------------------------------------------------------------------- -start_form(false, true); +start_form(); display_po_header($_SESSION['PO']); echo "
      "; @@ -413,13 +400,13 @@ div_start('controls', 'items_table'); if ($_SESSION['PO']->order_has_items()) { if ($_SESSION['PO']->order_no) - submit_center_first('Commit', _("Update Order"), '', true); + submit_center_first('Commit', _("Update Order"), '', 'default'); else - submit_center_first('Commit', _("Place Order"), '', true); + submit_center_first('Commit', _("Place Order"), '', 'default'); submit_center_last('CancelOrder', _("Cancel Order")); } else - submit_center('CancelOrder', _("Cancel Order")); + submit_center('CancelOrder', _("Cancel Order"), true, false, 'cancel'); div_end(); //--------------------------------------------------------------------------------------------------- diff --git a/purchasing/po_receive_items.php b/purchasing/po_receive_items.php index c2cf62ec..bfb8371c 100644 --- a/purchasing/po_receive_items.php +++ b/purchasing/po_receive_items.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 11; -$path_to_root=".."; +$page_security = 'SA_GRN'; +$path_to_root = ".."; include_once($path_to_root . "/purchasing/includes/po_class.inc"); include_once($path_to_root . "/includes/session.inc"); @@ -22,23 +22,21 @@ if ($use_popup_windows) $js .= get_js_open_window(900, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Receive Purchase Order Items"), false, false, "", $js); +page(_($help_context = "Receive Purchase Order Items"), false, false, "", $js); //--------------------------------------------------------------------------------------------------------------- if (isset($_GET['AddedID'])) { $grn = $_GET['AddedID']; - $trans_type = 25; + $trans_type = ST_SUPPRECEIVE; display_notification_centered(_("Purchase Order Delivery has been processed")); display_note(get_trans_view_str($trans_type, $grn, _("&View this Delivery"))); - //echo "
      "; - //echo get_gl_view_str(25, $grn, _("View the GL &Journal Entries for this Delivery")); + hyperlink_params("$path_to_root/purchasing/supplier_invoice.php", _("Entry purchase &invoice for this receival"), "New=1"); -// echo "
      "; hyperlink_no_params("$path_to_root/purchasing/inquiry/po_search.php", _("Select a different &purchase order for receiving items against")); display_footer_exit(); @@ -47,7 +45,6 @@ if (isset($_GET['AddedID'])) //-------------------------------------------------------------------------------------------------- if ((!isset($_GET['PONumber']) || $_GET['PONumber'] == 0) && !isset($_SESSION['PO'])) -//if (isset($_GET['PONumber']) && !$_GET['PONumber'] > 0 && !isset($_SESSION['PO'])) { die (_("This page can only be opened if a purchase order has been selected. Please select a purchase order first.")); } @@ -156,6 +153,8 @@ function check_po_changed() function can_process() { + global $SysPrefs, $Refs; + if (count($_SESSION['PO']->line_items) <= 0) { display_error(_("There is nothing to process. Please enter valid quantities greater than zero.")); @@ -169,14 +168,14 @@ function can_process() return false; } - if (!references::is_valid($_POST['ref'])) + if (!$Refs->is_valid($_POST['ref'])) { display_error(_("You must enter a reference.")); set_focus('ref'); return false; } - if (!is_new_reference($_POST['ref'], 25)) + if (!is_new_reference($_POST['ref'], ST_SUPPRECEIVE)) { display_error(_("The entered reference is already in use.")); set_focus('ref'); @@ -198,7 +197,7 @@ function can_process() foreach ($_SESSION['PO']->line_items as $order_line) { if ($order_line->receive_qty+$order_line->qty_received > - $order_line->quantity * (1+ (sys_prefs::over_receive_allowance() / 100))) + $order_line->quantity * (1+ ($SysPrefs->over_receive_allowance() / 100))) { $delivery_qty_too_large = 1; break; @@ -212,7 +211,7 @@ function can_process() } elseif ($delivery_qty_too_large == 1) { - display_error(_("Entered quantities cannot be greater than the quantity entered on the purchase order including the allowed over-receive percentage") . " (" . sys_prefs::over_receive_allowance() ."%)." + display_error(_("Entered quantities cannot be greater than the quantity entered on the purchase order including the allowed over-receive percentage") . " (" . $SysPrefs->over_receive_allowance() ."%)." . "
      " . _("Modify the ordered items on the purchase order if you wish to increase the quantities.")); return false; @@ -248,6 +247,7 @@ function process_receive_po() $grn = add_grn($_SESSION['PO'], $_POST['DefaultReceivedDate'], $_POST['ref'], $_POST['Location']); + new_doc_date($_POST['DefaultReceivedDate']); unset($_SESSION['PO']->line_items); unset($_SESSION['PO']); @@ -280,7 +280,7 @@ if (isset($_POST['Update']) || isset($_POST['ProcessGoodsReceived'])) $_POST[$line->line_no] = number_format2(0, get_qty_dec($line->stock_id)); if (!isset($_POST['DefaultReceivedDate']) || $_POST['DefaultReceivedDate'] == "") - $_POST['DefaultReceivedDate'] = Today(); + $_POST['DefaultReceivedDate'] = new_doc_date(); $_SESSION['PO']->line_items[$line->line_no]->receive_qty = input_num($line->line_no); @@ -302,7 +302,7 @@ if (isset($_POST['ProcessGoodsReceived'])) //-------------------------------------------------------------------------------------------------- -start_form(false, true); +start_form(); display_grn_summary($_SESSION['PO'], true); display_heading(_("Items to Receive")); @@ -310,7 +310,7 @@ display_po_receive_items(); echo '
      '; submit_center_first('Update', _("Update"), '', true); -submit_center_last('ProcessGoodsReceived', _("Process Receive Items"), _("Process Receive Items"), true); +submit_center_last('ProcessGoodsReceived', _("Process Receive Items"), _("Clear all GL entry fields"), 'default'); end_form(); diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php index 1f615ec9..1a8d63e9 100644 --- a/purchasing/supplier_credit.php +++ b/purchasing/supplier_credit.php @@ -9,12 +9,11 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$path_to_root=".."; +$page_security = 'SA_SUPPLIERCREDIT'; +$path_to_root = ".."; include_once($path_to_root . "/purchasing/includes/supp_trans_class.inc"); -$page_security=5; - include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/includes/data_checks.inc"); @@ -26,30 +25,18 @@ if ($use_popup_windows) $js .= get_js_open_window(900, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Supplier Credit Note"), false, false, "", $js); +page(_($help_context = "Supplier Credit Note"), false, false, "", $js); //---------------------------------------------------------------------------------------- check_db_has_suppliers(_("There are no suppliers defined in the system.")); -//--------------------------------------------------------------------------------------------------------------- -if ($ret = context_restore()) { - // return from supplier editor - copy_from_trans($_SESSION['supp_trans']); - if(isset($ret['supplier_id'])) - $_POST['supplier_id'] = $ret['supplier_id']; -} -if (isset($_POST['_supplier_id_editor'])) { - copy_to_trans($_SESSION['supp_trans']); - context_call($path_to_root.'/purchasing/manage/suppliers.php?supplier_id='.$_POST['supplier_id'], 'supp_trans'); -} - //--------------------------------------------------------------------------------------------------------------- if (isset($_GET['AddedID'])) { $invoice_no = $_GET['AddedID']; - $trans_type = 21; + $trans_type = ST_SUPPCREDIT; echo "
      "; @@ -150,7 +137,7 @@ if (isset($_POST['AddGLCodeToTrans'])){ function check_data() { - global $total_grn_value, $total_gl_value; + global $total_grn_value, $total_gl_value, $Refs; if (!$_SESSION['supp_trans']->is_valid_trans_to_post()) { @@ -159,21 +146,21 @@ function check_data() return false; } - if (!references::is_valid($_SESSION['supp_trans']->reference)) + if (!$Refs->is_valid($_SESSION['supp_trans']->reference)) { display_error(_("You must enter an credit note reference.")); set_focus('reference'); return false; } - if (!is_new_reference($_SESSION['supp_trans']->reference, 21)) + if (!is_new_reference($_SESSION['supp_trans']->reference, ST_SUPPCREDIT)) { display_error(_("The entered reference is already in use.")); set_focus('reference'); return false; } - if (!references::is_valid($_SESSION['supp_trans']->supp_reference)) + if (!$Refs->is_valid($_SESSION['supp_trans']->supp_reference)) { display_error(_("You must enter a supplier's credit note reference.")); set_focus('supp_reference'); @@ -325,7 +312,7 @@ if (isset($_POST['go'])) //-------------------------------------------------------------------------------------------------- -start_form(false, true); +start_form(); invoice_header($_SESSION['supp_trans']); if ($_POST['supplier_id']=='') @@ -354,7 +341,7 @@ if (get_post('AddGLCodeToTrans')) $Ajax->activate('inv_tot'); br(); -submit_center('PostCreditNote', _("Enter Credit Note"), true, '', true); +submit_center('PostCreditNote', _("Enter Credit Note"), true, '', 'default'); br(); end_form(); diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php index ab2409d9..34406781 100644 --- a/purchasing/supplier_invoice.php +++ b/purchasing/supplier_invoice.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security=5; -$path_to_root=".."; +$page_security = 'SA_SUPPLIERINVOICE'; +$path_to_root = ".."; include_once($path_to_root . "/purchasing/includes/purchasing_db.inc"); @@ -25,31 +25,18 @@ if ($use_popup_windows) $js .= get_js_open_window(900, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Enter Supplier Invoice"), false, false, "", $js); - +page(_($help_context = "Enter Supplier Invoice"), false, false, "", $js); //---------------------------------------------------------------------------------------- check_db_has_suppliers(_("There are no suppliers defined in the system.")); -//--------------------------------------------------------------------------------------------------------------- -if ($ret = context_restore()) { - // return from supplier editor - copy_from_trans($_SESSION['supp_trans']); - if(isset($ret['supplier_id'])) - $_POST['supplier_id'] = $ret['supplier_id']; -} -if (isset($_POST['_supplier_id_editor'])) { - copy_to_trans($_SESSION['supp_trans']); - context_call($path_to_root.'/purchasing/manage/suppliers.php?supplier_id='.$_POST['supplier_id'], 'supp_trans'); -} - //--------------------------------------------------------------------------------------------------------------- if (isset($_GET['AddedID'])) { $invoice_no = $_GET['AddedID']; - $trans_type = 20; + $trans_type = ST_SUPPINVOICE; echo "
      "; @@ -58,6 +45,8 @@ if (isset($_GET['AddedID'])) display_note(get_gl_view_str($trans_type, $invoice_no, _("View the GL Journal Entries for this Invoice")), 1); + hyperlink_no_params("$path_to_root/purchasing/supplier_payment.php", _("Entry supplier &payment for this invoice")); + hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Invoice"), "New=1"); hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$trans_type&trans_no=$invoice_no"); @@ -149,27 +138,29 @@ if (isset($_POST['AddGLCodeToTrans'])){ function check_data() { - If (!$_SESSION['supp_trans']->is_valid_trans_to_post()) + global $Refs; + + if (!$_SESSION['supp_trans']->is_valid_trans_to_post()) { display_error(_("The invoice cannot be processed because the there are no items or values on the invoice. Invoices are expected to have a charge.")); return false; } - if (!references::is_valid($_SESSION['supp_trans']->reference)) + if (!$Refs->is_valid($_SESSION['supp_trans']->reference)) { display_error(_("You must enter an invoice reference.")); set_focus('reference'); return false; } - if (!is_new_reference($_SESSION['supp_trans']->reference, 20)) + if (!is_new_reference($_SESSION['supp_trans']->reference, ST_SUPPINVOICE)) { display_error(_("The entered reference is already in use.")); set_focus('reference'); return false; } - if (!references::is_valid($_SESSION['supp_trans']->supp_reference)) + if (!$Refs->is_valid($_SESSION['supp_trans']->supp_reference)) { display_error(_("You must enter a supplier's invoice reference.")); set_focus('supp_reference'); @@ -239,7 +230,7 @@ if (isset($_POST['PostInvoice'])) function check_item_data($n) { global $check_price_charged_vs_order_price, - $check_qty_charged_vs_del_qty; + $check_qty_charged_vs_del_qty, $SysPrefs; if (!check_num('this_quantity_inv'.$n, 0) || input_num('this_quantity_inv'.$n)==0) { display_error( _("The quantity to invoice must be numeric and greater than zero.")); @@ -254,15 +245,16 @@ function check_item_data($n) return false; } + $margin = $SysPrefs->over_charge_allowance(); if ($check_price_charged_vs_order_price == True) { if ($_POST['order_price'.$n]!=input_num('ChgPrice'.$n)) { if ($_POST['order_price'.$n]==0 || input_num('ChgPrice'.$n)/$_POST['order_price'.$n] > - (1 + (sys_prefs::over_charge_allowance() / 100))) + (1 + ($margin/ 100))) { display_error(_("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.") . - _("The over-charge percentage allowance is :") . sys_prefs::over_charge_allowance() . "%"); + _("The over-charge percentage allowance is :") . $margin . "%"); set_focus('ChgPrice'.$n); return false; } @@ -272,10 +264,10 @@ function check_item_data($n) if ($check_qty_charged_vs_del_qty == True) { if (input_num('this_quantity_inv'.$n) / ($_POST['qty_recd'.$n] - $_POST['prev_quantity_inv'.$n]) > - (1+ (sys_prefs::over_charge_allowance() / 100))) + (1+ ($margin / 100))) { display_error( _("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 this. See the system administrator to modify the set up parameters if necessary.") - . _("The over-charge percentage allowance is :") . sys_prefs::over_charge_allowance() . "%"); + . _("The over-charge percentage allowance is :") . $margin . "%"); set_focus('this_quantity_inv'.$n); return false; } @@ -345,7 +337,7 @@ if ($id4 != -1) } $id2 = -1; -if ($_SESSION["wa_current_user"]->access == 2) +if ($_SESSION["wa_current_user"]->can_access('SA_GRNDELETE')) { $id2 = find_submit('void_item_id'); if ($id2 != -1) @@ -367,7 +359,7 @@ if ($_SESSION["wa_current_user"]->access == 2) update_average_material_cost($grn["supplier_id"], $myrow["item_code"], $myrow["unit_price"], -$myrow["QtyOstdg"], Today()); - add_stock_move(25, $myrow["item_code"], $myrow['grn_batch_id'], $grn['loc_code'], sql2date($grn["delivery_date"]), "", + add_stock_move(ST_SUPPRECEIVE, $myrow["item_code"], $myrow['grn_batch_id'], $grn['loc_code'], sql2date($grn["delivery_date"]), "", -$myrow["QtyOstdg"], $myrow['std_cost_unit'], $grn["supplier_id"], 1, $myrow['unit_price']); commit_transaction(); @@ -384,7 +376,7 @@ if (isset($_POST['go'])) $Ajax->activate('inv_tot'); } -start_form(false, true); +start_form(); invoice_header($_SESSION['supp_trans']); @@ -416,7 +408,7 @@ if (get_post('AddGLCodeToTrans')) $Ajax->activate('inv_tot'); br(); -submit_center('PostInvoice', _("Enter Invoice"), true, '', true); +submit_center('PostInvoice', _("Enter Invoice"), true, '', 'default'); br(); end_form(); diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php index 82ad2750..68ed1c8f 100644 --- a/purchasing/supplier_payment.php +++ b/purchasing/supplier_payment.php @@ -9,23 +9,26 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$path_to_root=".."; -$page_security = 5; +$page_security = 'SA_SUPPLIERPAYMNT'; +$path_to_root = ".."; +include_once($path_to_root . "/includes/ui/allocation_cart.inc"); include_once($path_to_root . "/includes/session.inc"); - include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); include_once($path_to_root . "/includes/banking.inc"); include_once($path_to_root . "/includes/data_checks.inc"); - +//include_once($path_to_root . "/purchasing/includes/ui/supp_alloc_ui.inc"); include_once($path_to_root . "/purchasing/includes/purchasing_db.inc"); + $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Supplier Payment Entry"), false, false, "", $js); +add_js_file('payalloc.js'); + +page(_($help_context = "Supplier Payment Entry"), false, false, "", $js); if (isset($_GET['supplier_id'])) { @@ -39,18 +42,25 @@ check_db_has_suppliers(_("There are no suppliers defined in the system.")); check_db_has_bank_accounts(_("There are no bank accounts defined in the system.")); //---------------------------------------------------------------------------------------- -if ($ret = context_restore()) { - if(isset($ret['supplier_id'])) - $_POST['supplier_id'] = $ret['supplier_id']; -} -if (isset($_POST['_supplier_id_editor'])) { - context_call($path_to_root.'/purchasing/manage/suppliers.php?supplier_id='.$_POST['supplier_id'], - array( 'supplier_id', 'bank_account', 'DatePaid', 'ref', 'amount', - 'discount', 'memo_') ); + +if (!isset($_POST['supplier_id'])) + $_POST['supplier_id'] = get_global_supplier(false); + +if (!isset($_POST['DatePaid'])) +{ + $_POST['DatePaid'] = new_doc_date(); + if (!is_date_in_fiscalyear($_POST['DatePaid'])) + $_POST['DatePaid'] = end_fiscalyear(); } + if (isset($_POST['_DatePaid_changed'])) { $Ajax->activate('_ex_rate'); } + +if (list_updated('supplier_id') || list_updated('bank_account')) { + $_SESSION['alloc']->read(); + $Ajax->activate('alloc_tbl'); +} //---------------------------------------------------------------------------------------- if (isset($_GET['AddedID'])) @@ -61,7 +71,7 @@ if (isset($_GET['AddedID'])) display_note(get_gl_view_str(22, $payment_id, _("View the GL &Journal Entries for this Payment"))); - hyperlink_params($path_to_root . "/purchasing/allocations/supplier_allocate.php", _("&Allocate this Payment"), "trans_no=$payment_id&trans_type=22"); +// hyperlink_params($path_to_root . "/purchasing/allocations/supplier_allocate.php", _("&Allocate this Payment"), "trans_no=$payment_id&trans_type=22"); hyperlink_params($_SERVER['PHP_SELF'], _("Enter another supplier &payment"), "supplier_id=" . $_POST['supplier_id']); @@ -70,64 +80,10 @@ if (isset($_GET['AddedID'])) //---------------------------------------------------------------------------------------- -function display_controls() -{ - global $table_style2; - start_form(false, true); - - if (!isset($_POST['supplier_id'])) - $_POST['supplier_id'] = get_global_supplier(false); - if (!isset($_POST['DatePaid'])) - { - $_POST['DatePaid'] = Today(); - if (!is_date_in_fiscalyear($_POST['DatePaid'])) - $_POST['DatePaid'] = end_fiscalyear(); - } - start_outer_table($table_style2, 5); - - table_section(1); - - bank_accounts_list_row(_("From Bank Account:"), 'bank_account', null, true); - - amount_row(_("Amount of Payment:"), 'amount'); - amount_row(_("Amount of Discount:"), 'discount'); - - date_row(_("Date Paid") . ":", 'DatePaid', '', null, 0, 0, 0, null, true); - - table_section(2); - - supplier_list_row(_("Payment To:"), 'supplier_id', null, false, true); - - set_global_supplier($_POST['supplier_id']); - - $comp_currency = get_company_currency(); - $supplier_currency = get_supplier_currency($_POST['supplier_id']); - $bank_currency = get_bank_account_currency($_POST['bank_account']); - if ($bank_currency != $supplier_currency) - { - exchange_rate_display($bank_currency, $supplier_currency, $_POST['DatePaid'], ($bank_currency == $comp_currency)); - } - - ref_row(_("Reference:"), 'ref', '', references::get_next(22)); - - text_row(_("Memo:"), 'memo_', null, 52,50); - - end_outer_table(1); // outer table - - submit_center('ProcessSuppPayment',_("Enter Payment"), true, '', true); - - if ($bank_currency != $supplier_currency) - { - display_note(_("The amount and discount are in the bank account's currency."), 2, 0); - } - - end_form(); -} - -//---------------------------------------------------------------------------------------- - function check_inputs() { + global $Refs; + if ($_POST['amount'] == "") { $_POST['amount'] = price_format(0); @@ -140,6 +96,21 @@ function check_inputs() return false; } + if (isset($_POST['charge']) && !check_num('charge', 0)) { + display_error(_("The entered amount is invalid or less than zero.")); + set_focus('charge'); + return false; + } + + if (isset($_POST['charge']) && input_num('charge') > 0) { + $charge_acct = get_company_pref('bank_charge_act'); + if (get_gl_account($charge_acct) == false) { + display_error(_("The Bank Charge Account has not been set in System and General GL Setup.")); + set_focus('charge'); + return false; + } + } + if (isset($_POST['_ex_rate']) && !check_num('_ex_rate', 0.000001)) { display_error(_("The exchange rate must be numeric and greater than zero.")); @@ -178,21 +149,26 @@ function check_inputs() set_focus('DatePaid'); return false; } - if (!references::is_valid($_POST['ref'])) + if (!$Refs->is_valid($_POST['ref'])) { display_error(_("You must enter a reference.")); set_focus('ref'); return false; } - if (!is_new_reference($_POST['ref'], 22)) + if (!is_new_reference($_POST['ref'], ST_SUPPAYMENT)) { display_error(_("The entered reference is already in use.")); set_focus('ref'); return false; } - return true; + $_SESSION['alloc']->amount = -input_num('amount'); + + if (isset($_POST["TotalNumberOfAllocs"])) + return check_allocations(); + else + return true; } //---------------------------------------------------------------------------------------- @@ -209,8 +185,11 @@ function handle_add_payment() $payment_id = add_supp_payment($_POST['supplier_id'], $_POST['DatePaid'], $_POST['bank_account'], input_num('amount'), input_num('discount'), - $_POST['ref'], $_POST['memo_'], $rate); + $_POST['ref'], $_POST['memo_'], $rate, input_num('charge')); + new_doc_date($_POST['DatePaid']); + $_SESSION['alloc']->trans_no = $payment_id; + $_SESSION['alloc']->write(); //unset($_POST['supplier_id']); unset($_POST['bank_account']); unset($_POST['DatePaid']); @@ -236,7 +215,63 @@ if (isset($_POST['ProcessSuppPayment'])) } } -display_controls(); +//---------------------------------------------------------------------------------------- + +start_form(); + + start_outer_table("$table_style2 width=60%", 5); + + table_section(1); + + supplier_list_row(_("Payment To:"), 'supplier_id', null, false, true); + + if (!isset($_POST['bank_account'])) // first page call + $_SESSION['alloc'] = new allocation(ST_SUPPAYMENT, 0); + + set_global_supplier($_POST['supplier_id']); + + bank_accounts_list_row(_("From Bank Account:"), 'bank_account', null, true); + + table_section(2); + + ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_SUPPAYMENT)); + + date_row(_("Date Paid") . ":", 'DatePaid', '', true, 0, 0, 0, null, true); + + table_section(3); + + $supplier_currency = get_supplier_currency($_POST['supplier_id']); + $bank_currency = get_bank_account_currency($_POST['bank_account']); + if ($bank_currency != $supplier_currency) + { + exchange_rate_display($bank_currency, $supplier_currency, $_POST['DatePaid'], true); + } + + amount_row(_("Bank Charge:"), 'charge'); + + + end_outer_table(1); // outer table + + if ($bank_currency == $supplier_currency) { + div_start('alloc_tbl'); + show_allocatable(false); + div_end(); + } + + start_table("$table_style width=60%"); + amount_row(_("Amount of Discount:"), 'discount'); + amount_row(_("Amount of Payment:"), 'amount'); + textarea_row(_("Memo:"), 'memo_', null, 22, 4); + end_table(1); + + if ($bank_currency != $supplier_currency) + { + display_note(_("The amount and discount are in the bank account's currency."), 0, 1); + } + + submit_center('ProcessSuppPayment',_("Enter Payment"), true, '', 'default'); + +end_form(); end_page(); ?> diff --git a/purchasing/view/view_grn.php b/purchasing/view/view_grn.php index b0c37d7f..71b5d120 100644 --- a/purchasing/view/view_grn.php +++ b/purchasing/view/view_grn.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; -$path_to_root="../.."; +$page_security = 'SA_SUPPTRANSVIEW'; +$path_to_root = "../.."; include($path_to_root . "/purchasing/includes/po_class.inc"); include($path_to_root . "/includes/session.inc"); @@ -18,7 +18,7 @@ include($path_to_root . "/includes/session.inc"); $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 500); -page(_("View Purchase Order Delivery"), true, false, "", $js); +page(_($help_context = "View Purchase Order Delivery"), true, false, "", $js); include($path_to_root . "/purchasing/includes/purchasing_ui.inc"); @@ -72,7 +72,7 @@ label_row(_("Total Excluding Tax/Shipping"), $display_total, end_table(1); -is_voided_display(25, $_GET['trans_no'], _("This delivery has been voided.")); +is_voided_display(ST_SUPPRECEIVE, $_GET['trans_no'], _("This delivery has been voided.")); end_page(true); diff --git a/purchasing/view/view_po.php b/purchasing/view/view_po.php index 81028338..32bd576d 100644 --- a/purchasing/view/view_po.php +++ b/purchasing/view/view_po.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; -$path_to_root="../.."; +$page_security = 'SA_SUPPTRANSVIEW'; +$path_to_root = "../.."; include($path_to_root . "/purchasing/includes/po_class.inc"); include($path_to_root . "/includes/session.inc"); @@ -19,7 +19,7 @@ include($path_to_root . "/purchasing/includes/purchasing_ui.inc"); $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 500); -page(_("View Purchase Order"), true, false, "", $js); +page(_($help_context = "View Purchase Order"), true, false, "", $js); if (!isset($_GET['trans_no'])) @@ -82,7 +82,7 @@ foreach ($purchase_order->line_items as $stock_item) $display_total = number_format2($total,user_price_dec()); label_row(_("Total Excluding Tax/Shipping"), $display_total, - "align=right colspan=5", "nowrap align=right"); + "align=right colspan=5", "nowrap align=right", 3); end_table(); @@ -108,7 +108,7 @@ if (db_num_rows($grns_result) > 0) { alt_table_row_color($k); - label_cell(get_trans_view_str(25,$myrow["id"])); + label_cell(get_trans_view_str(ST_SUPPRECEIVE,$myrow["id"])); label_cell($myrow["reference"]); label_cell(sql2date($myrow["delivery_date"])); end_row(); diff --git a/purchasing/view/view_supp_credit.php b/purchasing/view/view_supp_credit.php index b83a24cc..c0d921ec 100644 --- a/purchasing/view/view_supp_credit.php +++ b/purchasing/view/view_supp_credit.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 1; -$path_to_root="../.."; +$page_security = 'SA_SUPPTRANSVIEW'; +$path_to_root = "../.."; include_once($path_to_root . "/purchasing/includes/purchasing_db.inc"); include_once($path_to_root . "/includes/session.inc"); @@ -20,7 +20,7 @@ include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc"); $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 500); -page(_("View Supplier Credit Note"), true, false, "", $js); +page(_($help_context = "View Supplier Credit Note"), true, false, "", $js); if (isset($_GET["trans_no"])) { @@ -34,7 +34,7 @@ elseif (isset($_POST["trans_no"])) $supp_trans = new supp_trans(); $supp_trans->is_invoice = false; -read_supp_invoice($trans_no, 21, $supp_trans); +read_supp_invoice($trans_no, ST_SUPPCREDIT, $supp_trans); display_heading(_("SUPPLIER CREDIT NOTE") . " # " . $trans_no); echo "
      "; @@ -49,7 +49,7 @@ label_cells(_("Invoice Date"), $supp_trans->tran_date, "class='tableheader2'"); label_cells(_("Due Date"), $supp_trans->due_date, "class='tableheader2'"); label_cells(_("Currency"), get_supplier_currency($supp_trans->supplier_id), "class='tableheader2'"); end_row(); -comments_display_row(21, $trans_no); +comments_display_row(ST_SUPPCREDIT, $trans_no); end_table(1); $total_gl = display_gl_items($supp_trans, 3); @@ -60,7 +60,7 @@ $display_sub_tot = number_format2($total_gl+$total_grn,user_price_dec()); start_table("$table_style width=95%"); label_row(_("Sub Total"), $display_sub_tot, "align=right", "nowrap align=right width=17%"); -$tax_items = get_trans_tax_details(21, $trans_no); +$tax_items = get_trans_tax_details(ST_SUPPCREDIT, $trans_no); display_supp_trans_tax_details($tax_items, 1); $display_total = number_format2(-($supp_trans->ov_amount + $supp_trans->ov_gst),user_price_dec()); @@ -68,11 +68,11 @@ label_row(_("TOTAL CREDIT NOTE"), $display_total, "colspan=1 align=right", "nowr end_table(1); -$voided = is_voided_display(21, $trans_no, _("This credit note has been voided.")); +$voided = is_voided_display(ST_SUPPCREDIT, $trans_no, _("This credit note has been voided.")); if (!$voided) { - display_allocations_from(payment_person_types::supplier(), $supp_trans->supplier_id, 21, $trans_no, -($supp_trans->ov_amount + $supp_trans->ov_gst)); + display_allocations_from(PT_SUPPLIER, $supp_trans->supplier_id, ST_SUPPCREDIT, $trans_no, -($supp_trans->ov_amount + $supp_trans->ov_gst)); } end_page(true); diff --git a/purchasing/view/view_supp_invoice.php b/purchasing/view/view_supp_invoice.php index 0380ccd0..ae97355f 100644 --- a/purchasing/view/view_supp_invoice.php +++ b/purchasing/view/view_supp_invoice.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 1; -$path_to_root="../.."; +$page_security = 'SA_SUPPTRANSVIEW'; +$path_to_root = "../.."; include_once($path_to_root . "/purchasing/includes/purchasing_db.inc"); include_once($path_to_root . "/includes/session.inc"); @@ -20,7 +20,7 @@ include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc"); $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 500); -page(_("View Supplier Invoice"), true, false, "", $js); +page(_($help_context = "View Supplier Invoice"), true, false, "", $js); if (isset($_GET["trans_no"])) { @@ -34,7 +34,7 @@ elseif (isset($_POST["trans_no"])) $supp_trans = new supp_trans(); $supp_trans->is_invoice = true; -read_supp_invoice($trans_no, 20, $supp_trans); +read_supp_invoice($trans_no, ST_SUPPINVOICE, $supp_trans); $supplier_curr_code = get_supplier_currency($supp_trans->supplier_id); @@ -53,7 +53,7 @@ label_cells(_("Due Date"), $supp_trans->due_date, "class='tableheader2'"); if (!is_company_currency($supplier_curr_code)) label_cells(_("Currency"), $supplier_curr_code, "class='tableheader2'"); end_row(); -comments_display_row(20, $trans_no); +comments_display_row(ST_SUPPINVOICE, $trans_no); end_table(1); @@ -65,7 +65,7 @@ $display_sub_tot = number_format2($total_gl+$total_grn,user_price_dec()); start_table("width=95% $table_style"); label_row(_("Sub Total"), $display_sub_tot, "align=right", "nowrap align=right width=15%"); -$tax_items = get_trans_tax_details(20, $trans_no); +$tax_items = get_trans_tax_details(ST_SUPPINVOICE, $trans_no); display_supp_trans_tax_details($tax_items, 1); $display_total = number_format2($supp_trans->ov_amount + $supp_trans->ov_gst,user_price_dec()); @@ -74,7 +74,7 @@ label_row(_("TOTAL INVOICE"), $display_total, "colspan=1 align=right", "nowrap a end_table(1); -is_voided_display(20, $trans_no, _("This invoice has been voided.")); +is_voided_display(ST_SUPPINVOICE, $trans_no, _("This invoice has been voided.")); end_page(true); diff --git a/purchasing/view/view_supp_payment.php b/purchasing/view/view_supp_payment.php index 793f6d41..34fa9576 100644 --- a/purchasing/view/view_supp_payment.php +++ b/purchasing/view/view_supp_payment.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 1; -$path_to_root="../.."; +$page_security = 'SA_SUPPTRANSVIEW'; +$path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); @@ -19,14 +19,14 @@ include_once($path_to_root . "/purchasing/includes/purchasing_db.inc"); $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 500); -page(_("View Payment to Supplier"), true, false, "", $js); +page(_($help_context = "View Payment to Supplier"), true, false, "", $js); if (isset($_GET["trans_no"])) { $trans_no = $_GET["trans_no"]; } -$receipt = get_supp_trans($trans_no, 22); +$receipt = get_supp_trans($trans_no, ST_SUPPAYMENT); $company_currency = get_company_currency(); @@ -58,7 +58,7 @@ start_row(); if ($show_currencies) label_cells(_("Payment Currency"), $receipt['bank_curr_code'], "class='tableheader2'"); label_cells(_("Amount"), number_format2(-$receipt['BankAmount'], user_price_dec()), "class='tableheader2'"); -label_cells(_("Payment Type"), bank_account_types::transfer_type($receipt['BankTransType']), "class='tableheader2'"); +label_cells(_("Payment Type"), $bank_transfer_types[$receipt['BankTransType']], "class='tableheader2'"); end_row(); start_row(); if ($show_currencies) @@ -69,16 +69,16 @@ if ($show_both_amounts) label_cells(_("Amount"), number_format2(-$receipt['Total'], user_price_dec()), "class='tableheader2'"); label_cells(_("Reference"), $receipt['ref'], "class='tableheader2'"); end_row(); -comments_display_row(22, $trans_no); +comments_display_row(ST_SUPPAYMENT, $trans_no); end_table(1); -$voided = is_voided_display(22, $trans_no, _("This payment has been voided.")); +$voided = is_voided_display(ST_SUPPAYMENT, $trans_no, _("This payment has been voided.")); // now display the allocations for this payment if (!$voided) { - display_allocations_from(payment_person_types::supplier(), $receipt['supplier_id'], 22, $trans_no, -$receipt['Total']); + display_allocations_from(PT_SUPPLIER, $receipt['supplier_id'], ST_SUPPAYMENT, $trans_no, -$receipt['Total']); } end_page(true); diff --git a/reporting/includes/class.graphic.inc b/reporting/includes/class.graphic.inc index 19572288..c80f3377 100644 --- a/reporting/includes/class.graphic.inc +++ b/reporting/includes/class.graphic.inc @@ -223,7 +223,7 @@ class graph imagefill($this->img, 0, 0, $this->color['background']); //imagefilledrectangle($this->img, 0, 0, $this->width, $this->height, $this->color['background']); if ($border) - imagerectangle($this->img, 0, 0, $this->width-1, $this->height-1, $this->color['bars']); + imagerectangle($this->img, 0, 0, $this->width-1, $this->height-1, imagecolorallocate($this->img, 100, 150, 200)); // Draw title if (!empty($this->title)) diff --git a/reporting/includes/doctext.inc b/reporting/includes/doctext.inc index 5365d83d..0edc595f 100644 --- a/reporting/includes/doctext.inc +++ b/reporting/includes/doctext.inc @@ -24,19 +24,33 @@ if (isset($header2type)) $doc_Delivered_To = _("Delivered To"); } $doc_Shipping_Company = _("Shipping Company"); - if ($doctype == 9) + if ($doctype == 7) + $doc_Due_Date = _("Valid until"); + elseif ($doctype == 9) $doc_Due_Date = _("Delivery Date"); - else + else $doc_Due_Date = _("Due Date"); $doc_Your_Ref = _("Your Ref"); - $doc_Our_Ref = _("Our Ref."); - $doc_Your_VAT_no = _("Your VAT no."); + if ($doctype == 26) + { + $doc_Our_Ref = _("Type"); + $doc_Your_VAT_no = _("Manufactured Item"); + $doc_Payment_Terms = _("Required By"); + $doc_Customers_Ref = _("Reference"); + $doc_Our_Order_No = _("Into Location"); + $doc_Due_Date = _("Quantity"); + } + else + { + $doc_Our_Ref = _("Our Ref."); + $doc_Your_VAT_no = _("Your VAT no."); + $doc_Payment_Terms = _("Payment Terms"); + $doc_Customers_Ref = _("Customers Reference"); + $doc_Our_Order_No = _("Our Order No"); + } $doc_Our_VAT_no = _("Our VAT No."); - $doc_Payment_Terms = _("Payment Terms"); - $doc_Customers_Ref = _("Customers Reference"); - $doc_Our_Order_No = _("Our Order No"); $doc_Domicile = _("Domicile"); - if($doctype == 13 || $doctype == 8 || $doctype == 9) { + if($doctype == 13 || $doctype == 7 || $doctype == 8 || $doctype == 9) { $doc_Bank_Account = ''; $doc_Please_Quote = _("All amounts stated in"); } else { @@ -50,21 +64,28 @@ if (isset($header2type)) $doc_Bank = _("Bank"); $doc_Bank_Account = _("Bank Account"); $doc_Payment_Link = _("You can pay through"); - if ($doctype == 8 || $doctype == 9 || $doctype == 10 || $doctype == 11 || $doctype == 13) + if ($doctype == 7 || $doctype == 8 || $doctype == 9 || $doctype == 10 || $doctype == 11 || $doctype == 13 || $doctype == 26) { - if ($doctype == 8) + if ($doctype == 7) + $this->title = _("SALES QUOTATION"); + elseif ($doctype == 8) $this->title = _("PURCHASE ORDER"); - else if ($doctype == 13) - $this->title = _("DELIVERY NOTE"); - else if ($doctype == 9) + elseif ($doctype == 13) + $this->title = ($packing_slip==1 ? _("PACKING SLIP") : _("DELIVERY NOTE")); + elseif ($doctype == 9) $this->title = ($print_as_quote==1 ? _("QUOTE") : _("SALES ORDER")); - else if ($doctype == 10) + elseif ($doctype == 10) $this->title = _("INVOICE"); + elseif ($doctype == 26) + $this->title = _("WORK ORDER"); else $this->title = _("CREDIT NOTE"); if ($doctype == 8) $this->headers = array(_("Item Code"), _("Item Description"), _("Delivery Date"), _("Quantity"), _("Unit"), _("Price"), _("Total")); + elseif ($doctype == 26) + $this->headers = array(_("Item Code"), _("Item Description"), + _("From Location"), _("Work Centre"), _("Unit Quantity"), _("Total Quantity"), _("Units Issued")); else $this->headers = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"), _("Price"), _("Discount %"), _("Total")); @@ -85,14 +106,14 @@ if (isset($emailtype)) } if (isset($header2type) || isset($linetype)) { - $doc_Invoice_no = ($doctype==13 ? _("Delivery Note No.") : (($doctype==8 || $doctype==9) ? _("Order no.") : - ($doctype==10 ? _("Invoice No.") : _("Credit No.")))); + $doc_Invoice_no = ($doctype==13 ? _("Delivery Note No.") : (($doctype==7 || $doctype==8 || $doctype==9) ? _("Order no.") : + ($doctype==10 ? _("Invoice No.") : ($doctype==26 ? _("Word Order No") : _("Credit No."))))); $doc_Delivery_no = _("Delivery Note No."); $doc_Order_no = _("Order no."); } if (isset($linetype)) { - if ($doctype == 8 || $doctype == 9 || $doctype == 10 || $doctype == 11 || $doctype == 13) + if ($doctype == 7 || $doctype == 8 || $doctype == 9 || $doctype == 10 || $doctype == 11 || $doctype == 13) { $doc_Sub_total = _("Sub-total"); $doc_Shipping = _("Shipping"); diff --git a/reporting/includes/doctext2.inc b/reporting/includes/doctext2.inc index f022b504..40853642 100644 --- a/reporting/includes/doctext2.inc +++ b/reporting/includes/doctext2.inc @@ -24,19 +24,33 @@ if (isset($header2type)) $doc_Delivered_To = "Delivered To"; } $doc_Shipping_Company = "Shipping Company"; + if ($doctype == 7) + $doc_Due_Date = "Valid until"; if ($doctype == 9) $doc_Due_Date = "Delivery Date"; else $doc_Due_Date = "Due Date"; $doc_Your_Ref = "Your Ref"; - $doc_Our_Ref = "Our Ref."; - $doc_Your_VAT_no = "Your VAT No."; + if ($doctype == 26) + { + $doc_Our_Ref = "Type"; + $doc_Your_VAT_no = "Manufactured Item"; + $doc_Payment_Terms = "Required By"; + $doc_Customers_Ref = "Reference"; + $doc_Our_Order_No = "Into Location"; + $doc_Due_Date = "Quantity"; + } + else + { + $doc_Our_Ref = "Our Ref."; + $doc_Your_VAT_no = "Your VAT no."; + $doc_Payment_Terms = "Payment Terms"; + $doc_Customers_Ref = "Customers Reference"; + $doc_Our_Order_No = "Our Order No"; + } $doc_Our_VAT_no = "Our VAT No."; - $doc_Payment_Terms = "Payment Terms"; - $doc_Customers_Ref = "Customers Reference"; - $doc_Our_Order_No = "Our Order No"; $doc_Domicile = "Domicile"; - if($doctype == 13 || $doctype == 8 || $doctype == 9) { + if($doctype == 13 || $doctype == 7 || $doctype == 8 || $doctype == 9) { $doc_Bank_Account = ''; $doc_Please_Quote = "All amounts stated in"; } else { @@ -49,21 +63,28 @@ if (isset($header2type)) $doc_Bank = "Bank"; $doc_Bank_Account = "Bank Account"; $doc_Payment_Link = "You can pay through"; - if ($doctype == 8 || $doctype == 9 || $doctype == 10 || $doctype == 11 || $doctype == 13) + if ($doctype == 7 || $doctype == 8 || $doctype == 9 || $doctype == 10 || $doctype == 11 || $doctype == 13 || $doctype == 26) { - if ($doctype == 8) + if ($doctype == 7) + $this->title = "SALES QUOTATION"; + elseif ($doctype == 8) $this->title = "PURCHASE ORDER"; - else if ($doctype == 9) + elseif ($doctype == 9) $this->title = ($print_as_quote==1 ? "QUOTE" : "SALES ORDER"); - else if ($doctype == 10) + elseif ($doctype == 10) $this->title = "INVOICE"; - else if ($doctype == 13) - $this->title = "DELIVERY NOTE"; + elseif ($doctype == 13) + $this->title = ($packing_slip==1 ? "PACKING SLIP" : "DELIVERY NOTE"); + elseif ($doctype == 26) + $this->title = "WORK ORDER"; else $this->title = "CREDIT NOTE"; if ($doctype == 8) $this->headers = array('Item Code', 'Item Description', 'Delivery Date', 'Quantity', 'Unit', 'Price', 'Total'); + elseif ($doctype == 26) + $this->headers = array("Item Code", "Item Description", + "From Location", "Work Centre", "Unit Quantity", "Total Quantity", "Units Issued"); else $this->headers = array('Item Code', 'Item Description', 'Quantity', 'Unit', 'Price', 'Discount %', 'Total'); @@ -84,14 +105,14 @@ if (isset($emailtype)) } if (isset($header2type) || isset($linetype)) { - $doc_Invoice_no = ($doctype==13 ? "Delivery Note No." : (($doctype==8 || $doctype==9) ? "Order no." : - ($doctype==10 ? "Invoice No." : "Credit No."))); + $doc_Invoice_no = ($doctype==13 ? "Delivery Note No." : (($doctype == 7 || $doctype==8 || $doctype==9) ? "Order no." : + ($doctype==10 ? "Invoice No." : ($doctype == 26 ? "Work Order No" : "Credit No.")))); $doc_Delivery_no = "Delivery Note No."; $doc_Order_no = "Order no."; } if (isset($linetype)) { - if ($doctype == 8 || $doctype == 9 || $doctype == 10 || $doctype == 11 || $doctype == 13) + if ($doctype == 7 || $doctype == 8 || $doctype == 9 || $doctype == 10 || $doctype == 11 || $doctype == 13) { $doc_Sub_total = "Sub-total"; $doc_Shipping = "Shipping"; diff --git a/reporting/includes/excel_report.inc b/reporting/includes/excel_report.inc index e565552b..fb7ed1be 100644 --- a/reporting/includes/excel_report.inc +++ b/reporting/includes/excel_report.inc @@ -9,8 +9,6 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -/* $Revision$ */ -$page_security = 8; include_once($path_to_root . "/reporting/includes/Workbook.php"); include_once($path_to_root . "/admin/db/company_db.inc"); include_once($path_to_root . "/config.php"); @@ -57,8 +55,13 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook function FrontReport($title, $filename, $size = 'A4', $fontsize = 9) { - global $comp_path, $dateseps; - + global $comp_path, $dateseps, $page_security; + if (!$_SESSION["wa_current_user"]->can_access_page($page_security)) + { + display_error(_("The security settings on your account do not permit you to print this report")); + end_page(); + exit; + } $this->size = $size; $this->title = $title; $this->lineHeight = 12; diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc index 5f47cf3f..f98c3ffa 100644 --- a/reporting/includes/header2.inc +++ b/reporting/includes/header2.inc @@ -11,11 +11,13 @@ ***********************************************************************/ // New version (without vertical lines) + global $wo_types_array; + $this->row = $this->pageHeight - $this->topMargin; $upper = $this->row - 2 * $this->lineHeight; - $lower = $this->bottomMargin + 6 * $this->lineHeight; - $iline1 = $upper - 7 * $this->lineHeight; + $lower = $this->bottomMargin + 8 * $this->lineHeight; + $iline1 = $upper - 7.5 * $this->lineHeight; $iline2 = $iline1 - 8 * $this->lineHeight; $iline3 = $iline2 - 1.5 * $this->lineHeight; $iline4 = $iline3 - 1.5 * $this->lineHeight; @@ -23,7 +25,7 @@ $iline6 = $iline5 - 1.5 * $this->lineHeight; $iline7 = $lower; $right = $this->pageWidth - $this->rightMargin; - $width = ($right - $this->leftMargin) / 6; + $width = ($right - $this->leftMargin) / 5; $icol = $this->pageWidth / 2; $ccol = $this->cols[0] + 4; $c2col = $ccol + 60; @@ -108,19 +110,34 @@ $this->Text($ccol, $doc_Our_VAT_no, $c2col); $this->Text($c2col, $this->company['gst_no'], $mcol); $this->NewLine(); - } + } + if (($doctype == 10 || $doctype == 12) && $this->company['domicile'] != "") + { + $this->Text($ccol, $doc_Domicile, $c2col); + $this->Text($c2col, $this->company['domicile'], $mcol); + $this->NewLine(); + } $this->Font(); $this->row = $adrline; $this->NewLine(3); $this->Text($mcol + 100, $doc_Date.":"); - if ($doctype == 8 || $doctype == 9) + if ($doctype == 7 || $doctype == 8 || $doctype == 9) $this->Text($mcol + 180, sql2date($myrow['ord_date'])); + elseif ($doctype == 26) + $this->Text($mcol + 180, sql2date($myrow['date_'])); else $this->Text($mcol + 180, sql2date($myrow['tran_date'])); $this->NewLine(); $this->Text($mcol + 100, $doc_Invoice_no); - if ($doctype == 8 || $doctype == 9) // PO or SO - $this->Text($mcol + 180, $myrow['order_no']); + if ($doctype == 7 || $doctype == 8 || $doctype == 9) // QUOTE, PO or SO + { + if ($print_invoice_no == 1) + $this->Text($mcol + 180, $myrow['order_no']); + else + $this->Text($mcol + 180, $myrow['reference']); + } + elseif ($doctype == 26) + $this->Text($mcol + 180, $myrow['id']); else if (isset($myrow['trans_no']) && isset($myrow['reference'])) // INV/CRE/STA { if ($print_invoice_no == 1) @@ -140,10 +157,16 @@ $this->row = $this->row - $this->lineHeight - 5; $temp = $this->row; - if ($doctype == 9) + if ($doctype == 7 || $doctype == 9) { $this->Text($ccol, $myrow['name'], $icol); } + elseif ($doctype == 26) + { + $this->Text($ccol, $myrow['location_name'], $icol); + $this->NewLine(); + $this->TextWrapLines($ccol, $icol - $ccol, $myrow['delivery_address']); + } else { if ($doctype == 8) { @@ -185,13 +208,13 @@ else $this->TextWrap($col, $this->row, $width, $doc_Our_Order_No, 'C'); $col += $width; - $this->TextWrap($col, $this->row, $width, $doc_Payment_Terms, 'C'); - $col += $width; $this->TextWrap($col, $this->row, $width, $doc_Due_Date, 'C'); $this->row = $iline3 - $this->lineHeight - 1; $col = $this->leftMargin; if ($doctype == 8) $this->TextWrap($col, $this->row, $width, $myrow['supp_account_no'], 'C'); + elseif ($doctype == 26) + $this->TextWrap($col, $this->row, $width, $myrow['wo_ref'], 'C'); elseif (isset($sales_order["customer_ref"])) $this->TextWrap($col, $this->row, $width, $sales_order["customer_ref"], 'C'); $col += $width; @@ -203,8 +226,12 @@ $row = db_fetch($result); $this->TextWrap($col, $this->row, $width, $row['salesman_name'], 'C'); } + elseif ($doctype == 26) + $this->TextWrap($col, $this->row, $width, $wo_types_array[$myrow["type"]], 'C'); $col += $width; - if ($doctype != 8 && isset($myrow['tax_id'])) + if ($doctype == 26) + $this->TextWrap($col, $this->row, $width, $myrow["StockItemName"], 'C'); + elseif ($doctype != 8 && isset($myrow['tax_id'])) $this->TextWrap($col, $this->row, $width, $myrow['tax_id'], 'C'); $col += $width; if ($doctype == 10) @@ -220,20 +247,34 @@ } $this->TextWrap($col, $this->row, $width, $line, 'C'); } + elseif ($doctype == 26) + $this->TextWrap($col, $this->row, $width, $myrow["location_name"], 'C'); elseif (isset($myrow['order_'])) $this->TextWrap($col, $this->row, $width, $myrow['order_'], 'C'); $col += $width; - $id = $myrow['payment_terms']; - $sql = "SELECT terms FROM ".TB_PREF."payment_terms WHERE terms_indicator='$id'"; - $result = db_query($sql,"could not get paymentterms"); - $row = db_fetch($result); - $this->TextWrap($col, $this->row, $width, $row["terms"], 'C'); - $col += $width; - if ($doctype == 9) + if ($doctype == 9 || $doctype == 7) $this->TextWrap($col, $this->row, $width, sql2date($myrow['delivery_date']), 'C'); - else if ($doctype != 8 && $doctype != 11 && isset($myrow['due_date'])) + elseif ($doctype == 26) + $this->TextWrap($col, $this->row, $width, $myrow["units_issued"], 'C'); + elseif ($doctype != 8 && $doctype != 11 && isset($myrow['due_date'])) $this->TextWrap($col, $this->row, $width, sql2date($myrow['due_date']), 'C'); - + if (!isset($packing_slip) || $packing_slip == 0) + { + $this->row -= (2 * $this->lineHeight); + if ($doctype == 26) + $str = sql2date($myrow["required_by"]); + else + { + $id = $myrow['payment_terms']; + $sql = "SELECT terms FROM ".TB_PREF."payment_terms WHERE terms_indicator='$id'"; + $result = db_query($sql,"could not get paymentterms"); + $row = db_fetch($result); + $str = $row["terms"]; + } + $this->Font('italic'); + $this->TextWrap($ccol, $this->row, $right-$ccol, $doc_Payment_Terms . ": " . $str); + $this->Font(); + } $this->row = $iline5 - $this->lineHeight - 1; $this->Font('bold'); $count = count($this->headers); @@ -243,14 +284,15 @@ $this->Font(); $this->Font('italic'); $this->row = $iline7 - $this->lineHeight - 6; - $this->TextWrap($ccol, $this->row, $right - $ccol, $doc_Please_Quote . " - " . $myrow['curr_code'], 'C'); - $this->NewLine(); + if ($doctype != 26) + $this->TextWrap($ccol, $this->row, $right - $ccol, $doc_Please_Quote . " - " . $myrow['curr_code'], 'C'); + $this->row -= $this->lineHeight; if (isset($bankaccount['bank_name'])) { $txt = $doc_Bank . ": ".$bankaccount['bank_name']. ", " . $doc_Bank_Account . ": " . $bankaccount['bank_account_number']; $this->TextWrap($ccol, $this->row, $right - $ccol, $txt, 'C'); - $this->NewLine(); + $this->row -= $this->lineHeight; } if ($doctype == 10 && $branch['disable_branch'] > 0) // payment links { @@ -263,24 +305,23 @@ $name . "&amount=" . $amt . "¤cy_code=" . $myrow['curr_code']; $this->fontSize -= 2; $this->TextWrap($ccol, $this->row, $right - $ccol, $txt, 'C'); - $this->NewLine(); + $this->row -= $this->lineHeight; $this->SetTextColor(0, 0, 255); $this->TextWrap($ccol, $this->row, $right - $ccol, $url, 'C'); $this->SetTextColor(0, 0, 0); $this->addLink($url, $ccol, $this->row, $this->pageWidth - $this->rightMargin, $this->row + $this->lineHeight); $this->fontSize += 2; - $this->NewLine(); + $this->row -= $this->lineHeight; } } if ($this->params['comments'] != '') { $this->TextWrap($ccol, $this->row, $right - $ccol, $this->params['comments'], 'C'); - $this->NewLine(); + $this->row -= $this->lineHeight; } - $legal = get_company_pref('legal_text'); - if (($doctype == 10 || $doctype == 12) && $legal != "") + if (($doctype == 10 || $doctype == 12) && $this->company['legal_text'] != "") { - $this->TextWrap($ccol, $this->row, $right - $ccol, $legal, 'C'); + $this->TextWrapLines($ccol, $right - $ccol, $this->company['legal_text'], 'C'); } $this->Font(); $temp = $iline6 - $this->lineHeight - 2; diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc index 8d9bef0f..944b4c28 100644 --- a/reporting/includes/pdf_report.inc +++ b/reporting/includes/pdf_report.inc @@ -9,8 +9,6 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -/* $Revision$ */ -$page_security = 8; //include_once($path_to_root . "reporting/includes/class.pdf.inc"); include_once(dirname(__FILE__)."/class.pdf.inc"); include_once(dirname(__FILE__)."/printer_class.inc"); @@ -52,6 +50,13 @@ class FrontReport extends Cpdf function FrontReport($title, $filename, $size = 'A4', $fontsize = 9) { + global $page_security; + if (!$_SESSION["wa_current_user"]->can_access_page($page_security)) + { + display_error(_("The security settings on your account do not permit you to print this report")); + end_page(); + exit; + } switch ($size) { default: @@ -204,6 +209,8 @@ class FrontReport extends Cpdf $str = _("Print Out Date") . ':'; $this->Text($this->leftMargin, $str, $this->titleCol); $str = Today() . ' ' . Now(); + if ($this->company['time_zone']) + $str .= ' ' . date('O') . ' GMT'; $this->Text($this->titleCol, $str, $this->companyCol); $this->Text($this->companyCol, $this->host); @@ -259,13 +266,13 @@ class FrontReport extends Cpdf function Header2($myrow, $branch, $sales_order, $bankaccount, $doctype) { - global $comp_path, $path_to_root, $print_as_quote, $print_invoice_no; + global $comp_path, $path_to_root, $print_as_quote, $print_invoice_no, $packing_slip; $this->pageNumber++; if ($this->pageNumber > 1) $this->newPage(); $header2type = true; - if ($this->currency != $myrow['curr_code']) + if (isset($myrow['curr_code']) && $this->currency != $myrow['curr_code']) { include($path_to_root . "/reporting/includes/doctext2.inc"); } @@ -352,7 +359,7 @@ class FrontReport extends Cpdf do { $l = $this->TextWrap($c, $this->row , $width, $l, $align); - $this->NewLine(); + $this->row -= $this->lineHeight; } while ($l != ''); } @@ -425,7 +432,7 @@ class FrontReport extends Cpdf require_once($path_to_root . "/reporting/includes/class.mail.inc"); $mail = new email($this->company['coy_name'], $this->company['email']); if (!isset($myrow['email']) || $myrow['email'] == '') - $myrow['email'] = $myrow['contact_email']; + $myrow['email'] = isset($myrow['contact_email']) ? $myrow['contact_email'] : ''; $to = $myrow['DebtorName'] . " <" . $myrow['email'] . ">"; $msg = $doc_Dear_Sirs . " " . $myrow['DebtorName'] . ",\n\n" . $doc_AttachedFile . " " . $subject . "\n\n"; @@ -482,6 +489,7 @@ class FrontReport extends Cpdf header('Expires: 0'); header('Cache-Control: must-revalidate, post-check=0, pre-check=0'); header('Pragma: public'); + $this->Stream(); } } else { // send report to network printer diff --git a/reporting/includes/reporting.inc b/reporting/includes/reporting.inc index 4f7f574a..6a071299 100644 --- a/reporting/includes/reporting.inc +++ b/reporting/includes/reporting.inc @@ -14,7 +14,8 @@ // or display_note(print_document_link($order_no, _("Print this order"))); // You only need full parameter list for invoices/credit notes -function print_document_link($doc_no, $link_text, $link=true, $type_no, $icon=false) +function print_document_link($doc_no, $link_text, $link=true, $type_no, + $icon=false, $class='printlink', $id='', $email=0, $extra=0) { global $path_to_root; include_once($path_to_root . "/includes/types.inc"); @@ -23,84 +24,89 @@ function print_document_link($doc_no, $link_text, $link=true, $type_no, $icon=fa switch ($type_no) { - case systypes::sales_order() : + case ST_SALESQUOTE : + $rep = 111; + // from, to, currency, bank acc, email, quote, comments + $ar = array( + 'PARAM_0' => $doc_no, + 'PARAM_1' => $doc_no, + 'PARAM_2' => '', + 'PARAM_3' => $email, + 'PARAM_4' => ''); + break; + case ST_SALESORDER : $rep = 109; // from, to, currency, bank acc, email, quote, comments $ar = array( 'PARAM_0' => $doc_no, 'PARAM_1' => $doc_no, - 'PARAM_2' => "", - 'PARAM_3' => get_first_bank_account(), + 'PARAM_2' => '', + 'PARAM_3' => $email, 'PARAM_4' => 0, - 'PARAM_5' => 0, - 'PARAM_6' => ""); + 'PARAM_5' => ''); break; - case systypes::cust_dispatch() : + case ST_CUSTDELIVERY : $rep = 110; // from, to, email, comments $ar = array( 'PARAM_0' => $doc_no, 'PARAM_1' => $doc_no, - 'PARAM_2' => 0, - 'PARAM_3' => ""); + 'PARAM_2' => $email, + 'PARAM_3' => $extra); break; - case 10 : // Sales Invoice - case 11 : // Customer Credit Note + case ST_SALESINVOICE : // Sales Invoice + case ST_CUSTCREDIT : // Customer Credit Note $rep = 107; // from, to, currency, bank acc, email, paylink, comments, type $ar = array( 'PARAM_0' => $doc_no, 'PARAM_1' => $doc_no, - 'PARAM_2' => "", - 'PARAM_3' => get_first_bank_account(), - 'PARAM_4' => 0, - 'PARAM_5' => "", - 'PARAM_6' => "", - 'PARAM_7' => $type_no); + 'PARAM_2' => '', + 'PARAM_3' => $email, + 'PARAM_4' => '', + 'PARAM_5' => '', + 'PARAM_6' => $type_no); break; - case systypes::po() : + case ST_PURCHORDER : $rep = 209; // from, to, currency, bank acc, email, comments $ar = array( 'PARAM_0' => $doc_no, 'PARAM_1' => $doc_no, - 'PARAM_2' => "", - 'PARAM_3' => get_first_bank_account(), - 'PARAM_4' => 0, - 'PARAM_5' => ""); + 'PARAM_2' => '', + 'PARAM_3' => $email, + 'PARAM_4' => ''); break; // default: $ar = array(); } - return print_link($link_text, $rep, $ar, "", $icon); + return print_link($link_text, $rep, $ar, "", $icon, $class, $id); } // // Universal link to any kind of report. // -function print_link($link_text, $rep, $pars = array(), $dir = '', $icon=false) +function print_link($link_text, $rep, $pars = array(), $dir = '', + $icon=false, $class='printlink', $id='') { global $path_to_root, $pdf_debug; $url = $dir == '' ? $path_to_root.'/reporting/prn_redirect.php?' : $dir; + $id = default_focus($id); foreach($pars as $par => $val) { $pars[$par] = "$par=".urlencode($val); } $pars[] = 'REP_ID='.urlencode($rep); $url .= implode ('&', $pars); - $class = $pdf_debug ? '' : "class='printlink'"; + + if ($class != '') + $class = $pdf_debug ? '' : " class='$class'"; + if ($id != '') + $id = " id='$id'"; $pars = access_string($link_text); if (user_graphic_links() && $icon) $pars[0] = set_icon($icon, $pars[0]); - return "$pars[0]"; + return "$pars[0]"; } -function get_first_bank_account() -{ - $sql = "SELECT ".TB_PREF."bank_accounts.id FROM ".TB_PREF."bank_accounts, ".TB_PREF."company - WHERE bank_curr_code=curr_default LIMIT 0, 1"; - $result = db_query($sql); - $row = db_fetch_row($result); - return $row[0]; -} ?> \ No newline at end of file diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc index 4ff56b65..e7df6a73 100644 --- a/reporting/includes/reports_classes.inc +++ b/reporting/includes/reports_classes.inc @@ -12,6 +12,7 @@ class BoxReports { var $ar_classes; + var $ctrl_handlers = array(); function ReportClasses() { @@ -25,13 +26,15 @@ class BoxReports function addReport($class_name, $id, $rep_name, $params=null) { - $this->ar_classes[$class_name][] = new Report($id,$rep_name,$params); + unset($this->ar_classes[$class_name][$id]); // unset std report if any + $this->ar_classes[$class_name][$id] = new Report($id, $rep_name, $params); } function getDisplay($class=null) { global $table_style2, $comp_path, $path_to_root, $pdf_debug, $Ajax; + $temp = array_values($this->ar_classes); $display_class = $class==null ? $temp[0] : $this->ar_classes[$class]; $class_counter = 0; @@ -44,15 +47,17 @@ class BoxReports $style = $class_counter==$_REQUEST['Class'] ? '' : "style='display:none'"; $acc = access_string($key); $st_classes .= "$acc[0]
      "; + .$_SERVER['PHP_SELF']."?Class=$class_counter'" + ." class='menu_option' id='".default_focus()."'" + ." onclick='return showClass($class_counter);'$acc[1]>$acc[0]
      "; $st_reports .= "
      "; @@ -217,7 +219,7 @@ echo "
      "; } @@ -472,7 +472,7 @@ function display_grn_items(&$supp_trans, $mode=0) $th = array(_("Delivery"), _("Sequence #"), _("P.O."), _("Item"), _("Description"), _("Received On"), _("Quantity Received"), _("Quantity Invoiced"), _("Qty Yet To Invoice"), _("Order Price"), _("Total"), ""); - if ($supp_trans->is_invoice && $_SESSION["wa_current_user"]->access == 2) // Added 2008-10-18 by Joe Hunt. Only admins can remove GRNs + if ($supp_trans->is_invoice && $_SESSION["wa_current_user"]->can_access('SA_GRNDELETE')) // Added 2008-10-18 by Joe Hunt. Only admins can remove GRNs $th[] = ""; if (!$supp_trans->is_invoice) { @@ -496,7 +496,7 @@ function display_grn_items(&$supp_trans, $mode=0) alt_table_row_color($k); $grn_batch = get_grn_batch_from_item($entered_grn->id); - label_cell(get_trans_view_str(25,$grn_batch)); + label_cell(get_trans_view_str(ST_SUPPRECEIVE,$grn_batch)); if ($mode == 1) { label_cell($entered_grn->id); @@ -518,7 +518,7 @@ function display_grn_items(&$supp_trans, $mode=0) if ($mode == 1) { delete_button_cell("Delete" . $entered_grn->id, _("Edit"), _('Edit document line')); - if ($supp_trans->is_invoice && $_SESSION["wa_current_user"]->access == 2) + if ($supp_trans->is_invoice && $_SESSION["wa_current_user"]->can_access('SA_GRNDELETE')) label_cell(""); } end_row(); diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc index 87cb4941..dcc5f058 100644 --- a/purchasing/includes/ui/po_ui.inc +++ b/purchasing/includes/ui/po_ui.inc @@ -40,7 +40,7 @@ function create_new_po() session_register("PO"); $_SESSION['PO'] = new purch_order; - $_POST['OrderDate'] = Today(); + $_POST['OrderDate'] = new_doc_date(); if (!is_date_in_fiscalyear($_POST['OrderDate'])) $_POST['OrderDate'] = end_fiscalyear(); $_SESSION['PO']->orig_order_date = $_POST['OrderDate']; @@ -50,7 +50,7 @@ function create_new_po() function display_po_header(&$order) { - global $table_style2, $Ajax; + global $table_style2, $Ajax, $Refs; $editable = ($order->order_no == 0); @@ -59,10 +59,10 @@ function display_po_header(&$order) table_section(1); if ($editable) { - if (!isset($_POST['supplier_id']) && (get_global_supplier() != reserved_words::get_all())) + if (!isset($_POST['supplier_id']) && (get_global_supplier() != ALL_TEXT)) $_POST['supplier_id'] = get_global_supplier(); - supplier_list_row(_("Supplier:"), 'supplier_id', null, false, true); + supplier_list_row(_("Supplier:"), 'supplier_id', null, false, true, false, true); } else { @@ -91,7 +91,7 @@ function display_po_header(&$order) if ($editable) { - ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::po())); + ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_PURCHORDER)); } else { @@ -110,7 +110,7 @@ function display_po_header(&$order) // if (!is_date_in_fiscalyear($_POST['OrderDate'])) // $_POST['OrderDate'] = end_fiscalyear(); //} - date_row(_("Order Date:"), 'OrderDate', '', $_POST['OrderDate'], 0, 0, 0, null, true); + date_row(_("Order Date:"), 'OrderDate', '', true, 0, 0, 0, null, true); if (isset($_POST['_OrderDate_changed'])) { $Ajax->activate('_ex_rate'); } @@ -119,7 +119,7 @@ function display_po_header(&$order) echo "
      " . _("Receive Into:") . ""; - locations_list('StkLocation', null, false, true); + echo locations_list('StkLocation', null, false, true); echo "
      \n"; foreach($value as $report) { $acc = access_string($report->name); $st_reports .= "
      " . _("Reports For Class: ") . " $key
      id" - ."'$acc[1]>$acc[0]
      \n"; + .$_SERVER['PHP_SELF']."?Class=$class_counter&rep_id=$report->id'" + ." id='".default_focus()."'" + ."$acc[1]>$acc[0]
      \n"; if (isset($_REQUEST['rep_id']) && $_REQUEST['rep_id']==$report->id) { $action = $path_to_root.'/reporting/prn_redirect.php'; @@ -61,10 +66,11 @@ class BoxReports . "\n"; $st_params .= hidden('REP_ID', $report->id, false); $st_params .= submit('Rep'.$report->id, - _("Display: ") . access_string($report->name,true), - false, '', $pdf_debug==0) . '

      '; - $st_params .= $report->getDisplay() - . "\n
      \n"; + _("Display: ") . access_string($report->name, true), + false, '', $pdf_debug ? false : 'default') . '

      '; + $st_params .= $this->getOptions($report->get_controls()); + $st_params .= "\n
      \n"; + set_focus('Rep'.$report->id); $Ajax->addUpdate(true, 'rep_form', $st_params); } } @@ -102,38 +108,56 @@ class BoxReports return $st; } -} -class Report -{ - var $id; - var $name; - var $ar_params; - - function Report($id, $name, $ar_params) + function getOptions($controls) { - $this->id = $id; - $this->name = $name; - $this->ar_params = $ar_params; + $st = ''; + if ($controls == null) + return ""; + + $cnt = 0; + foreach($controls as $title => $type) + { + $ctrl = ''; + foreach($this->ctrl_handlers as $fun) { // first check for non-standard controls + $ctrl = $fun('PARAM_'.$cnt, $type); + if ($ctrl) break; + } + if ($ctrl == '') { + $ctrl = $this->get_ctrl('PARAM_'.$cnt, $type); + } + if ($ctrl != '') { + $st .= $title . ':
      '; + $st .= $ctrl; + $st .= "

      "; + } else { + display_error(_('Unknown report parameter type:').$type); + } + $cnt++; + } + return $st; } - - function getDisplay() + + // + // Register additional control handler + // $handle - name of global function f($name, $type) returning html code for control + function register_controls($handler) { + $this->ctrl_handlers[] = $handler; + } + // + // Returns html code for input control $name of type $type + // + function get_ctrl($name, $type) { global $path_to_root, $use_date_picker, $pdf_debug, $print_invoice_no; $st = ''; - $dummy = ""; - if ($this->ar_params==null) - return ""; - foreach($this->ar_params as $index=>$param) - { - $st .= $param->param_name . ':
      '; - switch ($param->param_type) + switch ($type) { case 'CURRENCY': - $sql = "SELECT curr_abrev, concat(curr_abrev,' - ', currency) FROM ".TB_PREF."currencies"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Currency Filter")); - break; + $sql = "SELECT curr_abrev, concat(curr_abrev,' - ', currency) AS name FROM ".TB_PREF."currencies"; + return combo_input($name, '', $sql, 'curr_abrev', 'name',array('spec_option'=>_("No Currency Filter"),'spec_id'=>ALL_TEXT,'order'=>false)); + case 'DATE': case 'DATEBEGIN': case 'DATEEND': @@ -141,22 +165,22 @@ class Report case 'DATEENDM': case 'DATEBEGINTAX': case 'DATEENDTAX': - if ($param->param_type == 'DATEBEGIN') + if ($type == 'DATEBEGIN') $date = begin_fiscalyear(); - elseif ($param->param_type == 'DATEEND') + elseif ($type == 'DATEEND') $date = end_fiscalyear(); else $date = Today(); - if ($param->param_type == 'DATEBEGINM') + if ($type == 'DATEBEGINM') $date = begin_month($date); - elseif ($param->param_type == 'DATEENDM') + elseif ($type == 'DATEENDM') $date = end_month($date); - elseif ($param->param_type == 'DATEBEGINTAX' || $param->param_type == 'DATEENDTAX') + elseif ($type == 'DATEBEGINTAX' || $type == 'DATEENDTAX') { $row = get_company_prefs(); $edate = add_months($date, -$row['tax_last']); $edate = end_month($edate); - if ($param->param_type == 'DATEENDTAX') + if ($type == 'DATEENDTAX') $date = $edate; else { @@ -165,274 +189,248 @@ class Report $date = $bdate; } } - $name = "PARAM_$index"; - $st .= ""; + $st = ""; if ($use_date_picker) $st .= "" . " "._(\n"; - + return $st; break; + case 'YES_NO': - $sel = array(_('No'), _("Yes")); - $st .= dup_simple_name_list("PARAM_$index", $sel); - break; + return yesno_list($name); + case 'PAYMENT_LINK': - $sel = array(_("No Payment Link"), "PayPal"); - $st .= dup_simple_name_list("PARAM_$index", $sel); - break; + $sel = array(_("No payment Link"), "PayPal"); + return array_selector($name, null, $sel); + case 'DESTINATION': $sel = array(_("PDF/Printer"), "Excel"); - $st .= dup_simple_name_list("PARAM_$index", $sel); - break; + return array_selector($name, null, $sel); + case 'COMPARE': $sel = array(_("Accumulated"), _("Period Y-1"), _("Budget")); - $st .= dup_simple_name_list("PARAM_$index", $sel); - break; + return array_selector($name, null, $sel); + case 'GRAPHIC': - $sel = array(_("No Graphics"), _("Vertical bars"), _("Horizontal bars"), _("Dots"), _("Lines"), _("Pie"), _("Donut")); - $st .= dup_simple_name_list("PARAM_$index", $sel); - break; + $sel = array(_("No Graphics"), _("Vertical bars"), _("Horizontal bars"), + _("Dots"), _("Lines"), _("Pie"), _("Donut")); + return array_selector($name, null, $sel); + case 'SYS_TYPES': - $st .= dup_systypes_list("PARAM_$index", $dummy, true, _("No Type Filter"), true); - break; + return gl_systypes_list($name, null, _("No Type Filter")); + + case 'SYS_TYPES_ALL': + return systypes_list($name, null, _("No Type Filter")); + case 'TEXT': - $st .= ""; - break; + return ""; + case 'TEXTBOX': - $st .= ""; - break; - case 'ACCOUNTS': - $sql = "SELECT id, name FROM ".TB_PREF."chart_types ORDER BY name"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Account Group Filter"), true); - break; + return ""; + + case 'ACCOUNTS': // not used +// $sql = "SELECT id, name FROM ".TB_PREF."chart_types"; +// return combo_input($name, '', $sql, 'id', 'name',array('spec_option'=>_("No Account Group Filter"),'spec_id'=>ALL_NUMERIC)); + return gl_account_types_list($name, null, _("No Account Group Filter"), true); + + case 'ACCOUNTS_NO_FILTER': // not used + return gl_account_types_list($name); + case 'GL_ACCOUNTS': - $sql = "SELECT account_code, concat(account_code, ' - ', account_name) as account_name FROM ".TB_PREF."chart_master ORDER BY account_code"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); - break; + return gl_all_accounts_list($name); + case 'BANK_ACCOUNTS': - $sql = "SELECT ".TB_PREF."bank_accounts.id, concat(bank_account_name, if (bank_curr_code=curr_default,'', concat(' - ', bank_curr_code))) FROM ".TB_PREF."bank_accounts, ".TB_PREF."company"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); - break; + return bank_accounts_list($name); + case 'DIMENSION': - $sql = "SELECT id, concat(reference, ' - ', name) AS DimName FROM ".TB_PREF."dimensions ORDER BY reference"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); - break; + return dimensions_list($name, null, false, ' ', false, true, 0); + case 'DIMENSIONS': - $sql = "SELECT id, concat(reference, ' - ', name) as DimName FROM ".TB_PREF."dimensions ORDER BY reference"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Dimension Filter"), true); - break; + return dimensions_list($name, null, true, _("No Dimension Filter"), false, true, 0); + case 'DIMENSION1': - $sql = "SELECT id, concat(reference, ' - ', name) AS DimName FROM ".TB_PREF."dimensions WHERE type_=1 ORDER BY reference"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index". "_$index", $dummy); - break; + return dimensions_list($name, null, false, ' ', false, true, 1); + case 'DIMENSIONS1': - $sql = "SELECT id, concat(reference, ' - ', name) as DimName FROM ".TB_PREF."dimensions WHERE type_=1 ORDER BY reference"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Dimension Filter"), true); - break; + return dimensions_list($name, null, true, _("No Dimension Filter"), false, true, 1); + case 'DIMENSION2': - $sql = "SELECT id, concat(reference, ' - ', name) AS DimName FROM ".TB_PREF."dimensions WHERE type_=2 ORDER BY reference"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); - break; + return dimensions_list($name, null, false, ' ', false, true, 2); + case 'DIMENSIONS2': - $sql = "SELECT id, concat(reference, ' - ', name) as DimName FROM ".TB_PREF."dimensions WHERE type_=2 ORDER BY reference"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Dimension Filter"), true); - break; + return dimensions_list($name, null, true, _("No Dimension Filter"), false, true, 2); + case 'CUSTOMERS_NO_FILTER': case 'CUSTOMERS': - $sql = "SELECT debtor_no, name FROM ".TB_PREF."debtors_master ORDER BY name"; - if ($param->param_type == 'CUSTOMERS_NO_FILTER') - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Customer Filter"), true); + $sql = "SELECT debtor_no, name FROM ".TB_PREF."debtors_master"; + if ($type == 'CUSTOMERS_NO_FILTER') + return combo_input($name, '', $sql, 'debtor_no', 'name',array('spec_option'=>_("No Customer Filter"),'spec_id'=>ALL_NUMERIC)); +// FIX allitems numeric! +// return customer_list($name, null, _("No Customer Filter")); else - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); - break; + return combo_input($name, '', $sql, 'debtor_no', 'name', null); +// return customer_list($name); + case 'SUPPLIERS_NO_FILTER': case 'SUPPLIERS': - $sql = "SELECT supplier_id, supp_name FROM ".TB_PREF."suppliers ORDER BY supp_name"; - if ($param->param_type == 'SUPPLIERS_NO_FILTER') - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Supplier Filter"), true); + $sql = "SELECT supplier_id, supp_name FROM ".TB_PREF."suppliers"; + if ($type == 'SUPPLIERS_NO_FILTER') + return combo_input($name, '', $sql, 'supplier_id', 'supp_name',array('spec_option'=>_("No Supplier Filter"),'spec_id'=>ALL_NUMERIC)); +// FIX allitems numeric! +// return supplier_list($name, null, _("No Supplier Filter")); else - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); - break; + return combo_input($name, '', $sql, 'supplier_id', 'supp_name', null); +// return supplier_list($name); + case 'INVOICE': $IV = _("IV"); $CN = _("CN"); - if ($print_invoice_no == 1) - $sql = "SELECT concat(".TB_PREF."debtor_trans.trans_no, '-', - ".TB_PREF."debtor_trans.type) AS TNO, concat(".TB_PREF."debtor_trans.trans_no, if (type=10, ' $IV ', ' $CN '), ".TB_PREF."debtors_master.name) as IName - FROM ".TB_PREF."debtors_master, ".TB_PREF."debtor_trans WHERE (type=10 OR type=11) AND ".TB_PREF."debtors_master.debtor_no=".TB_PREF."debtor_trans.debtor_no ORDER BY ".TB_PREF."debtor_trans.trans_no DESC"; - else - $sql = "SELECT concat(".TB_PREF."debtor_trans.trans_no, '-', - ".TB_PREF."debtor_trans.type) AS TNO, concat(".TB_PREF."debtor_trans.reference, if (type=10, ' $IV ', ' $CN '), ".TB_PREF."debtors_master.name) as IName - FROM ".TB_PREF."debtors_master, ".TB_PREF."debtor_trans WHERE (type=10 OR type=11) AND ".TB_PREF."debtors_master.debtor_no=".TB_PREF."debtor_trans.debtor_no ORDER BY ".TB_PREF."debtor_trans.trans_no DESC"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); - break; + $ref = ($print_invoice_no == 1 ? "trans_no" : "reference"); + $sql = "SELECT concat(".TB_PREF."debtor_trans.trans_no, '-', + ".TB_PREF."debtor_trans.type) AS TNO, concat(".TB_PREF."debtor_trans.$ref, if (type=".ST_SALESINVOICE.", ' $IV ', ' $CN '), ".TB_PREF."debtors_master.name) as IName + FROM ".TB_PREF."debtors_master, ".TB_PREF."debtor_trans WHERE (type=".ST_SALESINVOICE." OR type=".ST_CUSTCREDIT.") AND ".TB_PREF."debtors_master.debtor_no=".TB_PREF."debtor_trans.debtor_no ORDER BY ".TB_PREF."debtor_trans.trans_no DESC"; + return combo_input($name, '', $sql, 'TNO', 'IName',array('order'=>false)); + case 'DELIVERY': $DN = _("DN"); $sql = "SELECT concat(".TB_PREF."debtor_trans.trans_no, '-', ".TB_PREF."debtor_trans.type) AS TNO, concat(".TB_PREF."debtor_trans.trans_no, ' $DN ', ".TB_PREF."debtors_master.name) as IName FROM ".TB_PREF."debtors_master, ".TB_PREF."debtor_trans - WHERE type=13 AND ".TB_PREF."debtors_master.debtor_no=". + WHERE type=".ST_CUSTDELIVERY." AND ".TB_PREF."debtors_master.debtor_no=". TB_PREF."debtor_trans.debtor_no ORDER BY ".TB_PREF."debtor_trans.trans_no DESC"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); - break; + return combo_input($name, '', $sql, 'TNO', 'IName',array('order'=>false)); + case 'ORDERS': - $sql = "SELECT ".TB_PREF."sales_orders.order_no, concat(".TB_PREF."sales_orders.order_no, '-', + $ref = ($print_invoice_no == 1 ? "order_no" : "reference"); + $sql = "SELECT ".TB_PREF."sales_orders.order_no, concat(".TB_PREF."sales_orders.$ref, '-', ".TB_PREF."debtors_master.name) as IName - FROM ".TB_PREF."debtors_master, ".TB_PREF."sales_orders WHERE ".TB_PREF."debtors_master.debtor_no=".TB_PREF."sales_orders.debtor_no ORDER BY ".TB_PREF."sales_orders.order_no DESC"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); - break; + FROM ".TB_PREF."debtors_master, ".TB_PREF."sales_orders WHERE ".TB_PREF."debtors_master.debtor_no=".TB_PREF."sales_orders.debtor_no + AND ".TB_PREF."sales_orders.trans_type=".ST_SALESORDER." ORDER BY ".TB_PREF."sales_orders.order_no DESC"; + return combo_input($name, '', $sql, 'order_no', 'IName',array('order'=>false)); + + case 'QUOTATIONS': + $ref = ($print_invoice_no == 1 ? "order_no" : "reference"); + $sql = "SELECT ".TB_PREF."sales_orders.order_no, concat(".TB_PREF."sales_orders.$ref, '-', + ".TB_PREF."debtors_master.name) as IName + FROM ".TB_PREF."debtors_master, ".TB_PREF."sales_orders WHERE ".TB_PREF."debtors_master.debtor_no=".TB_PREF."sales_orders.debtor_no + AND ".TB_PREF."sales_orders.trans_type=".ST_SALESQUOTE." ORDER BY ".TB_PREF."sales_orders.order_no DESC"; + return combo_input($name, '', $sql, 'order_no', 'IName',array('order'=>false)); + case 'PO': - $sql = "SELECT ".TB_PREF."purch_orders.order_no, concat(".TB_PREF."purch_orders.order_no, '-', + $ref = ($print_invoice_no == 1 ? "order_no" : "reference"); + $sql = "SELECT ".TB_PREF."purch_orders.order_no, concat(".TB_PREF."purch_orders.$ref, '-', ".TB_PREF."suppliers.supp_name) as IName FROM ".TB_PREF."suppliers, ".TB_PREF."purch_orders WHERE ".TB_PREF."suppliers.supplier_id=".TB_PREF."purch_orders.supplier_id ORDER BY ".TB_PREF."purch_orders.order_no DESC"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); - break; + return combo_input($name, '', $sql, 'order_no', 'IName',array('order'=>false)); + case 'ITEMS': - $sql = "SELECT stock_id, concat(stock_id, '-', description) as name FROM ".TB_PREF."stock_master WHERE (mb_flag='A' OR mb_flag='M') ORDER BY stock_id"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); - break; + return stock_manufactured_items_list($name); + + case 'WORKORDER': + $sql = "SELECT ".TB_PREF."workorders.id, concat(".TB_PREF."workorders.id, '-', + ".TB_PREF."stock_master.description) as IName + FROM ".TB_PREF."stock_master, ".TB_PREF."workorders WHERE ".TB_PREF."stock_master.stock_id=".TB_PREF."workorders.stock_id ORDER BY ".TB_PREF."workorders.id DESC"; + return combo_input($name, '', $sql, 'id', 'IName',array('order'=>false)); + case 'LOCATIONS': - $sql = "SELECT loc_code, location_name FROM ".TB_PREF."locations ORDER BY location_name"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Location Filter"), false); - break; + return locations_list($name, null, _("No Location Filter")); + case 'CATEGORIES': - $sql = "SELECT category_id, description FROM ".TB_PREF."stock_category ORDER BY description"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Category Filter"), true); - break; + return stock_categories_list($name, null, _("No Category Filter")); + case 'SALESTYPES': - $sql = "SELECT id, sales_type FROM ".TB_PREF."sales_types ORDER BY sales_type"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); - break; + return sales_types_list($name); + case 'AREAS': - $sql = "SELECT area_code, description FROM ".TB_PREF."areas ORDER BY description"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Area Filter"), true); - break; + return sales_areas_list($name); + case 'SALESMEN': - $sql = "SELECT salesman_code, salesman_name FROM ".TB_PREF."salesman ORDER BY salesman_name"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Sales Folk Filter"), true); - break; + return sales_persons_list($name, null, _("No Sales Folk Filter")); + case 'TRANS_YEARS': - $sql = "SELECT DISTINCT YEAR(tran_date), YEAR(tran_date) FROM ".TB_PREF."gl_trans"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); - break; - case 'ACCOUNTS_NO_FILTER': - $sql = "SELECT id, name FROM ".TB_PREF."chart_types ORDER BY name"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); - break; + return fiscalyears_list($name); - } - $st .= "

      "; - } - return $st; - } -} + case 'USERS': + $sql = "SELECT id, user_id FROM ".TB_PREF."users"; + return combo_input($name, '', $sql, 'id', 'user_id',array('spec_option'=>_("No Users Filter"),'spec_id'=>ALL_NUMERIC)); -class ReportParam -{ - var $param_name; - var $param_type; + case 'ACCOUNTTAGS': + case 'DIMENSIONTAGS': + if ($type == 'ACCOUNTTAGS') + $tag_type = TAG_ACCOUNT; + else + $tag_type = TAG_DIMENSION; + return tag_list($name, 5, $tag_type, true, _("No tags")); - function ReportParam($param_name, $param_type) - { - $this->param_name = $param_name; - $this->param_type = $param_type; + } + return ''; } } -function dup_simple_codeandname_list($sql, $name, &$selected_id, - $all_option=false, $all_option_name=null, $all_option_numeric=false, - $submit_on_change=false) +class Report { - if ($submit_on_change == true) - $st = ""; - - if ($all_option == true) + var $id; + var $name; + var $ar_params; + var $controls; + + function Report($id, $name, $ar_params = null) { - if ($all_option_numeric) - $reserved_word = reserved_words::get_all_numeric(); - else - $reserved_word = reserved_words::get_all(); - - if ($reserved_word == $selected_id) - { - $st .= "\n"; - } - else - { - $st .= "\n"; - } - if ($selected_id == "") - { - $selected_id = $reserved_word; - } + $this->id = $id; + $this->name = $name; + if ($ar_params) $this->set_controls($ar_params); } - - $result = db_query($sql); - - while ($row = db_fetch_row($result)) - { - if ($selected_id == $row[0]) - { - $st .= "\n"; - - if ($selected_id == "") - { - $selected_id = $row[0]; - } + + function set_controls($ar_params) { + $this->controls = $ar_params; } - - $st .= ""; - db_free_result($result); - - return $st; -} - -function dup_simple_name_list($name, $selections) -{ - $st = ""; - return $st; + + function get_controls() { + return $this->controls; + } + } //------------------------------------------------------------------------------------------------ - -function dup_systypes_list($name, &$selected_id, $all_option=false, $all_option_name=null) +function gl_systypes_list($name, $value=null, $spec_opt=false) { global $systypes_array; + + $types = $systypes_array; + + foreach(array(ST_LOCTRANSFER, ST_PURCHORDER, ST_SUPPRECEIVE, ST_MANUISSUE, + ST_MANURECEIVE, ST_SALESORDER, ST_SALESQUOTE, ST_DIMENSION) as $type) + unset($types[$type]); + + return array_selector($name, $value, $types, + array( + 'spec_option'=> $spec_opt, + 'spec_id' => ALL_NUMERIC, + 'async' => false, + ) + ); +} - $st = ""; - return $st; + $file = $comp_path.'/'.user_company()."/reporting/reports_custom.php"; + if (file_exists($file)) + include_once($file); } - ?> \ No newline at end of file diff --git a/reporting/prn_redirect.php b/reporting/prn_redirect.php index 347e9ed7..9018e0fd 100644 --- a/reporting/prn_redirect.php +++ b/reporting/prn_redirect.php @@ -14,9 +14,40 @@ print button in reporting module. */ $path_to_root = ".."; -$page_security = 2; // this level is later overriden in rep file +$page_security = 'SA_OPEN'; // this level is later overriden in rep file include_once($path_to_root . "/includes/session.inc"); +/* + Find report definition file. + Standard reports can be superseded by report with the same id + included in active extension, or company customized report. +*/ +function find_report_file($rep) { + global $installed_extensions, $comp_path, $path_to_root; + + // customized per company versions + $rep_file = $comp_path.'/'.user_company()."/reporting/rep$rep.php"; + if (file_exists($rep_file)) + return $rep_file; + // reports added by active extension modules + if (count($installed_extensions) > 0) + { + $extensions = $installed_extensions; + foreach ($extensions as $ext) + if (($ext['active'] && $ext['type'] == 'module')) { + $rep_file = $path_to_root.'/'.$ext['path']."/reporting/rep$rep.php"; + if (file_exists($rep_file)) + return $rep_file; + } + } + // standard reports + $rep_file = $path_to_root ."/reporting/rep$rep.php"; + if (file_exists($rep_file)) + return $rep_file; + + return null; +} + if (isset($_GET['xls'])) { $filename = $_GET['filename']; @@ -53,10 +84,8 @@ if (!isset($_POST['REP_ID'])) { // print link clicked } } $rep = $_POST['REP_ID']; -$rep_file = $comp_path.'/'.user_company()."/reporting/rep$rep.php"; -if (!file_exists($rep_file)) { - $rep_file = $path_to_root ."/reporting/rep$rep.php"; -} + +$rep_file = find_report_file($rep); require($rep_file); exit(); diff --git a/reporting/rep101.php b/reporting/rep101.php index cce4be02..772d33f0 100644 --- a/reporting/rep101.php +++ b/reporting/rep101.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_CUSTPAYMREP'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ @@ -29,20 +29,59 @@ include_once($path_to_root . "/gl/includes/gl_db.inc"); // trial_inquiry_controls(); print_customer_balances(); -function get_transactions($debtorno, $date) +function get_open_balance($debtorno, $to, $convert) { - $date = date2sql($date); - - $sql = "SELECT ".TB_PREF."debtor_trans.*, ".TB_PREF."sys_types.type_name, - (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_freight_tax + - ".TB_PREF."debtor_trans.ov_discount) AS TotalAmount, ".TB_PREF."debtor_trans.alloc AS Allocated, - ((".TB_PREF."debtor_trans.type = 10) - AND ".TB_PREF."debtor_trans.due_date < '$date') AS OverDue - FROM ".TB_PREF."debtor_trans, ".TB_PREF."sys_types - WHERE ".TB_PREF."debtor_trans.tran_date <= '$date' - AND ".TB_PREF."debtor_trans.debtor_no = $debtorno - AND ".TB_PREF."debtor_trans.type != 13 - AND ".TB_PREF."debtor_trans.type = ".TB_PREF."sys_types.type_id + $to = date2sql($to); + + $sql = "SELECT SUM(IF(".TB_PREF."debtor_trans.type = ".ST_SALESINVOICE.", (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + + ".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount)"; + if ($convert) + $sql .= " * rate"; + $sql .= ", 0)) AS charges, + SUM(IF(".TB_PREF."debtor_trans.type <> ".ST_SALESINVOICE.", (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + + ".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount)"; + if ($convert) + $sql .= " * rate"; + $sql .= " * -1, 0)) AS credits, + SUM(".TB_PREF."debtor_trans.alloc"; + if ($convert) + $sql .= " * rate"; + $sql .= ") AS Allocated, + SUM(IF(".TB_PREF."debtor_trans.type = ".ST_SALESINVOICE.", (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + + ".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount - ".TB_PREF."debtor_trans.alloc)"; + if ($convert) + $sql .= " * rate"; + $sql .= ", + ((".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + + ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount) * -1 + ".TB_PREF."debtor_trans.alloc)"; + if ($convert) + $sql .= " * rate"; + $sql .= ")) AS OutStanding + FROM ".TB_PREF."debtor_trans + WHERE ".TB_PREF."debtor_trans.tran_date < '$to' + AND ".TB_PREF."debtor_trans.debtor_no = ".db_escape($debtorno)." + AND ".TB_PREF."debtor_trans.type <> ".ST_CUSTDELIVERY." GROUP BY debtor_no"; + + $result = db_query($sql,"No transactions were returned"); + return db_fetch($result); +} + +function get_transactions($debtorno, $from, $to) +{ + $from = date2sql($from); + $to = date2sql($to); + + $sql = "SELECT ".TB_PREF."debtor_trans.*, + (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + + ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount) + AS TotalAmount, ".TB_PREF."debtor_trans.alloc AS Allocated, + ((".TB_PREF."debtor_trans.type = ".ST_SALESINVOICE.") + AND ".TB_PREF."debtor_trans.due_date < '$to') AS OverDue + FROM ".TB_PREF."debtor_trans + WHERE ".TB_PREF."debtor_trans.tran_date >= '$from' + AND ".TB_PREF."debtor_trans.tran_date <= '$to' + AND ".TB_PREF."debtor_trans.debtor_no = ".db_escape($debtorno)." + AND ".TB_PREF."debtor_trans.type <> ".ST_CUSTDELIVERY." ORDER BY ".TB_PREF."debtor_trans.tran_date"; return db_query($sql,"No transactions were returned"); @@ -52,25 +91,26 @@ function get_transactions($debtorno, $date) function print_customer_balances() { - global $path_to_root; - - $to = $_POST['PARAM_0']; - $fromcust = $_POST['PARAM_1']; - $currency = $_POST['PARAM_2']; - $comments = $_POST['PARAM_3']; - $destination = $_POST['PARAM_4']; + global $path_to_root, $systypes_array; + + $from = $_POST['PARAM_0']; + $to = $_POST['PARAM_1']; + $fromcust = $_POST['PARAM_2']; + $currency = $_POST['PARAM_3']; + $comments = $_POST['PARAM_4']; + $destination = $_POST['PARAM_5']; if ($destination) include_once($path_to_root . "/reporting/includes/excel_report.inc"); else include_once($path_to_root . "/reporting/includes/pdf_report.inc"); - if ($fromcust == reserved_words::get_all_numeric()) - $from = _('All'); + if ($fromcust == ALL_NUMERIC) + $cust = _('All'); else - $from = get_customer_name($fromcust); + $cust = get_customer_name($fromcust); $dec = user_price_dec(); - if ($currency == reserved_words::get_all()) + if ($currency == ALL_TEXT) { $convert = true; $currency = _('Balances in Home Currency'); @@ -86,8 +126,8 @@ function print_customer_balances() $aligns = array('left', 'left', 'left', 'left', 'right', 'right', 'right', 'right'); $params = array( 0 => $comments, - 1 => array('text' => _('End Date'), 'from' => $to, 'to' => ''), - 2 => array('text' => _('Customer'), 'from' => $from, 'to' => ''), + 1 => array('text' => _('Period'), 'from' => $from, 'to' => $to), + 2 => array('text' => _('Customer'), 'from' => $cust, 'to' => ''), 3 => array('text' => _('Currency'), 'from' => $currency, 'to' => '')); $rep = new FrontReport(_('Customer Balances'), "CustomerBalances", user_pagesize()); @@ -99,9 +139,9 @@ function print_customer_balances() $grandtotal = array(0,0,0,0); $sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master "; - if ($fromcust != reserved_words::get_all_numeric()) - $sql .= "WHERE debtor_no=".db_escape($fromcust)." "; - $sql .= "ORDER BY name"; + if ($fromcust != ALL_NUMERIC) + $sql .= "WHERE debtor_no=".db_escape($fromcust); + $sql .= " ORDER BY name"; $result = db_query($sql, "The customers could not be retrieved"); while ($myrow = db_fetch($result)) @@ -109,30 +149,46 @@ function print_customer_balances() if (!$convert && $currency != $myrow['curr_code']) continue; $rep->fontSize += 2; - $rep->TextCol(0, 3, $myrow['name']); + $rep->TextCol(0, 2, $myrow['name']); if ($convert) - $rep->TextCol(3, 4, $myrow['curr_code']); + $rep->TextCol(2, 3, $myrow['curr_code']); $rep->fontSize -= 2; + $bal = get_open_balance($myrow['debtor_no'], $from, $convert); + $init[0] = $init[1] = 0.0; + $rep->TextCol(3, 4, _("Open Balance")); + $init[0] = round2(abs($bal['charges']), $dec); + $rep->AmountCol(4, 5, $init[0], $dec); + $init[1] = round2(Abs($bal['credits']), $dec); + $rep->AmountCol(5, 6, $init[1], $dec); + $init[2] = round2($bal['Allocated'], $dec); + $rep->AmountCol(6, 7, $init[2], $dec); + $init[3] = round2($bal['OutStanding'], $dec);; + $rep->AmountCol(7, 8, $init[3], $dec); + $total = array(0,0,0,0); + for ($i = 0; $i < 4; $i++) + { + $total[$i] += $init[$i]; + $grandtotal[$i] += $init[$i]; + } $rep->NewLine(1, 2); - $res = get_transactions($myrow['debtor_no'], $to); + $res = get_transactions($myrow['debtor_no'], $from, $to); if (db_num_rows($res)==0) continue; $rep->Line($rep->row + 4); - $total = array(0,0,0,0); while ($trans = db_fetch($res)) { $rep->NewLine(1, 2); - $rep->TextCol(0, 1, $trans['type_name']); + $rep->TextCol(0, 1, $systypes_array[$trans['type']]); $rep->TextCol(1, 2, $trans['reference']); $rep->DateCol(2, 3, $trans['tran_date'], true); - if ($trans['type'] == 10) + if ($trans['type'] == ST_SALESINVOICE) $rep->DateCol(3, 4, $trans['due_date'], true); $item[0] = $item[1] = 0.0; if ($convert) $rate = $trans['rate']; else $rate = 1.0; - if ($trans['type'] == 11 || $trans['type'] == 12 || $trans['type'] == 2) + if ($trans['type'] == ST_CUSTCREDIT || $trans['type'] == ST_CUSTPAYMENT || $trans['type'] == ST_BANKDEPOSIT) $trans['TotalAmount'] *= -1; if ($trans['TotalAmount'] > 0.0) { @@ -152,7 +208,7 @@ function print_customer_balances() else $item[3] = ($trans['TotalAmount'] + $trans['Allocated']) * $rate; */ - if ($trans['type'] == 10 || $trans['type'] == 1) + if ($trans['type'] == ST_SALESINVOICE || $trans['type'] == ST_BANKPAYMENT) $item[3] = $item[0] + $item[1] - $item[2]; else $item[3] = $item[0] - $item[1] + $item[2]; diff --git a/reporting/rep102.php b/reporting/rep102.php index 91425cb7..fc2457c4 100644 --- a/reporting/rep102.php +++ b/reporting/rep102.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_CUSTPAYMREP'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -37,8 +37,8 @@ function get_invoices($customer_id, $to) $value = "(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + " .TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_freight_tax + " .TB_PREF."debtor_trans.ov_discount)"; - $due = "IF (".TB_PREF."debtor_trans.type=10,".TB_PREF."debtor_trans.due_date,".TB_PREF."debtor_trans.tran_date)"; - $sql = "SELECT ".TB_PREF."sys_types.type_name, ".TB_PREF."debtor_trans.type, ".TB_PREF."debtor_trans.reference, + $due = "IF (".TB_PREF."debtor_trans.type=".ST_SALESINVOICE.",".TB_PREF."debtor_trans.due_date,".TB_PREF."debtor_trans.tran_date)"; + $sql = "SELECT ".TB_PREF."debtor_trans.type, ".TB_PREF."debtor_trans.reference, ".TB_PREF."debtor_trans.tran_date, $value as Balance, IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= 0,$value,0) AS Due, @@ -47,11 +47,9 @@ function get_invoices($customer_id, $to) FROM ".TB_PREF."debtors_master, ".TB_PREF."payment_terms, - ".TB_PREF."debtor_trans, - ".TB_PREF."sys_types + ".TB_PREF."debtor_trans - WHERE ".TB_PREF."sys_types.type_id = ".TB_PREF."debtor_trans.type - AND ".TB_PREF."debtor_trans.type <> 13 + WHERE ".TB_PREF."debtor_trans.type <> ".ST_CUSTDELIVERY." AND ".TB_PREF."debtors_master.payment_terms = ".TB_PREF."payment_terms.terms_indicator AND ".TB_PREF."debtors_master.debtor_no = ".TB_PREF."debtor_trans.debtor_no AND ".TB_PREF."debtor_trans.debtor_no = $customer_id @@ -66,7 +64,7 @@ function get_invoices($customer_id, $to) function print_aged_customer_analysis() { - global $comp_path, $path_to_root; + global $comp_path, $path_to_root, $systypes_array; $to = $_POST['PARAM_0']; $fromcust = $_POST['PARAM_1']; @@ -85,7 +83,7 @@ function print_aged_customer_analysis() $pg = new graph(); } - if ($fromcust == reserved_words::get_all_numeric()) + if ($fromcust == ALL_NUMERIC) $from = _('All'); else $from = get_customer_name($fromcust); @@ -95,7 +93,7 @@ function print_aged_customer_analysis() $summary = _('Summary Only'); else $summary = _('Detailed Report'); - if ($currency == reserved_words::get_all()) + if ($currency == ALL_TEXT) { $convert = true; $currency = _('Balances in Home Currency'); @@ -131,10 +129,10 @@ function print_aged_customer_analysis() $total = array(0,0,0,0, 0); - $sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master "; - if ($fromcust != reserved_words::get_all_numeric()) - $sql .= "WHERE debtor_no=".db_escape($fromcust)." "; - $sql .= "ORDER BY name"; + $sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master"; + if ($fromcust != ALL_NUMERIC) + $sql .= " WHERE debtor_no=".db_escape($fromcust); + $sql .= " ORDER BY name"; $result = db_query($sql, "The customers could not be retrieved"); while ($myrow=db_fetch($result)) @@ -176,10 +174,10 @@ function print_aged_customer_analysis() while ($trans=db_fetch($res)) { $rep->NewLine(1, 2); - $rep->TextCol(0, 1, $trans['type_name'], -2); + $rep->TextCol(0, 1, $systypes_array[$trans['type']], -2); $rep->TextCol(1, 2, $trans['reference'], -2); $rep->DateCol(2, 3, $trans['tran_date'], true, -2); - if ($trans['type'] == 11 || $trans['type'] == 12 || $trans['type'] == 2) + if ($trans['type'] == ST_CUSTCREDIT || $trans['type'] == ST_CUSTPAYMENT || $trans['type'] == ST_BANKDEPOSIT) { $trans['Balance'] *= -1; $trans['Due'] *= -1; diff --git a/reporting/rep103.php b/reporting/rep103.php index e68027fd..8ee0abbe 100644 --- a/reporting/rep103.php +++ b/reporting/rep103.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_CUSTBULKREP'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -67,7 +67,7 @@ function get_customer_details_for_report($area=0, $salesid=0) ".TB_PREF."salesman.salesman_name, ".TB_PREF."debtors_master.debtor_no, ".TB_PREF."cust_branch.branch_code"; - + return db_query($sql,"No transactions were returned"); } @@ -78,11 +78,11 @@ function getTransactions($debtorno, $branchcode, $date) $sql = "SELECT SUM((ov_amount+ov_freight+ov_discount)*rate) AS Turnover FROM ".TB_PREF."debtor_trans - WHERE debtor_no='$debtorno' - AND branch_code='$branchcode' - AND (type=10 or type=11) - AND tran_date >='$date'"; - + WHERE debtor_no=".db_escape($debtorno)." + AND branch_code=".db_escape($branchcode)." + AND (type=".ST_SALESINVOICE." OR type=".ST_CUSTCREDIT.") + AND trandate >='$date'"; + $result = db_query($sql,"No transactions were returned"); $row = db_fetch_row($result); @@ -109,9 +109,9 @@ function print_customer_details_listing() $dec = 0; - if ($area == reserved_words::get_all_numeric()) + if ($area == ALL_NUMERIC) $area = 0; - if ($folk == reserved_words::get_all_numeric()) + if ($folk == ALL_NUMERIC) $folk = 0; if ($area == 0) diff --git a/reporting/rep104.php b/reporting/rep104.php index de7d5400..d6249e0d 100644 --- a/reporting/rep104.php +++ b/reporting/rep104.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_PRICEREP'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -83,13 +83,13 @@ function print_price_listing() $dec = user_price_dec(); $home_curr = get_company_pref('curr_default'); - if ($currency == reserved_words::get_all()) + if ($currency == ALL_TEXT) $currency = $home_curr; $curr = get_currency($currency); $curr_sel = $currency . " - " . $curr['currency']; - if ($category == reserved_words::get_all_numeric()) + if ($category == ALL_NUMERIC) $category = 0; - if ($salestype == reserved_words::get_all_numeric()) + if ($salestype == ALL_NUMERIC) $salestype = 0; if ($category == 0) $cat = _('All'); diff --git a/reporting/rep105.php b/reporting/rep105.php index e3cd6de7..4b6a086c 100644 --- a/reporting/rep105.php +++ b/reporting/rep105.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_SALESBULKREP'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -49,7 +49,9 @@ function GetSalesOrders($from, $to, $category=0, $location=null, $backorder=0) ".TB_PREF."sales_order_details.qty_sent FROM ".TB_PREF."sales_orders INNER JOIN ".TB_PREF."sales_order_details - ON ".TB_PREF."sales_orders.order_no = ".TB_PREF."sales_order_details.order_no + ON (".TB_PREF."sales_orders.order_no = ".TB_PREF."sales_order_details.order_no + AND ".TB_PREF."sales_orders.trans_type = ".TB_PREF."sales_order_details.trans_type + AND ".TB_PREF."sales_orders.trans_type = ".ST_SALESORDER.") INNER JOIN ".TB_PREF."stock_master ON ".TB_PREF."sales_order_details.stk_code = ".TB_PREF."stock_master.stock_id WHERE ".TB_PREF."sales_orders.ord_date >='$fromdate' @@ -83,9 +85,9 @@ function print_order_status_list() else include_once($path_to_root . "/reporting/includes/pdf_report.inc"); - if ($category == reserved_words::get_all_numeric()) + if ($category == ALL_NUMERIC) $category = 0; - if ($location == reserved_words::get_all()) + if ($location == ALL_TEXT) $location = null; if ($category == 0) $cat = _('All'); diff --git a/reporting/rep106.php b/reporting/rep106.php index aa3a83f7..4aac08ab 100644 --- a/reporting/rep106.php +++ b/reporting/rep106.php @@ -9,12 +9,12 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_SALESMANREP'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt // date_: 2005-05-19 -// Title: Order Status List +// Title: Salesman Report // ---------------------------------------------------------------- $path_to_root=".."; @@ -45,7 +45,7 @@ function GetSalesmanTrans($from, $to) AND ".TB_PREF."sales_orders.branch_code=".TB_PREF."cust_branch.branch_code AND ".TB_PREF."cust_branch.salesman=".TB_PREF."salesman.salesman_code AND ".TB_PREF."debtor_trans.debtor_no=".TB_PREF."debtors_master.debtor_no - AND (".TB_PREF."debtor_trans.type=10 OR ".TB_PREF."debtor_trans.type=11) + AND (".TB_PREF."debtor_trans.type=".ST_SALESINVOICE." OR ".TB_PREF."debtor_trans.type=".ST_CUSTCREDIT.") AND ".TB_PREF."debtor_trans.tran_date>='$fromdate' AND ".TB_PREF."debtor_trans.tran_date<='$todate' ORDER BY ".TB_PREF."salesman.salesman_code, ".TB_PREF."debtor_trans.tran_date"; diff --git a/reporting/rep107.php b/reporting/rep107.php index d9f8aa22..5d181090 100644 --- a/reporting/rep107.php +++ b/reporting/rep107.php @@ -9,7 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = $_POST['PARAM_0'] == $_POST['PARAM_1'] ? + 'SA_SALESTRANSVIEW' : 'SA_SALESBULKREP'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -32,16 +33,15 @@ print_invoices(); function print_invoices() { global $path_to_root; - + include_once($path_to_root . "/reporting/includes/pdf_report.inc"); $from = $_POST['PARAM_0']; $to = $_POST['PARAM_1']; $currency = $_POST['PARAM_2']; - $bankaccount = $_POST['PARAM_3']; - $email = $_POST['PARAM_4']; - $paylink = $_POST['PARAM_5']; - $comments = $_POST['PARAM_6']; + $email = $_POST['PARAM_3']; + $paylink = $_POST['PARAM_4']; + $comments = $_POST['PARAM_5']; if ($from == null) $from = 0; @@ -49,7 +49,7 @@ function print_invoices() $to = 0; $dec = user_price_dec(); - $fno = explode("-", $from); + $fno = explode("-", $from); $tno = explode("-", $to); $cols = array(4, 60, 225, 300, 325, 385, 450, 515); @@ -57,10 +57,8 @@ function print_invoices() // $headers in doctext.inc $aligns = array('left', 'left', 'right', 'left', 'right', 'right', 'right'); - $params = array('comments' => $comments, - 'bankaccount' => $bankaccount); + $params = array('comments' => $comments); - $baccount = get_bank_account($params['bankaccount']); $cur = get_company_Pref('curr_default'); if ($email == 0) @@ -73,18 +71,21 @@ function print_invoices() for ($i = $fno[0]; $i <= $tno[0]; $i++) { - for ($j = 10; $j <= 11; $j++) + for ($j = ST_SALESINVOICE; $j <= ST_CUSTCREDIT; $j++) { - if (isset($_POST['PARAM_7']) && $_POST['PARAM_7'] != $j) + if (isset($_POST['PARAM_6']) && $_POST['PARAM_6'] != $j) continue; if (!exists_customer_trans($j, $i)) continue; - $sign = $j==10 ? 1 : -1; + $sign = $j==ST_SALESINVOICE ? 1 : -1; $myrow = get_customer_trans($i, $j); + $baccount = get_default_bank_account($myrow['curr_code']); + $params['bankaccount'] = $baccount['id']; + $branch = get_branch($myrow["branch_code"]); $branch['disable_branch'] = $paylink; // helper - if ($j == 10) - $sales_order = get_sales_order_header($myrow["order_"]); + if ($j == ST_SALESINVOICE) + $sales_order = get_sales_order_header($myrow["order_"], ST_SALESORDER); else $sales_order = null; if ($email == 1) @@ -92,7 +93,7 @@ function print_invoices() $rep = new FrontReport("", "", user_pagesize()); $rep->currency = $cur; $rep->Font(); - if ($j == 10) + if ($j == ST_SALESINVOICE) { $rep->title = _('INVOICE'); $rep->filename = "Invoice" . $myrow['reference'] . ".pdf"; @@ -105,7 +106,7 @@ function print_invoices() $rep->Info($params, $cols, null, $aligns); } else - $rep->title = ($j == 10) ? _('INVOICE') : _('CREDIT NOTE'); + $rep->title = ($j == ST_SALESINVOICE) ? _('INVOICE') : _('CREDIT NOTE'); $rep->Header2($myrow, $branch, $sales_order, $baccount, $j); $result = get_customer_trans_details($j, $i); diff --git a/reporting/rep108.php b/reporting/rep108.php index e07e49fe..97c4413b 100644 --- a/reporting/rep108.php +++ b/reporting/rep108.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_CUSTSTATREP'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -31,15 +31,15 @@ print_statements(); function getTransactions($debtorno, $date) { - $sql = "SELECT ".TB_PREF."debtor_trans.*, ".TB_PREF."sys_types.type_name, - (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_discount) + $sql = "SELECT ".TB_PREF."debtor_trans.*, + (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + + ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount) AS TotalAmount, ".TB_PREF."debtor_trans.alloc AS Allocated, - ((".TB_PREF."debtor_trans.type = 10) + ((".TB_PREF."debtor_trans.type = ".ST_SALESINVOICE.") AND ".TB_PREF."debtor_trans.due_date < '$date') AS OverDue - FROM ".TB_PREF."debtor_trans, ".TB_PREF."sys_types - WHERE ".TB_PREF."debtor_trans.tran_date <= '$date' AND ".TB_PREF."debtor_trans.debtor_no = $debtorno - AND ".TB_PREF."debtor_trans.type = ".TB_PREF."sys_types.type_id - AND ".TB_PREF."debtor_trans.type <> 13 + FROM ".TB_PREF."debtor_trans + WHERE ".TB_PREF."debtor_trans.tran_date <= '$date' AND ".TB_PREF."debtor_trans.debtor_no = ".db_escape($debtorno)." + AND ".TB_PREF."debtor_trans.type <> ".ST_CUSTDELIVERY." ORDER BY ".TB_PREF."debtor_trans.tran_date"; return db_query($sql,"No transactions were returned"); @@ -49,15 +49,14 @@ function getTransactions($debtorno, $date) function print_statements() { - global $path_to_root; + global $path_to_root, $systypes_array; include_once($path_to_root . "/reporting/includes/pdf_report.inc"); $customer = $_POST['PARAM_0']; $currency = $_POST['PARAM_1']; - $bankaccount = $_POST['PARAM_2']; - $email = $_POST['PARAM_3']; - $comments = $_POST['PARAM_4']; + $email = $_POST['PARAM_2']; + $comments = $_POST['PARAM_3']; $dec = user_price_dec(); @@ -67,10 +66,7 @@ function print_statements() $aligns = array('left', 'left', 'left', 'left', 'right', 'right', 'right', 'right'); - $params = array('comments' => $comments, - 'bankaccount' => $bankaccount); - - $baccount = get_bank_account($params['bankaccount']); + $params = array('comments' => $comments); $cur = get_company_pref('curr_default'); $PastDueDays1 = get_company_pref('past_due_days'); @@ -85,7 +81,7 @@ function print_statements() } $sql = "SELECT debtor_no, name AS DebtorName, address, tax_id, email, curr_code, curdate() AS tran_date, payment_terms FROM ".TB_PREF."debtors_master"; - if ($customer != reserved_words::get_all_numeric()) + if ($customer != ALL_NUMERIC) $sql .= " WHERE debtor_no = ".db_escape($customer); else $sql .= " ORDER by name"; @@ -98,6 +94,8 @@ function print_statements() $myrow['order_'] = ""; $TransResult = getTransactions($myrow['debtor_no'], $date); + $baccount = get_default_bank_account($myrow['curr_code']); + $params['bankaccount'] = $baccount['id']; if (db_num_rows($TransResult) == 0) continue; if ($email == 1) @@ -131,12 +129,12 @@ function print_statements() $DisplayAlloc = number_format2($myrow2["Allocated"],$dec); $DisplayNet = number_format2($myrow2["TotalAmount"] - $myrow2["Allocated"],$dec); - $rep->TextCol(0, 1, $myrow2['type_name'], -2); + $rep->TextCol(0, 1, $systypes_array[$myrow2['type']], -2); $rep->TextCol(1, 2, $myrow2['reference'], -2); $rep->TextCol(2, 3, sql2date($myrow2['tran_date']), -2); - if ($myrow2['type'] == 10) + if ($myrow2['type'] == ST_SALESINVOICE) $rep->TextCol(3, 4, sql2date($myrow2['due_date']), -2); - if ($myrow2['type'] == 10) + if ($myrow2['type'] == ST_SALESINVOICE) $rep->TextCol(4, 5, $DisplayTotal, -2); else $rep->TextCol(5, 6, $DisplayTotal, -2); diff --git a/reporting/rep109.php b/reporting/rep109.php index 31a769df..07767415 100644 --- a/reporting/rep109.php +++ b/reporting/rep109.php @@ -9,7 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = $_POST['PARAM_0'] == $_POST['PARAM_1'] ? + 'SA_SALESTRANSVIEW' : 'SA_SALESBULKREP'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -38,10 +39,9 @@ function print_sales_orders() $from = $_POST['PARAM_0']; $to = $_POST['PARAM_1']; $currency = $_POST['PARAM_2']; - $bankaccount = $_POST['PARAM_3']; - $email = $_POST['PARAM_4']; - $print_as_quote = $_POST['PARAM_5']; - $comments = $_POST['PARAM_6']; + $email = $_POST['PARAM_3']; + $print_as_quote = $_POST['PARAM_4']; + $comments = $_POST['PARAM_5']; if ($from == null) $from = 0; @@ -54,10 +54,8 @@ function print_sales_orders() // $headers in doctext.inc $aligns = array('left', 'left', 'right', 'left', 'right', 'right', 'right'); - $params = array('comments' => $comments, - 'bankaccount' => $bankaccount); + $params = array('comments' => $comments); - $baccount = get_bank_account($params['bankaccount']); $cur = get_company_Pref('curr_default'); if ($email == 0) @@ -73,7 +71,9 @@ function print_sales_orders() for ($i = $from; $i <= $to; $i++) { - $myrow = get_sales_order_header($i); + $myrow = get_sales_order_header($i, ST_SALESORDER); + $baccount = get_default_bank_account($myrow['curr_code']); + $params['bankaccount'] = $baccount['id']; $branch = get_branch($myrow["branch_code"]); if ($email == 1) { @@ -96,7 +96,7 @@ function print_sales_orders() $rep->title = ($print_as_quote==1 ? _("QUOTE") : _("SALES ORDER")); $rep->Header2($myrow, $branch, $myrow, $baccount, 9); - $result = get_sales_order_details($i); + $result = get_sales_order_details($i, ST_SALESORDER); $SubTotal = 0; while ($myrow2=db_fetch($result)) { @@ -165,7 +165,7 @@ function print_sales_orders() $myrow['contact_email'] = $myrow['master_email']; $myrow['DebtorName'] = $branch['br_name']; } - $myrow['reference'] = $i; + //$myrow['reference'] = $i; $rep->End($email, $doc_Invoice_no . " " . $i, $myrow); } } diff --git a/reporting/rep110.php b/reporting/rep110.php index b7aeb500..fc330428 100644 --- a/reporting/rep110.php +++ b/reporting/rep110.php @@ -9,7 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = $_POST['PARAM_0'] == $_POST['PARAM_1'] ? + 'SA_SALESTRANSVIEW' : 'SA_SALESBULKREP'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Janusz Dobrwolski @@ -24,6 +25,7 @@ include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/data_checks.inc"); include_once($path_to_root . "/sales/includes/sales_db.inc"); +$packing_slip = 0; //---------------------------------------------------------------------------------------------------- print_deliveries(); @@ -32,14 +34,15 @@ print_deliveries(); function print_deliveries() { - global $path_to_root; + global $path_to_root, $packing_slip; include_once($path_to_root . "/reporting/includes/pdf_report.inc"); $from = $_POST['PARAM_0']; $to = $_POST['PARAM_1']; $email = $_POST['PARAM_2']; - $comments = $_POST['PARAM_3']; + $packing_slip = $_POST['PARAM_3']; + $comments = $_POST['PARAM_4']; if ($from == null) $from = 0; @@ -61,7 +64,10 @@ function print_deliveries() if ($email == 0) { - $rep = new FrontReport(_('DELIVERY'), "DeliveryNoteBulk", user_pagesize()); + if ($packing_slip == 0) + $rep = new FrontReport(_('DELIVERY'), "DeliveryNoteBulk", user_pagesize()); + else + $rep = new FrontReport(_('PACKING SLIP'), "PackingSlipBulk", user_pagesize()); $rep->currency = $cur; $rep->Font(); $rep->Info($params, $cols, null, $aligns); @@ -69,25 +75,33 @@ function print_deliveries() for ($i = $fno[0]; $i <= $tno[0]; $i++) { - if (!exists_customer_trans(13, $i)) + if (!exists_customer_trans(ST_CUSTDELIVERY, $i)) continue; - $myrow = get_customer_trans($i, 13); + $myrow = get_customer_trans($i, ST_CUSTDELIVERY); $branch = get_branch($myrow["branch_code"]); - $sales_order = get_sales_order_header($myrow["order_"]); // ? + $sales_order = get_sales_order_header($myrow["order_"], ST_SALESORDER); // ? if ($email == 1) { $rep = new FrontReport("", "", user_pagesize()); $rep->currency = $cur; $rep->Font(); + if ($packing_slip == 0) + { $rep->title = _('DELIVERY NOTE'); $rep->filename = "Delivery" . $myrow['reference'] . ".pdf"; + } + else + { + $rep->title = _('PACKING SLIP'); + $rep->filename = "Packing_slip" . $myrow['reference'] . ".pdf"; + } $rep->Info($params, $cols, null, $aligns); } else $rep->title = _('DELIVERY NOTE'); $rep->Header2($myrow, $branch, $sales_order, '', 13); - $result = get_customer_trans_details(13, $i); + $result = get_customer_trans_details(13, $i); $SubTotal = 0; while ($myrow2=db_fetch($result)) { @@ -108,16 +122,19 @@ function print_deliveries() $rep->row = $oldrow; $rep->TextCol(2, 3, $DisplayQty, -2); $rep->TextCol(3, 4, $myrow2['units'], -2); - $rep->TextCol(4, 5, $DisplayPrice, -2); - $rep->TextCol(5, 6, $DisplayDiscount, -2); - $rep->TextCol(6, 7, $DisplayNet, -2); + if ($packing_slip == 0) + { + $rep->TextCol(4, 5, $DisplayPrice, -2); + $rep->TextCol(5, 6, $DisplayDiscount, -2); + $rep->TextCol(6, 7, $DisplayNet, -2); + } $rep->row = $newrow; //$rep->NewLine(1); if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight)) $rep->Header2($myrow, $branch, $sales_order,'',13); } - $comments = get_comments(13, $i); + $comments = get_comments(ST_CUSTDELIVERY, $i); if ($comments && db_num_rows($comments)) { $rep->NewLine(); @@ -139,40 +156,41 @@ function print_deliveries() { include($path_to_root . "/reporting/includes/doctext.inc"); } - - $rep->TextCol(3, 6, $doc_Sub_total, -2); - $rep->TextCol(6, 7, $DisplaySubTot, -2); - $rep->NewLine(); - $rep->TextCol(3, 6, $doc_Shipping, -2); - $rep->TextCol(6, 7, $DisplayFreight, -2); - $rep->NewLine(); - $tax_items = get_trans_tax_details(13, $i); - while ($tax_item = db_fetch($tax_items)) - { - $DisplayTax = number_format2($tax_item['amount'], $dec); - if ($tax_item['included_in_price']) - { - $rep->TextCol(3, 7, $doc_Included . " " . $tax_item['tax_type_name'] . - " (" . $tax_item['rate'] . "%) " . $doc_Amount . ":" . $DisplayTax, -2); - } - else - { - $rep->TextCol(3, 6, $tax_item['tax_type_name'] . " (" . - $tax_item['rate'] . "%)", -2); - $rep->TextCol(6, 7, $DisplayTax, -2); - } + if ($packing_slip == 0) + { + $rep->TextCol(3, 6, $doc_Sub_total, -2); + $rep->TextCol(6, 7, $DisplaySubTot, -2); $rep->NewLine(); - } - $rep->NewLine(); - $DisplayTotal = number_format2($myrow["ov_freight"] +$myrow["ov_freight_tax"] + $myrow["ov_gst"] + - $myrow["ov_amount"],$dec); - $rep->Font('bold'); - $rep->TextCol(3, 6, $doc_TOTAL_DELIVERY, - 2); - $rep->TextCol(6, 7, $DisplayTotal, -2); - $rep->Font(); + $rep->TextCol(3, 6, $doc_Shipping, -2); + $rep->TextCol(6, 7, $DisplayFreight, -2); + $rep->NewLine(); + $tax_items = get_trans_tax_details(13, $i); + while ($tax_item = db_fetch($tax_items)) + { + $DisplayTax = number_format2($tax_item['amount'], $dec); + if ($tax_item['included_in_price']) + { + $rep->TextCol(3, 7, $doc_Included . " " . $tax_item['tax_type_name'] . + " (" . $tax_item['rate'] . "%) " . $doc_Amount . ":" . $DisplayTax, -2); + } + else + { + $rep->TextCol(3, 6, $tax_item['tax_type_name'] . " (" . + $tax_item['rate'] . "%)", -2); + $rep->TextCol(6, 7, $DisplayTax, -2); + } + $rep->NewLine(); + } + $rep->NewLine(); + $DisplayTotal = number_format2($myrow["ov_freight"] +$myrow["ov_freight_tax"] + $myrow["ov_gst"] + + $myrow["ov_amount"],$dec); + $rep->Font('bold'); + $rep->TextCol(3, 6, $doc_TOTAL_DELIVERY, - 2); + $rep->TextCol(6, 7, $DisplayTotal, -2); + $rep->Font(); + } if ($email == 1) { - $myrow['dimension_id'] = $paylink; // helper for pmt link if ($myrow['email'] == '') { $myrow['email'] = $branch['email']; diff --git a/reporting/rep201.php b/reporting/rep201.php index 0e5f774e..532da5fc 100644 --- a/reporting/rep201.php +++ b/reporting/rep201.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_SUPPLIERANALYTIC'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -27,18 +27,50 @@ include_once($path_to_root . "/gl/includes/gl_db.inc"); print_supplier_balances(); -function getTransactions($supplier_id, $date) +function get_open_balance($supplier_id, $to, $convert) { - $date = date2sql($date); + $to = date2sql($to); + + $sql = "SELECT SUM(IF(".TB_PREF."supp_trans.type = ".ST_SUPPINVOICE.", (".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + + ".TB_PREF."supp_trans.ov_discount)"; + if ($convert) + $sql .= " * rate"; + $sql .= ", 0)) AS charges, + SUM(IF(".TB_PREF."supp_trans.type <> ".ST_SUPPINVOICE.", (".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + + ".TB_PREF."supp_trans.ov_discount)"; + if ($convert) + $sql .= "* rate"; + $sql .= ", 0)) AS credits, + SUM(".TB_PREF."supp_trans.alloc"; + if ($convert) + $sql .= " * rate"; + $sql .= ") AS Allocated, + SUM((".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + + ".TB_PREF."supp_trans.ov_discount - ".TB_PREF."supp_trans.alloc)"; + if ($convert) + $sql .= " * rate"; + $sql .= ") AS OutStanding + FROM ".TB_PREF."supp_trans + WHERE ".TB_PREF."supp_trans.tran_date < '$to' + AND ".TB_PREF."supp_trans.supplier_id = '$supplier_id' GROUP BY supplier_id"; + + $result = db_query($sql,"No transactions were returned"); + return db_fetch($result); +} + +function getTransactions($supplier_id, $from, $to) +{ + $from = date2sql($from); + $to = date2sql($to); - $sql = "SELECT ".TB_PREF."supp_trans.*, ".TB_PREF."sys_types.type_name, + $sql = "SELECT ".TB_PREF."supp_trans.*, (".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount) AS TotalAmount, ".TB_PREF."supp_trans.alloc AS Allocated, - ((".TB_PREF."supp_trans.type = 20) - AND ".TB_PREF."supp_trans.due_date < '$date') AS OverDue - FROM ".TB_PREF."supp_trans, ".TB_PREF."sys_types - WHERE ".TB_PREF."supp_trans.tran_date <= '$date' AND ".TB_PREF."supp_trans.supplier_id = '$supplier_id' - AND ".TB_PREF."supp_trans.type = ".TB_PREF."sys_types.type_id + ((".TB_PREF."supp_trans.type = ".ST_SUPPINVOICE.") + AND ".TB_PREF."supp_trans.due_date < '$to') AS OverDue + FROM ".TB_PREF."supp_trans + WHERE ".TB_PREF."supp_trans.tran_date >= '$from' AND ".TB_PREF."supp_trans.tran_date <= '$to' + AND ".TB_PREF."supp_trans.supplier_id = '$supplier_id' ORDER BY ".TB_PREF."supp_trans.tran_date"; $TransResult = db_query($sql,"No transactions were returned"); @@ -50,25 +82,26 @@ function getTransactions($supplier_id, $date) function print_supplier_balances() { - global $path_to_root; - - $to = $_POST['PARAM_0']; - $fromsupp = $_POST['PARAM_1']; - $currency = $_POST['PARAM_2']; - $comments = $_POST['PARAM_3']; - $destination = $_POST['PARAM_4']; + global $path_to_root, $systypes_array; + + $from = $_POST['PARAM_0']; + $to = $_POST['PARAM_1']; + $fromsupp = $_POST['PARAM_2']; + $currency = $_POST['PARAM_3']; + $comments = $_POST['PARAM_4']; + $destination = $_POST['PARAM_5']; if ($destination) include_once($path_to_root . "/reporting/includes/excel_report.inc"); else include_once($path_to_root . "/reporting/includes/pdf_report.inc"); - if ($fromsupp == reserved_words::get_all_numeric()) - $from = _('All'); + if ($fromsupp == ALL_NUMERIC) + $supp = _('All'); else - $from = get_supplier_name($fromsupp); + $supp = get_supplier_name($fromsupp); $dec = user_price_dec(); - if ($currency == reserved_words::get_all()) + if ($currency == ALL_TEXT) { $convert = true; $currency = _('Balances in Home currency'); @@ -84,8 +117,8 @@ function print_supplier_balances() $aligns = array('left', 'left', 'left', 'left', 'right', 'right', 'right', 'right'); $params = array( 0 => $comments, - 1 => array('text' => _('End Date'), 'from' => $to, 'to' => ''), - 2 => array('text' => _('Supplier'), 'from' => $from, 'to' => ''), + 1 => array('text' => _('Period'), 'from' => $from, 'to' => $to), + 2 => array('text' => _('Supplier'), 'from' => $supp, 'to' => ''), 3 => array( 'text' => _('Currency'),'from' => $currency, 'to' => '')); $rep = new FrontReport(_('Supplier Balances'), "SupplierBalances", user_pagesize()); @@ -97,10 +130,10 @@ function print_supplier_balances() $total = array(); $grandtotal = array(0,0,0,0); - $sql = "SELECT supplier_id, supp_name AS name, curr_code FROM ".TB_PREF."suppliers "; - if ($fromsupp != reserved_words::get_all_numeric()) - $sql .= "WHERE supplier_id=".db_escape($fromsupp)." "; - $sql .= "ORDER BY supp_name"; + $sql = "SELECT supplier_id, supp_name AS name, curr_code FROM ".TB_PREF."suppliers"; + if ($fromsupp != ALL_NUMERIC) + $sql .= " WHERE supplier_id=".db_escape($fromsupp); + $sql .= " ORDER BY supp_name"; $result = db_query($sql, "The customers could not be retrieved"); while ($myrow=db_fetch($result)) @@ -108,23 +141,39 @@ function print_supplier_balances() if (!$convert && $currency != $myrow['curr_code']) continue; $rep->fontSize += 2; - $rep->TextCol(0, 3, $myrow['name']); + $rep->TextCol(0, 2, $myrow['name']); if ($convert) - $rep->TextCol(3, 4, $myrow['curr_code']); + $rep->TextCol(2, 3, $myrow['curr_code']); $rep->fontSize -= 2; + $bal = get_open_balance($myrow['supplier_id'], $from, $convert); + $init[0] = $init[1] = 0.0; + $rep->TextCol(3, 4, _("Open Balance")); + $init[0] = round2(abs($bal['charges']), $dec); + $rep->AmountCol(4, 5, $init[0], $dec); + $init[1] = round2(Abs($bal['credits']), $dec); + $rep->AmountCol(5, 6, $init[1], $dec); + $init[2] = round2($bal['Allocated'], $dec); + $rep->AmountCol(6, 7, $init[2], $dec); + $init[3] = round2($bal['OutStanding'], $dec);; + $rep->AmountCol(7, 8, $init[3], $dec); + $total = array(0,0,0,0); + for ($i = 0; $i < 4; $i++) + { + $total[$i] += $init[$i]; + $grandtotal[$i] += $init[$i]; + } $rep->NewLine(1, 2); - $res = getTransactions($myrow['supplier_id'], $to); + $res = getTransactions($myrow['supplier_id'], $from, $to); if (db_num_rows($res)==0) continue; $rep->Line($rep->row + 4); - $total[0] = $total[1] = $total[2] = $total[3] = 0.0; while ($trans=db_fetch($res)) { $rep->NewLine(1, 2); - $rep->TextCol(0, 1, $trans['type_name']); + $rep->TextCol(0, 1, $systypes_array[$trans['type']]); $rep->TextCol(1, 2, $trans['reference']); $rep->DateCol(2, 3, $trans['tran_date'], true); - if ($trans['type'] == 20) + if ($trans['type'] == ST_SUPPINVOICE) $rep->DateCol(3, 4, $trans['due_date'], true); $item[0] = $item[1] = 0.0; if ($convert) @@ -149,7 +198,7 @@ function print_supplier_balances() else $item[3] = ($trans['TotalAmount'] + $trans['Allocated']) * $rate; */ - if ($trans['type'] == 20 || $trans['type'] == 2) + if ($trans['type'] == ST_SUPPINVOICE || $trans['type'] == ST_BANKDEPOSIT) $item[3] = $item[0] + $item[1] - $item[2]; else $item[3] = $item[0] - $item[1] + $item[2]; diff --git a/reporting/rep202.php b/reporting/rep202.php index 5b47bec7..3f68bb5a 100644 --- a/reporting/rep202.php +++ b/reporting/rep202.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_SUPPLIERANALYTIC'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -37,8 +37,8 @@ function get_invoices($supplier_id, $to) // Revomed allocated from sql $value = "(".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount)"; - $due = "IF (".TB_PREF."supp_trans.type=20 OR ".TB_PREF."supp_trans.type=21,".TB_PREF."supp_trans.due_date,".TB_PREF."supp_trans.tran_date)"; - $sql = "SELECT ".TB_PREF."sys_types.type_name, + $due = "IF (".TB_PREF."supp_trans.type=".ST_SUPPINVOICE." OR ".TB_PREF."supp_trans.type=".ST_SUPPCREDIT.",".TB_PREF."supp_trans.due_date,".TB_PREF."supp_trans.tran_date)"; + $sql = "SELECT ".TB_PREF."supp_trans.type, ".TB_PREF."supp_trans.reference, ".TB_PREF."supp_trans.tran_date, $value as Balance, @@ -48,11 +48,9 @@ function get_invoices($supplier_id, $to) FROM ".TB_PREF."suppliers, ".TB_PREF."payment_terms, - ".TB_PREF."supp_trans, - ".TB_PREF."sys_types + ".TB_PREF."supp_trans - WHERE ".TB_PREF."sys_types.type_id = ".TB_PREF."supp_trans.type - AND ".TB_PREF."suppliers.payment_terms = ".TB_PREF."payment_terms.terms_indicator + WHERE ".TB_PREF."suppliers.payment_terms = ".TB_PREF."payment_terms.terms_indicator AND ".TB_PREF."suppliers.supplier_id = ".TB_PREF."supp_trans.supplier_id AND ".TB_PREF."supp_trans.supplier_id = $supplier_id AND ".TB_PREF."supp_trans.tran_date <= '$todate' @@ -67,7 +65,7 @@ function get_invoices($supplier_id, $to) function print_aged_supplier_analysis() { - global $comp_path, $path_to_root; + global $comp_path, $path_to_root, $systypes_array; $to = $_POST['PARAM_0']; $fromsupp = $_POST['PARAM_1']; @@ -86,7 +84,7 @@ function print_aged_supplier_analysis() $pg = new graph(); } - if ($fromsupp == reserved_words::get_all_numeric()) + if ($fromsupp == ALL_NUMERIC) $from = _('All'); else $from = get_supplier_name($fromsupp); @@ -96,7 +94,7 @@ function print_aged_supplier_analysis() $summary = _('Summary Only'); else $summary = _('Detailed Report'); - if ($currency == reserved_words::get_all()) + if ($currency == ALL_TEXT) { $convert = true; $currency = _('Balances in Home Currency'); @@ -139,10 +137,10 @@ function print_aged_supplier_analysis() $pastdue1 = $PastDueDays1 + 1 . "-" . $PastDueDays2 . " " . _('Days'); $pastdue2 = _('Over') . " " . $PastDueDays2 . " " . _('Days'); - $sql = "SELECT supplier_id, supp_name AS name, curr_code FROM ".TB_PREF."suppliers "; - if ($fromsupp != reserved_words::get_all_numeric()) - $sql .= "WHERE supplier_id=".db_escape($fromsupp)." "; - $sql .= "ORDER BY supp_name"; + $sql = "SELECT supplier_id, supp_name AS name, curr_code FROM ".TB_PREF."suppliers"; + if ($fromsupp != ALL_NUMERIC) + $sql .= " WHERE supplier_id=".db_escape($fromsupp); + $sql .= " ORDER BY supp_name"; $result = db_query($sql, "The suppliers could not be retrieved"); while ($myrow=db_fetch($result)) @@ -184,7 +182,7 @@ function print_aged_supplier_analysis() while ($trans=db_fetch($res)) { $rep->NewLine(1, 2); - $rep->TextCol(0, 1, $trans['type_name'], -2); + $rep->TextCol(0, 1, $systypes_array[$trans['type']], -2); $rep->TextCol(1, 2, $trans['reference'], -2); $rep->TextCol(2, 3, sql2date($trans['tran_date']), -2); foreach ($trans as $i => $value) diff --git a/reporting/rep203.php b/reporting/rep203.php index f61e4bbf..27eef02b 100644 --- a/reporting/rep203.php +++ b/reporting/rep203.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_SUPPPAYMREP'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -31,8 +31,7 @@ function getTransactions($supplier, $date) { $date = date2sql($date); - $sql = "SELECT ".TB_PREF."sys_types.type_name, - ".TB_PREF."supp_trans.supp_reference, + $sql = "SELECT ".TB_PREF."supp_trans.supp_reference, ".TB_PREF."supp_trans.tran_date, ".TB_PREF."supp_trans.due_date, ".TB_PREF."supp_trans.trans_no, @@ -40,10 +39,8 @@ function getTransactions($supplier, $date) ".TB_PREF."supp_trans.rate, (ABS(".TB_PREF."supp_trans.ov_amount) + ABS(".TB_PREF."supp_trans.ov_gst) - ".TB_PREF."supp_trans.alloc) AS Balance, (ABS(".TB_PREF."supp_trans.ov_amount) + ABS(".TB_PREF."supp_trans.ov_gst) ) AS TranTotal - FROM ".TB_PREF."supp_trans, - ".TB_PREF."sys_types - WHERE ".TB_PREF."sys_types.type_id = ".TB_PREF."supp_trans.type - AND ".TB_PREF."supp_trans.supplier_id = '" . $supplier . "' + FROM ".TB_PREF."supp_trans + WHERE ".TB_PREF."supp_trans.supplier_id = '" . $supplier . "' AND ABS(".TB_PREF."supp_trans.ov_amount) + ABS(".TB_PREF."supp_trans.ov_gst) - ".TB_PREF."supp_trans.alloc != 0 AND ".TB_PREF."supp_trans.tran_date <='" . $date . "' ORDER BY ".TB_PREF."supp_trans.type, @@ -56,7 +53,7 @@ function getTransactions($supplier, $date) function print_payment_report() { - global $path_to_root; + global $path_to_root, $systypes_array; $to = $_POST['PARAM_0']; $fromsupp = $_POST['PARAM_1']; @@ -68,14 +65,14 @@ function print_payment_report() else include_once($path_to_root . "/reporting/includes/pdf_report.inc"); - if ($fromsupp == reserved_words::get_all_numeric()) + if ($fromsupp == ALL_NUMERIC) $from = _('All'); else $from = get_supplier_name($fromsupp); $dec = user_price_dec(); - if ($currency == reserved_words::get_all()) + if ($currency == ALL_TEXT) { $convert = true; $currency = _('Balances in Home Currency'); @@ -106,7 +103,7 @@ function print_payment_report() $sql = "SELECT supplier_id, supp_name AS name, curr_code, ".TB_PREF."payment_terms.terms FROM ".TB_PREF."suppliers, ".TB_PREF."payment_terms WHERE "; - if ($fromsupp != reserved_words::get_all_numeric()) + if ($fromsupp != ALL_NUMERIC) $sql .= "supplier_id=".db_escape($fromsupp)." AND "; $sql .= "".TB_PREF."suppliers.payment_terms = ".TB_PREF."payment_terms.terms_indicator ORDER BY supp_name"; @@ -134,13 +131,13 @@ function print_payment_report() else $rate = 1.0; $rep->NewLine(1, 2); - $rep->TextCol(0, 1, $trans['type_name']); + $rep->TextCol(0, 1, $systypes_array[$trans['type']]); $rep->TextCol(1, 2, $trans['supp_reference']); - if ($trans['type'] == 20) + if ($trans['type'] == ST_SUPPINVOICE) $rep->DateCol(2, 3, $trans['due_date'], true); else $rep->DateCol(2, 3, $trans['tran_date'], true); - if ($trans['type'] != 20) + if ($trans['type'] != ST_SUPPINVOICE) { $trans['TranTotal'] = -$trans['TranTotal']; $trans['Balance'] = -$trans['Balance']; diff --git a/reporting/rep204.php b/reporting/rep204.php index 07e84e73..2c8250cd 100644 --- a/reporting/rep204.php +++ b/reporting/rep204.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_SUPPLIERANALYTIC'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -48,7 +48,8 @@ function getTransactions($fromsupp) AND ".TB_PREF."grn_batch.id = ".TB_PREF."grn_items.grn_batch_id AND ".TB_PREF."grn_items.po_detail_item = ".TB_PREF."purch_order_details.po_detail_item AND qty_recd-quantity_inv <>0 "; - if ($fromsupp != reserved_words::get_all_numeric()) + + if ($fromsupp != ALL_NUMERIC) $sql .= "AND ".TB_PREF."grn_batch.supplier_id =".db_escape($fromsupp)." "; $sql .= "ORDER BY ".TB_PREF."grn_batch.supplier_id, ".TB_PREF."grn_batch.id"; @@ -70,7 +71,7 @@ function print_outstanding_GRN() else include_once($path_to_root . "/reporting/includes/pdf_report.inc"); - if ($fromsupp == reserved_words::get_all_numeric()) + if ($fromsupp == ALL_NUMERIC) $from = _('All'); else $from = get_supplier_name($fromsupp); diff --git a/reporting/rep209.php b/reporting/rep209.php index 9015a1b2..b6b88a45 100644 --- a/reporting/rep209.php +++ b/reporting/rep209.php @@ -9,7 +9,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; + +$page_security = $_POST['PARAM_0'] == $_POST['PARAM_1'] ? + 'SA_SUPPTRANSVIEW' : 'SA_SUPPBULKREP'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -60,9 +62,8 @@ function print_po() $from = $_POST['PARAM_0']; $to = $_POST['PARAM_1']; $currency = $_POST['PARAM_2']; - $bankaccount = $_POST['PARAM_3']; - $email = $_POST['PARAM_4']; - $comments = $_POST['PARAM_5']; + $email = $_POST['PARAM_3']; + $comments = $_POST['PARAM_4']; if ($from == null) $from = 0; @@ -75,10 +76,8 @@ function print_po() // $headers in doctext.inc $aligns = array('left', 'left', 'left', 'right', 'left', 'right', 'right'); - $params = array('comments' => $comments, - 'bankaccount' => $bankaccount); + $params = array('comments' => $comments); - $baccount = get_bank_account($params['bankaccount']); $cur = get_company_Pref('curr_default'); if ($email == 0) @@ -92,6 +91,8 @@ function print_po() for ($i = $from; $i <= $to; $i++) { $myrow = get_po($i); + $baccount = get_default_bank_account($myrow['curr_code']); + $params['bankaccount'] = $baccount['id']; if ($email == 1) { diff --git a/reporting/rep301.php b/reporting/rep301.php index a576b0f0..3b091cde 100644 --- a/reporting/rep301.php +++ b/reporting/rep301.php @@ -9,12 +9,12 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_ITEMSVALREP'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt // date_: 2005-05-19 -// Title: Supplier Balances +// Title: Inventory Valuation // ---------------------------------------------------------------- $path_to_root=".."; @@ -76,17 +76,17 @@ function print_inventory_valuation_report() include_once($path_to_root . "/reporting/includes/excel_report.inc"); else include_once($path_to_root . "/reporting/includes/pdf_report.inc"); - + $detail = !$detail; $dec = user_price_dec(); - if ($category == reserved_words::get_all_numeric()) + if ($category == ALL_NUMERIC) $category = 0; if ($category == 0) $cat = _('All'); else $cat = get_category_name($category); - if ($location == reserved_words::get_all()) + if ($location == ALL_TEXT) $location = 'all'; if ($location == 'all') $loc = _('All'); diff --git a/reporting/rep302.php b/reporting/rep302.php index d4f29975..8e5bb6dd 100644 --- a/reporting/rep302.php +++ b/reporting/rep302.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_ITEMSANALYTIC'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -97,14 +97,14 @@ function print_inventory_planning() else include_once($path_to_root . "/reporting/includes/pdf_report.inc"); - if ($category == reserved_words::get_all_numeric()) + if ($category == ALL_NUMERIC) $category = 0; if ($category == 0) $cat = _('All'); else $cat = get_category_name($category); - if ($location == reserved_words::get_all()) + if ($location == ALL_TEXT) $location = 'all'; if ($location == 'all') $loc = _('All'); diff --git a/reporting/rep303.php b/reporting/rep303.php index e3ffbc6b..25b7a68c 100644 --- a/reporting/rep303.php +++ b/reporting/rep303.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_ITEMSVALREP'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -75,14 +75,14 @@ function print_stock_check() else include_once($path_to_root . "/reporting/includes/pdf_report.inc"); - if ($category == reserved_words::get_all_numeric()) + if ($category == ALL_NUMERIC) $category = 0; if ($category == 0) $cat = _('All'); else $cat = get_category_name($category); - if ($location == reserved_words::get_all()) + if ($location == ALL_TEXT) $location = 'all'; if ($location == 'all') $loc = _('All'); diff --git a/reporting/rep304.php b/reporting/rep304.php index 661e56e2..f1262a18 100644 --- a/reporting/rep304.php +++ b/reporting/rep304.php @@ -9,12 +9,12 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_SALESANALYTIC'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt // date_: 2005-05-19 -// Title: Inventory Planning +// Title: Inventory Sales Report // ---------------------------------------------------------------- $path_to_root=".."; @@ -56,7 +56,7 @@ function getTransactions($category, $location, $fromcust, $from, $to) 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=13 AND ".TB_PREF."debtor_trans.version=1) OR ".TB_PREF."stock_moves.type=11) + 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."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); @@ -90,21 +90,21 @@ function print_inventory_sales() $dec = user_price_dec(); - if ($category == reserved_words::get_all_numeric()) + if ($category == ALL_NUMERIC) $category = 0; if ($category == 0) $cat = _('All'); else $cat = get_category_name($category); - if ($location == reserved_words::get_all()) + if ($location == ALL_TEXT) $location = 'all'; if ($location == 'all') $loc = _('All'); else $loc = get_location_name($location); - if ($fromcust == reserved_words::get_all_numeric()) + if ($fromcust == ALL_NUMERIC) $fromc = _('All'); else $fromc = get_customer_name($fromcust); @@ -112,7 +112,7 @@ function print_inventory_sales() $cols = array(0, 75, 175, 250, 300, 375, 450, 515); $headers = array(_('Category'), _('Description'), _('Customer'), _('Qty'), _('Sales'), _('Cost'), _('Contribution')); - if ($fromcust != reserved_words::get_all_numeric()) + if ($fromcust != ALL_NUMERIC) $headers[2] = ''; $aligns = array('left', 'left', 'left', 'right', 'right', 'right', 'right'); @@ -163,7 +163,7 @@ function print_inventory_sales() $rep->NewLine(); $rep->fontsize -= 2; $rep->TextCol(0, 1, $trans['stock_id']); - if ($fromcust == reserved_words::get_all_numeric()) + if ($fromcust == ALL_NUMERIC) { $rep->TextCol(1, 2, $trans['description']); $rep->TextCol(2, 3, $trans['debtor_name']); diff --git a/reporting/rep401.php b/reporting/rep401.php index fc1468fc..e72f163c 100644 --- a/reporting/rep401.php +++ b/reporting/rep401.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_BOMREP'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt diff --git a/reporting/rep501.php b/reporting/rep501.php index 0435dafb..45047adc 100644 --- a/reporting/rep501.php +++ b/reporting/rep501.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_DIMENSIONREP'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt diff --git a/reporting/rep601.php b/reporting/rep601.php index 66fbbf2a..893c8d9d 100644 --- a/reporting/rep601.php +++ b/reporting/rep601.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_BANKREP'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -54,7 +54,7 @@ function get_bank_transactions($from, $to, $account) function print_bank_transactions() { - global $path_to_root; + global $path_to_root, $systypes_array; $acc = $_POST['PARAM_0']; $from = $_POST['PARAM_1']; @@ -110,11 +110,11 @@ function print_bank_transactions() { $total += $myrow['amount']; - $rep->TextCol(0, 1, systypes::name($myrow["type"])); + $rep->TextCol(0, 1, $systypes_array[$myrow["type"]]); $rep->TextCol(1, 2, $myrow['trans_no']); $rep->TextCol(2, 3, $myrow['ref']); $rep->DateCol(3, 4, $myrow["trans_date"], true); - $rep->TextCol(4, 5, payment_person_types::person_name($myrow["person_type_id"],$myrow["person_id"], false)); + $rep->TextCol(4, 5, payment_person_name($myrow["person_type_id"],$myrow["person_id"], false)); if ($myrow['amount'] > 0.0) $rep->AmountCol(5, 6, abs($myrow['amount']), $dec); else diff --git a/reporting/rep701.php b/reporting/rep701.php index 4f49b549..847fb04e 100644 --- a/reporting/rep701.php +++ b/reporting/rep701.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_GLREP'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt diff --git a/reporting/rep702.php b/reporting/rep702.php index 5955c52f..10bcfef7 100644 --- a/reporting/rep702.php +++ b/reporting/rep702.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_GLANALYTIC'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -32,7 +32,7 @@ print_list_of_journal_entries(); function print_list_of_journal_entries() { - global $path_to_root; + global $path_to_root, $systypes_array; $from = $_POST['PARAM_0']; $to = $_POST['PARAM_1']; @@ -48,14 +48,15 @@ function print_list_of_journal_entries() $cols = array(0, 100, 240, 300, 400, 460, 520, 580); - $headers = array(_('Type/Account'), _('Account Name'), _('Date/Dim.'), + $headers = array(_('Type/Account'), _('Reference').'/'._('Account Name'), _('Date/Dim.'), _('Person/Item/Memo'), _('Debit'), _('Credit')); $aligns = array('left', 'left', 'left', 'left', 'right', 'right'); $params = array( 0 => $comments, 1 => array('text' => _('Period'), 'from' => $from,'to' => $to), - 2 => array('text' => _('Type'), 'from' => systypes::name($systype), + 2 => array('text' => _('Type'), 'from' => + $systype == -1 ? _('All') : $systypes_array[$systype], 'to' => '')); $rep = new FrontReport(_('List of Journal Entries'), "JournalEntries", user_pagesize()); @@ -81,10 +82,11 @@ function print_list_of_journal_entries() } $typeno = $myrow['type_no']; $type = $myrow['type']; - $TransName = systypes::name($myrow['type']); - $rep->TextCol(0, 2, $TransName . " # " . $myrow['type_no']); + $TransName = $systypes_array[$myrow['type']]; + $rep->TextCol(0, 1, $TransName . " # " . $myrow['type_no']); + $rep->TextCol(1, 2, get_reference($myrow['type'], $myrow['type_no'])); $rep->DateCol(2, 3, $myrow['tran_date'], true); - $coms = payment_person_types::person_name($myrow["person_type_id"],$myrow["person_id"]); + $coms = payment_person_name($myrow["person_type_id"],$myrow["person_id"]); $memo = get_comments_string($myrow['type'], $myrow['type_no']); if ($memo != '') { diff --git a/reporting/rep704.php b/reporting/rep704.php index b584c97c..8986237d 100644 --- a/reporting/rep704.php +++ b/reporting/rep704.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_GLREP'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -31,7 +31,7 @@ print_GL_transactions(); function print_GL_transactions() { - global $path_to_root; + global $path_to_root, $systypes_array; $dim = get_company_pref('use_dimension'); $dimension = $dimension2 = 0; @@ -66,7 +66,7 @@ function print_GL_transactions() $rep = new FrontReport(_('GL Account Transactions'), "GLAccountTransactions", user_pagesize()); $dec = user_price_dec(); - $cols = array(0, 70, 90, 140, 210, 280, 340, 400, 450, 510, 570); + $cols = array(0, 80, 100, 150, 210, 280, 340, 400, 450, 510, 570); //------------0--1---2---3----4----5----6----7----8----9----10------- //-----------------------dim1-dim2----------------------------------- //-----------------------dim1---------------------------------------- @@ -147,14 +147,14 @@ function print_GL_transactions() { $total += $myrow['amount']; - $rep->TextCol(0, 1, systypes::name($myrow["type"])); + $rep->TextCol(0, 1, $systypes_array[$myrow["type"]]); $rep->TextCol(1, 2, $myrow['type_no']); $rep->DateCol(2, 3, $myrow["tran_date"], true); if ($dim >= 1) $rep->TextCol(3, 4, get_dimension_string($myrow['dimension_id'])); if ($dim > 1) $rep->TextCol(4, 5, get_dimension_string($myrow['dimension2_id'])); - $rep->TextCol(5, 6, payment_person_types::person_name($myrow["person_type_id"],$myrow["person_id"], false)); + $rep->TextCol(5, 6, payment_person_name($myrow["person_type_id"],$myrow["person_id"], false)); if ($myrow['amount'] > 0.0) $rep->AmountCol(6, 7, abs($myrow['amount']), $dec); else diff --git a/reporting/rep705.php b/reporting/rep705.php index 0f088182..ad10656c 100644 --- a/reporting/rep705.php +++ b/reporting/rep705.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_GLANALYTIC'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -29,10 +29,10 @@ print_annual_expense_breakdown(); //---------------------------------------------------------------------------------------------------- -function getPeriods($year, $account, $dimension, $dimension2) +function getPeriods($row, $account, $dimension, $dimension2) { - $yr = $year; - $mo = 12; + $yr = $row['yr']; + $mo = $row['mo']; $date13 = date('Y-m-d',mktime(0,0,0,$mo+1,1,$yr)); $date12 = date('Y-m-d',mktime(0,0,0,$mo,1,$yr)); $date11 = date('Y-m-d',mktime(0,0,0,$mo-1,1,$yr)); @@ -61,10 +61,10 @@ function getPeriods($year, $account, $dimension, $dimension2) SUM(CASE WHEN tran_date >= '$date12' AND tran_date < '$date13' THEN amount / 1000 ELSE 0 END) AS per12 FROM ".TB_PREF."gl_trans WHERE account='$account'"; - if ($dimension > 0) - $sql .= " AND dimension_id = ".db_escape($dimension); - if ($dimension2 > 0) - $sql .= " AND dimension2_id = ".db_escape($dimension2); + if ($dimension != 0) + $sql .= " AND dimension_id = ".($dimension<0?0:db_escape($dimension)); + if ($dimension2 != 0) + $sql .= " AND dimension2_id = ".($dimension2<0?0:db_escape($dimension2)); $result = db_query($sql, "Transactions for account $account could not be calculated"); @@ -115,8 +115,13 @@ function print_annual_expense_breakdown() //$yr = date('Y'); //$mo = date('m'): // from now - $yr = $year; - $mo = 12; + $sql = "SELECT begin, end, YEAR(end) AS yr, MONTH(end) AS mo FROM ".TB_PREF."fiscal_year WHERE id=".db_escape($year); + $result = db_query($sql, "could not get fiscal year"); + $row = db_fetch($result); + + $year = sql2date($row['begin'])." - ".sql2date($row['end']); + $yr = $row['yr']; + $mo = $row['mo']; $da = 1; if ($date_system == 1) list($yr, $mo, $da) = jalali_to_gregorian($yr, $mo, $da); @@ -211,7 +216,7 @@ function print_annual_expense_breakdown() if ($account['account_code'] != null) { - $bal = getPeriods($year, $account["account_code"], $dimension, $dimension2); + $bal = getPeriods($row, $account["account_code"], $dimension, $dimension2); if (!$bal['per01'] && !$bal['per02'] && !$bal['per03'] && !$bal['per04'] && !$bal['per05'] && !$bal['per06'] && !$bal['per07'] && !$bal['per08'] && !$bal['per09'] && !$bal['per10'] && !$bal['per11'] && !$bal['per12']) diff --git a/reporting/rep706.php b/reporting/rep706.php index a1dece20..1ef4a9d7 100644 --- a/reporting/rep706.php +++ b/reporting/rep706.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_GLANALYTIC'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt diff --git a/reporting/rep707.php b/reporting/rep707.php index e19c29fe..15690a09 100644 --- a/reporting/rep707.php +++ b/reporting/rep707.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_GLANALYTIC'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -243,6 +243,7 @@ function print_profit_and_loss_statement() $last = $account['parent']; $typename[$level] = $account['AccountTypeName']; $closing[$level] = $account['parent']; + $rep->row -= 4; $rep->TextCol(0, 5, $account['AccountTypeName']); $rep->row -= 4; diff --git a/reporting/rep708.php b/reporting/rep708.php index dd027188..9e95275a 100644 --- a/reporting/rep708.php +++ b/reporting/rep708.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_GLANALYTIC'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt diff --git a/reporting/rep709.php b/reporting/rep709.php index ad6f59d0..4baf0105 100644 --- a/reporting/rep709.php +++ b/reporting/rep709.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_TAXREP'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -35,7 +35,6 @@ function getTaxTransactions($from, $to) $sql = "SELECT taxrec.*, taxrec.amount*ex_rate AS amount, taxrec.net_amount*ex_rate AS net_amount, - stype.type_name, IF(ISNULL(supp.supp_name), debt.name, supp.supp_name) as name, branch.br_name FROM ".TB_PREF."trans_tax_details taxrec @@ -45,11 +44,9 @@ function getTaxTransactions($from, $to) LEFT JOIN ".TB_PREF."debtor_trans dtrans ON taxrec.trans_no=dtrans.trans_no AND taxrec.trans_type=dtrans.type LEFT JOIN ".TB_PREF."debtors_master as debt ON dtrans.debtor_no=debt.debtor_no - LEFT JOIN ".TB_PREF."cust_branch as branch ON dtrans.branch_code=branch.branch_code, - ".TB_PREF."sys_types stype - WHERE taxrec.trans_type=stype.type_id - AND (taxrec.amount != 0 OR taxrec.net_amount != 0) - AND taxrec.trans_type != 13 + LEFT JOIN ".TB_PREF."cust_branch as branch ON dtrans.branch_code=branch.branch_code + WHERE (taxrec.amount <> 0 OR taxrec.net_amount <> 0) + AND taxrec.trans_type <> ".ST_CUSTDELIVERY." AND taxrec.tran_date >= '$fromdate' AND taxrec.tran_date <= '$todate' ORDER BY taxrec.tran_date"; @@ -74,7 +71,7 @@ function getTaxInfo($id) function print_tax_report() { - global $path_to_root, $trans_dir; + global $path_to_root, $trans_dir, $Hooks, $systypes_array; $from = $_POST['PARAM_0']; $to = $_POST['PARAM_1']; @@ -119,14 +116,16 @@ function print_tax_report() while ($trans=db_fetch($transactions)) { - if (in_array($trans['trans_type'], array(11,20))) { + if (in_array($trans['trans_type'], array(ST_CUSTCREDIT,ST_SUPPINVOICE))) { $trans['net_amount'] *= -1; $trans['amount'] *= -1; } if (!$summaryOnly) { - $rep->TextCol(0, 1, $trans['type_name']); + $rep->TextCol(0, 1, $systypes_array[$trans['trans_type']]); + if ($trans['memo'] == '') + $trans['memo'] = get_reference($trans['trans_type'], $trans['trans_no']); $rep->TextCol(1, 2, $trans['memo']); $rep->DateCol(2, 3, $trans['tran_date'], true); $rep->TextCol(3, 4, $trans['name']); @@ -144,7 +143,7 @@ function print_tax_report() $rep->Header(); } } - if (in_array($trans['trans_type'], array(2,10,11))) { + if (in_array($trans['trans_type'], array(ST_BANKDEPOSIT,ST_SALESINVOICE,ST_CUSTCREDIT))) { $taxes[$trans['tax_type_id']]['taxout'] += $trans['amount']; $taxes[$trans['tax_type_id']]['out'] += $trans['net_amount']; } else { @@ -193,15 +192,9 @@ function print_tax_report() $rep->Font(); $rep->NewLine(); - $locale = $path_to_root . "/lang/" . $_SESSION['language']->code . "/locale.inc"; - if (file_exists($locale)) + if (method_exists($Hooks, 'TaxFunction')) { - $taxinclude = true; - include($locale); - -// if (function_exists("TaxFunction")) -// TaxFunction(); - + $Hooks->TaxFunction(); } $rep->End(); diff --git a/reporting/reports_main.php b/reporting/reports_main.php index 4de6ef7a..650f0dba 100644 --- a/reporting/reports_main.php +++ b/reporting/reports_main.php @@ -10,7 +10,7 @@ See the License here . ***********************************************************************/ $path_to_root=".."; -$page_security = 5; +$page_security = 'SA_OPEN'; include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/includes/date_functions.inc"); @@ -20,7 +20,7 @@ include_once($path_to_root . "/reporting/includes/reports_classes.inc"); $js = ""; if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Reports and Analysis"), false, false, "", $js); +page(_($help_context = "Reports and Analysis"), false, false, "", $js); $reports = new BoxReports; @@ -28,301 +28,326 @@ $dim = get_company_pref('use_dimension'); $reports->addReportClass(_('Customer')); $reports->addReport(_('Customer'),101,_('Customer &Balances'), - array( new ReportParam(_('End Date'),'DATE'), - new ReportParam(_('Customer'),'CUSTOMERS_NO_FILTER'), - new ReportParam(_('Currency Filter'),'CURRENCY'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('Start Date') => 'DATEBEGIN', + _('End Date') => 'DATEENDM', + _('Customer') => 'CUSTOMERS_NO_FILTER', + _('Currency Filter') => 'CURRENCY', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); $reports->addReport(_('Customer'),102,_('&Aged Customer Analysis'), - array( new ReportParam(_('End Date'),'DATE'), - new ReportParam(_('Customer'),'CUSTOMERS_NO_FILTER'), - new ReportParam(_('Currency Filter'),'CURRENCY'), - new ReportParam(_('Summary Only'),'YES_NO'), - new ReportParam(_('Graphics'),'GRAPHIC'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('End Date') => 'DATE', + _('Customer') => 'CUSTOMERS_NO_FILTER', + _('Currency Filter') => 'CURRENCY', + _('Summary Only') => 'YES_NO', + _('Graphics') => 'GRAPHIC', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); $reports->addReport(_('Customer'),103,_('Customer &Detail Listing'), - array( new ReportParam(_('Activity Since'),'DATEBEGIN'), - new ReportParam(_('Sales Areas'),'AREAS'), - new ReportParam(_('Sales Folk'),'SALESMEN'), - new ReportParam(_('Activity Greater Than'),'TEXT'), - new ReportParam(_('Activity Less Than'),'TEXT'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('Activity Since') => 'DATEBEGIN', + _('Sales Areas') => 'AREAS', + _('Sales Folk') => 'SALESMEN', + _('Activity Greater Than') => 'TEXT', + _('Activity Less Than') => 'TEXT', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); $reports->addReport(_('Customer'),104,_('&Price Listing'), - array( new ReportParam(_('Currency Filter'),'CURRENCY'), - new ReportParam(_('Inventory Category'),'CATEGORIES'), - new ReportParam(_('Sales Types'),'SALESTYPES'), - new ReportParam(_('Show Pictures'),'YES_NO'), - new ReportParam(_('Show GP %'),'YES_NO'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('Currency Filter') => 'CURRENCY', + _('Inventory Category') => 'CATEGORIES', + _('Sales Types') => 'SALESTYPES', + _('Show Pictures') => 'YES_NO', + _('Show GP %') => 'YES_NO', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); $reports->addReport(_('Customer'),105,_('&Order Status Listing'), - array( new ReportParam(_('Start Date'),'DATEBEGINM'), - new ReportParam(_('End Date'),'DATEENDM'), - new ReportParam(_('Inventory Category'),'CATEGORIES'), - new ReportParam(_('Stock Location'),'LOCATIONS'), - new ReportParam(_('Back Orders Only'),'YES_NO'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('Start Date') => 'DATEBEGINM', + _('End Date') => 'DATEENDM', + _('Inventory Category') => 'CATEGORIES', + _('Stock Location') => 'LOCATIONS', + _('Back Orders Only') => 'YES_NO', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); $reports->addReport(_('Customer'),106,_('&Salesman Listing'), - array( new ReportParam(_('Start Date'),'DATEBEGINM'), - new ReportParam(_('End Date'),'DATEENDM'), - new ReportParam(_('Summary Only'),'YES_NO'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('Start Date') => 'DATEBEGINM', + _('End Date') => 'DATEENDM', + _('Summary Only') => 'YES_NO', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); $reports->addReport(_('Customer'),107,_('Print &Invoices/Credit Notes'), - array( new ReportParam(_('From'),'INVOICE'), - new ReportParam(_('To'),'INVOICE'), - new ReportParam(_('Currency Filter'),'CURRENCY'), - new ReportParam(_('Bank Account'),'BANK_ACCOUNTS'), - new ReportParam(_('email Customers'),'YES_NO'), - new ReportParam(_('Payment Link'),'PAYMENT_LINK'), - new ReportParam(_('Comments'),'TEXTBOX'))); + array( _('From') => 'INVOICE', + _('To') => 'INVOICE', + _('Currency Filter') => 'CURRENCY', + _('email Customers') => 'YES_NO', + _('Payment Link') => 'PAYMENT_LINK', + _('Comments') => 'TEXTBOX')); $reports->addReport(_('Customer'),110,_('Print &Deliveries'), - array( new ReportParam(_('From'),'DELIVERY'), - new ReportParam(_('To'),'DELIVERY'), - new ReportParam(_('email Customers'),'YES_NO'), - new ReportParam(_('Comments'),'TEXTBOX'))); + array( _('From') => 'DELIVERY', + _('To') => 'DELIVERY', + _('email Customers') => 'YES_NO', + _('Print as Packing Slip') => 'YES_NO', + _('Comments') => 'TEXTBOX')); $reports->addReport(_('Customer'),108,_('Print &Statements'), - array( new ReportParam(_('Customer'),'CUSTOMERS_NO_FILTER'), - new ReportParam(_('Currency Filter'),'CURRENCY'), - new ReportParam(_('Bank Account'),'BANK_ACCOUNTS'), - new ReportParam(_('Email Customers'),'YES_NO'), - new ReportParam(_('Comments'),'TEXTBOX'))); + array( _('Customer') => 'CUSTOMERS_NO_FILTER', + _('Currency Filter') => 'CURRENCY', + _('Email Customers') => 'YES_NO', + _('Comments') => 'TEXTBOX')); $reports->addReport(_('Customer'),109,_('&Print Sales Orders'), - array( new ReportParam(_('From'),'ORDERS'), - new ReportParam(_('To'),'ORDERS'), - new ReportParam(_('Currency Filter'),'CURRENCY'), - new ReportParam(_('Bank Account'),'BANK_ACCOUNTS'), - new ReportParam(_('Email Customers'),'YES_NO'), - new ReportParam(_('Print as Quote'),'YES_NO'), - new ReportParam(_('Comments'),'TEXTBOX'))); + array( _('From') => 'ORDERS', + _('To') => 'ORDERS', + _('Currency Filter') => 'CURRENCY', + _('Email Customers') => 'YES_NO', + _('Print as Quote') => 'YES_NO', + _('Comments') => 'TEXTBOX')); +$reports->addReport(_('Customer'),111,_('&Print Sales Quotations'), + array( _('From') => 'QUOTATIONS', + _('To') => 'QUOTATIONS', + _('Currency Filter') => 'CURRENCY', + _('Email Customers') => 'YES_NO', + _('Comments') => 'TEXTBOX')); $reports->addReportClass(_('Supplier')); $reports->addReport(_('Supplier'),201,_('Supplier &Balances'), - array( new ReportParam(_('End Date'),'DATE'), - new ReportParam(_('Supplier'),'SUPPLIERS_NO_FILTER'), - new ReportParam(_('Currency Filter'),'CURRENCY'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('Start Date') => 'DATEBEGIN', + _('End Date') => 'DATEENDM', + _('Supplier') => 'SUPPLIERS_NO_FILTER', + _('Currency Filter') => 'CURRENCY', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); $reports->addReport(_('Supplier'),202,_('&Aged Supplier Analyses'), - array( new ReportParam(_('End Date'),'DATE'), - new ReportParam(_('Supplier'),'SUPPLIERS_NO_FILTER'), - new ReportParam(_('Currency Filter'),'CURRENCY'), - new ReportParam(_('Summary Only'),'YES_NO'), - new ReportParam(_('Graphics'),'GRAPHIC'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('End Date') => 'DATE', + _('Supplier') => 'SUPPLIERS_NO_FILTER', + _('Currency Filter') => 'CURRENCY', + _('Summary Only') => 'YES_NO', + _('Graphics') => 'GRAPHIC', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); $reports->addReport(_('Supplier'),203,_('&Payment Report'), - array( new ReportParam(_('End Date'),'DATE'), - new ReportParam(_('Supplier'),'SUPPLIERS_NO_FILTER'), - new ReportParam(_('Currency Filter'),'CURRENCY'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('End Date') => 'DATE', + _('Supplier') => 'SUPPLIERS_NO_FILTER', + _('Currency Filter') => 'CURRENCY', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); $reports->addReport(_('Supplier'),204,_('Outstanding &GRNs Report'), - array( new ReportParam(_('Supplier'),'SUPPLIERS_NO_FILTER'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('Supplier') => 'SUPPLIERS_NO_FILTER', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); $reports->addReport(_('Supplier'),209,_('Print Purchase &Orders'), - array( new ReportParam(_('From'),'PO'), - new ReportParam(_('To'),'PO'), - new ReportParam(_('Currency Filter'),'CURRENCY'), - new ReportParam(_('Bank Account'),'BANK_ACCOUNTS'), - new ReportParam(_('Email Customers'),'YES_NO'), - new ReportParam(_('Comments'),'TEXTBOX'))); + array( _('From') => 'PO', + _('To') => 'PO', + _('Currency Filter') => 'CURRENCY', + _('Email Customers') => 'YES_NO', + _('Comments') => 'TEXTBOX')); $reports->addReportClass(_('Inventory')); $reports->addReport(_('Inventory'),301,_('Inventory &Valuation Report'), - array( new ReportParam(_('Inventory Category'),'CATEGORIES'), - new ReportParam(_('Location'),'LOCATIONS'), - new ReportParam(_('Detailed Report'),'YES_NO'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('Inventory Category') => 'CATEGORIES', + _('Location') => 'LOCATIONS', + _('Summary Only') => 'YES_NO', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); $reports->addReport(_('Inventory'),302,_('Inventory &Planning Report'), - array( new ReportParam(_('Inventory Category'),'CATEGORIES'), - new ReportParam(_('Location'),'LOCATIONS'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('Inventory Category') => 'CATEGORIES', + _('Location') => 'LOCATIONS', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); $reports->addReport(_('Inventory'),303,_('Stock &Check Sheets'), - array( new ReportParam(_('Inventory Category'),'CATEGORIES'), - new ReportParam(_('Location'),'LOCATIONS'), - new ReportParam(_('Show Pictures'),'YES_NO'), - new ReportParam(_('Inventory Column'),'YES_NO'), - new ReportParam(_('Show Shortage'),'YES_NO'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('Inventory Category') => 'CATEGORIES', + _('Location') => 'LOCATIONS', + _('Show Pictures') => 'YES_NO', + _('Inventory Column') => 'YES_NO', + _('Show Shortage') => 'YES_NO', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); $reports->addReport(_('Inventory'),304,_('Inventory &Sales Report'), - array( new ReportParam(_('Start Date'),'DATEBEGINM'), - new ReportParam(_('End Date'),'DATEENDM'), - new ReportParam(_('Inventory Category'),'CATEGORIES'), - new ReportParam(_('Location'),'LOCATIONS'), - new ReportParam(_('Customer'),'CUSTOMERS_NO_FILTER'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('Start Date') => 'DATEBEGINM', + _('End Date') => 'DATEENDM', + _('Inventory Category') => 'CATEGORIES', + _('Location') => 'LOCATIONS', + _('Customer') => 'CUSTOMERS_NO_FILTER', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); +$reports->addReport(_('Inventory'),305,_('&GRN Valuation Report'), + array( _('Start Date') => 'DATEBEGINM', + _('End Date') => 'DATEENDM', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); -$reports->addReportClass(_('Manufactoring')); -$reports->addReport(_('Manufactoring'),401,_('&Bill of Material Listing'), - array( new ReportParam(_('From component'),'ITEMS'), - new ReportParam(_('To component'),'ITEMS'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); - $reports->addReportClass(_('Dimensions')); +$reports->addReportClass(_('Manufacturing')); +$reports->addReport(_('Manufacturing'),401,_('&Bill of Material Listing'), + array( _('From product') => 'ITEMS', + _('To product') => 'ITEMS', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); +$reports->addReport(_('Manufacturing'),409,_('Print &Work Orders'), + array( _('From') => 'WORKORDER', + _('To') => 'WORKORDER', + _('Email Locations') => 'YES_NO', + _('Comments') => 'TEXTBOX')); +$reports->addReportClass(_('Dimensions')); if ($dim > 0) { $reports->addReport(_('Dimensions'),501,_('Dimension &Summary'), - array( new ReportParam(_('From Dimension'),'DIMENSION'), - new ReportParam(_('To Dimension'),'DIMENSION'), - new ReportParam(_('Show Balance'),'YES_NO'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('From Dimension') => 'DIMENSION', + _('To Dimension') => 'DIMENSION', + _('Show Balance') => 'YES_NO', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); //$reports->addReport(_('Dimensions'),502,_('Dimension Details'), - //array( new ReportParam(_('Dimension'),'DIMENSIONS'), - // new ReportParam(_('Comments'),'TEXTBOX'))); + //array( _('Dimension'),'DIMENSIONS'), + // _('Comments'),'TEXTBOX'))); } $reports->addReportClass(_('Banking')); $reports->addReport(_('Banking'),601,_('Bank &Statement'), - array( new ReportParam(_('Bank Accounts'),'BANK_ACCOUNTS'), - new ReportParam(_('Start Date'),'DATEBEGINM'), - new ReportParam(_('End Date'),'DATEENDM'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('Bank Accounts') => 'BANK_ACCOUNTS', + _('Start Date') => 'DATEBEGINM', + _('End Date') => 'DATEENDM', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); $reports->addReportClass(_('General Ledger')); $reports->addReport(_('General Ledger'),701,_('Chart of &Accounts'), - array( new ReportParam(_('Show Balances'),'YES_NO'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('Show Balances') => 'YES_NO', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); $reports->addReport(_('General Ledger'),702,_('List of &Journal Entries'), - array( new ReportParam(_('Start Date'),'DATEBEGINM'), - new ReportParam(_('End Date'),'DATEENDM'), - new ReportParam(_('Type'),'SYS_TYPES'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('Start Date') => 'DATEBEGINM', + _('End Date') => 'DATEENDM', + _('Type') => 'SYS_TYPES', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); //$reports->addReport(_('General Ledger'),703,_('GL Account Group Summary'), -// array( new ReportParam(_('Comments'),'TEXTBOX'))); +// array( _('Comments'),'TEXTBOX'))); + if ($dim == 2) { $reports->addReport(_('General Ledger'),704,_('GL Account &Transactions'), - array( new ReportParam(_('Start Date'),'DATEBEGINM'), - new ReportParam(_('End Date'),'DATEENDM'), - new ReportParam(_('From Account'),'GL_ACCOUNTS'), - new ReportParam(_('To Account'),'GL_ACCOUNTS'), - new ReportParam(_('Dimension')." 1", 'DIMENSIONS1'), - new ReportParam(_('Dimension')." 2", 'DIMENSIONS2'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('Start Date') => 'DATEBEGINM', + _('End Date') => 'DATEENDM', + _('From Account') => 'GL_ACCOUNTS', + _('To Account') => 'GL_ACCOUNTS', + _('Dimension')." 1" => 'DIMENSIONS1', + _('Dimension')." 2" => 'DIMENSIONS2', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); $reports->addReport(_('General Ledger'),705,_('Annual &Expense Breakdown'), - array( new ReportParam(_('Year'),'TRANS_YEARS'), - new ReportParam(_('Dimension')." 1", 'DIMENSIONS1'), - new ReportParam(_('Dimension')." 2", 'DIMENSIONS2'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('Year') => 'TRANS_YEARS', + _('Dimension')." 1" => 'DIMENSIONS1', + _('Dimension')." 2" => 'DIMENSIONS2', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); $reports->addReport(_('General Ledger'),706,_('&Balance Sheet'), - array( new ReportParam(_('Start Date'),'DATEBEGIN'), - new ReportParam(_('End Date'),'DATEENDM'), - new ReportParam(_('Dimension')." 1", 'DIMENSIONS1'), - new ReportParam(_('Dimension')." 2", 'DIMENSIONS2'), - new ReportParam(_('Graphics'),'GRAPHIC'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('Start Date') => 'DATEBEGIN', + _('End Date') => 'DATEENDM', + _('Dimension')." 1" => 'DIMENSIONS1', + _('Dimension')." 2" => 'DIMENSIONS2', + _('Graphics') => 'GRAPHIC', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); $reports->addReport(_('General Ledger'),707,_('&Profit and Loss Statement'), - array( new ReportParam(_('Start Date'),'DATEBEGINM'), - new ReportParam(_('End Date'),'DATEENDM'), - new ReportParam(_('Compare to'),'COMPARE'), - new ReportParam(_('Dimension')." 1", 'DIMENSIONS1'), - new ReportParam(_('Dimension')." 2", 'DIMENSIONS2'), - new ReportParam(_('Graphics'),'GRAPHIC'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('Start Date') => 'DATEBEGINM', + _('End Date') => 'DATEENDM', + _('Compare to') => 'COMPARE', + _('Dimension')." 1" => 'DIMENSIONS1', + _('Dimension')." 2" => 'DIMENSIONS2', + _('Graphics') => 'GRAPHIC', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); $reports->addReport(_('General Ledger'),708,_('Trial &Balance'), - array( new ReportParam(_('Start Date'),'DATEBEGINM'), - new ReportParam(_('End Date'),'DATEENDM'), - new ReportParam(_('Zero values'),'YES_NO'), - new ReportParam(_('Only balances'),'YES_NO'), - new ReportParam(_('Dimension')." 1", 'DIMENSIONS1'), - new ReportParam(_('Dimension')." 2", 'DIMENSIONS2'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('Start Date') => 'DATEBEGINM', + _('End Date') => 'DATEENDM', + _('Zero values') => 'YES_NO', + _('Only balances') => 'YES_NO', + _('Dimension')." 1" => 'DIMENSIONS1', + _('Dimension')." 2" => 'DIMENSIONS2', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); } else if ($dim == 1) { $reports->addReport(_('General Ledger'),704,_('GL Account &Transactions'), - array( new ReportParam(_('Start Date'),'DATEBEGINM'), - new ReportParam(_('End Date'),'DATEENDM'), - new ReportParam(_('From Account'),'GL_ACCOUNTS'), - new ReportParam(_('To Account'),'GL_ACCOUNTS'), - new ReportParam(_('Dimension'), 'DIMENSIONS1'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('Start Date') => 'DATEBEGINM', + _('End Date') => 'DATEENDM', + _('From Account') => 'GL_ACCOUNTS', + _('To Account') => 'GL_ACCOUNTS', + _('Dimension') => 'DIMENSIONS1', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); $reports->addReport(_('General Ledger'),705,_('Annual &Expense Breakdown'), - array( new ReportParam(_('Year'),'TRANS_YEARS'), - new ReportParam(_('Dimension'), 'DIMENSIONS1'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('Year') => 'TRANS_YEARS', + _('Dimension') => 'DIMENSIONS1', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); $reports->addReport(_('General Ledger'),706,_('&Balance Sheet'), - array( new ReportParam(_('Start Date'),'DATEBEGIN'), - new ReportParam(_('End Date'),'DATEENDM'), - new ReportParam(_('Dimension'), 'DIMENSIONS1'), - new ReportParam(_('Graphics'),'GRAPHIC'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('Start Date') => 'DATEBEGIN', + _('End Date') => 'DATEENDM', + _('Dimension') => 'DIMENSIONS1', + _('Graphics') => 'GRAPHIC', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); $reports->addReport(_('General Ledger'),707,_('&Profit and Loss Statement'), - array( new ReportParam(_('Start Date'),'DATEBEGINM'), - new ReportParam(_('End Date'),'DATEENDM'), - new ReportParam(_('Compare to'),'COMPARE'), - new ReportParam(_('Dimension'), 'DIMENSIONS1'), - new ReportParam(_('Graphics'),'GRAPHIC'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('Start Date') => 'DATEBEGINM', + _('End Date') => 'DATEENDM', + _('Compare to') => 'COMPARE', + _('Dimension') => 'DIMENSIONS1', + _('Graphics') => 'GRAPHIC', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); $reports->addReport(_('General Ledger'),708,_('Trial &Balance'), - array( new ReportParam(_('Start Date'),'DATEBEGINM'), - new ReportParam(_('End Date'),'DATEENDM'), - new ReportParam(_('Zero values'),'YES_NO'), - new ReportParam(_('Only balances'),'YES_NO'), - new ReportParam(_('Dimension'), 'DIMENSIONS1'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('Start Date') => 'DATEBEGINM', + _('End Date') => 'DATEENDM', + _('Zero values') => 'YES_NO', + _('Only balances') => 'YES_NO', + _('Dimension') => 'DIMENSIONS1', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); } else { $reports->addReport(_('General Ledger'),704,_('GL Account &Transactions'), - array( new ReportParam(_('Start Date'),'DATEBEGINM'), - new ReportParam(_('End Date'),'DATEENDM'), - new ReportParam(_('From Account'),'GL_ACCOUNTS'), - new ReportParam(_('To Account'),'GL_ACCOUNTS'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('Start Date') => 'DATEBEGINM', + _('End Date') => 'DATEENDM', + _('From Account') => 'GL_ACCOUNTS', + _('To Account') => 'GL_ACCOUNTS', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); $reports->addReport(_('General Ledger'),705,_('Annual &Expense Breakdown'), - array( new ReportParam(_('Year'),'TRANS_YEARS'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('Year') => 'TRANS_YEARS', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); $reports->addReport(_('General Ledger'),706,_('&Balance Sheet'), - array( new ReportParam(_('Start Date'),'DATEBEGIN'), - new ReportParam(_('End Date'),'DATEENDM'), - new ReportParam(_('Graphics'),'GRAPHIC'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('Start Date') => 'DATEBEGIN', + _('End Date') => 'DATEENDM', + _('Graphics') => 'GRAPHIC', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); $reports->addReport(_('General Ledger'),707,_('&Profit and Loss Statement'), - array( new ReportParam(_('Start Date'),'DATEBEGINM'), - new ReportParam(_('End Date'),'DATEENDM'), - new ReportParam(_('Compare to'),'COMPARE'), - new ReportParam(_('Graphics'),'GRAPHIC'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('Start Date') => 'DATEBEGINM', + _('End Date') => 'DATEENDM', + _('Compare to') => 'COMPARE', + _('Graphics') => 'GRAPHIC', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); $reports->addReport(_('General Ledger'),708,_('Trial &Balance'), - array( new ReportParam(_('Start Date'),'DATEBEGINM'), - new ReportParam(_('End Date'),'DATEENDM'), - new ReportParam(_('Zero values'),'YES_NO'), - new ReportParam(_('Only balances'),'YES_NO'), - new ReportParam(_('Comments'),'TEXTBOX'), - new ReportParam(_('Destination'),'DESTINATION'))); + array( _('Start Date') => 'DATEBEGINM', + _('End Date') => 'DATEENDM', + _('Zero values') => 'YES_NO', + _('Only balances') => 'YES_NO', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); } $reports->addReport(_('General Ledger'),709,_('Ta&x Report'), - array( new ReportParam(_('Start Date'),'DATEBEGINTAX'), - new ReportParam(_('End Date'),'DATEENDTAX'), - new ReportParam(_('Summary Only'),'YES_NO'), - new ReportParam(_('Comments'),'TEXTBOX'))); + array( _('Start Date') => 'DATEBEGINTAX', + _('End Date') => 'DATEENDTAX', + _('Summary Only') => 'YES_NO', + _('Comments') => 'TEXTBOX')); +$reports->addReport(_('General Ledger'),710,_('Audit Trail'), + array( _('Start Date') => 'DATEBEGINM', + _('End Date') => 'DATEENDM', + _('Type') => 'SYS_TYPES_ALL', + _('User') => 'USERS', + _('Comments') => 'TEXTBOX', + _('Destination') => 'DESTINATION')); + +add_custom_reports($reports); echo "