From 2675ad383b1de774e9832ef134abc81e69479fed Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Mon, 24 Jun 2019 22:57:49 +0200 Subject: [PATCH] Release 2.4.7. --- CHANGELOG.txt | 329 ++++ .../LC_MESSAGES/empty.po | 1459 +++++++++-------- themes/canvas/default.css | 1 - themes/default/default.css | 1 - themes/dropdown/default.css | 1 - version.php | 2 +- 6 files changed, 1065 insertions(+), 728 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 83c6257e..22c249ca 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,316 @@ +2019-06-23 22:49:00 +0200 Janusz Dobrowolski +Fixed inventory cost calculation for fiscal year deletion. +M admin/db/fiscalyears_db.inc + +2019-06-23 12:23:53 +0200 Janusz Dobrowolski +Reverted latest changes in inventory adjustment to ensure database consistency. +M inventory/includes/db/items_adjust_db.inc +M reporting/rep301.php +M reporting/rep308.php + +2019-06-20 09:17:13 +0200 Joe Hunt +Rerun rep306. Fixed dupplicated rows. +M reporting/rep306.php + +2019-06-20 09:11:13 +0200 Joe Hunt +Fixed Inventory Purchasing Report with physical rate from line. +M reporting/rep306.php + +2019-06-17 09:54:59 +0200 Joe Hunt +Rerun of items_adjust_db.inc. @itronics. +M inventory/includes/db/items_adjust_db.inc + +2019-06-17 08:25:43 +0200 Joe Hunt +Anomaly created by Cost Update in Inventory Sales Report (rep304). Updated bugfix. @boxygen. +M inventory/includes/db/items_adjust_db.inc +M reporting/rep301.php +M reporting/rep308.php + +2019-06-16 09:44:09 +0200 Joe Hunt +General Leger - List of journal entries - change in memo fields. @Braath Waate. +M reporting/rep702.php + +2019-06-16 08:55:00 +0200 Joe Hunt +Fixing Get_domestic_price in rep301 and rep308. @boxygen. +M reporting/rep301.php +M reporting/rep308.php + +2019-06-15 11:02:24 +0200 Janusz Dobrowolski +Rolled back invalid update of stock_move costs on cost update. +M inventory/includes/db/items_trans_db.inc + +2019-06-04 08:11:17 +0200 Joe Hunt +Bug 4896: Standard Cost is not Updated in debtor_trans_detail table if Customer Credit Note is processed. @boxygen. +M sales/includes/db/sales_credit_db.inc + +2019-06-04 07:58:40 +0200 Joe Hunt +Fixed Supplier Allocation Inquiry - Due Date. @poncho1234. +M purchasing/inquiry/supplier_allocation_inquiry.php + +2019-06-02 18:29:32 +0200 Joe Hunt +Wrong Presentation of supp balance in forms. @JimmyC +M purchasing/includes/db/invoice_db.inc +M purchasing/includes/db/po_db.inc + +2019-05-18 15:45:11 +0200 Joe Hunt +Rerun fix Supplier Trial Balance. +M reporting/rep206.php + +2019-05-18 15:35:34 +0200 Joe Hunt +Buxfix in Customer and Supplier Trial Balance Report and margin fixes. @boxygen. +M reporting/rep115.php +M reporting/rep206.php + +2019-05-01 10:00:31 +0200 Joe Hunt +Fixed Email Receipt to customer. +M reporting/includes/reporting.inc +M reporting/rep112.php +M reporting/reports_main.php +M sales/customer_payments.php + +2019-04-22 10:07:25 +0200 Joe Hunt +New Soluton to sales_order_ui.inc has a bug. @kvvaradha. +M sales/includes/ui/sales_order_ui.inc + +2019-04-19 16:40:04 +0200 Joe Hunt +Rerun: user_list_cells Real name sometimes shows empty. @apmuthu +M includes/ui/ui_lists.inc + +2019-04-14 23:30:50 +0200 Joe Hunt +user_list_cells Real name shows empty when not entered in user table. @kvvaradha. +M includes/ui/ui_lists.inc + +2019-04-13 09:52:25 +0200 Joe Hunt +rerun of sales_order_ui.inc has a bug. @Braath Waate and @kvvaradha. +M sales/includes/ui/sales_order_ui.inc + +2019-04-07 08:48:16 +0200 Joe Hunt +Recurrent Invoices in 2.4 is not sending. Fixed by @Braath Waate. +M sales/create_recurrent_invoices.php + +2019-03-26 16:57:32 +0100 Joe Hunt +4863: Dimension not defaulted on po entry, po modify. @Braath Waate and @joe fixed +M purchasing/includes/db/grn_db.inc +M purchasing/includes/db/invoice_db.inc +M purchasing/includes/db/po_db.inc + +2019-03-26 11:17:08 +0100 Joe Hunt +4867: supplier quick entry g/l account list should show the bank accounts in the line. +M purchasing/includes/ui/invoice_ui.inc + +2019-03-26 10:51:56 +0100 Joe Hunt +Rerun /reporting/includes/report_classes.inc +M reporting/includes/reports_classes.inc + +2019-03-26 10:42:35 +0100 Joe Hunt +4869: Work order listing and print work orders reports should omit voided orders. @Braath Waate fixed. +M manufacturing/includes/db/work_orders_db.inc +M reporting/includes/reports_classes.inc +M reporting/rep402.php + +2019-03-26 01:42:25 +0100 Joe Hunt +Sometimes when amount tax details was zero and net amount was set an empty gl transaction was made. @JimmyC and @joe fixed it. +M sales/includes/db/sales_invoice_db.inc + +2019-03-24 18:07:25 +0100 Joe Hunt +Rerun of sales_order_entry.php. +M sales/sales_order_entry.php + +2019-03-24 18:02:00 +0100 Joe Hunt +Fixing bug in Sales Invoice and Sales Delivery when Cash Sales and document date is earlier then todays date. Due date should be the same. +M sales/sales_order_entry.php + +2019-03-23 10:50:42 +0100 Joe Hunt +Presentation bug in Sales Order View when reference is 'auto'. +M sales/view/view_sales_order.php + +2019-03-21 22:28:35 +0100 Joe Hunt +Removed CCA, (currencyconverterapi.com) is no longer working. Updated url from google api. @notrinos. +M config.default.php +M gl/includes/db/gl_db_rates.inc + +2019-03-19 21:40:45 +0100 Joe Hunt +No edit in supplier invoice quick entry fixed. @Braath Waate. +M purchasing/includes/ui/invoice_ui.inc +M purchasing/supplier_invoice.php + +2019-03-06 22:55:17 +0100 Joe Hunt +PHP 7.X produces A non-numeric value encountered in \includes\date_functions.inc when using date format 5 (YYYY/MM/D. +M includes/date_functions.inc + +2019-03-04 08:42:29 +0100 Joe Hunt +Clean up in en_US-demo.sql and en_US-new.sql. @apmuthu. +M sql/en_US-demo.sql +M sql/en_US-new.sql + +2019-02-22 23:30:45 +0100 Joe Hunt +4859: The Outstanding in Customer Balance is Not Ok with Journal Entry. Fixed by @boxygen. +M reporting/rep101.php + +2019-02-22 10:01:34 +0100 Joe Hunt +0004847: FA allows reconciliation of closed transactions. Fixed by @Braath Waathe. +M gl/bank_account_reconcile.php + +2019-02-22 09:49:28 +0100 Joe Hunt +Display of newlines in memo show as html during purchase order modify. Fixed by @Braath Waathe- +M purchasing/includes/db/po_db.inc + +2019-02-19 08:28:59 +0100 Joe Hunt +Fixed users Last Visit Date with Time. @kvvaradha and @apmuthu. +M admin/users.php + +2019-02-13 16:05:42 +0100 Janusz Dobrowolski +Process Depreciation: hardcoded fiscal years constraint removed. +M includes/data_checks.inc +M includes/ui/ui_lists.inc + +2019-02-13 15:48:50 +0100 Joe Hunt +Customer balance Report rep101.php has one extra parameter. Fixed @kvvaradha. +M reporting/rep101.php + +2019-01-29 15:10:00 +0100 Joe Hunt +Bad english language in db error msg. +M inventory/includes/db/items_units_db.inc + +2019-01-27 15:57:06 +0100 Joe Hunt +Fixed small bug item units db by @anoopmb. +M inventory/includes/db/items_units_db.inc + +2019-01-25 21:27:35 +0100 Janusz Dobrowolski +Additional sql strict mode related fix in add_trans_tax_details(). +M gl/includes/db/gl_db_trans.inc + +2019-01-25 10:20:55 +0100 Joe Hunt +Rerun of sales_order_ui.inc has a bug. +M sales/includes/ui/sales_order_ui.inc + +2019-01-24 23:28:25 +0100 Joe Hunt +Bugs in sales_db.inc and sales_order_ui.inc fixed by @kvvaradha. +M sales/includes/sales_db.inc +M sales/includes/ui/sales_order_ui.inc + +2019-01-23 11:26:41 +0100 Joe Hunt +items_cart class has a logical bug, fixed by @kvvaradha. +M includes/ui/items_cart.inc + +2019-01-22 12:29:08 +0100 Joe Hunt +Redesign of the 2 core COAs. They are similar now except the demo data in the demo variant. +M sql/en_US-demo.sql +M sql/en_US-new.sql + +2019-01-21 23:09:30 +0100 Joe Hunt +Rerun2 of updated en_US-demo.sql. +M sql/en_US-demo.sql + +2019-01-21 13:41:03 +0100 Joe Hunt +Rerun of en_US-demo COA. Cleaning. +M sql/en_US-demo.sql + +2019-01-21 11:45:47 +0100 Joe Hunt +Updated en_US-demo to contain 2018 and a couple of transes in 2019. +M sql/en_US-demo.sql + +2019-01-20 20:20:31 +0100 Janusz Dobrowolski +Relaxed sql_mode set on database initialization to provide backward compatibility during backup restartion. +M admin/db/maintenance_db.inc + +2019-01-17 08:25:14 +0100 Joe Hunt +Double semicolon line endings fixed by @apmuthu. +M admin/attachments.php +M fixed_assets/includes/fa_classes_db.inc +M inventory/view/view_transfer.php +M js/behaviour.js +M manufacturing/view/wo_issue_view.php +M purchasing/view/view_po.php +M reporting/rep451.php +M sales/customer_credit_invoice.php +M sales/includes/db/customers_db.inc +M taxes/tax_groups.php + +2019-01-16 22:37:09 +0100 Joe Hunt +Double Semi Colon in this line. Please remove one by £boxygen +M gl/includes/db/gl_db_trans.inc + +2019-01-16 22:24:19 +0100 Joe Hunt +Placeholders Not Allowed for Dimensions. Fixed by @boxygen +M includes/references.inc + +2019-01-14 17:29:25 +0100 Joe Hunt +wrong command symbol in ui_list.inc by @notrinos. +M includes/ui/ui_lists.inc + +2019-01-11 08:29:58 +0100 Joe Hunt +Rerun of Update Material Cost Function. $notrinos. +M manufacturing/includes/db/work_order_costing_db.inc + +2019-01-10 20:04:20 +0100 Janusz Dobrowolski +Fixed get_post() support for numeric fields. +M admin/display_prefs.php +M includes/ui/ui_controls.inc + +2019-01-10 18:00:25 +0100 Janusz Dobrowolski +Quick Entries: fixed false warning. +M gl/manage/gl_quick_entries.php + +2019-01-10 16:29:01 +0100 Janusz Dobrowolski +Fixed allocation date for customer payments entry, additional fixes for strict sql mode. +M includes/db/audit_trail_db.inc +M sales/customer_payments.php + +2019-01-10 10:17:14 +0100 Janusz Dobrowolski +Activated strict SQL mode, minor SQL injection fix, fixed _vl() debug helper. +M admin/display_prefs.php +M includes/date_functions.inc +M includes/db/class.reflines_db.inc +M includes/db/connect_db_mysql.inc +M includes/db/connect_db_mysqli.inc +M includes/ui/class.crud_view.inc +M includes/ui/class.reflines_crud.inc +M includes/ui/ui_input.inc +M includes/ui/ui_view.inc +M inventory/includes/db/items_db.inc +M inventory/manage/items.php +M inventory/manage/locations.php +M purchasing/manage/suppliers.php +M sales/includes/cart_class.inc + +2019-01-09 23:15:27 +0100 Joe Hunt +Rollback. Update material cost when quantity on hand is zero. @notrinos. +M manufacturing/includes/db/work_order_costing_db.inc + +2019-01-08 23:42:04 +0100 Joe Hunt +Merge branch 'master' of https://git.code.sf.net/p/frontaccounting/git +2019-01-08 23:41:40 +0100 Joe Hunt +Password reset mail could take several hours. After fix only a couple of seconds. Using From: email in header. +M includes/current_user.inc + +2019-01-08 23:40:09 +0100 Joe Hunt +Bug 4817: g/l account inquiry can timeout due to slow sql. @Braath Waate. +M gl/includes/db/gl_db_trans.inc +M gl/inquiry/gl_account_inquiry.php + +2019-01-08 20:44:35 +0100 Janusz Dobrowolski +New transaction reference formats {FF}/{FFFF} for fiscal years starting on other day than January 1st. +M includes/references.inc + +2019-01-07 17:31:09 +0100 Joe Hunt +Optimized function get_trans_tax_details() by @apmuthu. +M gl/includes/db/gl_db_trans.inc + +2019-01-05 10:42:24 +0100 Joe Hunt +Date Picker close when clicked outside of the datepicker. @kvvaradha and @apmuthu. +M includes/ui/ui_view.inc + +2019-01-02 09:12:17 +0100 Joe Hunt +Supplier Transaction Inquiry for GRN did not filter on date. Fixed by @notrinos. +M purchasing/includes/db/supp_trans_db.inc + +2018-12-24 00:41:51 +0100 Joe Hunt +Merge branch 'master' of https://git.code.sf.net/p/frontaccounting/git +2018-12-24 00:41:14 +0100 Joe Hunt +New CHANGELOG.txt file. +M CHANGELOG.txt + 2018-12-24 00:38:18 +0100 Joe Hunt Release 2.4.6 M version.php @@ -6,6 +319,22 @@ M version.php Report Stock Check Sheet is now testing for valid barcodes of EAN, EAN-8, EAN-13, GTIN-8, GTIN-12, GTIN-14, UPC, UPC-12 coupon code, JAN if 'Using Barcodes' is enabled. M reporting/rep303.php +2018-12-23 15:39:52 +0100 Janusz Dobrowolski +Update README.md, removed obsolete install/update info, added list of contributors. +M README.md +M doc/license.txt +D install.html +D update.html + +2018-12-23 10:57:11 +0100 Janusz Dobrowolski +Gettext template update. +M lang/new_language_template/LC_MESSAGES/empty.po + +2018-12-20 21:09:08 +0100 Janusz Dobrowolski +Attach Documents: fixed SQL injection vulnerability. +M admin/db/transactions_db.inc +M includes/references.inc + 2018-12-22 11:54:46 +0100 Joe Hunt Barcodes in report Stock Check Sheets should only print numeric stock id's. M reporting/rep303.php diff --git a/lang/new_language_template/LC_MESSAGES/empty.po b/lang/new_language_template/LC_MESSAGES/empty.po index a0acb8cd..675ced37 100644 --- a/lang/new_language_template/LC_MESSAGES/empty.po +++ b/lang/new_language_template/LC_MESSAGES/empty.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-23 10:56+0100\n" +"POT-Creation-Date: 2019-06-24 19:31+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -66,7 +66,7 @@ msgstr "" msgid "User name" msgstr "" -#: access/login.php:97 admin/users.php:200 +#: access/login.php:97 admin/users.php:202 msgid "Password:" msgstr "" @@ -81,7 +81,7 @@ msgid "Login -->" msgstr "" #: access/login.php:155 access/password_reset.php:106 -#: admin/display_prefs.php:123 themes/default/renderer.php:136 +#: admin/display_prefs.php:125 themes/default/renderer.php:136 msgid "Theme:" msgstr "" @@ -154,14 +154,14 @@ msgstr "" #: admin/attachments.php:186 admin/create_coy.php:269 #: admin/crm_categories.php:106 admin/fiscalyears.php:164 #: admin/inst_lang.php:100 admin/payment_terms.php:142 admin/printers.php:96 -#: admin/shipping_companies.php:106 admin/tags.php:140 admin/users.php:153 +#: admin/shipping_companies.php:106 admin/tags.php:140 admin/users.php:155 #: dimensions/inquiry/search_dimensions.php:116 gl/manage/bank_accounts.php:133 #: gl/manage/currencies.php:164 gl/manage/exchange_rates.php:94 #: gl/manage/gl_account_classes.php:131 gl/manage/gl_account_types.php:159 #: gl/manage/gl_quick_entries.php:201 gl/manage/gl_quick_entries.php:303 #: gl/includes/ui/gl_bank_ui.inc:179 gl/includes/ui/gl_journal_ui.inc:160 -#: includes/ui/class.crud_view.inc:281 includes/ui/contacts_view.inc:61 -#: includes/ui/simple_crud_class.inc:52 includes/ui/ui_view.inc:1567 +#: includes/ui/class.crud_view.inc:290 includes/ui/contacts_view.inc:61 +#: includes/ui/simple_crud_class.inc:52 includes/ui/ui_view.inc:1575 #: inventory/prices.php:163 inventory/purchasing_data.php:167 #: inventory/includes/item_adjustments_ui.inc:100 #: inventory/includes/stock_transfers_ui.inc:83 @@ -170,7 +170,8 @@ msgstr "" #: inventory/manage/sales_kits.php:51 manufacturing/manage/bom_edit.php:59 #: manufacturing/manage/work_centres.php:114 #: manufacturing/includes/work_order_issue_ui.inc:61 -#: purchasing/includes/ui/invoice_ui.inc:551 +#: purchasing/includes/ui/invoice_ui.inc:320 +#: purchasing/includes/ui/invoice_ui.inc:553 #: purchasing/includes/ui/po_ui.inc:253 sales/manage/credit_status.php:119 #: sales/manage/customer_branches.php:158 #: sales/manage/recurrent_invoices.php:156 sales/manage/sales_areas.php:103 @@ -194,13 +195,13 @@ msgstr "" #: admin/crm_categories.php:110 admin/fiscalyears.php:166 #: admin/inst_chart.php:90 admin/inst_lang.php:109 admin/inst_module.php:152 #: admin/inst_theme.php:87 admin/payment_terms.php:143 admin/printers.php:97 -#: admin/shipping_companies.php:107 admin/tags.php:141 admin/users.php:155 +#: admin/shipping_companies.php:107 admin/tags.php:141 admin/users.php:157 #: gl/gl_budget.php:136 gl/manage/bank_accounts.php:134 #: gl/manage/currencies.php:166 gl/manage/exchange_rates.php:99 #: gl/manage/gl_account_classes.php:132 gl/manage/gl_account_types.php:160 #: gl/manage/gl_quick_entries.php:202 gl/manage/gl_quick_entries.php:304 #: gl/includes/ui/gl_bank_ui.inc:181 gl/includes/ui/gl_journal_ui.inc:162 -#: includes/ui/class.crud_view.inc:285 includes/ui/contacts_view.inc:64 +#: includes/ui/class.crud_view.inc:294 includes/ui/contacts_view.inc:64 #: includes/ui/simple_crud_class.inc:54 includes/ui/ui_input.inc:305 #: inventory/prices.php:164 inventory/purchasing_data.php:168 #: inventory/includes/item_adjustments_ui.inc:102 @@ -210,7 +211,7 @@ msgstr "" #: inventory/manage/sales_kits.php:52 manufacturing/manage/bom_edit.php:60 #: manufacturing/manage/work_centres.php:115 #: manufacturing/includes/work_order_issue_ui.inc:63 -#: purchasing/includes/ui/invoice_ui.inc:317 +#: purchasing/includes/ui/invoice_ui.inc:318 #: purchasing/includes/ui/po_ui.inc:255 sales/manage/credit_status.php:120 #: sales/manage/customer_branches.php:162 #: sales/manage/recurrent_invoices.php:157 sales/manage/sales_areas.php:104 @@ -249,8 +250,8 @@ msgstr "" #: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:209 #: reporting/includes/doctext.inc:247 #: sales/allocations/customer_allocation_main.php:93 -#: sales/view/view_sales_order.php:109 sales/view/view_sales_order.php:142 -#: sales/view/view_sales_order.php:179 +#: sales/view/view_sales_order.php:111 sales/view/view_sales_order.php:144 +#: sales/view/view_sales_order.php:181 #: sales/inquiry/customer_allocation_inquiry.php:147 #: sales/inquiry/customer_inquiry.php:195 msgid "#" @@ -267,13 +268,13 @@ msgstr "" #: inventory/manage/sales_kits.php:36 inventory/view/view_adjustment.php:54 #: inventory/view/view_transfer.php:50 manufacturing/manage/bom_edit.php:43 #: manufacturing/includes/manufacturing_ui.inc:28 -#: purchasing/includes/ui/invoice_ui.inc:501 -#: purchasing/includes/ui/invoice_ui.inc:513 purchasing/po_receive_items.php:62 +#: purchasing/includes/ui/invoice_ui.inc:503 +#: purchasing/includes/ui/invoice_ui.inc:515 purchasing/po_receive_items.php:62 #: reporting/rep104.php:109 reporting/rep105.php:115 reporting/rep204.php:84 -#: reporting/rep303.php:121 reporting/rep303.php:127 reporting/rep304.php:127 +#: reporting/rep303.php:223 reporting/rep303.php:229 reporting/rep304.php:127 #: reporting/rep305.php:106 reporting/rep306.php:141 reporting/rep307.php:114 -#: reporting/rep308.php:223 reporting/rep309.php:99 reporting/rep310.php:142 -#: reporting/rep401.php:71 sales/create_recurrent_invoices.php:203 +#: reporting/rep308.php:224 reporting/rep309.php:99 reporting/rep310.php:142 +#: reporting/rep401.php:71 sales/create_recurrent_invoices.php:202 #: sales/manage/credit_status.php:97 sales/manage/recurrent_invoices.php:128 #: sales/inquiry/sales_orders_view.php:284 #: sales/inquiry/sales_orders_view.php:288 taxes/tax_groups.php:126 @@ -340,14 +341,14 @@ msgstr "" #: gl/manage/currencies.php:162 gl/manage/gl_account_classes.php:126 #: gl/manage/gl_quick_entries.php:237 includes/system_tests.inc:41 #: includes/system_tests.inc:116 includes/system_tests.inc:129 -#: includes/ui/class.reflines_crud.inc:56 includes/ui/ui_lists.inc:1876 +#: includes/ui/class.reflines_crud.inc:56 includes/ui/ui_lists.inc:1877 #: purchasing/manage/suppliers.php:122 reporting/rep101.php:121 #: reporting/rep101.php:132 reporting/rep102.php:110 reporting/rep102.php:112 #: reporting/rep104.php:103 reporting/rep106.php:81 reporting/rep114.php:74 -#: reporting/rep115.php:157 reporting/rep201.php:111 reporting/rep202.php:116 +#: reporting/rep115.php:156 reporting/rep201.php:111 reporting/rep202.php:116 #: reporting/rep202.php:118 reporting/rep203.php:84 reporting/rep206.php:111 -#: reporting/rep303.php:112 reporting/rep303.php:117 reporting/rep304.php:123 -#: reporting/rep402.php:129 reporting/rep402.php:130 reporting/rep402.php:181 +#: reporting/rep303.php:214 reporting/rep303.php:219 reporting/rep304.php:123 +#: reporting/rep402.php:131 reporting/rep402.php:132 reporting/rep402.php:183 #: reporting/rep501.php:113 sales/manage/sales_points.php:94 #: sales/manage/sales_points.php:95 sales/manage/sales_types.php:119 #: taxes/item_tax_types.php:129 @@ -386,8 +387,8 @@ msgstr "" msgid "Create backup" msgstr "" -#: admin/backups.php:194 sales/includes/ui/sales_order_ui.inc:582 -#: sales/includes/ui/sales_order_ui.inc:638 +#: admin/backups.php:194 sales/includes/ui/sales_order_ui.inc:585 +#: sales/includes/ui/sales_order_ui.inc:641 msgid "Comments:" msgstr "" @@ -473,7 +474,7 @@ msgstr "" msgid "Your password has been updated." msgstr "" -#: admin/change_current_user_password.php:85 admin/users.php:189 +#: admin/change_current_user_password.php:85 admin/users.php:191 msgid "User login:" msgstr "" @@ -564,7 +565,7 @@ msgstr "" #: admin/company_preferences.php:226 admin/shipping_companies.php:142 #: includes/ui/contacts_view.inc:106 inventory/manage/locations.php:212 -#: sales/manage/customers.php:234 sales/includes/ui/sales_order_ui.inc:629 +#: sales/manage/customers.php:234 sales/includes/ui/sales_order_ui.inc:632 msgid "Address:" msgstr "" @@ -583,7 +584,7 @@ msgstr "" msgid "Fax Number:" msgstr "" -#: admin/company_preferences.php:231 admin/users.php:211 +#: admin/company_preferences.php:231 admin/users.php:213 msgid "Email Address:" msgstr "" @@ -697,12 +698,12 @@ msgid "Optional Modules" msgstr "" #: admin/company_preferences.php:270 includes/dashboard.inc:118 -#: reporting/reports_main.php:315 +#: reporting/reports_main.php:316 msgid "Manufacturing" msgstr "" #: admin/company_preferences.php:271 includes/dashboard.inc:116 -#: inventory/manage/items.php:24 reporting/reports_main.php:339 +#: inventory/manage/items.php:24 reporting/reports_main.php:340 msgid "Fixed Assets" msgstr "" @@ -742,18 +743,18 @@ msgstr "" msgid "seconds" msgstr "" -#: admin/company_preferences.php:286 admin/display_prefs.php:160 +#: admin/company_preferences.php:286 admin/display_prefs.php:162 #: admin/gl_setup.php:309 admin/inst_chart.php:84 admin/inst_lang.php:103 #: admin/inst_module.php:146 admin/inst_module.php:164 #: admin/inst_module.php:207 admin/inst_theme.php:81 #: dimensions/dimension_entry.php:283 gl/gl_bank.php:415 gl/gl_budget.php:134 #: gl/manage/gl_quick_entries.php:60 gl/includes/ui/gl_bank_ui.inc:265 -#: gl/includes/ui/gl_journal_ui.inc:278 includes/ui/class.crud_view.inc:289 +#: gl/includes/ui/gl_journal_ui.inc:278 includes/ui/class.crud_view.inc:298 #: includes/ui/db_pager_view.inc:180 includes/ui/simple_crud_class.inc:56 #: includes/ui/simple_crud_class.inc:225 includes/ui/ui_input.inc:227 -#: includes/ui/ui_input.inc:960 inventory/adjustments.php:255 +#: includes/ui/ui_input.inc:966 inventory/adjustments.php:255 #: inventory/cost_update.php:150 inventory/reorder_level.php:111 -#: inventory/transfers.php:237 inventory/includes/item_adjustments_ui.inc:190 +#: inventory/transfers.php:237 inventory/includes/item_adjustments_ui.inc:193 #: inventory/includes/stock_transfers_ui.inc:150 #: inventory/manage/sales_kits.php:208 manufacturing/work_order_entry.php:437 #: manufacturing/includes/work_order_issue_ui.inc:132 @@ -763,7 +764,7 @@ msgstr "" #: sales/customer_invoice.php:662 sales/inquiry/sales_orders_view.php:316 #: sales/includes/ui/sales_credit_ui.inc:288 #: sales/includes/ui/sales_order_ui.inc:231 -#: sales/includes/ui/sales_order_ui.inc:548 +#: sales/includes/ui/sales_order_ui.inc:551 msgid "Update" msgstr "" @@ -896,14 +897,14 @@ msgstr "" #: gl/manage/gl_quick_entries.php:237 includes/system_tests.inc:41 #: includes/system_tests.inc:116 includes/system_tests.inc:129 #: includes/ui/class.reflines_crud.inc:56 -#: includes/ui/class.reflines_crud.inc:101 includes/ui/ui_lists.inc:1877 +#: includes/ui/class.reflines_crud.inc:101 includes/ui/ui_lists.inc:1878 #: purchasing/manage/suppliers.php:122 reporting/rep101.php:120 #: reporting/rep101.php:131 reporting/rep102.php:109 reporting/rep102.php:111 #: reporting/rep104.php:105 reporting/rep106.php:83 reporting/rep114.php:76 -#: reporting/rep115.php:156 reporting/rep201.php:110 reporting/rep202.php:115 +#: reporting/rep115.php:155 reporting/rep201.php:110 reporting/rep202.php:115 #: reporting/rep202.php:117 reporting/rep203.php:83 reporting/rep206.php:110 -#: reporting/rep303.php:107 reporting/rep303.php:116 reporting/rep304.php:122 -#: reporting/rep402.php:129 reporting/rep402.php:130 reporting/rep501.php:111 +#: reporting/rep303.php:209 reporting/rep303.php:218 reporting/rep304.php:122 +#: reporting/rep402.php:131 reporting/rep402.php:132 reporting/rep501.php:111 #: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95 #: sales/manage/sales_types.php:119 taxes/item_tax_types.php:133 msgid "Yes" @@ -1032,164 +1033,164 @@ msgstr "" msgid "Query size must be integer and greater than zero." msgstr "" -#: admin/display_prefs.php:61 +#: admin/display_prefs.php:63 msgid "" "Display settings have been updated. Keep in mind that changed settings are " "restored on every login in demo mode." msgstr "" -#: admin/display_prefs.php:63 +#: admin/display_prefs.php:65 msgid "Display settings have been updated." msgstr "" -#: admin/display_prefs.php:72 +#: admin/display_prefs.php:74 msgid "Decimal Places" msgstr "" -#: admin/display_prefs.php:74 +#: admin/display_prefs.php:76 msgid "Prices/Amounts:" msgstr "" -#: admin/display_prefs.php:75 +#: admin/display_prefs.php:77 msgid "Quantities:" msgstr "" -#: admin/display_prefs.php:76 +#: admin/display_prefs.php:78 msgid "Exchange Rates:" msgstr "" -#: admin/display_prefs.php:77 +#: admin/display_prefs.php:79 msgid "Percentages:" msgstr "" -#: admin/display_prefs.php:79 +#: admin/display_prefs.php:81 msgid "Date Format and Separators" msgstr "" -#: admin/display_prefs.php:81 +#: admin/display_prefs.php:83 msgid "Date Format:" msgstr "" -#: admin/display_prefs.php:83 +#: admin/display_prefs.php:85 msgid "Date Separator:" msgstr "" -#: admin/display_prefs.php:88 +#: admin/display_prefs.php:90 msgid "Thousand Separator:" msgstr "" -#: admin/display_prefs.php:93 +#: admin/display_prefs.php:95 msgid "Decimal Separator:" msgstr "" -#: admin/display_prefs.php:98 +#: admin/display_prefs.php:100 msgid "Use Date Picker" msgstr "" -#: admin/display_prefs.php:103 +#: admin/display_prefs.php:105 msgid "Reports" msgstr "" -#: admin/display_prefs.php:105 +#: admin/display_prefs.php:107 msgid "Save Report Selection Days:" msgstr "" -#: admin/display_prefs.php:107 +#: admin/display_prefs.php:109 msgid "Default Report Destination:" msgstr "" -#: admin/display_prefs.php:108 +#: admin/display_prefs.php:110 msgid "Excel" msgstr "" -#: admin/display_prefs.php:108 reporting/includes/reports_classes.inc:235 +#: admin/display_prefs.php:110 reporting/includes/reports_classes.inc:235 msgid "PDF/Printer" msgstr "" -#: admin/display_prefs.php:110 +#: admin/display_prefs.php:112 msgid "Default Report Orientation:" msgstr "" -#: admin/display_prefs.php:111 reporting/includes/reports_classes.inc:242 +#: admin/display_prefs.php:113 reporting/includes/reports_classes.inc:242 msgid "Landscape" msgstr "" -#: admin/display_prefs.php:111 reporting/includes/reports_classes.inc:242 +#: admin/display_prefs.php:113 reporting/includes/reports_classes.inc:242 msgid "Portrait" msgstr "" -#: admin/display_prefs.php:115 applications/setup.php:42 +#: admin/display_prefs.php:117 applications/setup.php:42 #: includes/sysnames.inc:99 msgid "Miscellaneous" msgstr "" -#: admin/display_prefs.php:117 +#: admin/display_prefs.php:119 msgid "Show hints for new users:" msgstr "" -#: admin/display_prefs.php:119 +#: admin/display_prefs.php:121 msgid "Show GL Information:" msgstr "" -#: admin/display_prefs.php:121 +#: admin/display_prefs.php:123 msgid "Show Item Codes:" msgstr "" -#: admin/display_prefs.php:128 +#: admin/display_prefs.php:130 msgid "Page Size:" msgstr "" -#: admin/display_prefs.php:130 +#: admin/display_prefs.php:132 msgid "Start-up Tab" msgstr "" -#: admin/display_prefs.php:138 admin/users.php:219 +#: admin/display_prefs.php:140 admin/users.php:221 msgid "Printing profile" msgstr "" -#: admin/display_prefs.php:139 admin/users.php:220 +#: admin/display_prefs.php:141 admin/users.php:222 msgid "Browser printing support" msgstr "" -#: admin/display_prefs.php:141 +#: admin/display_prefs.php:143 msgid "Use popup window to display reports:" msgstr "" -#: admin/display_prefs.php:142 admin/users.php:223 +#: admin/display_prefs.php:144 admin/users.php:225 msgid "Set this option to on if your browser directly supports pdf files" msgstr "" -#: admin/display_prefs.php:144 +#: admin/display_prefs.php:146 msgid "Use icons instead of text links:" msgstr "" -#: admin/display_prefs.php:145 +#: admin/display_prefs.php:147 msgid "Set this option to on for using icons instead of text links" msgstr "" -#: admin/display_prefs.php:147 +#: admin/display_prefs.php:149 msgid "Remember last document date:" msgstr "" -#: admin/display_prefs.php:148 +#: admin/display_prefs.php:150 msgid "" "If set document date is remembered on subsequent documents, otherwise " "default is current date" msgstr "" -#: admin/display_prefs.php:150 +#: admin/display_prefs.php:152 msgid "Query page size:" msgstr "" -#: admin/display_prefs.php:152 +#: admin/display_prefs.php:154 msgid "Transaction days:" msgstr "" -#: admin/display_prefs.php:154 admin/inst_lang.php:35 +#: admin/display_prefs.php:156 admin/inst_lang.php:35 msgid "Language" msgstr "" -#: admin/display_prefs.php:156 admin/users.php:215 +#: admin/display_prefs.php:158 admin/users.php:217 msgid "Language:" msgstr "" @@ -1254,8 +1255,8 @@ msgstr "" #: admin/fiscalyears.php:138 dimensions/inquiry/search_dimensions.php:130 #: dimensions/inquiry/search_dimensions.php:136 includes/ui/ui_lists.inc:761 -#: includes/ui/ui_view.inc:1566 manufacturing/search_work_orders.php:114 -#: reporting/rep402.php:134 reporting/rep501.php:87 reporting/rep710.php:113 +#: includes/ui/ui_view.inc:1574 manufacturing/search_work_orders.php:114 +#: reporting/rep402.php:136 reporting/rep501.php:87 reporting/rep710.php:113 #: reporting/includes/excel_report.inc:231 #: reporting/includes/pdf_report.inc:267 msgid "Closed" @@ -1433,7 +1434,7 @@ msgstr "" #: sales/customer_invoice.php:445 sales/customer_invoice.php:450 #: sales/allocations/customer_allocation_main.php:94 #: sales/view/view_dispatch.php:85 sales/view/view_invoice.php:85 -#: sales/view/view_receipt.php:39 sales/view/view_sales_order.php:94 +#: sales/view/view_receipt.php:39 sales/view/view_sales_order.php:96 #: sales/inquiry/customer_allocation_inquiry.php:148 #: sales/inquiry/customer_inquiry.php:197 #: sales/inquiry/sales_deliveries_view.php:174 @@ -1537,7 +1538,7 @@ msgstr "" msgid "Show PO item codes:" msgstr "" -#: admin/gl_setup.php:269 reporting/reports_main.php:228 +#: admin/gl_setup.php:269 reporting/reports_main.php:229 msgid "Inventory" msgstr "" @@ -1599,7 +1600,7 @@ msgstr "" #: admin/gl_setup.php:297 gl/accruals.php:198 #: gl/manage/gl_quick_entries.php:247 gl/includes/ui/gl_journal_ui.inc:69 -#: sales/create_recurrent_invoices.php:203 +#: sales/create_recurrent_invoices.php:202 #: sales/manage/recurrent_invoices.php:128 msgid "Monthly" msgstr "" @@ -1640,7 +1641,7 @@ msgstr "" #: admin/inst_chart.php:62 admin/inst_lang.php:36 admin/inst_module.php:115 #: admin/inst_theme.php:55 inventory/inquiry/stock_status.php:75 -#: reporting/rep303.php:113 +#: reporting/rep303.php:215 msgid "Available" msgstr "" @@ -1681,9 +1682,9 @@ msgstr "" #: inventory/manage/item_categories.php:117 #: inventory/manage/item_categories.php:121 #: manufacturing/manage/work_centres.php:101 -#: purchasing/includes/ui/invoice_ui.inc:278 -#: purchasing/includes/ui/invoice_ui.inc:280 -#: purchasing/includes/ui/invoice_ui.inc:282 reporting/rep115.php:161 +#: purchasing/includes/ui/invoice_ui.inc:279 +#: purchasing/includes/ui/invoice_ui.inc:281 +#: purchasing/includes/ui/invoice_ui.inc:283 reporting/rep115.php:161 #: reporting/rep206.php:115 reporting/rep501.php:87 reporting/rep709.php:116 #: reporting/rep709.php:117 sales/manage/customer_branches.php:284 #: sales/manage/sales_people.php:99 taxes/item_tax_types.php:117 @@ -1784,7 +1785,7 @@ msgid "Install third-party extension." msgstr "" #: admin/inst_module.php:177 includes/ui/ui_lists.inc:761 -#: includes/ui/ui_lists.inc:2354 reporting/includes/excel_report.inc:229 +#: includes/ui/ui_lists.inc:2355 reporting/includes/excel_report.inc:229 #: reporting/includes/pdf_report.inc:265 msgid "Active" msgstr "" @@ -1894,8 +1895,8 @@ msgid "Save database and perform upgrade" msgstr "" #: admin/payment_terms.php:16 reporting/includes/doctext.inc:40 -#: sales/view/view_invoice.php:76 sales/view/view_sales_order.php:82 -#: sales/view/view_sales_order.php:90 +#: sales/view/view_invoice.php:76 sales/view/view_sales_order.php:84 +#: sales/view/view_sales_order.php:92 msgid "Payment Terms" msgstr "" @@ -1948,11 +1949,11 @@ msgstr "" #: manufacturing/includes/manufacturing_ui.inc:346 #: purchasing/inquiry/supplier_allocation_inquiry.php:136 #: purchasing/inquiry/supplier_inquiry.php:173 reporting/rep102.php:130 -#: reporting/rep202.php:137 reporting/rep402.php:134 reporting/rep501.php:87 +#: reporting/rep202.php:137 reporting/rep402.php:136 reporting/rep501.php:87 #: reporting/rep601.php:79 reporting/rep602.php:80 reporting/rep702.php:60 #: reporting/rep704.php:82 reporting/rep704.php:85 reporting/rep704.php:88 #: reporting/rep709.php:112 reporting/rep710.php:78 reporting/rep710.php:86 -#: reporting/reports_main.php:385 reporting/reports_main.php:547 +#: reporting/reports_main.php:386 reporting/reports_main.php:548 #: reporting/includes/doctext.inc:161 reporting/includes/doctext.inc:204 #: reporting/includes/doctext.inc:223 #: sales/inquiry/customer_allocation_inquiry.php:146 @@ -2188,15 +2189,15 @@ msgstr "" #: admin/security_roles.php:244 admin/void_transaction.php:253 #: gl/manage/gl_quick_entries.php:61 gl/includes/ui/gl_bank_ui.inc:267 -#: gl/includes/ui/gl_journal_ui.inc:280 includes/ui/class.crud_view.inc:292 +#: gl/includes/ui/gl_journal_ui.inc:280 includes/ui/class.crud_view.inc:301 #: includes/ui/simple_crud_class.inc:58 includes/ui/simple_crud_class.inc:229 #: includes/ui/ui_controls.inc:645 includes/ui/ui_input.inc:230 -#: inventory/includes/item_adjustments_ui.inc:192 +#: inventory/includes/item_adjustments_ui.inc:195 #: inventory/includes/stock_transfers_ui.inc:152 inventory/manage/items.php:538 #: manufacturing/includes/work_order_issue_ui.inc:134 -#: purchasing/includes/ui/po_ui.inc:444 sales/create_recurrent_invoices.php:190 +#: purchasing/includes/ui/po_ui.inc:444 sales/create_recurrent_invoices.php:189 #: sales/includes/ui/sales_credit_ui.inc:290 -#: sales/includes/ui/sales_order_ui.inc:550 +#: sales/includes/ui/sales_order_ui.inc:553 msgid "Cancel" msgstr "" @@ -2281,11 +2282,11 @@ msgstr "" msgid "Unspecified tag type" msgstr "" -#: admin/tags.php:40 reporting/reports_main.php:406 -#: reporting/reports_main.php:415 reporting/reports_main.php:427 -#: reporting/reports_main.php:458 reporting/reports_main.php:466 -#: reporting/reports_main.php:477 reporting/reports_main.php:505 -#: reporting/reports_main.php:512 reporting/reports_main.php:522 +#: admin/tags.php:40 reporting/reports_main.php:407 +#: reporting/reports_main.php:416 reporting/reports_main.php:428 +#: reporting/reports_main.php:459 reporting/reports_main.php:467 +#: reporting/reports_main.php:478 reporting/reports_main.php:506 +#: reporting/reports_main.php:513 reporting/reports_main.php:523 msgid "Account Tags" msgstr "" @@ -2358,7 +2359,7 @@ msgstr "" msgid "User login" msgstr "" -#: admin/users.php:123 admin/users.php:207 includes/ui/contacts_view.inc:40 +#: admin/users.php:123 admin/users.php:209 includes/ui/contacts_view.inc:40 msgid "Full Name" msgstr "" @@ -2370,7 +2371,7 @@ msgid "Phone" msgstr "" #: admin/users.php:124 sales/manage/customer_branches.php:290 -#: sales/view/view_sales_order.php:96 +#: sales/view/view_sales_order.php:98 msgid "E-mail" msgstr "" @@ -2382,27 +2383,27 @@ msgstr "" msgid "Access Level" msgstr "" -#: admin/users.php:193 +#: admin/users.php:195 msgid "User Login:" msgstr "" -#: admin/users.php:204 +#: admin/users.php:206 msgid "Enter a new password to change, leave empty to keep current." msgstr "" -#: admin/users.php:209 +#: admin/users.php:211 msgid "Telephone No.:" msgstr "" -#: admin/users.php:213 +#: admin/users.php:215 msgid "Access Level:" msgstr "" -#: admin/users.php:217 +#: admin/users.php:219 msgid "User's POS" msgstr "" -#: admin/users.php:222 +#: admin/users.php:224 msgid "Use popup window for reports:" msgstr "" @@ -2435,7 +2436,7 @@ msgstr "" #: dimensions/inquiry/search_dimensions.php:87 gl/inquiry/accounts_list.php:40 #: gl/inquiry/journal_inquiry.php:58 inventory/inquiry/stock_list.php:42 #: manufacturing/search_work_orders.php:84 -#: purchasing/includes/ui/invoice_ui.inc:483 +#: purchasing/includes/ui/invoice_ui.inc:485 #: purchasing/inquiry/po_search_completed.php:99 #: purchasing/inquiry/po_search.php:78 #: purchasing/inquiry/supplier_allocation_inquiry.php:57 @@ -2489,16 +2490,16 @@ msgstr "" #: purchasing/inquiry/supplier_inquiry.php:178 #: purchasing/allocations/supplier_allocation_main.php:97 #: reporting/rep101.php:136 reporting/rep107.php:202 reporting/rep201.php:115 -#: reporting/rep306.php:141 reporting/rep310.php:142 reporting/rep402.php:134 -#: reporting/rep402.php:139 reporting/rep501.php:87 reporting/rep601.php:79 +#: reporting/rep306.php:141 reporting/rep310.php:142 reporting/rep402.php:136 +#: reporting/rep402.php:141 reporting/rep501.php:87 reporting/rep601.php:79 #: reporting/rep602.php:80 reporting/rep704.php:82 reporting/rep704.php:85 #: reporting/rep704.php:88 reporting/rep709.php:116 reporting/rep710.php:77 #: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:209 #: reporting/includes/doctext.inc:247 reporting/includes/header2.inc:137 #: sales/customer_delivery.php:366 sales/customer_invoice.php:485 #: sales/allocations/customer_allocation_main.php:95 -#: sales/view/view_credit.php:69 sales/view/view_sales_order.php:109 -#: sales/view/view_sales_order.php:142 sales/view/view_sales_order.php:179 +#: sales/view/view_credit.php:69 sales/view/view_sales_order.php:111 +#: sales/view/view_sales_order.php:144 sales/view/view_sales_order.php:181 #: sales/inquiry/customer_allocation_inquiry.php:150 #: sales/inquiry/customer_inquiry.php:198 msgid "Date" @@ -2552,7 +2553,7 @@ msgstr "" #: purchasing/includes/ui/invoice_ui.inc:193 #: purchasing/includes/ui/po_ui.inc:471 purchasing/po_entry_items.php:486 #: purchasing/supplier_payment.php:331 sales/customer_invoice.php:658 -#: sales/customer_payments.php:380 +#: sales/customer_payments.php:382 msgid "Memo:" msgstr "" @@ -2612,9 +2613,9 @@ msgstr "" #: purchasing/po_receive_items.php:179 purchasing/supplier_credit.php:186 #: purchasing/supplier_invoice.php:193 purchasing/supplier_payment.php:200 #: sales/create_recurrent_invoices.php:87 -#: sales/create_recurrent_invoices.php:166 sales/credit_note_entry.php:157 +#: sales/create_recurrent_invoices.php:165 sales/credit_note_entry.php:157 #: sales/customer_credit_invoice.php:94 sales/customer_delivery.php:164 -#: sales/customer_invoice.php:302 sales/customer_payments.php:161 +#: sales/customer_invoice.php:302 sales/customer_payments.php:162 #: sales/sales_order_entry.php:378 msgid "" "The entered date is out of fiscal year or is closed for further data entry." @@ -2684,13 +2685,13 @@ msgstr "" msgid "The language files folder " msgstr "" -#: admin/db/maintenance_db.inc:402 +#: admin/db/maintenance_db.inc:403 msgid "" "This is new format backup file which cannot be restored on database not " "migrated to utf8." msgstr "" -#: admin/db/maintenance_db.inc:486 +#: admin/db/maintenance_db.inc:487 #, php-format msgid "SQL script execution failed in line %d: %s" msgstr "" @@ -3004,8 +3005,8 @@ msgstr "" msgid "Ta&x Inquiry" msgstr "" -#: applications/generalledger.php:44 reporting/reports_main.php:433 -#: reporting/reports_main.php:483 reporting/reports_main.php:528 +#: applications/generalledger.php:44 reporting/reports_main.php:434 +#: reporting/reports_main.php:484 reporting/reports_main.php:529 msgid "Trial &Balance" msgstr "" @@ -3402,19 +3403,19 @@ msgstr "" #: dimensions/dimension_entry.php:267 reporting/reports_main.php:36 #: reporting/reports_main.php:57 reporting/reports_main.php:77 #: reporting/reports_main.php:93 reporting/reports_main.php:102 -#: reporting/reports_main.php:164 reporting/reports_main.php:185 -#: reporting/reports_main.php:255 reporting/reports_main.php:265 -#: reporting/reports_main.php:271 reporting/reports_main.php:281 -#: reporting/reports_main.php:289 reporting/reports_main.php:297 -#: reporting/reports_main.php:304 reporting/reports_main.php:363 -#: reporting/reports_main.php:371 reporting/reports_main.php:383 -#: reporting/reports_main.php:393 reporting/reports_main.php:411 -#: reporting/reports_main.php:422 reporting/reports_main.php:434 -#: reporting/reports_main.php:447 reporting/reports_main.php:463 -#: reporting/reports_main.php:473 reporting/reports_main.php:484 -#: reporting/reports_main.php:496 reporting/reports_main.php:510 -#: reporting/reports_main.php:519 reporting/reports_main.php:529 -#: reporting/reports_main.php:538 reporting/reports_main.php:545 +#: reporting/reports_main.php:165 reporting/reports_main.php:186 +#: reporting/reports_main.php:256 reporting/reports_main.php:266 +#: reporting/reports_main.php:272 reporting/reports_main.php:282 +#: reporting/reports_main.php:290 reporting/reports_main.php:298 +#: reporting/reports_main.php:305 reporting/reports_main.php:364 +#: reporting/reports_main.php:372 reporting/reports_main.php:384 +#: reporting/reports_main.php:394 reporting/reports_main.php:412 +#: reporting/reports_main.php:423 reporting/reports_main.php:435 +#: reporting/reports_main.php:448 reporting/reports_main.php:464 +#: reporting/reports_main.php:474 reporting/reports_main.php:485 +#: reporting/reports_main.php:497 reporting/reports_main.php:511 +#: reporting/reports_main.php:520 reporting/reports_main.php:530 +#: reporting/reports_main.php:539 reporting/reports_main.php:546 msgid "Start Date" msgstr "" @@ -3458,11 +3459,11 @@ msgstr "" msgid "Delete unused dimension" msgstr "" -#: dimensions/dimension_entry.php:292 includes/ui/class.crud_view.inc:296 +#: dimensions/dimension_entry.php:292 includes/ui/class.crud_view.inc:305 #: includes/ui/simple_crud_class.inc:223 -#: purchasing/includes/ui/invoice_ui.inc:219 -#: purchasing/includes/ui/invoice_ui.inc:421 +#: purchasing/includes/ui/invoice_ui.inc:220 #: purchasing/includes/ui/invoice_ui.inc:423 +#: purchasing/includes/ui/invoice_ui.inc:425 msgid "Add" msgstr "" @@ -3478,9 +3479,9 @@ msgstr "" #: gl/inquiry/gl_account_inquiry.php:131 gl/inquiry/gl_trial_balance.php:215 #: gl/manage/gl_quick_entries.php:248 gl/manage/gl_quick_entries.php:342 #: includes/dashboard.inc:606 includes/sysnames.inc:179 -#: purchasing/includes/ui/invoice_ui.inc:278 -#: purchasing/includes/ui/invoice_ui.inc:280 -#: purchasing/includes/ui/invoice_ui.inc:282 reporting/rep701.php:110 +#: purchasing/includes/ui/invoice_ui.inc:279 +#: purchasing/includes/ui/invoice_ui.inc:281 +#: purchasing/includes/ui/invoice_ui.inc:283 reporting/rep701.php:110 #: reporting/rep705.php:235 reporting/rep706.php:185 reporting/rep707.php:210 #: reporting/rep708.php:192 msgid "Account" @@ -3496,7 +3497,7 @@ msgstr "" #: gl/includes/ui/gl_journal_ui.inc:116 gl/includes/ui/gl_journal_ui.inc:119 #: manufacturing/view/wo_costs_view.php:61 #: purchasing/inquiry/supplier_allocation_inquiry.php:144 -#: reporting/rep115.php:161 reporting/rep206.php:115 reporting/rep402.php:139 +#: reporting/rep115.php:161 reporting/rep206.php:115 reporting/rep402.php:141 #: reporting/rep601.php:80 reporting/rep602.php:81 reporting/rep702.php:54 #: reporting/rep704.php:83 reporting/rep704.php:86 reporting/rep704.php:89 #: reporting/rep708.php:192 reporting/rep708.php:193 @@ -3514,7 +3515,7 @@ msgstr "" #: gl/includes/ui/gl_journal_ui.inc:116 gl/includes/ui/gl_journal_ui.inc:119 #: includes/sysnames.inc:90 manufacturing/view/wo_costs_view.php:61 #: purchasing/inquiry/supplier_allocation_inquiry.php:145 -#: reporting/rep115.php:161 reporting/rep206.php:116 reporting/rep402.php:139 +#: reporting/rep115.php:161 reporting/rep206.php:116 reporting/rep402.php:141 #: reporting/rep601.php:80 reporting/rep602.php:81 reporting/rep702.php:54 #: reporting/rep704.php:83 reporting/rep704.php:86 reporting/rep704.php:89 #: reporting/rep708.php:192 reporting/rep708.php:193 @@ -3561,24 +3562,24 @@ msgstr "" #: manufacturing/includes/work_order_issue_ui.inc:161 #: purchasing/includes/ui/invoice_ui.inc:116 #: purchasing/includes/ui/po_ui.inc:156 purchasing/includes/ui/po_ui.inc:161 -#: purchasing/supplier_payment.php:302 sales/customer_payments.php:349 +#: purchasing/supplier_payment.php:302 sales/customer_payments.php:351 msgid "Reference:" msgstr "" #: dimensions/inquiry/search_dimensions.php:74 -#: includes/ui/allocation_cart.inc:314 includes/ui/ui_lists.inc:2124 +#: includes/ui/allocation_cart.inc:314 includes/ui/ui_lists.inc:2125 #: reporting/rep101.php:115 reporting/rep102.php:92 reporting/rep104.php:95 #: reporting/rep104.php:99 reporting/rep105.php:96 reporting/rep105.php:100 -#: reporting/rep115.php:128 reporting/rep201.php:97 reporting/rep202.php:98 +#: reporting/rep115.php:127 reporting/rep201.php:97 reporting/rep202.php:98 #: reporting/rep203.php:69 reporting/rep204.php:77 reporting/rep206.php:97 -#: reporting/rep301.php:151 reporting/rep301.php:158 reporting/rep302.php:103 -#: reporting/rep302.php:110 reporting/rep303.php:95 reporting/rep303.php:102 +#: reporting/rep301.php:152 reporting/rep301.php:159 reporting/rep302.php:103 +#: reporting/rep302.php:110 reporting/rep303.php:197 reporting/rep303.php:204 #: reporting/rep304.php:109 reporting/rep304.php:114 reporting/rep304.php:119 #: reporting/rep306.php:120 reporting/rep306.php:125 reporting/rep306.php:130 #: reporting/rep306.php:135 reporting/rep307.php:103 reporting/rep307.php:108 -#: reporting/rep308.php:212 reporting/rep308.php:217 reporting/rep309.php:93 +#: reporting/rep308.php:213 reporting/rep308.php:218 reporting/rep309.php:93 #: reporting/rep310.php:121 reporting/rep310.php:126 reporting/rep310.php:131 -#: reporting/rep310.php:136 reporting/rep402.php:117 reporting/rep402.php:125 +#: reporting/rep310.php:136 reporting/rep402.php:119 reporting/rep402.php:127 #: reporting/rep451.php:67 reporting/rep451.php:74 reporting/rep702.php:61 #: reporting/rep710.php:86 reporting/rep710.php:87 msgid "All" @@ -3626,10 +3627,10 @@ msgstr "" #: reporting/includes/doctext.inc:164 reporting/includes/doctext.inc:166 #: reporting/includes/doctext.inc:207 reporting/includes/doctext.inc:209 #: sales/customer_invoice.php:492 sales/view/view_dispatch.php:97 -#: sales/view/view_invoice.php:96 +#: sales/view/view_invoice.php:96 sales/view/view_sales_order.php:71 #: sales/inquiry/customer_allocation_inquiry.php:151 #: sales/inquiry/customer_inquiry.php:199 -#: sales/includes/ui/sales_order_ui.inc:589 +#: sales/includes/ui/sales_order_ui.inc:592 msgid "Due Date" msgstr "" @@ -3718,8 +3719,8 @@ msgstr "" #: includes/sysnames.inc:180 inventory/manage/item_categories.php:258 #: inventory/manage/item_categories.php:260 inventory/manage/items.php:449 #: inventory/manage/items.php:451 purchasing/includes/ui/invoice_ui.inc:140 -#: purchasing/includes/ui/invoice_ui.inc:278 -#: purchasing/includes/ui/invoice_ui.inc:280 +#: purchasing/includes/ui/invoice_ui.inc:279 +#: purchasing/includes/ui/invoice_ui.inc:281 #: purchasing/includes/ui/po_ui.inc:172 purchasing/manage/suppliers.php:147 #: purchasing/manage/suppliers.php:148 purchasing/manage/suppliers.php:150 #: reporting/rep103.php:240 reporting/rep103.php:252 reporting/rep205.php:152 @@ -3729,14 +3730,14 @@ msgstr "" #: reporting/rep705.php:259 reporting/rep706.php:194 reporting/rep706.php:196 #: reporting/rep706.php:204 reporting/rep707.php:218 reporting/rep707.php:220 #: reporting/rep707.php:228 reporting/rep708.php:201 reporting/rep708.php:203 -#: reporting/rep708.php:210 reporting/reports_main.php:397 -#: reporting/reports_main.php:398 reporting/reports_main.php:404 -#: reporting/reports_main.php:405 reporting/reports_main.php:413 -#: reporting/reports_main.php:414 reporting/reports_main.php:425 -#: reporting/reports_main.php:426 reporting/reports_main.php:438 -#: reporting/reports_main.php:439 reporting/reports_main.php:451 -#: reporting/reports_main.php:457 reporting/reports_main.php:465 -#: reporting/reports_main.php:476 reporting/reports_main.php:488 +#: reporting/rep708.php:210 reporting/reports_main.php:398 +#: reporting/reports_main.php:399 reporting/reports_main.php:405 +#: reporting/reports_main.php:406 reporting/reports_main.php:414 +#: reporting/reports_main.php:415 reporting/reports_main.php:426 +#: reporting/reports_main.php:427 reporting/reports_main.php:439 +#: reporting/reports_main.php:440 reporting/reports_main.php:452 +#: reporting/reports_main.php:458 reporting/reports_main.php:466 +#: reporting/reports_main.php:477 reporting/reports_main.php:489 #: sales/customer_delivery.php:383 sales/customer_delivery.php:391 #: sales/customer_invoice.php:457 sales/customer_invoice.php:494 #: sales/manage/customers.php:275 sales/manage/customers.php:277 @@ -3761,13 +3762,13 @@ msgstr "" #: gl/includes/ui/gl_bank_ui.inc:300 gl/includes/ui/gl_journal_ui.inc:113 #: gl/includes/ui/gl_journal_ui.inc:116 gl/includes/ui/gl_journal_ui.inc:119 #: gl/includes/ui/gl_journal_ui.inc:297 includes/ui/class.reflines_crud.inc:38 -#: inventory/cost_update.php:146 inventory/includes/item_adjustments_ui.inc:214 +#: inventory/cost_update.php:146 inventory/includes/item_adjustments_ui.inc:217 #: inventory/includes/stock_transfers_ui.inc:174 #: manufacturing/view/wo_costs_view.php:61 #: manufacturing/includes/work_order_issue_ui.inc:169 -#: purchasing/includes/ui/invoice_ui.inc:278 -#: purchasing/includes/ui/invoice_ui.inc:280 -#: purchasing/includes/ui/invoice_ui.inc:282 reporting/rep402.php:139 +#: purchasing/includes/ui/invoice_ui.inc:279 +#: purchasing/includes/ui/invoice_ui.inc:281 +#: purchasing/includes/ui/invoice_ui.inc:283 reporting/rep402.php:141 #: sales/customer_credit_invoice.php:359 sales/customer_delivery.php:523 #: sales/includes/ui/sales_credit_ui.inc:334 msgid "Memo" @@ -3820,11 +3821,11 @@ msgstr "" #: includes/dashboard.inc:189 includes/dashboard.inc:226 #: includes/dashboard.inc:294 includes/dashboard.inc:336 #: includes/dashboard.inc:448 includes/sysnames.inc:138 -#: includes/ui/allocation_cart.inc:290 includes/ui/ui_lists.inc:1372 +#: includes/ui/allocation_cart.inc:290 includes/ui/ui_lists.inc:1373 #: manufacturing/includes/manufacturing_ui.inc:253 -#: purchasing/includes/ui/invoice_ui.inc:278 -#: purchasing/includes/ui/invoice_ui.inc:280 -#: purchasing/includes/ui/invoice_ui.inc:282 +#: purchasing/includes/ui/invoice_ui.inc:279 +#: purchasing/includes/ui/invoice_ui.inc:281 +#: purchasing/includes/ui/invoice_ui.inc:283 #: purchasing/view/view_supp_payment.php:60 #: purchasing/view/view_supp_payment.php:72 #: purchasing/inquiry/supplier_inquiry.php:181 reporting/rep102.php:242 @@ -3848,7 +3849,7 @@ msgstr "" msgid "Periods" msgstr "" -#: gl/accruals.php:232 reporting/rep402.php:153 reporting/reports_main.php:326 +#: gl/accruals.php:232 reporting/rep402.php:155 reporting/reports_main.php:327 msgid "Show GL Rows" msgstr "" @@ -3887,7 +3888,7 @@ msgstr "" msgid "Bank Statement:" msgstr "" -#: gl/bank_account_reconcile.php:202 includes/ui/class.crud_view.inc:300 +#: gl/bank_account_reconcile.php:202 includes/ui/class.crud_view.inc:309 msgid "New" msgstr "" @@ -3967,12 +3968,12 @@ msgid "Transfer Date:" msgstr "" #: gl/bank_transfer.php:126 gl/bank_transfer.php:133 -#: sales/customer_payments.php:378 +#: sales/customer_payments.php:380 msgid "Amount:" msgstr "" #: gl/bank_transfer.php:127 gl/bank_transfer.php:134 -#: purchasing/supplier_payment.php:319 sales/customer_payments.php:364 +#: purchasing/supplier_payment.php:319 sales/customer_payments.php:366 msgid "Bank Charge:" msgstr "" @@ -4026,7 +4027,7 @@ msgid "" msgstr "" #: gl/bank_transfer.php:231 purchasing/supplier_payment.php:158 -#: sales/customer_payments.php:185 +#: sales/customer_payments.php:186 msgid "" "The Bank Charge Account has not been set in System and General GL Setup." msgstr "" @@ -4208,7 +4209,7 @@ msgstr "" #: reporting/rep105.php:119 reporting/rep106.php:98 reporting/rep114.php:90 #: reporting/rep115.php:166 reporting/rep201.php:123 reporting/rep206.php:121 #: reporting/rep304.php:134 reporting/rep305.php:111 reporting/rep306.php:148 -#: reporting/rep307.php:119 reporting/rep308.php:229 reporting/rep309.php:104 +#: reporting/rep307.php:119 reporting/rep308.php:230 reporting/rep309.php:104 #: reporting/rep310.php:149 reporting/rep601.php:85 reporting/rep602.php:86 #: reporting/rep702.php:59 reporting/rep704.php:94 reporting/rep704.php:104 #: reporting/rep704.php:112 reporting/rep706.php:185 reporting/rep706.php:193 @@ -4237,21 +4238,21 @@ msgstr "" #: includes/dashboard.inc:571 inventory/includes/item_adjustments_ui.inc:60 #: inventory/includes/item_adjustments_ui.inc:114 #: manufacturing/includes/manufacturing_ui.inc:195 -#: purchasing/includes/ui/invoice_ui.inc:341 -#: purchasing/includes/ui/invoice_ui.inc:504 -#: purchasing/includes/ui/invoice_ui.inc:575 purchasing/po_receive_items.php:63 +#: purchasing/includes/ui/invoice_ui.inc:343 +#: purchasing/includes/ui/invoice_ui.inc:506 +#: purchasing/includes/ui/invoice_ui.inc:577 purchasing/po_receive_items.php:63 #: purchasing/view/view_po.php:140 #: purchasing/allocations/supplier_allocation_main.php:100 #: reporting/rep101.php:260 reporting/rep106.php:90 reporting/rep106.php:125 #: reporting/rep106.php:172 reporting/rep114.php:161 reporting/rep201.php:230 #: reporting/rep203.php:89 reporting/rep203.php:166 reporting/rep204.php:113 -#: reporting/rep204.php:141 reporting/rep301.php:192 reporting/rep301.php:240 +#: reporting/rep204.php:141 reporting/rep301.php:193 reporting/rep301.php:241 #: reporting/rep304.php:160 reporting/rep304.php:205 reporting/rep305.php:106 #: reporting/rep305.php:132 reporting/rep305.php:188 reporting/rep306.php:141 #: reporting/rep306.php:176 reporting/rep306.php:196 reporting/rep306.php:212 -#: reporting/rep306.php:261 reporting/rep306.php:276 reporting/rep306.php:287 +#: reporting/rep306.php:260 reporting/rep306.php:275 reporting/rep306.php:286 #: reporting/rep309.php:125 reporting/rep309.php:152 reporting/rep451.php:120 -#: reporting/rep451.php:155 reporting/rep702.php:142 reporting/rep705.php:152 +#: reporting/rep451.php:155 reporting/rep702.php:136 reporting/rep705.php:152 #: reporting/rep705.php:312 reporting/rep706.php:106 reporting/rep706.php:255 #: reporting/rep706.php:290 reporting/rep707.php:115 reporting/rep707.php:299 #: reporting/rep708.php:253 reporting/includes/doctext.inc:32 @@ -4260,9 +4261,9 @@ msgstr "" #: sales/customer_invoice.php:522 #: sales/allocations/customer_allocation_main.php:98 #: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113 -#: sales/view/view_invoice.php:116 sales/view/view_sales_order.php:109 -#: sales/view/view_sales_order.php:142 sales/view/view_sales_order.php:179 -#: sales/view/view_sales_order.php:220 +#: sales/view/view_invoice.php:116 sales/view/view_sales_order.php:111 +#: sales/view/view_sales_order.php:144 sales/view/view_sales_order.php:181 +#: sales/view/view_sales_order.php:222 #: sales/includes/ui/sales_credit_ui.inc:163 #: sales/includes/ui/sales_order_ui.inc:148 msgid "Total" @@ -4429,18 +4430,18 @@ msgstr "" #: gl/includes/ui/gl_bank_ui.inc:146 gl/includes/ui/gl_bank_ui.inc:149 #: gl/includes/ui/gl_bank_ui.inc:152 gl/includes/ui/gl_journal_ui.inc:112 #: gl/includes/ui/gl_journal_ui.inc:115 gl/includes/ui/gl_journal_ui.inc:118 -#: manufacturing/view/wo_costs_view.php:60 reporting/rep402.php:139 +#: manufacturing/view/wo_costs_view.php:60 reporting/rep402.php:141 #: reporting/rep701.php:110 msgid "Account Code" msgstr "" #: gl/inquiry/accounts_list.php:52 inventory/inquiry/stock_list.php:53 #: inventory/manage/item_codes.php:127 reporting/rep104.php:115 -#: reporting/rep105.php:120 reporting/rep301.php:164 reporting/rep301.php:170 -#: reporting/rep302.php:122 reporting/rep302.php:129 reporting/rep303.php:133 +#: reporting/rep105.php:120 reporting/rep301.php:165 reporting/rep301.php:171 +#: reporting/rep302.php:122 reporting/rep302.php:129 reporting/rep303.php:235 #: reporting/rep304.php:127 reporting/rep304.php:135 reporting/rep306.php:141 #: reporting/rep306.php:149 reporting/rep307.php:114 reporting/rep307.php:120 -#: reporting/rep308.php:223 reporting/rep308.php:230 reporting/rep309.php:105 +#: reporting/rep308.php:224 reporting/rep308.php:231 reporting/rep309.php:105 #: reporting/rep310.php:150 msgid "Category" msgstr "" @@ -4520,15 +4521,15 @@ msgstr "" msgid "No zero values" msgstr "" -#: gl/inquiry/gl_trial_balance.php:62 reporting/reports_main.php:437 -#: reporting/reports_main.php:487 reporting/reports_main.php:532 +#: gl/inquiry/gl_trial_balance.php:62 reporting/reports_main.php:438 +#: reporting/reports_main.php:488 reporting/reports_main.php:533 msgid "Only balances" msgstr "" #: gl/inquiry/gl_trial_balance.php:104 gl/inquiry/gl_trial_balance.php:165 #: includes/dashboard.inc:526 reporting/rep706.php:307 reporting/rep707.php:327 #: reporting/rep708.php:51 reporting/rep708.php:126 -#: sales/create_recurrent_invoices.php:203 +#: sales/create_recurrent_invoices.php:202 #: sales/manage/recurrent_invoices.php:128 msgid "Group" msgstr "" @@ -4540,7 +4541,7 @@ msgstr "" #: gl/inquiry/gl_trial_balance.php:216 gl/manage/bank_accounts.php:109 #: gl/view/gl_trans_view.php:95 gl/view/gl_trans_view.php:98 #: gl/view/gl_trans_view.php:101 manufacturing/view/wo_costs_view.php:60 -#: reporting/rep402.php:139 reporting/rep701.php:110 reporting/rep702.php:53 +#: reporting/rep402.php:141 reporting/rep701.php:110 reporting/rep702.php:53 #: reporting/rep705.php:235 reporting/rep706.php:185 reporting/rep707.php:210 #: reporting/rep708.php:192 msgid "Account Name" @@ -4607,7 +4608,7 @@ msgid "Supplier's Reference" msgstr "" #: gl/inquiry/journal_inquiry.php:116 reporting/rep710.php:77 -#: reporting/rep710.php:87 reporting/reports_main.php:548 +#: reporting/rep710.php:87 reporting/reports_main.php:549 msgid "User" msgstr "" @@ -4630,8 +4631,8 @@ msgstr "" msgid "Budget" msgstr "" -#: gl/inquiry/profit_loss.php:178 reporting/reports_main.php:424 -#: reporting/reports_main.php:475 reporting/reports_main.php:521 +#: gl/inquiry/profit_loss.php:178 reporting/reports_main.php:425 +#: reporting/reports_main.php:476 reporting/reports_main.php:522 msgid "Compare to" msgstr "" @@ -4671,8 +4672,8 @@ msgstr "" msgid "Total payable or refund" msgstr "" -#: gl/manage/bank_accounts.php:16 reporting/reports_main.php:362 -#: reporting/reports_main.php:370 +#: gl/manage/bank_accounts.php:16 reporting/reports_main.php:363 +#: reporting/reports_main.php:371 msgid "Bank Accounts" msgstr "" @@ -4727,7 +4728,7 @@ msgstr "" #: purchasing/allocations/supplier_allocation_main.php:99 #: purchasing/allocations/supplier_allocation_main.php:107 #: reporting/rep101.php:147 reporting/rep102.php:129 reporting/rep102.php:135 -#: reporting/rep103.php:229 reporting/rep104.php:114 reporting/rep115.php:168 +#: reporting/rep103.php:229 reporting/rep104.php:114 reporting/rep115.php:170 #: reporting/rep201.php:125 reporting/rep202.php:136 reporting/rep203.php:96 #: reporting/rep205.php:141 reporting/rep206.php:123 #: sales/customer_credit_invoice.php:236 sales/customer_delivery.php:328 @@ -5238,8 +5239,8 @@ msgstr "" msgid "Quick Entries" msgstr "" -#: gl/manage/gl_quick_entries.php:58 includes/ui/class.crud_view.inc:296 -#: includes/ui/class.crud_view.inc:300 includes/ui/simple_crud_class.inc:219 +#: gl/manage/gl_quick_entries.php:58 includes/ui/class.crud_view.inc:305 +#: includes/ui/class.crud_view.inc:309 includes/ui/simple_crud_class.inc:219 #: includes/ui/ui_input.inc:225 msgid "Add new" msgstr "" @@ -5403,8 +5404,8 @@ msgstr "" #: reporting/reports_main.php:109 reporting/reports_main.php:119 #: reporting/reports_main.php:127 reporting/reports_main.php:141 #: reporting/reports_main.php:149 reporting/reports_main.php:156 -#: reporting/reports_main.php:214 reporting/reports_main.php:221 -#: reporting/reports_main.php:331 +#: reporting/reports_main.php:215 reporting/reports_main.php:222 +#: reporting/reports_main.php:332 msgid "From" msgstr "" @@ -5536,13 +5537,13 @@ msgstr "" #: gl/includes/db/gl_db_banking.inc:227 reporting/reports_main.php:110 #: reporting/reports_main.php:120 reporting/reports_main.php:128 #: reporting/reports_main.php:142 reporting/reports_main.php:150 -#: reporting/reports_main.php:157 reporting/reports_main.php:215 -#: reporting/reports_main.php:222 reporting/reports_main.php:332 +#: reporting/reports_main.php:157 reporting/reports_main.php:216 +#: reporting/reports_main.php:223 reporting/reports_main.php:333 msgid "To" msgstr "" #: gl/includes/db/gl_db_banking.inc:360 gl/includes/db/gl_db_banking.inc:533 -#: gl/includes/db/gl_journal.inc:114 purchasing/includes/db/invoice_db.inc:139 +#: gl/includes/db/gl_journal.inc:114 purchasing/includes/db/invoice_db.inc:140 msgid "Document reentered." msgstr "" @@ -5584,7 +5585,7 @@ msgstr "" msgid "Customer:" msgstr "" -#: gl/includes/ui/gl_bank_ui.inc:68 sales/customer_payments.php:320 +#: gl/includes/ui/gl_bank_ui.inc:68 sales/customer_payments.php:322 #: sales/manage/recurrent_invoices.php:198 #: sales/includes/ui/sales_credit_ui.inc:37 #: sales/includes/ui/sales_order_ui.inc:274 @@ -5592,13 +5593,13 @@ msgid "Branch:" msgstr "" #: gl/includes/ui/gl_bank_ui.inc:82 gl/includes/ui/gl_bank_ui.inc:85 -#: sales/customer_payments.php:342 +#: sales/customer_payments.php:344 msgid "This customer account is on hold." msgstr "" #: gl/includes/ui/gl_bank_ui.inc:98 gl/includes/ui/gl_journal_ui.inc:70 #: gl/includes/ui/gl_journal_ui.inc:76 -#: purchasing/includes/ui/invoice_ui.inc:264 +#: purchasing/includes/ui/invoice_ui.inc:265 msgid "Go" msgstr "" @@ -5606,24 +5607,24 @@ msgstr "" msgid "Into:" msgstr "" -#: gl/includes/ui/gl_bank_ui.inc:180 includes/ui/class.crud_view.inc:281 +#: gl/includes/ui/gl_bank_ui.inc:180 includes/ui/class.crud_view.inc:290 #: includes/ui/simple_crud_class.inc:52 #: inventory/includes/item_adjustments_ui.inc:100 #: inventory/includes/stock_transfers_ui.inc:83 #: manufacturing/includes/work_order_issue_ui.inc:62 -#: purchasing/includes/ui/invoice_ui.inc:551 +#: purchasing/includes/ui/invoice_ui.inc:553 #: purchasing/includes/ui/po_ui.inc:254 #: sales/includes/ui/sales_credit_ui.inc:193 #: sales/includes/ui/sales_order_ui.inc:197 msgid "Edit document line" msgstr "" -#: gl/includes/ui/gl_bank_ui.inc:182 includes/ui/class.crud_view.inc:285 +#: gl/includes/ui/gl_bank_ui.inc:182 includes/ui/class.crud_view.inc:294 #: includes/ui/simple_crud_class.inc:54 #: inventory/includes/item_adjustments_ui.inc:102 #: inventory/includes/stock_transfers_ui.inc:84 #: manufacturing/includes/work_order_issue_ui.inc:64 -#: purchasing/includes/ui/invoice_ui.inc:318 +#: purchasing/includes/ui/invoice_ui.inc:319 #: purchasing/includes/ui/po_ui.inc:256 #: sales/includes/ui/sales_credit_ui.inc:195 #: sales/includes/ui/sales_order_ui.inc:199 @@ -5632,43 +5633,43 @@ msgstr "" #: gl/includes/ui/gl_bank_ui.inc:266 gl/includes/ui/gl_journal_ui.inc:279 #: includes/ui/simple_crud_class.inc:56 -#: inventory/includes/item_adjustments_ui.inc:191 +#: inventory/includes/item_adjustments_ui.inc:194 #: inventory/includes/stock_transfers_ui.inc:151 #: manufacturing/includes/work_order_issue_ui.inc:133 #: purchasing/includes/ui/po_ui.inc:443 #: sales/includes/ui/sales_credit_ui.inc:289 -#: sales/includes/ui/sales_order_ui.inc:549 +#: sales/includes/ui/sales_order_ui.inc:552 msgid "Confirm changes" msgstr "" #: gl/includes/ui/gl_bank_ui.inc:268 gl/includes/ui/gl_journal_ui.inc:281 -#: includes/ui/class.crud_view.inc:292 includes/ui/simple_crud_class.inc:58 -#: inventory/includes/item_adjustments_ui.inc:193 +#: includes/ui/class.crud_view.inc:301 includes/ui/simple_crud_class.inc:58 +#: inventory/includes/item_adjustments_ui.inc:196 #: inventory/includes/stock_transfers_ui.inc:153 #: manufacturing/includes/work_order_issue_ui.inc:135 #: purchasing/includes/ui/po_ui.inc:445 #: sales/includes/ui/sales_credit_ui.inc:291 -#: sales/includes/ui/sales_order_ui.inc:551 +#: sales/includes/ui/sales_order_ui.inc:554 msgid "Cancel changes" msgstr "" #: gl/includes/ui/gl_bank_ui.inc:273 gl/includes/ui/gl_journal_ui.inc:285 -#: inventory/includes/item_adjustments_ui.inc:199 +#: inventory/includes/item_adjustments_ui.inc:202 #: inventory/includes/stock_transfers_ui.inc:159 #: manufacturing/includes/work_order_issue_ui.inc:141 #: purchasing/includes/ui/po_ui.inc:451 #: sales/includes/ui/sales_credit_ui.inc:297 -#: sales/includes/ui/sales_order_ui.inc:557 +#: sales/includes/ui/sales_order_ui.inc:560 msgid "Add Item" msgstr "" #: gl/includes/ui/gl_bank_ui.inc:274 -#: inventory/includes/item_adjustments_ui.inc:200 +#: inventory/includes/item_adjustments_ui.inc:203 #: inventory/includes/stock_transfers_ui.inc:160 #: manufacturing/includes/work_order_issue_ui.inc:142 #: purchasing/includes/ui/po_ui.inc:452 #: sales/includes/ui/sales_credit_ui.inc:298 -#: sales/includes/ui/sales_order_ui.inc:558 +#: sales/includes/ui/sales_order_ui.inc:561 msgid "Add new item to document" msgstr "" @@ -5813,7 +5814,7 @@ msgid "Dimensions configuration" msgstr "" #: includes/access_levels.inc:79 inventory/manage/items.php:447 -#: reporting/reports_main.php:349 +#: reporting/reports_main.php:350 msgid "Dimensions" msgstr "" @@ -6351,11 +6352,11 @@ msgstr "" msgid "System is available for site admin only until full database upgrade" msgstr "" -#: includes/current_user.inc:162 +#: includes/current_user.inc:168 msgid "New password for" msgstr "" -#: includes/current_user.inc:618 +#: includes/current_user.inc:624 msgid "Requesting data..." msgstr "" @@ -6368,8 +6369,8 @@ msgstr "" #: reporting/rep304.php:137 reporting/reports_main.php:34 #: reporting/reports_main.php:38 reporting/reports_main.php:47 #: reporting/reports_main.php:59 reporting/reports_main.php:115 -#: reporting/reports_main.php:134 reporting/reports_main.php:259 -#: sales/create_recurrent_invoices.php:203 +#: reporting/reports_main.php:134 reporting/reports_main.php:260 +#: sales/create_recurrent_invoices.php:202 #: sales/customer_credit_invoice.php:234 sales/customer_delivery.php:326 #: sales/customer_invoice.php:431 #: sales/allocations/customer_allocation_main.php:96 @@ -6414,11 +6415,11 @@ msgstr "" #: reporting/rep201.php:124 reporting/rep202.php:128 reporting/rep202.php:135 #: reporting/rep203.php:95 reporting/rep204.php:90 reporting/rep206.php:122 #: reporting/rep306.php:141 reporting/rep306.php:151 reporting/rep310.php:142 -#: reporting/rep310.php:152 reporting/reports_main.php:162 -#: reporting/reports_main.php:166 reporting/reports_main.php:175 -#: reporting/reports_main.php:187 reporting/reports_main.php:195 -#: reporting/reports_main.php:202 reporting/reports_main.php:275 -#: reporting/reports_main.php:308 +#: reporting/rep310.php:152 reporting/reports_main.php:163 +#: reporting/reports_main.php:167 reporting/reports_main.php:176 +#: reporting/reports_main.php:188 reporting/reports_main.php:196 +#: reporting/reports_main.php:203 reporting/reports_main.php:276 +#: reporting/reports_main.php:309 msgid "Supplier" msgstr "" @@ -6429,9 +6430,9 @@ msgstr "" #: includes/dashboard.inc:120 includes/dashboard.inc:165 #: includes/ui/ui_controls.inc:512 includes/ui/ui_controls.inc:514 #: inventory/transfers.php:231 inventory/inquiry/stock_list.php:29 -#: inventory/manage/items.php:29 reporting/rep402.php:150 -#: reporting/reports_main.php:276 reporting/reports_main.php:309 -#: reporting/reports_main.php:323 +#: inventory/manage/items.php:29 reporting/rep402.php:152 +#: reporting/reports_main.php:277 reporting/reports_main.php:310 +#: reporting/reports_main.php:324 msgid "Items" msgstr "" @@ -6478,10 +6479,10 @@ msgstr "" #: manufacturing/search_work_orders.php:161 #: manufacturing/view/wo_issue_view.php:43 #: manufacturing/view/wo_production_view.php:44 -#: purchasing/includes/ui/invoice_ui.inc:501 -#: purchasing/includes/ui/invoice_ui.inc:513 reporting/rep204.php:84 +#: purchasing/includes/ui/invoice_ui.inc:503 +#: purchasing/includes/ui/invoice_ui.inc:515 reporting/rep204.php:84 #: reporting/rep306.php:152 reporting/rep310.php:142 reporting/rep310.php:153 -#: reporting/rep402.php:134 +#: reporting/rep402.php:136 msgid "Item" msgstr "" @@ -6496,14 +6497,14 @@ msgstr "" #: manufacturing/includes/manufacturing_ui.inc:174 #: manufacturing/includes/manufacturing_ui.inc:347 #: manufacturing/includes/work_order_issue_ui.inc:33 -#: purchasing/includes/ui/invoice_ui.inc:514 +#: purchasing/includes/ui/invoice_ui.inc:516 #: purchasing/includes/ui/po_ui.inc:216 purchasing/view/view_grn.php:40 -#: purchasing/view/view_po.php:45 reporting/rep301.php:164 -#: reporting/rep303.php:121 reporting/rep303.php:127 reporting/rep401.php:71 +#: purchasing/view/view_po.php:45 reporting/rep301.php:165 +#: reporting/rep303.php:223 reporting/rep303.php:229 reporting/rep401.php:71 #: reporting/includes/doctext.inc:31 reporting/includes/doctext.inc:191 #: reporting/includes/doctext.inc:226 sales/customer_invoice.php:518 #: sales/view/view_credit.php:90 sales/view/view_dispatch.php:112 -#: sales/view/view_invoice.php:115 sales/view/view_sales_order.php:219 +#: sales/view/view_invoice.php:115 sales/view/view_sales_order.php:221 #: sales/includes/ui/sales_credit_ui.inc:162 #: sales/includes/ui/sales_order_ui.inc:146 msgid "Quantity" @@ -6531,8 +6532,8 @@ msgid "Ref." msgstr "" #: includes/dashboard.inc:486 includes/dashboard.inc:526 -#: reporting/rep105.php:110 reporting/rep106.php:89 reporting/rep112.php:180 -#: sales/create_recurrent_invoices.php:203 +#: reporting/rep105.php:110 reporting/rep106.php:89 reporting/rep112.php:189 +#: sales/create_recurrent_invoices.php:202 #: sales/customer_credit_invoice.php:235 sales/customer_delivery.php:327 #: sales/customer_invoice.php:432 sales/manage/customers.php:255 #: sales/manage/customers.php:295 sales/manage/recurrent_invoices.php:128 @@ -6558,7 +6559,7 @@ msgstr "" #: reporting/rep108.php:158 reporting/rep108.php:159 reporting/rep108.php:160 #: reporting/rep202.php:122 reporting/rep202.php:123 reporting/rep202.php:124 #: reporting/rep202.php:156 reporting/rep202.php:157 reporting/rep202.php:158 -#: reporting/rep202.php:249 sales/create_recurrent_invoices.php:203 +#: reporting/rep202.php:249 sales/create_recurrent_invoices.php:202 #: sales/manage/recurrent_invoices.php:128 #: sales/inquiry/customer_inquiry.php:116 #: sales/inquiry/customer_inquiry.php:117 @@ -6570,12 +6571,12 @@ msgstr "" msgid "Overdue Recurrent Invoices" msgstr "" -#: includes/dashboard.inc:526 sales/create_recurrent_invoices.php:203 +#: includes/dashboard.inc:526 sales/create_recurrent_invoices.php:202 #: sales/manage/recurrent_invoices.php:128 msgid "Template No" msgstr "" -#: includes/dashboard.inc:526 sales/create_recurrent_invoices.php:203 +#: includes/dashboard.inc:526 sales/create_recurrent_invoices.php:202 msgid "Next invoice" msgstr "" @@ -6587,22 +6588,22 @@ msgstr "" msgid "Bank Account Balances" msgstr "" -#: includes/data_checks.inc:612 +#: includes/data_checks.inc:613 #, php-format msgid "%s #%s is closed for further edition." msgstr "" -#: includes/data_checks.inc:654 +#: includes/data_checks.inc:655 msgid "You have no edit access to transactions created by other users." msgstr "" -#: includes/data_checks.inc:669 +#: includes/data_checks.inc:670 msgid "The entered reference is invalid." msgstr "" -#: includes/data_checks.inc:673 sales/credit_note_entry.php:181 +#: includes/data_checks.inc:674 sales/credit_note_entry.php:181 #: sales/customer_credit_invoice.php:204 sales/customer_delivery.php:298 -#: sales/customer_invoice.php:364 sales/sales_order_entry.php:474 +#: sales/customer_invoice.php:364 sales/sales_order_entry.php:478 msgid "The entered reference is already in use." msgstr "" @@ -6689,16 +6690,16 @@ msgstr "" msgid "Package '%s' not found." msgstr "" -#: includes/references.inc:103 +#: includes/references.inc:107 msgid "Invalid refline template." msgstr "" -#: includes/references.inc:113 +#: includes/references.inc:117 #, php-format msgid "Missing refline context data: '%s'" msgstr "" -#: includes/references.inc:156 +#: includes/references.inc:165 msgid "Missing numeric placeholder in refline definition." msgstr "" @@ -6861,7 +6862,7 @@ msgstr "" msgid "Sales Order" msgstr "" -#: includes/sysnames.inc:41 sales/sales_order_entry.php:655 +#: includes/sysnames.inc:41 sales/sales_order_entry.php:659 msgid "Sales Quotation" msgstr "" @@ -7102,7 +7103,7 @@ msgid "One-time" msgstr "" #: includes/sysnames.inc:171 manufacturing/search_work_orders.php:163 -#: manufacturing/includes/manufacturing_ui.inc:293 reporting/rep402.php:134 +#: manufacturing/includes/manufacturing_ui.inc:293 reporting/rep402.php:136 msgid "Manufactured" msgstr "" @@ -7481,7 +7482,7 @@ msgid "Test type" msgstr "" #: includes/system_tests.inc:424 reporting/rep204.php:85 -#: reporting/rep301.php:164 reporting/rep308.php:224 +#: reporting/rep301.php:165 reporting/rep308.php:225 msgid "Value" msgstr "" @@ -7492,33 +7493,33 @@ msgstr "" #: reporting/reports_main.php:105 reporting/reports_main.php:114 #: reporting/reports_main.php:124 reporting/reports_main.php:131 #: reporting/reports_main.php:138 reporting/reports_main.php:146 -#: reporting/reports_main.php:153 reporting/reports_main.php:159 -#: reporting/reports_main.php:170 reporting/reports_main.php:181 -#: reporting/reports_main.php:190 reporting/reports_main.php:198 -#: reporting/reports_main.php:203 reporting/reports_main.php:210 -#: reporting/reports_main.php:218 reporting/reports_main.php:225 -#: reporting/reports_main.php:234 reporting/reports_main.php:240 -#: reporting/reports_main.php:251 reporting/reports_main.php:261 -#: reporting/reports_main.php:267 reporting/reports_main.php:277 -#: reporting/reports_main.php:285 reporting/reports_main.php:293 -#: reporting/reports_main.php:300 reporting/reports_main.php:310 -#: reporting/reports_main.php:319 reporting/reports_main.php:327 -#: reporting/reports_main.php:334 reporting/reports_main.php:345 -#: reporting/reports_main.php:356 reporting/reports_main.php:366 -#: reporting/reports_main.php:373 reporting/reports_main.php:379 -#: reporting/reports_main.php:386 reporting/reports_main.php:399 -#: reporting/reports_main.php:407 reporting/reports_main.php:418 -#: reporting/reports_main.php:430 reporting/reports_main.php:440 -#: reporting/reports_main.php:452 reporting/reports_main.php:459 -#: reporting/reports_main.php:469 reporting/reports_main.php:480 -#: reporting/reports_main.php:489 reporting/reports_main.php:500 -#: reporting/reports_main.php:506 reporting/reports_main.php:515 -#: reporting/reports_main.php:525 reporting/reports_main.php:533 -#: reporting/reports_main.php:541 reporting/reports_main.php:549 +#: reporting/reports_main.php:153 reporting/reports_main.php:160 +#: reporting/reports_main.php:171 reporting/reports_main.php:182 +#: reporting/reports_main.php:191 reporting/reports_main.php:199 +#: reporting/reports_main.php:204 reporting/reports_main.php:211 +#: reporting/reports_main.php:219 reporting/reports_main.php:226 +#: reporting/reports_main.php:235 reporting/reports_main.php:241 +#: reporting/reports_main.php:252 reporting/reports_main.php:262 +#: reporting/reports_main.php:268 reporting/reports_main.php:278 +#: reporting/reports_main.php:286 reporting/reports_main.php:294 +#: reporting/reports_main.php:301 reporting/reports_main.php:311 +#: reporting/reports_main.php:320 reporting/reports_main.php:328 +#: reporting/reports_main.php:335 reporting/reports_main.php:346 +#: reporting/reports_main.php:357 reporting/reports_main.php:367 +#: reporting/reports_main.php:374 reporting/reports_main.php:380 +#: reporting/reports_main.php:387 reporting/reports_main.php:400 +#: reporting/reports_main.php:408 reporting/reports_main.php:419 +#: reporting/reports_main.php:431 reporting/reports_main.php:441 +#: reporting/reports_main.php:453 reporting/reports_main.php:460 +#: reporting/reports_main.php:470 reporting/reports_main.php:481 +#: reporting/reports_main.php:490 reporting/reports_main.php:501 +#: reporting/reports_main.php:507 reporting/reports_main.php:516 +#: reporting/reports_main.php:526 reporting/reports_main.php:534 +#: reporting/reports_main.php:542 reporting/reports_main.php:550 #: reporting/includes/excel_report.inc:292 #: reporting/includes/excel_report.inc:425 #: reporting/includes/pdf_report.inc:360 reporting/includes/pdf_report.inc:621 -#: sales/view/view_sales_order.php:98 +#: sales/view/view_sales_order.php:100 msgid "Comments" msgstr "" @@ -7671,8 +7672,8 @@ msgstr "" #: includes/ui/allocation_cart.inc:290 reporting/rep704.php:82 #: reporting/rep704.php:85 reporting/rep704.php:88 reporting/rep709.php:116 -#: sales/view/view_credit.php:68 sales/view/view_sales_order.php:109 -#: sales/view/view_sales_order.php:142 sales/view/view_sales_order.php:179 +#: sales/view/view_credit.php:68 sales/view/view_sales_order.php:111 +#: sales/view/view_sales_order.php:144 sales/view/view_sales_order.php:181 #: sales/inquiry/customer_branches_list.php:49 #: sales/inquiry/sales_orders_view.php:214 #: sales/inquiry/sales_orders_view.php:253 @@ -7687,7 +7688,7 @@ msgstr "" #: includes/ui/allocation_cart.inc:291 includes/ui/allocation_cart.inc:337 #: includes/ui/ui_view.inc:547 #: purchasing/allocations/supplier_allocation_main.php:101 -#: reporting/rep112.php:150 reporting/rep210.php:157 +#: reporting/rep112.php:159 reporting/rep210.php:157 #: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:209 #: sales/allocations/customer_allocation_main.php:99 msgid "Left to Allocate" @@ -7698,7 +7699,7 @@ msgstr "" msgid "This Allocation" msgstr "" -#: includes/ui/allocation_cart.inc:324 reporting/rep112.php:147 +#: includes/ui/allocation_cart.inc:324 reporting/rep112.php:156 #: reporting/rep210.php:154 msgid "Total Allocated" msgstr "" @@ -7717,12 +7718,12 @@ msgid "" "than the total amount left to allocate." msgstr "" -#: includes/ui/class.crud_view.inc:289 includes/ui/simple_crud_class.inc:225 +#: includes/ui/class.crud_view.inc:298 includes/ui/simple_crud_class.inc:225 #: includes/ui/ui_input.inc:227 msgid "Submit changes" msgstr "" -#: includes/ui/class.crud_view.inc:304 includes/ui/simple_crud_class.inc:227 +#: includes/ui/class.crud_view.inc:313 includes/ui/simple_crud_class.inc:227 #: includes/ui/ui_input.inc:228 msgid "Clone" msgstr "" @@ -7820,7 +7821,7 @@ msgstr "" msgid "You have to select at least one category." msgstr "" -#: includes/ui/db_pager_view.inc:172 includes/ui/ui_input.inc:958 +#: includes/ui/db_pager_view.inc:172 includes/ui/ui_input.inc:964 msgid "Show also Inactive" msgstr "" @@ -7909,23 +7910,23 @@ msgid "" "Do you want to abandon changes?" msgstr "" -#: includes/ui/ui_input.inc:655 reporting/includes/reports_classes.inc:223 +#: includes/ui/ui_input.inc:661 reporting/includes/reports_classes.inc:223 msgid "Click Here to Pick up the date" msgstr "" -#: includes/ui/ui_input.inc:970 includes/ui/ui_lists.inc:2354 -#: reporting/rep301.php:224 reporting/rep302.php:168 reporting/rep303.php:198 -#: reporting/rep304.php:184 reporting/rep304.php:188 reporting/rep306.php:235 -#: reporting/rep306.php:242 reporting/rep310.php:189 reporting/rep310.php:197 +#: includes/ui/ui_input.inc:976 includes/ui/ui_lists.inc:2355 +#: reporting/rep301.php:225 reporting/rep302.php:168 reporting/rep303.php:300 +#: reporting/rep304.php:184 reporting/rep304.php:188 reporting/rep306.php:234 +#: reporting/rep306.php:241 reporting/rep310.php:189 reporting/rep310.php:197 #: reporting/rep451.php:143 sales/manage/customer_branches.php:292 msgid "Inactive" msgstr "" -#: includes/ui/ui_input.inc:980 includes/ui/ui_input.inc:992 +#: includes/ui/ui_input.inc:986 includes/ui/ui_input.inc:998 msgid "Current Credit:" msgstr "" -#: includes/ui/ui_input.inc:1006 +#: includes/ui/ui_input.inc:1012 msgid "Bank Balance:" msgstr "" @@ -7964,7 +7965,7 @@ msgstr "" msgid "Search suppliers" msgstr "" -#: includes/ui/ui_lists.inc:540 includes/ui/ui_lists.inc:1551 +#: includes/ui/ui_lists.inc:540 includes/ui/ui_lists.inc:1552 msgid "All Suppliers" msgstr "" @@ -8004,120 +8005,120 @@ msgstr "" msgid "All Items" msgstr "" -#: includes/ui/ui_lists.inc:1483 +#: includes/ui/ui_lists.inc:1484 msgid "All Sales Types" msgstr "" -#: includes/ui/ui_lists.inc:1831 +#: includes/ui/ui_lists.inc:1832 msgid "Use Item Sales Accounts" msgstr "" -#: includes/ui/ui_lists.inc:2140 includes/ui/ui_lists.inc:2156 -#: includes/ui/ui_lists.inc:2172 +#: includes/ui/ui_lists.inc:2141 includes/ui/ui_lists.inc:2157 +#: includes/ui/ui_lists.inc:2173 msgid "All Types" msgstr "" -#: includes/ui/ui_lists.inc:2141 sales/view/view_sales_order.php:140 +#: includes/ui/ui_lists.inc:2142 sales/view/view_sales_order.php:142 msgid "Sales Invoices" msgstr "" -#: includes/ui/ui_lists.inc:2142 includes/ui/ui_lists.inc:2175 +#: includes/ui/ui_lists.inc:2143 includes/ui/ui_lists.inc:2176 msgid "Unsettled transactions" msgstr "" -#: includes/ui/ui_lists.inc:2143 includes/ui/ui_lists.inc:2159 -#: includes/ui/ui_lists.inc:2176 includes/ui/ui_view.inc:609 +#: includes/ui/ui_lists.inc:2144 includes/ui/ui_lists.inc:2160 +#: includes/ui/ui_lists.inc:2177 includes/ui/ui_view.inc:609 #: includes/ui/ui_view.inc:613 msgid "Payments" msgstr "" -#: includes/ui/ui_lists.inc:2144 includes/ui/ui_lists.inc:2160 -#: includes/ui/ui_lists.inc:2177 sales/view/view_sales_order.php:176 +#: includes/ui/ui_lists.inc:2145 includes/ui/ui_lists.inc:2161 +#: includes/ui/ui_lists.inc:2178 sales/view/view_sales_order.php:178 msgid "Credit Notes" msgstr "" -#: includes/ui/ui_lists.inc:2145 sales/view/view_sales_order.php:106 +#: includes/ui/ui_lists.inc:2146 sales/view/view_sales_order.php:108 msgid "Delivery Notes" msgstr "" -#: includes/ui/ui_lists.inc:2157 includes/ui/ui_lists.inc:2174 +#: includes/ui/ui_lists.inc:2158 includes/ui/ui_lists.inc:2175 msgid "Invoices" msgstr "" -#: includes/ui/ui_lists.inc:2158 +#: includes/ui/ui_lists.inc:2159 msgid "Overdue Invoices" msgstr "" -#: includes/ui/ui_lists.inc:2161 includes/ui/ui_lists.inc:2178 +#: includes/ui/ui_lists.inc:2162 includes/ui/ui_lists.inc:2179 msgid "Overdue Credit Notes" msgstr "" -#: includes/ui/ui_lists.inc:2173 +#: includes/ui/ui_lists.inc:2174 msgid "GRNs" msgstr "" -#: includes/ui/ui_lists.inc:2191 +#: includes/ui/ui_lists.inc:2192 msgid "Automatically put balance on back order" msgstr "" -#: includes/ui/ui_lists.inc:2192 +#: includes/ui/ui_lists.inc:2193 msgid "Cancel any quantites not delivered" msgstr "" -#: includes/ui/ui_lists.inc:2209 +#: includes/ui/ui_lists.inc:2210 msgid "Items Returned to Inventory Location" msgstr "" -#: includes/ui/ui_lists.inc:2210 +#: includes/ui/ui_lists.inc:2211 msgid "Items Written Off" msgstr "" -#: includes/ui/ui_lists.inc:2379 +#: includes/ui/ui_lists.inc:2380 msgid "New role" msgstr "" -#: includes/ui/ui_lists.inc:2431 +#: includes/ui/ui_lists.inc:2432 msgid "No tags defined." msgstr "" -#: includes/ui/ui_lists.inc:2431 +#: includes/ui/ui_lists.inc:2432 msgid "No active tags defined." msgstr "" -#: includes/ui/ui_lists.inc:2469 +#: includes/ui/ui_lists.inc:2470 #, php-format msgid "Activated for '%s'" msgstr "" -#: includes/ui/ui_lists.inc:2472 +#: includes/ui/ui_lists.inc:2473 msgid "Available and/or installed" msgstr "" -#: includes/ui/ui_lists.inc:2542 +#: includes/ui/ui_lists.inc:2543 msgid "Standard new company American COA (4 digit)" msgstr "" -#: includes/ui/ui_lists.inc:2544 +#: includes/ui/ui_lists.inc:2545 msgid "Standard American COA (4 digit) with demo data" msgstr "" -#: includes/ui/ui_lists.inc:2565 +#: includes/ui/ui_lists.inc:2566 msgid "No payment Link" msgstr "" -#: includes/ui/ui_lists.inc:2685 +#: includes/ui/ui_lists.inc:2686 msgid "Numeric" msgstr "" -#: includes/ui/ui_lists.inc:2685 +#: includes/ui/ui_lists.inc:2686 msgid "Alpha Numeric" msgstr "" -#: includes/ui/ui_lists.inc:2685 +#: includes/ui/ui_lists.inc:2686 msgid "ALPHA NUMERIC" msgstr "" -#: includes/ui/ui_lists.inc:2701 +#: includes/ui/ui_lists.inc:2702 msgid "All users" msgstr "" @@ -8179,7 +8180,7 @@ msgstr "" msgid "No Quick Entry lines are defined." msgstr "" -#: includes/ui/ui_view.inc:875 purchasing/includes/ui/invoice_ui.inc:482 +#: includes/ui/ui_view.inc:875 purchasing/includes/ui/invoice_ui.inc:484 msgid "and" msgstr "" @@ -8319,7 +8320,7 @@ msgid "The entered standard cost is negative or invalid." msgstr "" #: inventory/adjustments.php:228 inventory/cost_update.php:42 -#: inventory/transfers.php:216 sales/sales_order_entry.php:701 +#: inventory/transfers.php:216 sales/sales_order_entry.php:705 msgid "There are no fixed assets defined in the system." msgstr "" @@ -8450,14 +8451,14 @@ msgid "Sales Type" msgstr "" #: inventory/prices.php:151 inventory/purchasing_data.php:150 -#: purchasing/includes/ui/invoice_ui.inc:514 purchasing/po_receive_items.php:63 +#: purchasing/includes/ui/invoice_ui.inc:516 purchasing/po_receive_items.php:63 #: purchasing/view/view_grn.php:41 purchasing/view/view_po.php:45 #: reporting/rep104.php:109 reporting/includes/doctext.inc:32 #: reporting/includes/doctext.inc:191 sales/customer_credit_invoice.php:276 #: sales/customer_delivery.php:421 sales/customer_invoice.php:519 #: sales/customer_invoice.php:522 sales/view/view_credit.php:91 #: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:116 -#: sales/view/view_sales_order.php:220 +#: sales/view/view_sales_order.php:222 #: sales/includes/ui/sales_credit_ui.inc:163 msgid "Price" msgstr "" @@ -8578,15 +8579,15 @@ msgstr "" #: purchasing/inquiry/po_search_completed.php:113 #: purchasing/inquiry/po_search_completed.php:123 #: purchasing/inquiry/po_search.php:120 purchasing/inquiry/po_search.php:131 -#: reporting/rep105.php:121 reporting/rep301.php:171 reporting/rep302.php:130 -#: reporting/rep303.php:134 reporting/rep304.php:136 reporting/rep306.php:150 -#: reporting/rep307.php:121 reporting/rep308.php:231 reporting/rep310.php:142 -#: reporting/rep310.php:151 reporting/rep402.php:134 reporting/rep402.php:151 -#: reporting/rep451.php:87 reporting/reports_main.php:232 -#: reporting/reports_main.php:239 reporting/reports_main.php:245 -#: reporting/reports_main.php:258 reporting/reports_main.php:274 -#: reporting/reports_main.php:284 reporting/reports_main.php:292 -#: reporting/reports_main.php:307 reporting/reports_main.php:324 +#: reporting/rep105.php:121 reporting/rep301.php:172 reporting/rep302.php:130 +#: reporting/rep303.php:236 reporting/rep304.php:136 reporting/rep306.php:150 +#: reporting/rep307.php:121 reporting/rep308.php:232 reporting/rep310.php:142 +#: reporting/rep310.php:151 reporting/rep402.php:136 reporting/rep402.php:153 +#: reporting/rep451.php:87 reporting/reports_main.php:233 +#: reporting/reports_main.php:240 reporting/reports_main.php:246 +#: reporting/reports_main.php:259 reporting/reports_main.php:275 +#: reporting/reports_main.php:285 reporting/reports_main.php:293 +#: reporting/reports_main.php:308 reporting/reports_main.php:325 #: sales/manage/sales_points.php:84 msgid "Location" msgstr "" @@ -8685,7 +8686,7 @@ msgstr "" #: sales/customer_delivery.php:419 sales/customer_invoice.php:518 #: sales/customer_invoice.php:521 sales/view/view_credit.php:90 #: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:115 -#: sales/view/view_sales_order.php:219 +#: sales/view/view_sales_order.php:221 #: sales/includes/ui/sales_credit_ui.inc:162 #: sales/includes/ui/sales_order_ui.inc:146 msgid "Item Code" @@ -8701,7 +8702,7 @@ msgstr "" #: sales/customer_credit_invoice.php:275 sales/customer_delivery.php:419 #: sales/customer_invoice.php:518 sales/customer_invoice.php:521 #: sales/view/view_credit.php:90 sales/view/view_dispatch.php:112 -#: sales/view/view_invoice.php:115 sales/view/view_sales_order.php:219 +#: sales/view/view_invoice.php:115 sales/view/view_sales_order.php:221 #: sales/includes/ui/sales_credit_ui.inc:162 #: sales/includes/ui/sales_order_ui.inc:146 msgid "Item Description" @@ -8716,7 +8717,7 @@ msgstr "" #: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:32 #: reporting/includes/doctext.inc:191 sales/view/view_credit.php:91 #: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:116 -#: sales/view/view_sales_order.php:219 +#: sales/view/view_sales_order.php:221 #: sales/includes/ui/sales_credit_ui.inc:162 #: sales/includes/ui/sales_order_ui.inc:148 msgid "Unit" @@ -8727,7 +8728,7 @@ msgstr "" #: inventory/view/view_adjustment.php:55 #: manufacturing/view/wo_issue_view.php:76 #: manufacturing/includes/manufacturing_ui.inc:29 -#: manufacturing/includes/work_order_issue_ui.inc:34 reporting/rep301.php:164 +#: manufacturing/includes/work_order_issue_ui.inc:34 reporting/rep301.php:165 msgid "Unit Cost" msgstr "" @@ -8755,30 +8756,30 @@ msgid "" "Marked items have insufficient quantities in stock as on day of transfer." msgstr "" -#: inventory/includes/db/items_db.inc:139 +#: inventory/includes/db/items_db.inc:140 msgid "" "Cannot delete this item because there are stock movements that refer to this " "item." msgstr "" -#: inventory/includes/db/items_db.inc:142 +#: inventory/includes/db/items_db.inc:143 msgid "" "Cannot delete this item record because there are bills of material that " "require this part as a component." msgstr "" -#: inventory/includes/db/items_db.inc:145 +#: inventory/includes/db/items_db.inc:146 msgid "" "Cannot delete this item because there are existing sales order items for it." msgstr "" -#: inventory/includes/db/items_db.inc:148 +#: inventory/includes/db/items_db.inc:149 msgid "" "Cannot delete this item because there are existing purchase order items for " "it." msgstr "" -#: inventory/includes/db/items_db.inc:166 +#: inventory/includes/db/items_db.inc:167 msgid "" "This item cannot be deleted because some code aliases \n" "\t\t\t\tor foreign codes was entered for it, or there are kits defined \n" @@ -8807,7 +8808,7 @@ msgid "Show Movements" msgstr "" #: inventory/inquiry/stock_movements.php:88 -#: purchasing/includes/ui/invoice_ui.inc:483 +#: purchasing/includes/ui/invoice_ui.inc:485 #: purchasing/inquiry/supplier_allocation_inquiry.php:57 #: purchasing/inquiry/supplier_inquiry.php:147 #: sales/inquiry/customer_allocation_inquiry.php:51 @@ -8846,12 +8847,12 @@ msgid "" msgstr "" #: inventory/inquiry/stock_status.php:70 inventory/inquiry/stock_status.php:75 -#: reporting/rep303.php:121 reporting/rep303.php:127 +#: reporting/rep303.php:223 reporting/rep303.php:229 msgid "Demand" msgstr "" -#: inventory/inquiry/stock_status.php:75 reporting/rep303.php:121 -#: reporting/rep303.php:127 +#: inventory/inquiry/stock_status.php:75 reporting/rep303.php:223 +#: reporting/rep303.php:229 msgid "On Order" msgstr "" @@ -8973,7 +8974,7 @@ msgstr "" msgid "Foreign Item Codes" msgstr "" -#: inventory/manage/item_codes.php:26 sales/sales_order_entry.php:703 +#: inventory/manage/item_codes.php:26 sales/sales_order_entry.php:707 msgid "There are no inventory items defined in the system." msgstr "" @@ -9019,7 +9020,7 @@ msgstr "" #: inventory/manage/item_codes.php:182 inventory/manage/items.php:359 #: inventory/manage/sales_kits.php:206 inventory/manage/sales_kits.php:230 #: manufacturing/manage/work_centres.php:138 -#: sales/create_recurrent_invoices.php:179 sales/manage/credit_status.php:145 +#: sales/create_recurrent_invoices.php:178 sales/manage/credit_status.php:145 #: sales/manage/recurrent_invoices.php:191 taxes/item_tax_types.php:173 #: taxes/tax_groups.php:165 taxes/tax_types.php:158 msgid "Description:" @@ -9513,13 +9514,13 @@ msgstr "" msgid "Produce" msgstr "" -#: manufacturing/search_work_orders.php:162 reporting/rep402.php:134 +#: manufacturing/search_work_orders.php:162 reporting/rep402.php:136 msgid "Required" msgstr "" #: manufacturing/search_work_orders.php:165 #: manufacturing/includes/manufacturing_ui.inc:292 -#: manufacturing/includes/manufacturing_ui.inc:296 reporting/rep402.php:134 +#: manufacturing/includes/manufacturing_ui.inc:296 reporting/rep402.php:136 #: reporting/includes/doctext.inc:228 sales/inquiry/sales_orders_view.php:258 msgid "Required By" msgstr "" @@ -9847,25 +9848,25 @@ msgstr "" msgid "View Work Order Costs" msgstr "" -#: manufacturing/view/wo_costs_view.php:60 reporting/rep402.php:139 +#: manufacturing/view/wo_costs_view.php:60 reporting/rep402.php:141 msgid "Transaction" msgstr "" -#: manufacturing/view/wo_costs_view.php:66 reporting/rep402.php:186 +#: manufacturing/view/wo_costs_view.php:66 reporting/rep402.php:188 msgid "Finished Product Requirements" msgstr "" -#: manufacturing/view/wo_costs_view.php:69 reporting/rep402.php:189 +#: manufacturing/view/wo_costs_view.php:69 reporting/rep402.php:191 msgid "Additional Material Issues" msgstr "" #: manufacturing/view/wo_costs_view.php:72 #: manufacturing/view/work_order_view.php:66 -#: manufacturing/view/work_order_view.php:73 reporting/rep402.php:192 +#: manufacturing/view/work_order_view.php:73 reporting/rep402.php:194 msgid "Additional Costs" msgstr "" -#: manufacturing/view/wo_costs_view.php:75 reporting/rep402.php:195 +#: manufacturing/view/wo_costs_view.php:75 reporting/rep402.php:197 msgid "Finished Product Receival" msgstr "" @@ -10181,7 +10182,7 @@ msgstr "" msgid "COGS changed from %s to %s for %d %s of '%s'" msgstr "" -#: manufacturing/includes/db/work_order_costing_db.inc:240 +#: manufacturing/includes/db/work_order_costing_db.inc:236 #, php-format msgid "Voided WO #%s" msgstr "" @@ -10199,7 +10200,7 @@ msgid "Production." msgstr "" #: manufacturing/includes/db/work_orders_db.inc:95 -#: purchasing/includes/db/po_db.inc:153 sales/includes/db/cust_trans_db.inc:115 +#: purchasing/includes/db/po_db.inc:154 sales/includes/db/cust_trans_db.inc:115 #: sales/includes/db/sales_order_db.inc:211 msgid "Updated." msgstr "" @@ -10208,7 +10209,7 @@ msgstr "" msgid "Canceled." msgstr "" -#: manufacturing/includes/db/work_orders_db.inc:195 +#: manufacturing/includes/db/work_orders_db.inc:197 msgid "Released." msgstr "" @@ -10216,23 +10217,23 @@ msgstr "" msgid "Payment for:" msgstr "" -#: purchasing/includes/db/invoice_db.inc:339 +#: purchasing/includes/db/invoice_db.inc:340 msgid "Supplier invoice adjustment for zero inventory of " msgstr "" -#: purchasing/includes/db/invoice_db.inc:339 reporting/rep106.php:89 +#: purchasing/includes/db/invoice_db.inc:340 reporting/rep106.php:89 #: sales/inquiry/sales_deliveries_view.php:155 #: sales/inquiry/sales_orders_view.php:134 msgid "Invoice" msgstr "" -#: purchasing/includes/db/invoice_db.inc:693 -#: purchasing/includes/db/invoice_db.inc:695 +#: purchasing/includes/db/invoice_db.inc:696 +#: purchasing/includes/db/invoice_db.inc:698 msgid "GRN Removal" msgstr "" #: purchasing/includes/ui/grn_ui.inc:23 purchasing/includes/ui/grn_ui.inc:55 -#: purchasing/includes/ui/po_ui.inc:307 sales/view/view_sales_order.php:74 +#: purchasing/includes/ui/po_ui.inc:307 sales/view/view_sales_order.php:76 msgid "Order Currency" msgstr "" @@ -10251,7 +10252,7 @@ msgid "Deliver Into Location" msgstr "" #: purchasing/includes/ui/grn_ui.inc:38 purchasing/includes/ui/grn_ui.inc:79 -#: purchasing/includes/ui/po_ui.inc:336 sales/view/view_sales_order.php:92 +#: purchasing/includes/ui/po_ui.inc:336 sales/view/view_sales_order.php:94 msgid "Delivery Address" msgstr "" @@ -10306,51 +10307,55 @@ msgstr "" msgid "Credit Note Total" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:220 +#: purchasing/includes/ui/invoice_ui.inc:221 msgid "Add GL Line" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:221 +#: purchasing/includes/ui/invoice_ui.inc:222 msgid "Reset" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:222 +#: purchasing/includes/ui/invoice_ui.inc:223 #: purchasing/po_receive_items.php:326 msgid "Clear all GL entry fields" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:240 +#: purchasing/includes/ui/invoice_ui.inc:241 msgid "GL Items for this Invoice" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:242 +#: purchasing/includes/ui/invoice_ui.inc:243 msgid "GL Items for this Credit Note" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:252 +#: purchasing/includes/ui/invoice_ui.inc:253 msgid "Quick Entry:" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:421 -msgid "Add to Invoice" +#: purchasing/includes/ui/invoice_ui.inc:321 +msgid "Edit line from document" msgstr "" #: purchasing/includes/ui/invoice_ui.inc:423 +msgid "Add to Invoice" +msgstr "" + +#: purchasing/includes/ui/invoice_ui.inc:425 msgid "Add to Credit Note" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:425 sales/customer_invoice.php:581 +#: purchasing/includes/ui/invoice_ui.inc:427 sales/customer_invoice.php:581 msgid "Remove" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:425 -#: purchasing/includes/ui/invoice_ui.inc:460 +#: purchasing/includes/ui/invoice_ui.inc:427 +#: purchasing/includes/ui/invoice_ui.inc:462 msgid "" "WARNING! Be careful with removal. The operation is executed immediately and " "cannot be undone !!!" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:427 +#: purchasing/includes/ui/invoice_ui.inc:429 #, php-format msgid "" "You are about to remove all yet non-invoiced items from delivery line #%d. " @@ -10358,102 +10363,102 @@ msgid "" "continue ?" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:458 +#: purchasing/includes/ui/invoice_ui.inc:460 msgid "Items Received Yet to be Invoiced" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:463 +#: purchasing/includes/ui/invoice_ui.inc:465 msgid "Delivery Item Selected For Adding To A Supplier Credit Note" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:468 +#: purchasing/includes/ui/invoice_ui.inc:470 msgid "Received Items Charged on this Invoice" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:470 +#: purchasing/includes/ui/invoice_ui.inc:472 msgid "Received Items Credited on this Note" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:480 +#: purchasing/includes/ui/invoice_ui.inc:482 msgid "Received between" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:492 +#: purchasing/includes/ui/invoice_ui.inc:494 msgid "Add All Items" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:501 -#: purchasing/includes/ui/invoice_ui.inc:513 reporting/rep308.php:223 +#: purchasing/includes/ui/invoice_ui.inc:503 +#: purchasing/includes/ui/invoice_ui.inc:515 reporting/rep308.php:224 #: sales/inquiry/sales_orders_view.php:142 msgid "Delivery" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:501 +#: purchasing/includes/ui/invoice_ui.inc:503 msgid "P.O." msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:502 +#: purchasing/includes/ui/invoice_ui.inc:504 msgid "Received On" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:502 purchasing/view/view_po.php:46 +#: purchasing/includes/ui/invoice_ui.inc:504 purchasing/view/view_po.php:46 msgid "Quantity Received" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:502 purchasing/view/view_grn.php:41 +#: purchasing/includes/ui/invoice_ui.inc:504 purchasing/view/view_grn.php:41 #: purchasing/view/view_po.php:46 msgid "Quantity Invoiced" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:503 +#: purchasing/includes/ui/invoice_ui.inc:505 msgid "Qty Yet To Invoice" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:503 +#: purchasing/includes/ui/invoice_ui.inc:505 #: purchasing/includes/ui/po_ui.inc:217 #: sales/includes/ui/sales_order_ui.inc:148 msgid "Price after Tax" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:503 +#: purchasing/includes/ui/invoice_ui.inc:505 #: purchasing/includes/ui/po_ui.inc:217 #: sales/includes/ui/sales_order_ui.inc:148 msgid "Price before Tax" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:509 +#: purchasing/includes/ui/invoice_ui.inc:511 msgid "Qty Yet To Credit" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:514 +#: purchasing/includes/ui/invoice_ui.inc:516 msgid "Line Value" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:582 +#: purchasing/includes/ui/invoice_ui.inc:584 msgid "" "There are no outstanding items received from this supplier that have not " "been invoiced by them." msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:585 +#: purchasing/includes/ui/invoice_ui.inc:587 msgid "" "There are no received items for the selected supplier that have been " "invoiced." msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:586 +#: purchasing/includes/ui/invoice_ui.inc:588 msgid "Credits can only be applied to invoiced items." msgstr "" -#: purchasing/includes/ui/po_ui.inc:135 sales/sales_order_entry.php:727 +#: purchasing/includes/ui/po_ui.inc:135 sales/sales_order_entry.php:731 msgid "Order Date:" msgstr "" -#: purchasing/includes/ui/po_ui.inc:136 sales/sales_order_entry.php:714 +#: purchasing/includes/ui/po_ui.inc:136 sales/sales_order_entry.php:718 msgid "Delivery Date:" msgstr "" -#: purchasing/includes/ui/po_ui.inc:136 sales/sales_order_entry.php:708 +#: purchasing/includes/ui/po_ui.inc:136 sales/sales_order_entry.php:712 msgid "Invoice Date:" msgstr "" @@ -10492,7 +10497,7 @@ msgid "Received" msgstr "" #: purchasing/includes/ui/po_ui.inc:217 -#: sales/includes/ui/sales_order_ui.inc:604 +#: sales/includes/ui/sales_order_ui.inc:607 msgid "Required Delivery Date" msgstr "" @@ -10513,7 +10518,7 @@ msgstr "" #: purchasing/includes/ui/po_ui.inc:285 purchasing/po_receive_items.php:122 #: purchasing/view/view_grn.php:79 purchasing/view/view_po.php:93 -#: sales/customer_delivery.php:512 sales/view/view_sales_order.php:263 +#: sales/customer_delivery.php:512 sales/view/view_sales_order.php:265 #: sales/includes/ui/sales_order_ui.inc:230 msgid "Amount Total" msgstr "" @@ -10525,7 +10530,7 @@ msgstr "" msgid "Refresh" msgstr "" -#: purchasing/includes/ui/po_ui.inc:342 sales/view/view_sales_order.php:83 +#: purchasing/includes/ui/po_ui.inc:342 sales/view/view_sales_order.php:85 msgid "Required Pre-Payment" msgstr "" @@ -10544,8 +10549,8 @@ msgid "Delayed" msgstr "" #: purchasing/includes/ui/po_ui.inc:469 -#: sales/includes/ui/sales_order_ui.inc:615 -#: sales/includes/ui/sales_order_ui.inc:617 +#: sales/includes/ui/sales_order_ui.inc:618 +#: sales/includes/ui/sales_order_ui.inc:620 msgid "Pre-Payment Required:" msgstr "" @@ -10672,7 +10677,7 @@ msgstr "" msgid "Enter a new purchase order" msgstr "" -#: purchasing/po_entry_items.php:228 sales/sales_order_entry.php:518 +#: purchasing/po_entry_items.php:228 sales/sales_order_entry.php:522 msgid "Item description cannot be empty." msgstr "" @@ -10707,7 +10712,7 @@ msgid "" "purchased." msgstr "" -#: purchasing/po_entry_items.php:338 purchasing/supplier_invoice.php:380 +#: purchasing/po_entry_items.php:338 purchasing/supplier_invoice.php:394 #: purchasing/supplier_payment.php:132 msgid "There is no supplier selected." msgstr "" @@ -10748,7 +10753,7 @@ msgstr "" msgid "Required prepayment is greater than total invoice value." msgstr "" -#: purchasing/po_entry_items.php:491 sales/sales_order_entry.php:731 +#: purchasing/po_entry_items.php:491 sales/sales_order_entry.php:735 msgid "Place Order" msgstr "" @@ -10756,7 +10761,7 @@ msgstr "" msgid "Update Order" msgstr "" -#: purchasing/po_entry_items.php:493 sales/sales_order_entry.php:730 +#: purchasing/po_entry_items.php:493 sales/sales_order_entry.php:734 msgid "Cancel Order" msgstr "" @@ -10780,7 +10785,7 @@ msgstr "" msgid "Update Invoice" msgstr "" -#: purchasing/po_entry_items.php:502 sales/sales_order_entry.php:711 +#: purchasing/po_entry_items.php:502 sales/sales_order_entry.php:715 msgid "Cancel Invoice" msgstr "" @@ -10986,12 +10991,12 @@ msgid "" "necessary." msgstr "" -#: purchasing/supplier_invoice.php:362 +#: purchasing/supplier_invoice.php:376 #, php-format msgid "All yet non-invoiced items on delivery line # %d has been removed." msgstr "" -#: purchasing/supplier_invoice.php:404 +#: purchasing/supplier_invoice.php:418 msgid "Enter Invoice" msgstr "" @@ -11027,7 +11032,7 @@ msgstr "" msgid "Enter another supplier &payment" msgstr "" -#: purchasing/supplier_payment.php:105 sales/customer_payments.php:111 +#: purchasing/supplier_payment.php:105 sales/customer_payments.php:112 msgid "Enter Other &Payment" msgstr "" @@ -11035,11 +11040,11 @@ msgstr "" msgid "Enter &Customer Payment" msgstr "" -#: purchasing/supplier_payment.php:107 sales/customer_payments.php:109 +#: purchasing/supplier_payment.php:107 sales/customer_payments.php:110 msgid "Enter Other &Deposit" msgstr "" -#: purchasing/supplier_payment.php:108 sales/customer_payments.php:112 +#: purchasing/supplier_payment.php:108 sales/customer_payments.php:113 msgid "Bank Account &Transfer" msgstr "" @@ -11073,7 +11078,7 @@ msgstr "" msgid "Bank Amount:" msgstr "" -#: purchasing/supplier_payment.php:329 sales/customer_payments.php:376 +#: purchasing/supplier_payment.php:329 sales/customer_payments.php:378 msgid "Amount of Discount:" msgstr "" @@ -11095,7 +11100,7 @@ msgid "" msgstr "" #: purchasing/view/view_grn.php:37 purchasing/view/view_po.php:41 -#: sales/view/view_sales_order.php:216 +#: sales/view/view_sales_order.php:218 msgid "Line Details" msgstr "" @@ -11108,7 +11113,7 @@ msgstr "" #: purchasing/view/view_grn.php:70 purchasing/view/view_po.php:84 #: purchasing/view/view_supp_credit.php:60 #: purchasing/view/view_supp_invoice.php:66 sales/view/view_credit.php:135 -#: sales/view/view_sales_order.php:253 +#: sales/view/view_sales_order.php:255 msgid "Sub Total" msgstr "" @@ -11206,10 +11211,10 @@ msgstr "" msgid "Payment Currency" msgstr "" -#: purchasing/view/view_supp_payment.php:62 reporting/rep112.php:155 +#: purchasing/view/view_supp_payment.php:62 reporting/rep112.php:164 #: reporting/rep210.php:164 sales/customer_delivery.php:421 #: sales/customer_invoice.php:519 sales/customer_invoice.php:522 -#: sales/view/view_receipt.php:45 sales/view/view_sales_order.php:220 +#: sales/view/view_receipt.php:45 sales/view/view_sales_order.php:222 msgid "Discount" msgstr "" @@ -11568,7 +11573,7 @@ msgid "Marked items are settled." msgstr "" #: reporting/rep101.php:126 reporting/rep102.php:104 reporting/rep114.php:108 -#: reporting/rep115.php:151 reporting/rep202.php:110 reporting/rep203.php:78 +#: reporting/rep115.php:150 reporting/rep202.php:110 reporting/rep203.php:78 msgid "Balances in Home Currency" msgstr "" @@ -11589,17 +11594,17 @@ msgid "Credits" msgstr "" #: reporting/rep101.php:146 reporting/reports_main.php:39 -#: reporting/reports_main.php:167 reporting/reports_main.php:355 +#: reporting/reports_main.php:168 reporting/reports_main.php:356 msgid "Show Balance" msgstr "" -#: reporting/rep101.php:148 reporting/rep102.php:132 reporting/rep115.php:169 +#: reporting/rep101.php:148 reporting/rep102.php:132 reporting/rep115.php:171 #: reporting/rep201.php:126 reporting/rep202.php:139 reporting/rep203.php:97 -#: reporting/rep206.php:124 reporting/rep303.php:136 +#: reporting/rep206.php:124 reporting/rep303.php:238 #: reporting/reports_main.php:41 reporting/reports_main.php:51 -#: reporting/reports_main.php:63 reporting/reports_main.php:169 -#: reporting/reports_main.php:179 reporting/reports_main.php:189 -#: reporting/reports_main.php:197 reporting/reports_main.php:249 +#: reporting/reports_main.php:63 reporting/reports_main.php:170 +#: reporting/reports_main.php:180 reporting/reports_main.php:190 +#: reporting/reports_main.php:198 reporting/reports_main.php:250 msgid "Suppress Zeros" msgstr "" @@ -11610,17 +11615,17 @@ msgstr "" #: reporting/rep101.php:267 reporting/rep102.php:226 reporting/rep105.php:177 #: reporting/rep106.php:181 reporting/rep115.php:292 reporting/rep201.php:240 #: reporting/rep202.php:233 reporting/rep203.php:176 reporting/rep204.php:148 -#: reporting/rep206.php:228 reporting/rep301.php:249 reporting/rep304.php:212 -#: reporting/rep305.php:193 reporting/rep306.php:293 reporting/rep309.php:157 +#: reporting/rep206.php:227 reporting/rep301.php:250 reporting/rep304.php:212 +#: reporting/rep305.php:193 reporting/rep306.php:292 reporting/rep309.php:157 #: reporting/rep451.php:164 msgid "Grand Total" msgstr "" #: reporting/rep102.php:98 reporting/rep106.php:99 reporting/rep202.php:104 #: reporting/rep709.php:100 reporting/reports_main.php:50 -#: reporting/reports_main.php:104 reporting/reports_main.php:178 -#: reporting/reports_main.php:233 reporting/reports_main.php:344 -#: reporting/reports_main.php:540 +#: reporting/reports_main.php:104 reporting/reports_main.php:179 +#: reporting/reports_main.php:234 reporting/reports_main.php:345 +#: reporting/reports_main.php:541 msgid "Summary Only" msgstr "" @@ -11629,31 +11634,31 @@ msgid "Detailed Report" msgstr "" #: reporting/rep102.php:127 reporting/rep202.php:134 reporting/rep203.php:94 -#: reporting/rep301.php:169 reporting/rep451.php:85 +#: reporting/rep301.php:170 reporting/rep451.php:85 #: reporting/reports_main.php:37 reporting/reports_main.php:46 #: reporting/reports_main.php:58 reporting/reports_main.php:78 #: reporting/reports_main.php:94 reporting/reports_main.php:103 -#: reporting/reports_main.php:165 reporting/reports_main.php:174 -#: reporting/reports_main.php:186 reporting/reports_main.php:194 -#: reporting/reports_main.php:230 reporting/reports_main.php:256 -#: reporting/reports_main.php:266 reporting/reports_main.php:272 -#: reporting/reports_main.php:282 reporting/reports_main.php:290 -#: reporting/reports_main.php:298 reporting/reports_main.php:305 -#: reporting/reports_main.php:341 reporting/reports_main.php:364 -#: reporting/reports_main.php:372 reporting/reports_main.php:384 -#: reporting/reports_main.php:394 reporting/reports_main.php:412 -#: reporting/reports_main.php:423 reporting/reports_main.php:435 -#: reporting/reports_main.php:448 reporting/reports_main.php:464 -#: reporting/reports_main.php:474 reporting/reports_main.php:485 -#: reporting/reports_main.php:497 reporting/reports_main.php:511 -#: reporting/reports_main.php:520 reporting/reports_main.php:530 -#: reporting/reports_main.php:539 reporting/reports_main.php:546 +#: reporting/reports_main.php:166 reporting/reports_main.php:175 +#: reporting/reports_main.php:187 reporting/reports_main.php:195 +#: reporting/reports_main.php:231 reporting/reports_main.php:257 +#: reporting/reports_main.php:267 reporting/reports_main.php:273 +#: reporting/reports_main.php:283 reporting/reports_main.php:291 +#: reporting/reports_main.php:299 reporting/reports_main.php:306 +#: reporting/reports_main.php:342 reporting/reports_main.php:365 +#: reporting/reports_main.php:373 reporting/reports_main.php:385 +#: reporting/reports_main.php:395 reporting/reports_main.php:413 +#: reporting/reports_main.php:424 reporting/reports_main.php:436 +#: reporting/reports_main.php:449 reporting/reports_main.php:465 +#: reporting/reports_main.php:475 reporting/reports_main.php:486 +#: reporting/reports_main.php:498 reporting/reports_main.php:512 +#: reporting/reports_main.php:521 reporting/reports_main.php:531 +#: reporting/reports_main.php:540 reporting/reports_main.php:547 msgid "End Date" msgstr "" #: reporting/rep102.php:131 reporting/rep202.php:138 #: reporting/reports_main.php:49 reporting/reports_main.php:136 -#: reporting/reports_main.php:177 +#: reporting/reports_main.php:178 msgid "Show Also Allocated" msgstr "" @@ -11661,7 +11666,7 @@ msgstr "" msgid "Aged Customer Analysis" msgstr "" -#: reporting/rep103.php:131 reporting/rep115.php:137 +#: reporting/rep103.php:131 reporting/rep115.php:136 msgid "All Areas" msgstr "" @@ -11694,17 +11699,18 @@ msgid "Branch Delivery Address" msgstr "" #: reporting/rep103.php:158 reporting/rep205.php:99 -#: reporting/reports_main.php:68 reporting/reports_main.php:207 +#: reporting/reports_main.php:68 reporting/reports_main.php:208 msgid "Activity Since" msgstr "" -#: reporting/rep103.php:159 reporting/reports_main.php:60 -#: reporting/reports_main.php:69 sales/manage/sales_areas.php:16 +#: reporting/rep103.php:159 reporting/rep115.php:168 +#: reporting/reports_main.php:60 reporting/reports_main.php:69 +#: sales/manage/sales_areas.php:16 msgid "Sales Areas" msgstr "" -#: reporting/rep103.php:160 reporting/reports_main.php:61 -#: reporting/reports_main.php:70 +#: reporting/rep103.php:160 reporting/rep115.php:169 +#: reporting/reports_main.php:61 reporting/reports_main.php:70 msgid "Sales Folk" msgstr "" @@ -11736,8 +11742,8 @@ msgstr "" msgid "Category/Items" msgstr "" -#: reporting/rep104.php:109 reporting/rep301.php:164 reporting/rep303.php:121 -#: reporting/rep303.php:127 reporting/rep307.php:114 reporting/rep308.php:223 +#: reporting/rep104.php:109 reporting/rep301.php:165 reporting/rep303.php:223 +#: reporting/rep303.php:229 reporting/rep307.php:114 reporting/rep308.php:224 #: reporting/rep451.php:80 msgid "UOM" msgstr "" @@ -11843,7 +11849,7 @@ msgstr "" #: reporting/rep107.php:237 reporting/rep109.php:160 reporting/rep110.php:162 #: reporting/rep111.php:157 reporting/rep113.php:151 #: sales/view/view_credit.php:140 sales/view/view_dispatch.php:155 -#: sales/view/view_invoice.php:160 sales/view/view_sales_order.php:246 +#: sales/view/view_invoice.php:160 sales/view/view_sales_order.php:248 #: sales/includes/ui/sales_credit_ui.inc:217 msgid "Shipping" msgstr "" @@ -11908,31 +11914,32 @@ msgstr "" msgid "SALES QUOTATION" msgstr "" -#: reporting/rep112.php:85 reporting/includes/doctext.inc:197 +#: reporting/rep112.php:87 reporting/rep112.php:112 +#: reporting/includes/doctext.inc:197 msgid "RECEIPT" msgstr "" -#: reporting/rep112.php:119 reporting/rep210.php:127 +#: reporting/rep112.php:128 reporting/rep210.php:127 msgid "As advance / full / part / payment towards:" msgstr "" -#: reporting/rep112.php:160 +#: reporting/rep112.php:169 msgid "TOTAL RECEIPT" msgstr "" -#: reporting/rep112.php:171 +#: reporting/rep112.php:180 msgid "Received / Sign" msgstr "" -#: reporting/rep112.php:173 +#: reporting/rep112.php:182 msgid "By Cash / Cheque* / Draft No." msgstr "" -#: reporting/rep112.php:175 +#: reporting/rep112.php:184 msgid "Dated" msgstr "" -#: reporting/rep112.php:178 +#: reporting/rep112.php:187 msgid "Drawn on Bank" msgstr "" @@ -11965,11 +11972,11 @@ msgstr "" msgid "Tax" msgstr "" -#: reporting/rep115.php:144 +#: reporting/rep115.php:143 msgid "All Sales Man" msgstr "" -#: reporting/rep115.php:171 reporting/reports_main.php:56 +#: reporting/rep115.php:173 reporting/reports_main.php:56 msgid "Customer Trial Balance" msgstr "" @@ -12047,7 +12054,7 @@ msgstr "" msgid "TOTAL REMITTANCE" msgstr "" -#: reporting/rep301.php:173 +#: reporting/rep301.php:174 msgid "Inventory Valuation Report" msgstr "" @@ -12071,23 +12078,23 @@ msgstr "" msgid "Inventory Planning Report" msgstr "" -#: reporting/rep303.php:108 +#: reporting/rep303.php:210 msgid "Shortage" msgstr "" -#: reporting/rep303.php:121 reporting/rep303.php:127 reporting/rep305.php:106 +#: reporting/rep303.php:223 reporting/rep303.php:229 reporting/rep305.php:106 msgid "Stock ID" msgstr "" -#: reporting/rep303.php:121 +#: reporting/rep303.php:223 msgid "Check" msgstr "" -#: reporting/rep303.php:135 +#: reporting/rep303.php:237 msgid "Only Shortage" msgstr "" -#: reporting/rep303.php:159 +#: reporting/rep303.php:261 msgid "Stock Check Sheets" msgstr "" @@ -12100,7 +12107,7 @@ msgstr "" msgid "Contribution" msgstr "" -#: reporting/rep304.php:138 reporting/reports_main.php:260 +#: reporting/rep304.php:138 reporting/reports_main.php:261 msgid "Show Service Items" msgstr "" @@ -12144,36 +12151,36 @@ msgstr "" msgid "Inventory Movements" msgstr "" -#: reporting/rep308.php:223 +#: reporting/rep308.php:224 msgid "OpeningStock" msgstr "" -#: reporting/rep308.php:223 +#: reporting/rep308.php:224 msgid "StockIn" msgstr "" -#: reporting/rep308.php:223 +#: reporting/rep308.php:224 msgid "ClosingStock" msgstr "" -#: reporting/rep308.php:224 +#: reporting/rep308.php:225 msgid "QTY" msgstr "" -#: reporting/rep308.php:224 reporting/rep709.php:117 +#: reporting/rep308.php:225 reporting/rep709.php:117 #: taxes/item_tax_types.php:185 msgid "Rate" msgstr "" -#: reporting/rep308.php:233 +#: reporting/rep308.php:234 msgid "Costed Inventory Movements" msgstr "" -#: reporting/rep308.php:304 +#: reporting/rep308.php:305 msgid "Total Movement" msgstr "" -#: reporting/rep308.php:310 +#: reporting/rep308.php:311 msgid "Total Out" msgstr "" @@ -12213,11 +12220,11 @@ msgstr "" msgid "Bill of Material Listing" msgstr "" -#: reporting/rep402.php:152 +#: reporting/rep402.php:154 msgid "Open Only" msgstr "" -#: reporting/rep402.php:156 +#: reporting/rep402.php:158 msgid "Work Order Listing" msgstr "" @@ -12296,8 +12303,8 @@ msgid "GL Account Transactions" msgstr "" #: reporting/rep705.php:244 reporting/rep705.php:257 reporting/rep705.php:268 -#: reporting/reports_main.php:403 reporting/reports_main.php:456 -#: reporting/reports_main.php:504 +#: reporting/reports_main.php:404 reporting/reports_main.php:457 +#: reporting/reports_main.php:505 msgid "Year" msgstr "" @@ -12359,7 +12366,7 @@ msgstr "" msgid "Action" msgstr "" -#: reporting/rep710.php:89 reporting/reports_main.php:544 +#: reporting/rep710.php:89 reporting/reports_main.php:545 msgid "Audit Trail" msgstr "" @@ -12380,9 +12387,9 @@ msgstr "" #: reporting/reports_main.php:111 reporting/reports_main.php:121 #: reporting/reports_main.php:135 reporting/reports_main.php:143 #: reporting/reports_main.php:151 reporting/reports_main.php:158 -#: reporting/reports_main.php:168 reporting/reports_main.php:176 -#: reporting/reports_main.php:188 reporting/reports_main.php:196 -#: reporting/reports_main.php:216 reporting/reports_main.php:223 +#: reporting/reports_main.php:169 reporting/reports_main.php:177 +#: reporting/reports_main.php:189 reporting/reports_main.php:197 +#: reporting/reports_main.php:217 reporting/reports_main.php:224 msgid "Currency Filter" msgstr "" @@ -12393,28 +12400,28 @@ msgstr "" #: reporting/reports_main.php:116 reporting/reports_main.php:125 #: reporting/reports_main.php:132 reporting/reports_main.php:139 #: reporting/reports_main.php:147 reporting/reports_main.php:154 -#: reporting/reports_main.php:160 reporting/reports_main.php:171 -#: reporting/reports_main.php:182 reporting/reports_main.php:191 -#: reporting/reports_main.php:199 reporting/reports_main.php:204 -#: reporting/reports_main.php:211 reporting/reports_main.php:219 -#: reporting/reports_main.php:226 reporting/reports_main.php:235 -#: reporting/reports_main.php:241 reporting/reports_main.php:252 -#: reporting/reports_main.php:262 reporting/reports_main.php:268 -#: reporting/reports_main.php:278 reporting/reports_main.php:286 -#: reporting/reports_main.php:294 reporting/reports_main.php:301 -#: reporting/reports_main.php:311 reporting/reports_main.php:320 -#: reporting/reports_main.php:328 reporting/reports_main.php:335 -#: reporting/reports_main.php:346 reporting/reports_main.php:357 -#: reporting/reports_main.php:367 reporting/reports_main.php:380 -#: reporting/reports_main.php:387 reporting/reports_main.php:400 -#: reporting/reports_main.php:408 reporting/reports_main.php:419 -#: reporting/reports_main.php:431 reporting/reports_main.php:441 -#: reporting/reports_main.php:453 reporting/reports_main.php:460 -#: reporting/reports_main.php:470 reporting/reports_main.php:481 -#: reporting/reports_main.php:490 reporting/reports_main.php:501 -#: reporting/reports_main.php:507 reporting/reports_main.php:516 -#: reporting/reports_main.php:526 reporting/reports_main.php:534 -#: reporting/reports_main.php:542 reporting/reports_main.php:550 +#: reporting/reports_main.php:161 reporting/reports_main.php:172 +#: reporting/reports_main.php:183 reporting/reports_main.php:192 +#: reporting/reports_main.php:200 reporting/reports_main.php:205 +#: reporting/reports_main.php:212 reporting/reports_main.php:220 +#: reporting/reports_main.php:227 reporting/reports_main.php:236 +#: reporting/reports_main.php:242 reporting/reports_main.php:253 +#: reporting/reports_main.php:263 reporting/reports_main.php:269 +#: reporting/reports_main.php:279 reporting/reports_main.php:287 +#: reporting/reports_main.php:295 reporting/reports_main.php:302 +#: reporting/reports_main.php:312 reporting/reports_main.php:321 +#: reporting/reports_main.php:329 reporting/reports_main.php:336 +#: reporting/reports_main.php:347 reporting/reports_main.php:358 +#: reporting/reports_main.php:368 reporting/reports_main.php:381 +#: reporting/reports_main.php:388 reporting/reports_main.php:401 +#: reporting/reports_main.php:409 reporting/reports_main.php:420 +#: reporting/reports_main.php:432 reporting/reports_main.php:442 +#: reporting/reports_main.php:454 reporting/reports_main.php:461 +#: reporting/reports_main.php:471 reporting/reports_main.php:482 +#: reporting/reports_main.php:491 reporting/reports_main.php:502 +#: reporting/reports_main.php:508 reporting/reports_main.php:517 +#: reporting/reports_main.php:527 reporting/reports_main.php:535 +#: reporting/reports_main.php:543 reporting/reports_main.php:551 msgid "Orientation" msgstr "" @@ -12422,27 +12429,27 @@ msgstr "" #: reporting/reports_main.php:66 reporting/reports_main.php:75 #: reporting/reports_main.php:82 reporting/reports_main.php:91 #: reporting/reports_main.php:100 reporting/reports_main.php:107 -#: reporting/reports_main.php:172 reporting/reports_main.php:183 -#: reporting/reports_main.php:192 reporting/reports_main.php:200 -#: reporting/reports_main.php:205 reporting/reports_main.php:212 -#: reporting/reports_main.php:236 reporting/reports_main.php:242 -#: reporting/reports_main.php:253 reporting/reports_main.php:263 -#: reporting/reports_main.php:269 reporting/reports_main.php:279 -#: reporting/reports_main.php:287 reporting/reports_main.php:295 -#: reporting/reports_main.php:302 reporting/reports_main.php:312 -#: reporting/reports_main.php:321 reporting/reports_main.php:329 -#: reporting/reports_main.php:347 reporting/reports_main.php:358 -#: reporting/reports_main.php:368 reporting/reports_main.php:374 -#: reporting/reports_main.php:381 reporting/reports_main.php:388 -#: reporting/reports_main.php:401 reporting/reports_main.php:409 -#: reporting/reports_main.php:420 reporting/reports_main.php:432 -#: reporting/reports_main.php:442 reporting/reports_main.php:454 -#: reporting/reports_main.php:461 reporting/reports_main.php:471 -#: reporting/reports_main.php:482 reporting/reports_main.php:491 -#: reporting/reports_main.php:502 reporting/reports_main.php:508 -#: reporting/reports_main.php:517 reporting/reports_main.php:527 -#: reporting/reports_main.php:535 reporting/reports_main.php:543 -#: reporting/reports_main.php:551 +#: reporting/reports_main.php:173 reporting/reports_main.php:184 +#: reporting/reports_main.php:193 reporting/reports_main.php:201 +#: reporting/reports_main.php:206 reporting/reports_main.php:213 +#: reporting/reports_main.php:237 reporting/reports_main.php:243 +#: reporting/reports_main.php:254 reporting/reports_main.php:264 +#: reporting/reports_main.php:270 reporting/reports_main.php:280 +#: reporting/reports_main.php:288 reporting/reports_main.php:296 +#: reporting/reports_main.php:303 reporting/reports_main.php:313 +#: reporting/reports_main.php:322 reporting/reports_main.php:330 +#: reporting/reports_main.php:348 reporting/reports_main.php:359 +#: reporting/reports_main.php:369 reporting/reports_main.php:375 +#: reporting/reports_main.php:382 reporting/reports_main.php:389 +#: reporting/reports_main.php:402 reporting/reports_main.php:410 +#: reporting/reports_main.php:421 reporting/reports_main.php:433 +#: reporting/reports_main.php:443 reporting/reports_main.php:455 +#: reporting/reports_main.php:462 reporting/reports_main.php:472 +#: reporting/reports_main.php:483 reporting/reports_main.php:492 +#: reporting/reports_main.php:503 reporting/reports_main.php:509 +#: reporting/reports_main.php:518 reporting/reports_main.php:528 +#: reporting/reports_main.php:536 reporting/reports_main.php:544 +#: reporting/reports_main.php:552 msgid "Destination" msgstr "" @@ -12450,10 +12457,10 @@ msgstr "" msgid "&Aged Customer Analysis" msgstr "" -#: reporting/reports_main.php:52 reporting/reports_main.php:180 -#: reporting/reports_main.php:417 reporting/reports_main.php:429 -#: reporting/reports_main.php:468 reporting/reports_main.php:479 -#: reporting/reports_main.php:514 reporting/reports_main.php:524 +#: reporting/reports_main.php:52 reporting/reports_main.php:181 +#: reporting/reports_main.php:418 reporting/reports_main.php:430 +#: reporting/reports_main.php:469 reporting/reports_main.php:480 +#: reporting/reports_main.php:515 reporting/reports_main.php:525 msgid "Graphics" msgstr "" @@ -12461,11 +12468,11 @@ msgstr "" msgid "Customer &Detail Listing" msgstr "" -#: reporting/reports_main.php:71 reporting/reports_main.php:208 +#: reporting/reports_main.php:71 reporting/reports_main.php:209 msgid "Activity Greater Than" msgstr "" -#: reporting/reports_main.php:72 reporting/reports_main.php:209 +#: reporting/reports_main.php:72 reporting/reports_main.php:210 msgid "Activity Less Than" msgstr "" @@ -12478,11 +12485,11 @@ msgid "&Price Listing" msgstr "" #: reporting/reports_main.php:85 reporting/reports_main.php:95 -#: reporting/reports_main.php:231 reporting/reports_main.php:238 -#: reporting/reports_main.php:244 reporting/reports_main.php:257 -#: reporting/reports_main.php:273 reporting/reports_main.php:283 -#: reporting/reports_main.php:291 reporting/reports_main.php:299 -#: reporting/reports_main.php:306 +#: reporting/reports_main.php:232 reporting/reports_main.php:239 +#: reporting/reports_main.php:245 reporting/reports_main.php:258 +#: reporting/reports_main.php:274 reporting/reports_main.php:284 +#: reporting/reports_main.php:292 reporting/reports_main.php:300 +#: reporting/reports_main.php:307 msgid "Inventory Category" msgstr "" @@ -12490,7 +12497,7 @@ msgstr "" msgid "Sales Types" msgstr "" -#: reporting/reports_main.php:87 reporting/reports_main.php:246 +#: reporting/reports_main.php:87 reporting/reports_main.php:247 msgid "Show Pictures" msgstr "" @@ -12536,7 +12543,7 @@ msgid "Print &Statements" msgstr "" #: reporting/reports_main.php:137 reporting/reports_main.php:144 -#: reporting/reports_main.php:152 +#: reporting/reports_main.php:152 reporting/reports_main.php:159 msgid "Email Customers" msgstr "" @@ -12556,217 +12563,217 @@ msgstr "" msgid "Print Receipts" msgstr "" -#: reporting/reports_main.php:163 +#: reporting/reports_main.php:164 msgid "Supplier &Balances" msgstr "" -#: reporting/reports_main.php:173 +#: reporting/reports_main.php:174 msgid "&Aged Supplier Analyses" msgstr "" -#: reporting/reports_main.php:184 +#: reporting/reports_main.php:185 msgid "Supplier &Trial Balances" msgstr "" -#: reporting/reports_main.php:193 +#: reporting/reports_main.php:194 msgid "&Payment Report" msgstr "" -#: reporting/reports_main.php:201 +#: reporting/reports_main.php:202 msgid "Outstanding &GRNs Report" msgstr "" -#: reporting/reports_main.php:206 +#: reporting/reports_main.php:207 msgid "Supplier &Detail Listing" msgstr "" -#: reporting/reports_main.php:213 +#: reporting/reports_main.php:214 msgid "Print Purchase &Orders" msgstr "" -#: reporting/reports_main.php:217 reporting/reports_main.php:224 +#: reporting/reports_main.php:218 reporting/reports_main.php:225 msgid "Email Suppliers" msgstr "" -#: reporting/reports_main.php:220 +#: reporting/reports_main.php:221 msgid "Print Remi&ttances" msgstr "" -#: reporting/reports_main.php:229 +#: reporting/reports_main.php:230 msgid "Inventory &Valuation Report" msgstr "" -#: reporting/reports_main.php:237 +#: reporting/reports_main.php:238 msgid "Inventory &Planning Report" msgstr "" -#: reporting/reports_main.php:243 +#: reporting/reports_main.php:244 msgid "Stock &Check Sheets" msgstr "" -#: reporting/reports_main.php:247 +#: reporting/reports_main.php:248 msgid "Inventory Column" msgstr "" -#: reporting/reports_main.php:248 +#: reporting/reports_main.php:249 msgid "Show Shortage" msgstr "" -#: reporting/reports_main.php:250 +#: reporting/reports_main.php:251 msgid "Item Like" msgstr "" -#: reporting/reports_main.php:254 +#: reporting/reports_main.php:255 msgid "Inventory &Sales Report" msgstr "" -#: reporting/reports_main.php:264 +#: reporting/reports_main.php:265 msgid "&GRN Valuation Report" msgstr "" -#: reporting/reports_main.php:270 +#: reporting/reports_main.php:271 msgid "Inventory P&urchasing Report" msgstr "" -#: reporting/reports_main.php:280 +#: reporting/reports_main.php:281 msgid "Inventory &Movement Report" msgstr "" -#: reporting/reports_main.php:288 +#: reporting/reports_main.php:289 msgid "C&osted Inventory Movement Report" msgstr "" -#: reporting/reports_main.php:296 +#: reporting/reports_main.php:297 msgid "Item &Sales Summary Report" msgstr "" -#: reporting/reports_main.php:303 +#: reporting/reports_main.php:304 msgid "Inventory Purchasing - &Transaction Based" msgstr "" -#: reporting/reports_main.php:316 +#: reporting/reports_main.php:317 msgid "&Bill of Material Listing" msgstr "" -#: reporting/reports_main.php:317 +#: reporting/reports_main.php:318 msgid "From product" msgstr "" -#: reporting/reports_main.php:318 +#: reporting/reports_main.php:319 msgid "To product" msgstr "" -#: reporting/reports_main.php:322 +#: reporting/reports_main.php:323 msgid "Work Order &Listing" msgstr "" -#: reporting/reports_main.php:325 +#: reporting/reports_main.php:326 msgid "Outstanding Only" msgstr "" -#: reporting/reports_main.php:330 +#: reporting/reports_main.php:331 msgid "Print &Work Orders" msgstr "" -#: reporting/reports_main.php:333 +#: reporting/reports_main.php:334 msgid "Email Locations" msgstr "" -#: reporting/reports_main.php:340 +#: reporting/reports_main.php:341 msgid "&Fixed Assets Valuation" msgstr "" -#: reporting/reports_main.php:342 +#: reporting/reports_main.php:343 msgid "Fixed Assets Class" msgstr "" -#: reporting/reports_main.php:343 +#: reporting/reports_main.php:344 msgid "Fixed Assets Location" msgstr "" -#: reporting/reports_main.php:352 +#: reporting/reports_main.php:353 msgid "Dimension &Summary" msgstr "" -#: reporting/reports_main.php:353 +#: reporting/reports_main.php:354 msgid "From Dimension" msgstr "" -#: reporting/reports_main.php:354 +#: reporting/reports_main.php:355 msgid "To Dimension" msgstr "" -#: reporting/reports_main.php:360 +#: reporting/reports_main.php:361 msgid "Banking" msgstr "" -#: reporting/reports_main.php:361 +#: reporting/reports_main.php:362 msgid "Bank &Statement" msgstr "" -#: reporting/reports_main.php:365 reporting/reports_main.php:436 -#: reporting/reports_main.php:486 reporting/reports_main.php:531 +#: reporting/reports_main.php:366 reporting/reports_main.php:437 +#: reporting/reports_main.php:487 reporting/reports_main.php:532 #: sales/inquiry/customer_inquiry.php:163 msgid "Zero values" msgstr "" -#: reporting/reports_main.php:369 +#: reporting/reports_main.php:370 msgid "Bank Statement w/ &Reconcile" msgstr "" -#: reporting/reports_main.php:376 +#: reporting/reports_main.php:377 msgid "General Ledger" msgstr "" -#: reporting/reports_main.php:377 +#: reporting/reports_main.php:378 msgid "Chart of &Accounts" msgstr "" -#: reporting/reports_main.php:378 +#: reporting/reports_main.php:379 msgid "Show Balances" msgstr "" -#: reporting/reports_main.php:382 +#: reporting/reports_main.php:383 msgid "List of &Journal Entries" msgstr "" -#: reporting/reports_main.php:392 reporting/reports_main.php:446 -#: reporting/reports_main.php:495 +#: reporting/reports_main.php:393 reporting/reports_main.php:447 +#: reporting/reports_main.php:496 msgid "GL Account &Transactions" msgstr "" -#: reporting/reports_main.php:395 reporting/reports_main.php:449 -#: reporting/reports_main.php:498 +#: reporting/reports_main.php:396 reporting/reports_main.php:450 +#: reporting/reports_main.php:499 msgid "From Account" msgstr "" -#: reporting/reports_main.php:396 reporting/reports_main.php:450 -#: reporting/reports_main.php:499 +#: reporting/reports_main.php:397 reporting/reports_main.php:451 +#: reporting/reports_main.php:500 msgid "To Account" msgstr "" -#: reporting/reports_main.php:402 reporting/reports_main.php:455 -#: reporting/reports_main.php:503 +#: reporting/reports_main.php:403 reporting/reports_main.php:456 +#: reporting/reports_main.php:504 msgid "Annual &Expense Breakdown" msgstr "" -#: reporting/reports_main.php:410 reporting/reports_main.php:462 -#: reporting/reports_main.php:509 +#: reporting/reports_main.php:411 reporting/reports_main.php:463 +#: reporting/reports_main.php:510 msgid "&Balance Sheet" msgstr "" -#: reporting/reports_main.php:416 reporting/reports_main.php:428 -#: reporting/reports_main.php:467 reporting/reports_main.php:478 -#: reporting/reports_main.php:513 reporting/reports_main.php:523 +#: reporting/reports_main.php:417 reporting/reports_main.php:429 +#: reporting/reports_main.php:468 reporting/reports_main.php:479 +#: reporting/reports_main.php:514 reporting/reports_main.php:524 msgid "Decimal values" msgstr "" -#: reporting/reports_main.php:421 reporting/reports_main.php:472 -#: reporting/reports_main.php:518 +#: reporting/reports_main.php:422 reporting/reports_main.php:473 +#: reporting/reports_main.php:519 msgid "&Profit and Loss Statement" msgstr "" -#: reporting/reports_main.php:537 +#: reporting/reports_main.php:538 msgid "Ta&x Report" msgstr "" @@ -12823,7 +12830,7 @@ msgstr "" #: reporting/includes/doctext.inc:59 sales/view/view_sales_order.php:69 #: sales/inquiry/sales_orders_view.php:272 -#: sales/includes/ui/sales_order_ui.inc:599 +#: sales/includes/ui/sales_order_ui.inc:602 msgid "Valid until" msgstr "" @@ -13101,29 +13108,29 @@ msgstr "" msgid "No Supplier Filter" msgstr "" -#: reporting/includes/reports_classes.inc:418 -#: reporting/includes/reports_classes.inc:420 +#: reporting/includes/reports_classes.inc:419 +#: reporting/includes/reports_classes.inc:421 msgid "No Location Filter" msgstr "" -#: reporting/includes/reports_classes.inc:423 -#: reporting/includes/reports_classes.inc:425 +#: reporting/includes/reports_classes.inc:424 +#: reporting/includes/reports_classes.inc:426 msgid "No Category Filter" msgstr "" -#: reporting/includes/reports_classes.inc:427 +#: reporting/includes/reports_classes.inc:428 msgid "No Class Filter" msgstr "" -#: reporting/includes/reports_classes.inc:432 +#: reporting/includes/reports_classes.inc:433 msgid "No Areas Filter" msgstr "" -#: reporting/includes/reports_classes.inc:435 +#: reporting/includes/reports_classes.inc:436 msgid "No Sales Folk Filter" msgstr "" -#: reporting/includes/reports_classes.inc:442 +#: reporting/includes/reports_classes.inc:443 msgid "No Users Filter" msgstr "" @@ -13141,89 +13148,89 @@ msgstr "" msgid "&Print Recurrent Invoices # %s - # %s" msgstr "" -#: sales/create_recurrent_invoices.php:150 +#: sales/create_recurrent_invoices.php:149 #, php-format msgid "&Email Recurrent Invoices # %s - # %s" msgstr "" -#: sales/create_recurrent_invoices.php:168 +#: sales/create_recurrent_invoices.php:167 msgid "" "Recurrent invoice cannot be generated before last day of covered period." msgstr "" -#: sales/create_recurrent_invoices.php:170 +#: sales/create_recurrent_invoices.php:169 msgid "" "Recurrent invoices cannot be generated because some items have no price " "defined in customer currency." msgstr "" -#: sales/create_recurrent_invoices.php:172 +#: sales/create_recurrent_invoices.php:171 msgid "" "Recurrent invoices cannot be generated because selected sales order template " "uses prepayment sales terms. Change payment terms and try again." msgstr "" -#: sales/create_recurrent_invoices.php:180 +#: sales/create_recurrent_invoices.php:179 #: sales/manage/recurrent_invoices.php:193 msgid "Template:" msgstr "" -#: sales/create_recurrent_invoices.php:181 +#: sales/create_recurrent_invoices.php:180 msgid "Number of invoices:" msgstr "" -#: sales/create_recurrent_invoices.php:182 +#: sales/create_recurrent_invoices.php:181 msgid "Invoice date:" msgstr "" -#: sales/create_recurrent_invoices.php:183 +#: sales/create_recurrent_invoices.php:182 msgid "Invoice notice:" msgstr "" -#: sales/create_recurrent_invoices.php:183 +#: sales/create_recurrent_invoices.php:182 #, php-format msgid "Recurrent Invoice covers period %s - %s." msgstr "" -#: sales/create_recurrent_invoices.php:189 +#: sales/create_recurrent_invoices.php:188 msgid "Create" msgstr "" -#: sales/create_recurrent_invoices.php:189 +#: sales/create_recurrent_invoices.php:188 msgid "Create recurrent invoices" msgstr "" -#: sales/create_recurrent_invoices.php:190 +#: sales/create_recurrent_invoices.php:189 msgid "Return to recurrent invoices" msgstr "" -#: sales/create_recurrent_invoices.php:191 +#: sales/create_recurrent_invoices.php:190 #, php-format msgid "" "You are about to issue %s invoices.\n" " Do you want to continue?" msgstr "" -#: sales/create_recurrent_invoices.php:203 +#: sales/create_recurrent_invoices.php:202 #: sales/manage/recurrent_invoices.php:128 msgid "Begin" msgstr "" -#: sales/create_recurrent_invoices.php:203 +#: sales/create_recurrent_invoices.php:202 #: sales/manage/recurrent_invoices.php:128 msgid "End" msgstr "" -#: sales/create_recurrent_invoices.php:240 +#: sales/create_recurrent_invoices.php:239 #, php-format msgid "Create %s Invoice(s)" msgstr "" -#: sales/create_recurrent_invoices.php:252 +#: sales/create_recurrent_invoices.php:251 msgid "Marked items are due." msgstr "" -#: sales/create_recurrent_invoices.php:254 +#: sales/create_recurrent_invoices.php:253 msgid "No recurrent invoices are due." msgstr "" @@ -13232,7 +13239,7 @@ msgstr "" msgid "Modifying Customer Credit Note #%d" msgstr "" -#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:705 +#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:709 msgid "" "There are no customers, or there are no customers with branches. Please " "define customers and customer branches." @@ -13589,7 +13596,7 @@ msgid "Process Dispatch" msgstr "" #: sales/customer_delivery.php:536 sales/customer_invoice.php:665 -#: sales/sales_order_entry.php:752 +#: sales/sales_order_entry.php:756 msgid "Check entered data and save document" msgstr "" @@ -13707,7 +13714,7 @@ msgstr "" msgid "Payment terms:" msgstr "" -#: sales/customer_invoice.php:512 sales/sales_order_entry.php:728 +#: sales/customer_invoice.php:512 sales/sales_order_entry.php:732 msgid "Sales Order Items" msgstr "" @@ -13759,89 +13766,93 @@ msgstr "" msgid "The customer payment has been successfully entered." msgstr "" -#: sales/customer_payments.php:104 sales/customer_payments.php:123 +#: sales/customer_payments.php:104 sales/customer_payments.php:124 msgid "&Print This Receipt" msgstr "" -#: sales/customer_payments.php:106 +#: sales/customer_payments.php:105 +msgid "&Email This Receipt" +msgstr "" + +#: sales/customer_payments.php:107 msgid "&View this Customer Payment" msgstr "" -#: sales/customer_payments.php:108 sales/customer_payments.php:131 +#: sales/customer_payments.php:109 sales/customer_payments.php:132 msgid "Enter Another &Customer Payment" msgstr "" -#: sales/customer_payments.php:110 +#: sales/customer_payments.php:111 msgid "Enter Payment to &Supplier" msgstr "" -#: sales/customer_payments.php:114 sales/customer_payments.php:125 +#: sales/customer_payments.php:115 sales/customer_payments.php:126 msgid "&View the GL Journal Entries for this Customer Payment" msgstr "" -#: sales/customer_payments.php:121 +#: sales/customer_payments.php:122 msgid "The customer payment has been successfully updated." msgstr "" -#: sales/customer_payments.php:129 +#: sales/customer_payments.php:130 msgid "Select Another Customer Payment for &Edition" msgstr "" -#: sales/customer_payments.php:144 sales/sales_order_entry.php:360 +#: sales/customer_payments.php:145 sales/sales_order_entry.php:360 msgid "There is no customer selected." msgstr "" -#: sales/customer_payments.php:151 sales/sales_order_entry.php:367 +#: sales/customer_payments.php:152 sales/sales_order_entry.php:367 msgid "This customer has no branch defined." msgstr "" -#: sales/customer_payments.php:157 +#: sales/customer_payments.php:158 msgid "The entered date is invalid. Please enter a valid date for the payment." msgstr "" -#: sales/customer_payments.php:172 sales/customer_payments.php:178 +#: sales/customer_payments.php:173 sales/customer_payments.php:179 msgid "The entered amount is invalid or negative and cannot be processed." msgstr "" -#: sales/customer_payments.php:197 +#: sales/customer_payments.php:198 msgid "The entered discount is not a valid number." msgstr "" -#: sales/customer_payments.php:203 +#: sales/customer_payments.php:204 msgid "" "The balance of the amount and discount is zero or negative. Please enter " "valid amounts." msgstr "" -#: sales/customer_payments.php:210 +#: sales/customer_payments.php:211 msgid "The entered payment amount is zero or negative." msgstr "" -#: sales/customer_payments.php:313 sales/customer_payments.php:315 +#: sales/customer_payments.php:315 sales/customer_payments.php:317 msgid "From Customer:" msgstr "" -#: sales/customer_payments.php:336 +#: sales/customer_payments.php:338 msgid "Into Bank Account:" msgstr "" -#: sales/customer_payments.php:347 +#: sales/customer_payments.php:349 msgid "Date of Deposit:" msgstr "" -#: sales/customer_payments.php:361 +#: sales/customer_payments.php:363 msgid "Payment Amount:" msgstr "" -#: sales/customer_payments.php:374 +#: sales/customer_payments.php:376 msgid "Customer prompt payment discount :" msgstr "" -#: sales/customer_payments.php:384 +#: sales/customer_payments.php:386 msgid "Add Payment" msgstr "" -#: sales/customer_payments.php:386 +#: sales/customer_payments.php:388 msgid "Update Payment" msgstr "" @@ -14025,152 +14036,152 @@ msgstr "" msgid "You need to define a cash account for your Sales Point." msgstr "" -#: sales/sales_order_entry.php:479 +#: sales/sales_order_entry.php:483 msgid "" "The reference number field has been increased. Please save the document " "again." msgstr "" -#: sales/sales_order_entry.php:523 +#: sales/sales_order_entry.php:527 msgid "" "The item could not be updated because you are attempting to set the quantity " "ordered to less than 0, or the discount percent to more than 100." msgstr "" -#: sales/sales_order_entry.php:527 +#: sales/sales_order_entry.php:531 msgid "Price for inventory item must be entered and can not be less than 0" msgstr "" -#: sales/sales_order_entry.php:534 +#: sales/sales_order_entry.php:538 msgid "" "You attempting to make the quantity ordered a quantity less than has already " "been delivered. The quantity delivered cannot be modified retrospectively." msgstr "" -#: sales/sales_order_entry.php:552 +#: sales/sales_order_entry.php:556 #, php-format msgid "Price %s is below Standard Cost %s" msgstr "" -#: sales/sales_order_entry.php:577 +#: sales/sales_order_entry.php:581 msgid "" "This item cannot be deleted because some of it has already been delivered." msgstr "" -#: sales/sales_order_entry.php:606 +#: sales/sales_order_entry.php:610 msgid "Direct delivery entry has been cancelled as requested." msgstr "" -#: sales/sales_order_entry.php:607 +#: sales/sales_order_entry.php:611 msgid "Enter a New Sales Delivery" msgstr "" -#: sales/sales_order_entry.php:609 +#: sales/sales_order_entry.php:613 msgid "Direct invoice entry has been cancelled as requested." msgstr "" -#: sales/sales_order_entry.php:610 +#: sales/sales_order_entry.php:614 msgid "Enter a New Sales Invoice" msgstr "" -#: sales/sales_order_entry.php:615 +#: sales/sales_order_entry.php:619 msgid "This sales quotation has been cancelled as requested." msgstr "" -#: sales/sales_order_entry.php:616 +#: sales/sales_order_entry.php:620 msgid "Enter a New Sales Quotation" msgstr "" -#: sales/sales_order_entry.php:623 +#: sales/sales_order_entry.php:627 msgid "Undelivered part of order has been cancelled as requested." msgstr "" -#: sales/sales_order_entry.php:624 +#: sales/sales_order_entry.php:628 msgid "Select Another Sales Order for Edition" msgstr "" -#: sales/sales_order_entry.php:628 +#: sales/sales_order_entry.php:632 msgid "This sales order has been cancelled as requested." msgstr "" -#: sales/sales_order_entry.php:629 +#: sales/sales_order_entry.php:633 msgid "Enter a New Sales Order" msgstr "" -#: sales/sales_order_entry.php:709 +#: sales/sales_order_entry.php:713 msgid "Sales Invoice Items" msgstr "" -#: sales/sales_order_entry.php:710 +#: sales/sales_order_entry.php:714 msgid "Enter Delivery Details and Confirm Invoice" msgstr "" -#: sales/sales_order_entry.php:712 +#: sales/sales_order_entry.php:716 msgid "Place Invoice" msgstr "" -#: sales/sales_order_entry.php:715 +#: sales/sales_order_entry.php:719 msgid "Delivery Note Items" msgstr "" -#: sales/sales_order_entry.php:716 +#: sales/sales_order_entry.php:720 msgid "Enter Delivery Details and Confirm Dispatch" msgstr "" -#: sales/sales_order_entry.php:717 +#: sales/sales_order_entry.php:721 msgid "Cancel Delivery" msgstr "" -#: sales/sales_order_entry.php:718 +#: sales/sales_order_entry.php:722 msgid "Place Delivery" msgstr "" -#: sales/sales_order_entry.php:720 +#: sales/sales_order_entry.php:724 msgid "Quotation Date:" msgstr "" -#: sales/sales_order_entry.php:721 +#: sales/sales_order_entry.php:725 msgid "Sales Quotation Items" msgstr "" -#: sales/sales_order_entry.php:722 +#: sales/sales_order_entry.php:726 msgid "Enter Delivery Details and Confirm Quotation" msgstr "" -#: sales/sales_order_entry.php:723 +#: sales/sales_order_entry.php:727 msgid "Cancel Quotation" msgstr "" -#: sales/sales_order_entry.php:724 +#: sales/sales_order_entry.php:728 msgid "Place Quotation" msgstr "" -#: sales/sales_order_entry.php:725 +#: sales/sales_order_entry.php:729 msgid "Commit Quotations Changes" msgstr "" -#: sales/sales_order_entry.php:729 +#: sales/sales_order_entry.php:733 msgid "Enter Delivery Details and Confirm Order" msgstr "" -#: sales/sales_order_entry.php:732 +#: sales/sales_order_entry.php:736 msgid "Commit Order Changes" msgstr "" -#: sales/sales_order_entry.php:754 sales/sales_order_entry.php:760 +#: sales/sales_order_entry.php:758 sales/sales_order_entry.php:764 msgid "" "Cancels document entry or removes sales order when editing an old document" msgstr "" -#: sales/sales_order_entry.php:755 sales/sales_order_entry.php:764 +#: sales/sales_order_entry.php:759 sales/sales_order_entry.php:768 msgid "You are about to void this Document.\\nDo you want to continue?" msgstr "" -#: sales/sales_order_entry.php:758 +#: sales/sales_order_entry.php:762 msgid "Validate changes and update document" msgstr "" -#: sales/sales_order_entry.php:762 +#: sales/sales_order_entry.php:766 msgid "" "You are about to cancel undelivered part of this order.\\nDo you want to " "continue?" @@ -14967,31 +14978,31 @@ msgstr "" msgid "Deliver To Branch" msgstr "" -#: sales/view/view_sales_order.php:71 +#: sales/view/view_sales_order.php:73 msgid "Requested Delivery" msgstr "" -#: sales/view/view_sales_order.php:75 +#: sales/view/view_sales_order.php:77 msgid "Deliver From Location" msgstr "" -#: sales/view/view_sales_order.php:86 +#: sales/view/view_sales_order.php:88 msgid "Non-Invoiced Prepayments" msgstr "" -#: sales/view/view_sales_order.php:87 +#: sales/view/view_sales_order.php:89 msgid "All Payments Allocated" msgstr "" -#: sales/view/view_sales_order.php:95 +#: sales/view/view_sales_order.php:97 msgid "Telephone" msgstr "" -#: sales/view/view_sales_order.php:215 +#: sales/view/view_sales_order.php:217 msgid "This Sales Order is used as a Template." msgstr "" -#: sales/view/view_sales_order.php:220 +#: sales/view/view_sales_order.php:222 msgid "Quantity Delivered" msgstr "" @@ -15151,11 +15162,11 @@ msgstr "" msgid "Unknown %s price for '%s' in pricelist '%s'" msgstr "" -#: sales/includes/db/sales_credit_db.inc:185 +#: sales/includes/db/sales_credit_db.inc:187 msgid "Return" msgstr "" -#: sales/includes/db/sales_credit_db.inc:187 +#: sales/includes/db/sales_credit_db.inc:189 msgid "Ex Inv:" msgstr "" @@ -15169,7 +15180,7 @@ msgid "Customer Currency:" msgstr "" #: sales/includes/ui/sales_credit_ui.inc:108 -#: sales/includes/ui/sales_order_ui.inc:640 +#: sales/includes/ui/sales_order_ui.inc:643 msgid "Shipping Company:" msgstr "" @@ -15218,72 +15229,72 @@ msgstr "" msgid "[Select item]" msgstr "" -#: sales/includes/ui/sales_order_ui.inc:575 +#: sales/includes/ui/sales_order_ui.inc:578 msgid "Cash payment" msgstr "" -#: sales/includes/ui/sales_order_ui.inc:578 -#: sales/includes/ui/sales_order_ui.inc:610 +#: sales/includes/ui/sales_order_ui.inc:581 +#: sales/includes/ui/sales_order_ui.inc:613 msgid "Deliver from Location:" msgstr "" -#: sales/includes/ui/sales_order_ui.inc:581 +#: sales/includes/ui/sales_order_ui.inc:584 msgid "Cash account:" msgstr "" -#: sales/includes/ui/sales_order_ui.inc:588 +#: sales/includes/ui/sales_order_ui.inc:591 msgid "Delivery Details" msgstr "" -#: sales/includes/ui/sales_order_ui.inc:593 +#: sales/includes/ui/sales_order_ui.inc:596 msgid "Invoice Delivery Details" msgstr "" -#: sales/includes/ui/sales_order_ui.inc:594 +#: sales/includes/ui/sales_order_ui.inc:597 msgid "Invoice before" msgstr "" -#: sales/includes/ui/sales_order_ui.inc:598 +#: sales/includes/ui/sales_order_ui.inc:601 msgid "Quotation Delivery Details" msgstr "" -#: sales/includes/ui/sales_order_ui.inc:603 +#: sales/includes/ui/sales_order_ui.inc:606 msgid "Order Delivery Details" msgstr "" -#: sales/includes/ui/sales_order_ui.inc:624 +#: sales/includes/ui/sales_order_ui.inc:627 msgid "Enter requested day of delivery" msgstr "" -#: sales/includes/ui/sales_order_ui.inc:625 +#: sales/includes/ui/sales_order_ui.inc:628 msgid "Enter Valid until Date" msgstr "" -#: sales/includes/ui/sales_order_ui.inc:626 +#: sales/includes/ui/sales_order_ui.inc:629 msgid "Deliver To:" msgstr "" -#: sales/includes/ui/sales_order_ui.inc:627 +#: sales/includes/ui/sales_order_ui.inc:630 msgid "Additional identifier for delivery e.g. name of receiving person" msgstr "" -#: sales/includes/ui/sales_order_ui.inc:630 +#: sales/includes/ui/sales_order_ui.inc:633 msgid "Delivery address. Default is address of customer branch" msgstr "" -#: sales/includes/ui/sales_order_ui.inc:634 +#: sales/includes/ui/sales_order_ui.inc:637 msgid "Contact Phone Number:" msgstr "" -#: sales/includes/ui/sales_order_ui.inc:635 +#: sales/includes/ui/sales_order_ui.inc:638 msgid "Phone number of ordering person. Defaults to branch phone number" msgstr "" -#: sales/includes/ui/sales_order_ui.inc:636 +#: sales/includes/ui/sales_order_ui.inc:639 msgid "Customer Reference:" msgstr "" -#: sales/includes/ui/sales_order_ui.inc:637 +#: sales/includes/ui/sales_order_ui.inc:640 msgid "Customer reference number for this order (if any)" msgstr "" diff --git a/themes/canvas/default.css b/themes/canvas/default.css index 490ce94c..96c0aece 100644 --- a/themes/canvas/default.css +++ b/themes/canvas/default.css @@ -491,7 +491,6 @@ table.tablestyle_inner td { input.amount { padding-right: 0px; - border-right: none; } .editbutton { diff --git a/themes/default/default.css b/themes/default/default.css index 535412e4..a2bfd91e 100644 --- a/themes/default/default.css +++ b/themes/default/default.css @@ -414,7 +414,6 @@ table.tablestyle_inner td { input.amount { padding-right: 0px; - border-right: none; } .editbutton { diff --git a/themes/dropdown/default.css b/themes/dropdown/default.css index 8a7cdd50..0c5e16a5 100644 --- a/themes/dropdown/default.css +++ b/themes/dropdown/default.css @@ -357,7 +357,6 @@ table.tablestyle_inner td { input.amount { padding-right: 0px; - border-right: none; } .editbutton { diff --git a/version.php b/version.php index 1c6a49bc..68fd95f2 100644 --- a/version.php +++ b/version.php @@ -6,7 +6,7 @@ // Versions used by source/database version compatibility checks. Do not change. $db_version = "2.4.1"; -$src_version = "2.4.6"; +$src_version = "2.4.7"; // application version - can be overriden in config.php $version = isset($SysPrefs->version) ? $SysPrefs->version : $src_version; -- 2.30.2