msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-27 08:46+0100\n"
+"POT-Creation-Date: 2014-12-25 16:46+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
msgstr ""
#: ../frontaccounting.php:75
-#: ../access/logout.php:18
+#: ../access/logout.php:21
#: ../themes/default/renderer.php:70
#: ../themes/default/renderer.php:83
msgid "Logout"
msgstr ""
#: ../access/login.php:13
+#: ../access/password_reset.php:13
msgid "Restricted access"
msgstr ""
msgid "Please login here"
msgstr ""
-#: ../access/login.php:36
+#: ../access/login.php:33
+msgid "or"
+msgstr ""
+
+#: ../access/login.php:33
+msgid "request new password"
+msgstr ""
+
+#: ../access/login.php:39
msgid "Too many failed login attempts.<br>Please wait a while or try later."
msgstr ""
-#: ../access/login.php:49
-#: ../access/login.php:80
+#: ../access/login.php:52
+#: ../access/login.php:83
msgid "Authorization timeout"
msgstr ""
-#: ../access/login.php:49
-#: ../access/login.php:87
+#: ../access/login.php:52
+#: ../access/login.php:90
msgid "Login"
msgstr ""
-#: ../access/login.php:87
+#: ../access/login.php:90
+#: ../access/password_reset.php:61
#: ../admin/inst_upgrade.php:141
msgid "Version"
msgstr ""
-#: ../access/login.php:90
+#: ../access/login.php:93
msgid "User name"
msgstr ""
-#: ../access/login.php:94
-#: ../admin/users.php:191
+#: ../access/login.php:97
+#: ../admin/users.php:200
msgid "Password:"
msgstr ""
-#: ../access/login.php:104
-#: ../access/login.php:111
+#: ../access/login.php:107
+#: ../access/login.php:114
+#: ../access/password_reset.php:70
+#: ../access/password_reset.php:77
#: ../admin/create_coy.php:253
#: ../admin/create_coy.php:336
#: ../includes/sysnames.inc:194
msgid "Company"
msgstr ""
-#: ../access/login.php:118
+#: ../access/login.php:121
msgid "Login -->"
msgstr ""
-#: ../access/login.php:149
+#: ../access/login.php:156
+#: ../access/password_reset.php:108
#: ../admin/display_prefs.php:112
#: ../themes/default/renderer.php:129
msgid "Theme:"
msgstr ""
-#: ../access/logout.php:29
+#: ../access/logout.php:32
msgid "Thank you for using"
msgstr ""
-#: ../access/logout.php:40
+#: ../access/logout.php:43
msgid "Click here to Login Again."
msgstr ""
+#: ../access/password_reset.php:31
+#: ../access/password_reset.php:61
+msgid "Password reset"
+msgstr ""
+
+#: ../access/password_reset.php:63
+#: ../reporting/rep103.php:277
+#: ../reporting/rep106.php:88
+#: ../reporting/rep205.php:195
+#: ../reporting/includes/header2.inc:113
+#: ../sales/manage/sales_people.php:99
+msgid "Email"
+msgstr ""
+
+#: ../access/password_reset.php:83
+msgid "Send password -->"
+msgstr ""
+
#: ../admin/attachments.php:74
msgid "Attach Documents"
msgstr ""
msgid "Select attachment file."
msgstr ""
-#: ../admin/attachments.php:125
+#: ../admin/attachments.php:128
msgid "Attachment has been inserted."
msgstr ""
-#: ../admin/attachments.php:131
+#: ../admin/attachments.php:134
msgid "Attachment has been updated."
msgstr ""
-#: ../admin/attachments.php:146
+#: ../admin/attachments.php:149
msgid "Attachment has been deleted."
msgstr ""
-#: ../admin/attachments.php:164
+#: ../admin/attachments.php:167
#: ../admin/view_print_transaction.php:72
#: ../gl/inquiry/journal_inquiry.php:47
#: ../inventory/includes/item_adjustments_ui.inc:47
-#: ../manufacturing/work_order_add_finished.php:203
+#: ../manufacturing/work_order_add_finished.php:200
#: ../manufacturing/work_order_costs.php:136
-#: ../manufacturing/work_order_entry.php:379
-#: ../manufacturing/work_order_entry.php:387
-#: ../manufacturing/includes/work_order_issue_ui.inc:161
+#: ../manufacturing/work_order_entry.php:377
+#: ../manufacturing/work_order_entry.php:385
+#: ../manufacturing/includes/work_order_issue_ui.inc:168
#: ../sales/inquiry/customer_allocation_inquiry.php:47
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:47
msgid "Type:"
msgstr ""
-#: ../admin/attachments.php:180
+#: ../admin/attachments.php:183
#: ../admin/create_coy.php:277
#: ../admin/crm_categories.php:115
#: ../admin/fiscalyears.php:164
#: ../admin/printers.php:96
#: ../admin/shipping_companies.php:106
#: ../admin/tags.php:140
-#: ../admin/users.php:144
+#: ../admin/users.php:153
#: ../dimensions/inquiry/search_dimensions.php:120
#: ../gl/inquiry/journal_inquiry.php:118
#: ../gl/manage/bank_accounts.php:133
#: ../includes/ui/contacts_view.inc:64
#: ../includes/ui/simple_crud_class.inc:52
#: ../includes/ui/ui_input.inc:961
-#: ../inventory/prices.php:158
-#: ../inventory/purchasing_data.php:164
-#: ../inventory/includes/item_adjustments_ui.inc:87
-#: ../inventory/includes/stock_transfers_ui.inc:79
+#: ../inventory/prices.php:159
+#: ../inventory/purchasing_data.php:165
+#: ../inventory/includes/item_adjustments_ui.inc:91
+#: ../inventory/includes/stock_transfers_ui.inc:83
#: ../inventory/manage/item_categories.php:121
#: ../inventory/manage/item_codes.php:140
#: ../inventory/manage/item_units.php:110
#: ../manufacturing/search_work_orders.php:109
#: ../manufacturing/manage/bom_edit.php:86
#: ../manufacturing/manage/work_centres.php:114
-#: ../manufacturing/includes/work_order_issue_ui.inc:58
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:542
-#: ../purchasing/includes/ui/po_ui.inc.orig:273
-#: ../purchasing/inquiry/po_search_completed.php:105
-#: ../purchasing/inquiry/po_search_completed.php.orig:104
-#: ../purchasing/inquiry/po_search.php:87
+#: ../manufacturing/includes/work_order_issue_ui.inc:63
+#: ../purchasing/includes/ui/invoice_ui.inc:557
+#: ../purchasing/includes/ui/po_ui.inc:275
+#: ../purchasing/inquiry/po_search_completed.php:108
+#: ../purchasing/inquiry/po_search.php:89
#: ../sales/manage/credit_status.php:119
#: ../sales/manage/customer_branches.php:159
#: ../sales/manage/recurrent_invoices.php:130
#: ../sales/manage/sales_people.php:119
#: ../sales/manage/sales_points.php:99
#: ../sales/manage/sales_types.php:121
-#: ../sales/inquiry/sales_deliveries_view.php:154
-#: ../sales/inquiry/sales_orders_view.php.orig:136
+#: ../sales/inquiry/sales_deliveries_view.php:156
+#: ../sales/inquiry/sales_orders_view.php:136
#: ../sales/includes/ui/sales_credit_ui.inc:197
-#: ../sales/includes/ui/sales_order_ui.inc:209
+#: ../sales/includes/ui/sales_order_ui.inc:197
#: ../taxes/item_tax_types.php:139
#: ../taxes/sav.tax_types.php:211
#: ../taxes/sav.tax_types.php:262
msgid "Edit"
msgstr ""
-#: ../admin/attachments.php:185
+#: ../admin/attachments.php:188
#: ../gl/inquiry/journal_inquiry.php:135
msgid "View"
msgstr ""
-#: ../admin/attachments.php:190
+#: ../admin/attachments.php:193
msgid "Download"
msgstr ""
-#: ../admin/attachments.php:195
+#: ../admin/attachments.php:198
#: ../admin/create_coy.php:278
#: ../admin/crm_categories.php:119
#: ../admin/fiscalyears.php:166
#: ../admin/printers.php:97
#: ../admin/shipping_companies.php:107
#: ../admin/tags.php:141
-#: ../admin/users.php:146
+#: ../admin/users.php:155
#: ../gl/gl_budget.php:137
#: ../gl/manage/bank_accounts.php:134
#: ../gl/manage/currencies.php:166
#: ../includes/ui/contacts_view.inc:67
#: ../includes/ui/simple_crud_class.inc:54
#: ../includes/ui/ui_input.inc:286
-#: ../inventory/prices.php:159
-#: ../inventory/purchasing_data.php:165
-#: ../inventory/includes/item_adjustments_ui.inc:89
-#: ../inventory/includes/stock_transfers_ui.inc:81
+#: ../inventory/prices.php:160
+#: ../inventory/purchasing_data.php:166
+#: ../inventory/includes/item_adjustments_ui.inc:93
+#: ../inventory/includes/stock_transfers_ui.inc:85
#: ../inventory/manage/item_categories.php:122
#: ../inventory/manage/item_codes.php:141
#: ../inventory/manage/item_units.php:111
#: ../inventory/manage/sales_kits.php:56
#: ../manufacturing/manage/bom_edit.php:87
#: ../manufacturing/manage/work_centres.php:115
-#: ../manufacturing/includes/work_order_issue_ui.inc:60
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:304
-#: ../purchasing/includes/ui/po_ui.inc.orig:275
+#: ../manufacturing/includes/work_order_issue_ui.inc:65
+#: ../purchasing/includes/ui/invoice_ui.inc:319
+#: ../purchasing/includes/ui/po_ui.inc:277
#: ../sales/manage/credit_status.php:120
#: ../sales/manage/customer_branches.php:163
#: ../sales/manage/recurrent_invoices.php:131
#: ../sales/manage/sales_points.php:100
#: ../sales/manage/sales_types.php:122
#: ../sales/includes/ui/sales_credit_ui.inc:199
-#: ../sales/includes/ui/sales_order_ui.inc:211
+#: ../sales/includes/ui/sales_order_ui.inc:199
#: ../taxes/item_tax_types.php:140
#: ../taxes/sav.tax_types.php:212
#: ../taxes/tax_groups.php:138
msgid "Delete"
msgstr ""
-#: ../admin/attachments.php:202
+#: ../admin/attachments.php:205
#: ../admin/view_print_transaction.php:126
#: ../admin/void_transaction.php:181
#: ../dimensions/inquiry/search_dimensions.php:127
#: ../gl/inquiry/gl_account_inquiry.php:126
#: ../gl/inquiry/journal_inquiry.php:127
#: ../gl/inquiry/journal_inquiry.php:140
-#: ../includes/ui/allocation_cart.inc.orig:264
+#: ../includes/ui/allocation_cart.inc:290
#: ../inventory/inquiry/stock_movements.php:78
#: ../manufacturing/search_work_orders.php:159
#: ../manufacturing/includes/manufacturing_ui.inc:157
#: ../manufacturing/includes/manufacturing_ui.inc:331
#: ../purchasing/view/view_po.php:115
#: ../purchasing/view/view_po.php:140
-#: ../purchasing/inquiry/po_search_completed.php:120
-#: ../purchasing/inquiry/po_search_completed.php.orig:119
-#: ../purchasing/inquiry/po_search.php:130
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:126
+#: ../purchasing/inquiry/po_search_completed.php:123
+#: ../purchasing/inquiry/po_search.php:132
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:127
#: ../purchasing/inquiry/supplier_inquiry.php:174
#: ../purchasing/allocations/supplier_allocation_main.php:95
#: ../reporting/rep101.php:118
#: ../sales/view/view_sales_order.php:109
#: ../sales/view/view_sales_order.php:142
#: ../sales/view/view_sales_order.php:179
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:145
-#: ../sales/inquiry/customer_inquiry.php.orig:201
+#: ../sales/inquiry/customer_allocation_inquiry.php:145
+#: ../sales/inquiry/customer_inquiry.php:201
msgid "#"
msgstr ""
-#: ../admin/attachments.php:203
-#: ../admin/attachments.php:247
+#: ../admin/attachments.php:206
+#: ../admin/attachments.php:250
#: ../admin/crm_categories.php:97
#: ../admin/inst_upgrade.php:141
#: ../admin/payment_terms.php:127
#: ../inventory/view/view_transfer.php:56
#: ../manufacturing/manage/bom_edit.php:70
#: ../manufacturing/includes/manufacturing_ui.inc:28
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:492
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:504
+#: ../purchasing/includes/ui/invoice_ui.inc:507
+#: ../purchasing/includes/ui/invoice_ui.inc:519
#: ../purchasing/po_receive_items.php:62
#: ../reporting/rep104.php:111
#: ../reporting/rep105.php:114
#: ../reporting/rep305.php:101
#: ../reporting/rep306.php:141
#: ../reporting/rep307.php:117
-#: ../reporting/rep308.php:149
+#: ../reporting/rep308.php:230
#: ../reporting/rep309.php:98
#: ../reporting/rep401.php:71
#: ../sales/create_recurrent_invoices.php:134
#: ../sales/manage/credit_status.php:97
#: ../sales/manage/recurrent_invoices.php:102
-#: ../sales/inquiry/sales_orders_view.php.orig:317
-#: ../sales/inquiry/sales_orders_view.php.orig:321
+#: ../sales/inquiry/sales_orders_view.php:318
+#: ../sales/inquiry/sales_orders_view.php:322
#: ../taxes/sav.tax_types.php:190
#: ../taxes/tax_groups.php:123
#: ../taxes/tax_types.php:115
msgid "Description"
msgstr ""
-#: ../admin/attachments.php:204
+#: ../admin/attachments.php:207
#: ../admin/backups.php:63
#: ../admin/backups.php:149
msgid "Filename"
msgstr ""
-#: ../admin/attachments.php:205
+#: ../admin/attachments.php:208
msgid "Size"
msgstr ""
-#: ../admin/attachments.php:206
+#: ../admin/attachments.php:209
msgid "Filetype"
msgstr ""
-#: ../admin/attachments.php:207
+#: ../admin/attachments.php:210
msgid "Date Uploaded"
msgstr ""
-#: ../admin/attachments.php:241
-#: ../admin/attachments.php:246
+#: ../admin/attachments.php:244
+#: ../admin/attachments.php:249
msgid "Transaction #"
msgstr ""
-#: ../admin/attachments.php:248
+#: ../admin/attachments.php:251
msgid "Attached File"
msgstr ""
#: ../includes/system_tests.inc:38
#: ../includes/system_tests.inc:113
#: ../includes/system_tests.inc:126
-#: ../includes/ui/ui_lists.inc:1679
-#: ../purchasing/manage/suppliers.php:122
-#: ../purchasing/manage/suppliers.php.orig:122
+#: ../includes/ui/ui_lists.inc:1681
+#: ../purchasing/manage/suppliers.php:123
#: ../reporting/rep101.php:114
#: ../reporting/rep102.php:114
#: ../reporting/rep102.php:116
#: ../reporting/rep203.php:89
#: ../reporting/rep303.php:113
#: ../reporting/rep303.php:117
+#: ../reporting/rep402.php:99
+#: ../reporting/rep402.php:134
#: ../reporting/rep501.php:113
#: ../sales/manage/sales_points.php:94
#: ../sales/manage/sales_points.php:95
msgstr ""
#: ../admin/backups.php:181
-#: ../sales/includes/ui/sales_order_ui.inc:595
-#: ../sales/includes/ui/sales_order_ui.inc:651
+#: ../sales/includes/ui/sales_order_ui.inc:580
+#: ../sales/includes/ui/sales_order_ui.inc:636
msgid "Comments:"
msgstr ""
msgstr ""
#: ../admin/change_current_user_password.php:85
-#: ../admin/users.php:180
+#: ../admin/users.php:189
msgid "User login:"
msgstr ""
msgstr ""
#: ../admin/company_preferences.php:59
-#: ../inventory/manage/items.php.orig:87
+#: ../inventory/manage/items.php:86
msgid ""
"The file size is over the maximum allowed. The maximum size allowed in KB is"
msgstr ""
#: ../admin/company_preferences.php:64
-#: ../inventory/manage/items.php.orig:77
-#: ../inventory/manage/items.php.orig:92
+#: ../inventory/manage/items.php:76
+#: ../inventory/manage/items.php:91
msgid "Only graphics files can be uploaded"
msgstr ""
#: ../admin/company_preferences.php:72
#: ../admin/company_preferences.php:93
-#: ../inventory/manage/items.php.orig:100
+#: ../inventory/manage/items.php:99
msgid "The existing image could not be removed"
msgstr ""
#: ../includes/ui/contacts_view.inc:109
#: ../inventory/manage/locations.php:202
#: ../sales/manage/customers.php:234
-#: ../sales/manage/sav.customers.php:231
-#: ../sales/includes/ui/sales_order_ui.inc:642
+#: ../sales/includes/ui/sales_order_ui.inc:627
msgid "Address:"
msgstr ""
#: ../admin/company_preferences.php:168
#: ../admin/shipping_companies.php:138
-#: ../purchasing/manage/suppliers.php:135
-#: ../purchasing/manage/suppliers.php.orig:135
+#: ../purchasing/manage/suppliers.php:137
#: ../sales/manage/customer_branches.php:262
msgid "Phone Number:"
msgstr ""
#: ../admin/company_preferences.php:169
#: ../includes/ui/contacts_view.inc:104
-#: ../purchasing/manage/suppliers.php:138
-#: ../purchasing/manage/suppliers.php.orig:138
+#: ../purchasing/manage/suppliers.php:140
#: ../sales/manage/customer_branches.php:264
-#: ../sales/manage/customers.php:257
-#: ../sales/manage/sav.customers.php:254
+#: ../sales/manage/customers.php:258
msgid "Fax Number:"
msgstr ""
#: ../admin/company_preferences.php:170
-#: ../admin/users.php:202
+#: ../admin/users.php:211
msgid "Email Address:"
msgstr ""
#: ../admin/company_preferences.php:175
#: ../purchasing/manage/suppliers.php:96
-#: ../purchasing/manage/suppliers.php.orig:96
#: ../sales/manage/customers.php:236
-#: ../sales/manage/sav.customers.php:233
msgid "GSTNo:"
msgstr ""
#: ../admin/company_preferences.php:208
#: ../admin/display_prefs.php:145
#: ../admin/forms_setup.php:61
-#: ../admin/gl_setup.php:241
+#: ../admin/gl_setup.php:249
#: ../admin/inst_chart.php:74
#: ../admin/inst_lang.php:103
#: ../admin/inst_module.php:137
#: ../admin/inst_module.php:198
#: ../admin/inst_theme.php:96
#: ../dimensions/dimension_entry.php:293
-#: ../gl/gl_bank.php:416
+#: ../gl/gl_bank.php:417
#: ../gl/gl_budget.php:135
#: ../gl/manage/gl_quick_entries.php:60
#: ../gl/includes/ui/gl_bank_ui.inc:277
#: ../includes/ui/simple_crud_class.inc:227
#: ../includes/ui/ui_input.inc:208
#: ../includes/ui/ui_input.inc:906
-#: ../inventory/adjustments.php:233
-#: ../inventory/cost_update.php:136
-#: ../inventory/reorder_level.php:111
-#: ../inventory/transfers.php:234
-#: ../inventory/includes/item_adjustments_ui.inc:157
-#: ../inventory/includes/stock_transfers_ui.inc:137
+#: ../inventory/adjustments.php:234
+#: ../inventory/cost_update.php:134
+#: ../inventory/reorder_level.php:112
+#: ../inventory/transfers.php:230
+#: ../inventory/includes/item_adjustments_ui.inc:163
+#: ../inventory/includes/stock_transfers_ui.inc:143
#: ../inventory/manage/sales_kits.php:208
-#: ../manufacturing/work_order_entry.php:459
-#: ../manufacturing/includes/work_order_issue_ui.inc:131
-#: ../purchasing/includes/ui/po_ui.inc.orig:306
-#: ../purchasing/includes/ui/po_ui.inc.orig:455
+#: ../manufacturing/work_order_entry.php:457
+#: ../manufacturing/includes/work_order_issue_ui.inc:138
+#: ../purchasing/includes/ui/po_ui.inc:308
+#: ../purchasing/includes/ui/po_ui.inc:459
#: ../purchasing/po_receive_items.php:332
#: ../sales/credit_note_entry.php:284
#: ../sales/customer_credit_invoice.php:380
-#: ../sales/customer_delivery.php:547
-#: ../sales/customer_invoice.php:684
-#: ../sales/inquiry/sales_orders_view.php.orig:349
+#: ../sales/customer_delivery.php:563
+#: ../sales/customer_invoice.php:693
+#: ../sales/inquiry/sales_orders_view.php:350
#: ../sales/includes/ui/sales_credit_ui.inc:293
-#: ../sales/includes/ui/sales_order_ui.inc:244
-#: ../sales/includes/ui/sales_order_ui.inc:561
+#: ../sales/includes/ui/sales_order_ui.inc:232
+#: ../sales/includes/ui/sales_order_ui.inc:546
#: ../taxes/sav.tax_types.php:255
msgid "Update"
msgstr ""
#: ../includes/system_tests.inc:38
#: ../includes/system_tests.inc:113
#: ../includes/system_tests.inc:126
-#: ../includes/ui/ui_lists.inc:1680
-#: ../purchasing/manage/suppliers.php:122
-#: ../purchasing/manage/suppliers.php.orig:122
+#: ../includes/ui/ui_lists.inc:1682
+#: ../purchasing/manage/suppliers.php:123
#: ../reporting/rep101.php:113
#: ../reporting/rep102.php:113
#: ../reporting/rep102.php:115
#: ../reporting/rep203.php:88
#: ../reporting/rep303.php:108
#: ../reporting/rep303.php:116
+#: ../reporting/rep402.php:99
#: ../reporting/rep501.php:111
#: ../sales/manage/sales_points.php:94
#: ../sales/manage/sales_points.php:95
#: ../admin/inst_theme.php:93
#: ../admin/inst_upgrade.php:153
#: ../gl/manage/gl_account_types.php:190
-#: ../includes/ui/allocation_cart.inc.orig:288
+#: ../includes/ui/allocation_cart.inc:316
#: ../taxes/sav.tax_types.php:168
msgid "None"
msgstr ""
msgstr ""
#: ../admin/display_prefs.php:101
-#: ../admin/users.php:206
+#: ../admin/users.php:215
msgid "Language:"
msgstr ""
msgstr ""
#: ../admin/display_prefs.php:127
-#: ../admin/users.php:210
+#: ../admin/users.php:219
msgid "Printing profile"
msgstr ""
#: ../admin/display_prefs.php:128
-#: ../admin/users.php:211
+#: ../admin/users.php:220
msgid "Browser printing support"
msgstr ""
msgstr ""
#: ../admin/display_prefs.php:131
-#: ../admin/users.php:214
+#: ../admin/users.php:223
msgid "Set this option to on if your browser directly supports pdf files"
msgstr ""
#: ../dimensions/inquiry/search_dimensions.php:133
#: ../dimensions/inquiry/search_dimensions.php:139
#: ../includes/ui/ui_input.inc:959
-#: ../includes/ui/ui_lists.inc:675
+#: ../includes/ui/ui_lists.inc:677
#: ../manufacturing/search_work_orders.php:108
+#: ../reporting/rep402.php:103
#: ../reporting/rep501.php:87
#: ../reporting/rep710.php:113
#: ../reporting/includes/excel_report.inc:234
msgid "The general GL setup has been updated."
msgstr ""
-#: ../admin/gl_setup.php:144
+#: ../admin/gl_setup.php:150
msgid "General GL"
msgstr ""
-#: ../admin/gl_setup.php:146
+#: ../admin/gl_setup.php:152
msgid "Past Due Days Interval:"
msgstr ""
-#: ../admin/gl_setup.php:146
-#: ../admin/gl_setup.php:186
+#: ../admin/gl_setup.php:152
+#: ../admin/gl_setup.php:192
#: ../admin/gl_setup.php:194
-#: ../admin/gl_setup.php:212
-#: ../admin/gl_setup.php:234
+#: ../admin/gl_setup.php:202
+#: ../admin/gl_setup.php:220
+#: ../admin/gl_setup.php:242
#: ../admin/payment_terms.php:140
msgid "days"
msgstr ""
-#: ../admin/gl_setup.php:148
+#: ../admin/gl_setup.php:154
msgid "Retained Earnings:"
msgstr ""
-#: ../admin/gl_setup.php:150
+#: ../admin/gl_setup.php:156
msgid "Profit/Loss Year:"
msgstr ""
-#: ../admin/gl_setup.php:152
+#: ../admin/gl_setup.php:158
msgid "Exchange Variances Account:"
msgstr ""
-#: ../admin/gl_setup.php:154
+#: ../admin/gl_setup.php:160
#: ../gl/manage/bank_accounts.php:193
msgid "Bank Charges Account:"
msgstr ""
-#: ../admin/gl_setup.php:156
+#: ../admin/gl_setup.php:162
msgid "Tax Algorithm:"
msgstr ""
-#: ../admin/gl_setup.php:160
+#: ../admin/gl_setup.php:166
msgid "Customers and Sales"
msgstr ""
-#: ../admin/gl_setup.php:162
+#: ../admin/gl_setup.php:168
msgid "Default Credit Limit:"
msgstr ""
-#: ../admin/gl_setup.php:164
+#: ../admin/gl_setup.php:170
msgid "Accumulate batch shipping:"
msgstr ""
-#: ../admin/gl_setup.php:166
+#: ../admin/gl_setup.php:172
msgid "Legal Text on Invoice:"
msgstr ""
-#: ../admin/gl_setup.php:168
+#: ../admin/gl_setup.php:174
msgid "Shipping Charged Account:"
msgstr ""
-#: ../admin/gl_setup.php:170
+#: ../admin/gl_setup.php:176
msgid "Deferred Income Account:"
msgstr ""
-#: ../admin/gl_setup.php:171
+#: ../admin/gl_setup.php:177
msgid "Not used"
msgstr ""
-#: ../admin/gl_setup.php:175
+#: ../admin/gl_setup.php:181
msgid "Customers and Sales Defaults"
msgstr ""
-#: ../admin/gl_setup.php:177
+#: ../admin/gl_setup.php:183
msgid "Receivable Account:"
msgstr ""
-#: ../admin/gl_setup.php:179
-#: ../admin/gl_setup.php:220
+#: ../admin/gl_setup.php:185
+#: ../admin/gl_setup.php:228
#: ../inventory/manage/item_categories.php:196
-#: ../inventory/manage/items.php.orig:366
+#: ../inventory/manage/items.php:365
#: ../sales/manage/customer_branches.php:251
msgid "Sales Account:"
msgstr ""
-#: ../admin/gl_setup.php:182
+#: ../admin/gl_setup.php:188
#: ../sales/manage/customer_branches.php:252
msgid "Sales Discount Account:"
msgstr ""
-#: ../admin/gl_setup.php:184
+#: ../admin/gl_setup.php:190
#: ../sales/manage/customer_branches.php:254
msgid "Prompt Payment Discount Account:"
msgstr ""
-#: ../admin/gl_setup.php:186
+#: ../admin/gl_setup.php:192
+msgid "Quote Valid Days:"
+msgstr ""
+
+#: ../admin/gl_setup.php:194
msgid "Delivery Required By:"
msgstr ""
-#: ../admin/gl_setup.php:192
+#: ../admin/gl_setup.php:200
msgid "Dimension Defaults"
msgstr ""
-#: ../admin/gl_setup.php:194
+#: ../admin/gl_setup.php:202
msgid "Dimension Required By After:"
msgstr ""
-#: ../admin/gl_setup.php:198
+#: ../admin/gl_setup.php:206
msgid "Suppliers and Purchasing"
msgstr ""
-#: ../admin/gl_setup.php:200
+#: ../admin/gl_setup.php:208
msgid "Delivery Over-Receive Allowance:"
msgstr ""
-#: ../admin/gl_setup.php:202
+#: ../admin/gl_setup.php:210
msgid "Invoice Over-Charge Allowance:"
msgstr ""
-#: ../admin/gl_setup.php:204
+#: ../admin/gl_setup.php:212
msgid "Suppliers and Purchasing Defaults"
msgstr ""
-#: ../admin/gl_setup.php:206
+#: ../admin/gl_setup.php:214
msgid "Payable Account:"
msgstr ""
-#: ../admin/gl_setup.php:208
-#: ../purchasing/manage/suppliers.php:132
-#: ../purchasing/manage/suppliers.php.orig:132
+#: ../admin/gl_setup.php:216
+#: ../purchasing/manage/suppliers.php:133
msgid "Purchase Discount Account:"
msgstr ""
-#: ../admin/gl_setup.php:210
+#: ../admin/gl_setup.php:218
msgid "GRN Clearing Account:"
msgstr ""
-#: ../admin/gl_setup.php:210
+#: ../admin/gl_setup.php:218
msgid "No postings on GRN"
msgstr ""
-#: ../admin/gl_setup.php:212
+#: ../admin/gl_setup.php:220
msgid "Receival Required By:"
msgstr ""
-#: ../admin/gl_setup.php:214
+#: ../admin/gl_setup.php:222
+#: ../reporting/reports_main.php:206
msgid "Inventory"
msgstr ""
-#: ../admin/gl_setup.php:216
+#: ../admin/gl_setup.php:224
msgid "Allow Negative Inventory:"
msgstr ""
-#: ../admin/gl_setup.php:217
+#: ../admin/gl_setup.php:225
msgid "Warning: This may cause a delay in GL postings"
msgstr ""
-#: ../admin/gl_setup.php:219
+#: ../admin/gl_setup.php:227
msgid "Items Defaults"
msgstr ""
-#: ../admin/gl_setup.php:222
+#: ../admin/gl_setup.php:230
#: ../inventory/manage/item_categories.php:206
-#: ../inventory/manage/items.php.orig:370
+#: ../inventory/manage/items.php:369
msgid "Inventory Account:"
msgstr ""
-#: ../admin/gl_setup.php:224
+#: ../admin/gl_setup.php:232
#: ../inventory/manage/item_categories.php:200
#: ../inventory/manage/item_categories.php:208
-#: ../inventory/manage/items.php.orig:371
-#: ../inventory/manage/items.php.orig:376
+#: ../inventory/manage/items.php:370
+#: ../inventory/manage/items.php:375
msgid "C.O.G.S. Account:"
msgstr ""
-#: ../admin/gl_setup.php:226
+#: ../admin/gl_setup.php:234
#: ../inventory/manage/item_categories.php:209
-#: ../inventory/manage/items.php.orig:372
+#: ../inventory/manage/items.php:371
msgid "Inventory Adjustments Account:"
msgstr ""
-#: ../admin/gl_setup.php:228
+#: ../admin/gl_setup.php:236
#: ../inventory/manage/item_categories.php:213
-#: ../inventory/manage/items.php.orig:383
+#: ../inventory/manage/items.php:382
msgid "Item Assembly Costs Account:"
msgstr ""
-#: ../admin/gl_setup.php:232
+#: ../admin/gl_setup.php:240
msgid "Manufacturing Defaults"
msgstr ""
-#: ../admin/gl_setup.php:234
+#: ../admin/gl_setup.php:242
msgid "Work Order Required By After:"
msgstr ""
#: ../admin/inst_module.php:105
#: ../admin/inst_theme.php:74
#: ../inventory/inquiry/stock_status.php:71
-#: ../inventory/inquiry/stock_status.php.orig:77
#: ../reporting/rep303.php:114
msgid "Available"
msgstr ""
#: ../admin/inst_chart.php:50
#: ../admin/inst_lang.php:35
-#: ../admin/inst_lang.php:218
+#: ../admin/inst_lang.php:220
msgid "Encoding"
msgstr ""
#: ../dimensions/view/view_dimension.php:55
#: ../inventory/manage/item_categories.php:98
#: ../manufacturing/manage/work_centres.php:101
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:265
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:267
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:269
+#: ../purchasing/includes/ui/invoice_ui.inc:280
+#: ../purchasing/includes/ui/invoice_ui.inc:282
+#: ../purchasing/includes/ui/invoice_ui.inc:284
#: ../reporting/rep501.php:87
-#: ../reporting/rep709.php:111
-#: ../reporting/rep709.php:112
+#: ../reporting/rep709.php:116
+#: ../reporting/rep709.php:117
#: ../sales/manage/customer_branches.php:296
#: ../sales/manage/sales_people.php:99
#: ../taxes/item_tax_types.php:117
msgstr ""
#: ../admin/inst_lang.php:35
-#: ../admin/inst_lang.php:220
+#: ../admin/inst_lang.php:222
msgid "Right To Left"
msgstr ""
"install this language manually, uninstall standard language package first."
msgstr ""
-#: ../admin/inst_lang.php:216
+#: ../admin/inst_lang.php:218
msgid "Language Code"
msgstr ""
-#: ../admin/inst_lang.php:217
+#: ../admin/inst_lang.php:219
msgid "Language Name"
msgstr ""
-#: ../admin/inst_lang.php:221
+#: ../admin/inst_lang.php:223
msgid "Default Language"
msgstr ""
-#: ../admin/inst_lang.php:223
-#: ../admin/inst_lang.php:224
+#: ../admin/inst_lang.php:225
+#: ../admin/inst_lang.php:226
msgid "Language File"
msgstr ""
-#: ../admin/inst_lang.php:227
+#: ../admin/inst_lang.php:229
msgid "Select your language files from your local harddisk."
msgstr ""
msgstr ""
#: ../admin/inst_module.php:168
-#: ../includes/ui/ui_lists.inc:675
-#: ../includes/ui/ui_lists.inc:2160
+#: ../includes/ui/ui_lists.inc:677
+#: ../includes/ui/ui_lists.inc:2162
#: ../reporting/includes/excel_report.inc:232
#: ../reporting/includes/pdf_report.inc:264
msgid "Active"
#: ../gl/manage/gl_quick_entries.php:186
#: ../gl/view/accrual_trans.php:52
#: ../gl/includes/ui/gl_bank_ui.inc:93
-#: ../includes/ui/ui_view.inc.orig:488
+#: ../includes/ui/ui_view.inc:547
#: ../inventory/inquiry/stock_movements.php:78
#: ../inventory/manage/item_categories.php:98
#: ../manufacturing/search_work_orders.php:161
#: ../manufacturing/includes/manufacturing_ui.inc:276
#: ../manufacturing/includes/manufacturing_ui.inc:280
#: ../manufacturing/includes/manufacturing_ui.inc:331
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:125
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:126
#: ../purchasing/inquiry/supplier_inquiry.php:173
#: ../reporting/rep102.php:134
#: ../reporting/rep202.php:139
+#: ../reporting/rep402.php:103
#: ../reporting/rep501.php:87
#: ../reporting/rep601.php:79
#: ../reporting/rep602.php:80
#: ../reporting/rep704.php:83
#: ../reporting/rep704.php:86
#: ../reporting/rep704.php:89
-#: ../reporting/rep709.php:107
+#: ../reporting/rep709.php:112
#: ../reporting/rep710.php:78
#: ../reporting/rep710.php:86
+#: ../reporting/reports_main.php:340
+#: ../reporting/reports_main.php:504
#: ../reporting/includes/doctext.inc:162
#: ../reporting/includes/doctext.inc:203
#: ../reporting/includes/doctext.inc:222
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:144
-#: ../sales/inquiry/customer_inquiry.php.orig:200
+#: ../sales/inquiry/customer_allocation_inquiry.php:144
+#: ../sales/inquiry/customer_inquiry.php:200
msgid "Type"
msgstr ""
#: ../admin/security_roles.php:180
#: ../gl/manage/gl_accounts.php:198
-#: ../inventory/manage/items.php.orig:445
-#: ../purchasing/manage/suppliers.php.orig:291
-#: ../sales/manage/customers.php:329
-#: ../sales/manage/sav.customers.php:324
+#: ../inventory/manage/items.php:444
+#: ../purchasing/manage/suppliers.php:293
+#: ../sales/manage/customers.php:330
msgid "Show inactive:"
msgstr ""
#: ../includes/ui/simple_crud_class.inc:231
#: ../includes/ui/ui_controls.inc:596
#: ../includes/ui/ui_input.inc:211
-#: ../inventory/includes/item_adjustments_ui.inc:159
-#: ../inventory/includes/stock_transfers_ui.inc:139
-#: ../inventory/manage/items.php.orig:428
-#: ../manufacturing/includes/work_order_issue_ui.inc:133
-#: ../purchasing/includes/ui/po_ui.inc.orig:457
+#: ../inventory/includes/item_adjustments_ui.inc:165
+#: ../inventory/includes/stock_transfers_ui.inc:145
+#: ../inventory/manage/items.php:427
+#: ../manufacturing/includes/work_order_issue_ui.inc:140
+#: ../purchasing/includes/ui/po_ui.inc:461
#: ../sales/includes/ui/sales_credit_ui.inc:295
-#: ../sales/includes/ui/sales_order_ui.inc:563
+#: ../sales/includes/ui/sales_order_ui.inc:548
#: ../taxes/sav.tax_types.php:173
#: ../taxes/sav.tax_types.php:253
#: ../taxes/sav.tax_types.php:256
msgstr ""
#: ../admin/security_roles.php:249
-#: ../inventory/manage/items.php.orig:428
+#: ../inventory/manage/items.php:427
msgid "Cancel Edition"
msgstr ""
#: ../admin/shipping_companies.php:15
#: ../sales/customer_credit_invoice.php:254
-#: ../sales/customer_delivery.php:382
-#: ../sales/customer_invoice.php:488
+#: ../sales/customer_delivery.php:392
+#: ../sales/customer_invoice.php:497
#: ../sales/view/view_credit.php:74
#: ../sales/view/view_dispatch.php:92
#: ../sales/view/view_invoice.php:92
#: ../admin/shipping_companies.php:134
#: ../gl/manage/gl_account_types.php:188
#: ../gl/includes/ui/gl_bank_ui.inc:57
-#: ../inventory/manage/items.php.orig:308
+#: ../inventory/manage/items.php:307
#: ../manufacturing/manage/work_centres.php:137
msgid "Name:"
msgstr ""
#: ../admin/shipping_companies.php:136
+#: ../purchasing/manage/suppliers.php:136
#: ../sales/manage/customer_branches.php:261
msgid "Contact Person:"
msgstr ""
#: ../admin/shipping_companies.php:140
#: ../includes/ui/contacts_view.inc:103
#: ../inventory/manage/locations.php:205
-#: ../purchasing/manage/suppliers.php:136
-#: ../purchasing/manage/suppliers.php.orig:136
+#: ../purchasing/manage/suppliers.php:138
#: ../sales/manage/customer_branches.php:263
-#: ../sales/manage/customers.php:256
-#: ../sales/manage/sav.customers.php:253
+#: ../sales/manage/customers.php:257
msgid "Secondary Phone Number:"
msgstr ""
msgstr ""
#: ../admin/tags.php:40
+#: ../reporting/reports_main.php:363
+#: ../reporting/reports_main.php:372
+#: ../reporting/reports_main.php:384
+#: ../reporting/reports_main.php:415
+#: ../reporting/reports_main.php:423
+#: ../reporting/reports_main.php:434
+#: ../reporting/reports_main.php:462
+#: ../reporting/reports_main.php:469
+#: ../reporting/reports_main.php:479
msgid "Account Tags"
msgstr ""
msgid "A new user has been added."
msgstr ""
-#: ../admin/users.php:97
+#: ../admin/users.php:100
+msgid "Cannot delete this user because entries are associated with this user."
+msgstr ""
+
+#: ../admin/users.php:105
msgid "User has been deleted."
msgstr ""
-#: ../admin/users.php:114
+#: ../admin/users.php:123
msgid "User login"
msgstr ""
-#: ../admin/users.php:114
-#: ../admin/users.php:198
+#: ../admin/users.php:123
+#: ../admin/users.php:207
#: ../includes/ui/contacts_view.inc:41
msgid "Full Name"
msgstr ""
-#: ../admin/users.php:114
+#: ../admin/users.php:123
#: ../includes/ui/contacts_view.inc:41
#: ../inventory/manage/locations.php:146
#: ../reporting/rep106.php:88
-#: ../reporting/includes/header2.inc:98
+#: ../reporting/includes/header2.inc:101
#: ../sales/manage/sales_people.php:99
msgid "Phone"
msgstr ""
-#: ../admin/users.php:115
+#: ../admin/users.php:124
#: ../sales/manage/customer_branches.php:302
#: ../sales/view/view_sales_order.php:96
msgid "E-mail"
msgstr ""
-#: ../admin/users.php:115
+#: ../admin/users.php:124
msgid "Last Visit"
msgstr ""
-#: ../admin/users.php:115
+#: ../admin/users.php:124
msgid "Access Level"
msgstr ""
-#: ../admin/users.php:184
+#: ../admin/users.php:193
msgid "User Login:"
msgstr ""
-#: ../admin/users.php:195
+#: ../admin/users.php:204
msgid "Enter a new password to change, leave empty to keep current."
msgstr ""
-#: ../admin/users.php:200
+#: ../admin/users.php:209
msgid "Telephone No.:"
msgstr ""
-#: ../admin/users.php:204
+#: ../admin/users.php:213
msgid "Access Level:"
msgstr ""
-#: ../admin/users.php:208
+#: ../admin/users.php:217
msgid "User's POS"
msgstr ""
-#: ../admin/users.php:213
+#: ../admin/users.php:222
msgid "Use popup window for reports:"
msgstr ""
#: ../admin/view_print_transaction.php:45
#: ../admin/view_print_transaction.php:129
#: ../includes/ui/ui_controls.inc:195
-#: ../purchasing/inquiry/po_search_completed.php:112
-#: ../purchasing/inquiry/po_search_completed.php.orig:111
-#: ../purchasing/inquiry/po_search.php:93
-#: ../sales/inquiry/customer_inquiry.php.orig:185
-#: ../sales/inquiry/sales_deliveries_view.php:160
+#: ../purchasing/inquiry/po_search_completed.php:115
+#: ../purchasing/inquiry/po_search.php:95
+#: ../sales/inquiry/customer_inquiry.php:185
+#: ../sales/inquiry/sales_deliveries_view.php:162
#: ../sales/inquiry/sales_orders_view.php:125
-#: ../sales/inquiry/sales_orders_view.php.orig:125
msgid "Print"
msgstr ""
#: ../dimensions/inquiry/search_dimensions.php:88
#: ../gl/inquiry/journal_inquiry.php:53
#: ../manufacturing/search_work_orders.php:78
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:474
-#: ../purchasing/inquiry/po_search_completed.php:74
-#: ../purchasing/inquiry/po_search_completed.php.orig:75
-#: ../purchasing/inquiry/po_search.php:76
+#: ../purchasing/includes/ui/invoice_ui.inc:489
+#: ../purchasing/inquiry/po_search_completed.php:77
+#: ../purchasing/inquiry/po_search.php:78
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:57
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:57
#: ../purchasing/inquiry/supplier_inquiry.php:55
#: ../sales/inquiry/customer_allocation_inquiry.php:51
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:51
#: ../sales/inquiry/customer_inquiry.php:54
-#: ../sales/inquiry/customer_inquiry.php.orig:54
-#: ../sales/inquiry/sales_deliveries_view.php:116
-#: ../sales/inquiry/sales_orders_view.php.orig:269
+#: ../sales/inquiry/sales_deliveries_view.php:118
+#: ../sales/inquiry/sales_orders_view.php:270
msgid "Search"
msgstr ""
#: ../manufacturing/includes/manufacturing_ui.inc:331
#: ../purchasing/includes/ui/grn_ui.inc:32
#: ../purchasing/includes/ui/grn_ui.inc:64
-#: ../purchasing/includes/ui/po_ui.inc.orig:321
+#: ../purchasing/includes/ui/po_ui.inc:323
#: ../purchasing/view/view_po.php:115
#: ../purchasing/view/view_supp_credit.php:43
#: ../purchasing/view/view_supp_invoice.php:47
#: ../purchasing/view/view_supp_payment.php:73
-#: ../purchasing/inquiry/po_search_completed.php:121
-#: ../purchasing/inquiry/po_search_completed.php.orig:120
-#: ../purchasing/inquiry/po_search.php:131
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:127
+#: ../purchasing/inquiry/po_search_completed.php:124
+#: ../purchasing/inquiry/po_search.php:133
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:128
#: ../purchasing/inquiry/supplier_inquiry.php:175
#: ../purchasing/allocations/supplier_allocation_main.php:96
#: ../reporting/rep501.php:87
#: ../reporting/includes/doctext.inc:221
#: ../sales/customer_credit_invoice.php:245
#: ../sales/customer_credit_invoice.php:247
-#: ../sales/customer_delivery.php:362
-#: ../sales/customer_delivery.php:364
-#: ../sales/customer_invoice.php:460
-#: ../sales/customer_invoice.php:462
+#: ../sales/customer_delivery.php:372
+#: ../sales/customer_delivery.php:374
+#: ../sales/customer_invoice.php:469
+#: ../sales/customer_invoice.php:471
#: ../sales/allocations/customer_allocation_main.php:95
#: ../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/inquiry/customer_allocation_inquiry.php.orig:146
-#: ../sales/inquiry/customer_inquiry.php.orig:203
-#: ../sales/inquiry/sales_deliveries_view.php:184
+#: ../sales/inquiry/customer_allocation_inquiry.php:146
+#: ../sales/inquiry/customer_inquiry.php:203
+#: ../sales/inquiry/sales_deliveries_view.php:186
#: ../sales/includes/ui/sales_credit_ui.inc:85
#: ../sales/includes/ui/sales_credit_ui.inc:87
-#: ../sales/includes/ui/sales_order_ui.inc:379
+#: ../sales/includes/ui/sales_order_ui.inc:364
msgid "Reference"
msgstr ""
#: ../gl/view/gl_deposit_view.php:68
#: ../gl/view/gl_payment_view.php:66
#: ../gl/view/gl_trans_view.php:36
-#: ../includes/ui/allocation_cart.inc.orig:264
-#: ../includes/ui/ui_view.inc.orig:488
+#: ../includes/ui/allocation_cart.inc:290
+#: ../includes/ui/ui_view.inc:547
#: ../inventory/inquiry/stock_movements.php:80
#: ../inventory/view/view_adjustment.php:45
#: ../inventory/view/view_transfer.php:47
#: ../manufacturing/search_work_orders.php:166
-#: ../manufacturing/work_order_entry.php:419
-#: ../manufacturing/work_order_entry.php:425
+#: ../manufacturing/work_order_entry.php:417
+#: ../manufacturing/work_order_entry.php:423
#: ../manufacturing/view/wo_costs_view.php:46
#: ../manufacturing/view/wo_production_view.php:45
#: ../manufacturing/includes/manufacturing_ui.inc:157
#: ../manufacturing/includes/manufacturing_ui.inc:277
#: ../manufacturing/includes/manufacturing_ui.inc:281
#: ../manufacturing/includes/manufacturing_ui.inc:332
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:114
-#: ../purchasing/includes/ui/po_ui.inc.orig:335
+#: ../purchasing/includes/ui/invoice_ui.inc:129
+#: ../purchasing/includes/ui/po_ui.inc:337
#: ../purchasing/view/view_po.php:140
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:130
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:131
#: ../purchasing/inquiry/supplier_inquiry.php:178
#: ../purchasing/allocations/supplier_allocation_main.php:97
#: ../reporting/rep101.php:118
+#: ../reporting/rep107.php:202
#: ../reporting/rep201.php:110
#: ../reporting/rep306.php:141
+#: ../reporting/rep402.php:103
#: ../reporting/rep501.php:87
#: ../reporting/rep601.php:79
#: ../reporting/rep602.php:80
#: ../reporting/rep704.php:83
#: ../reporting/rep704.php:86
#: ../reporting/rep704.php:89
-#: ../reporting/rep709.php:111
+#: ../reporting/rep709.php:116
#: ../reporting/rep710.php:77
#: ../reporting/includes/doctext.inc:167
#: ../reporting/includes/doctext.inc:208
#: ../reporting/includes/doctext.inc:246
-#: ../reporting/includes/header2.inc:135
-#: ../sales/customer_delivery.php:392
-#: ../sales/customer_invoice.php:503
+#: ../reporting/includes/header2.inc:138
+#: ../sales/customer_delivery.php:402
+#: ../sales/customer_invoice.php:512
#: ../sales/allocations/customer_allocation_main.php:96
#: ../sales/view/view_credit.php:69
#: ../sales/view/view_sales_order.php:109
#: ../sales/view/view_sales_order.php:142
#: ../sales/view/view_sales_order.php:179
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:148
-#: ../sales/inquiry/customer_inquiry.php.orig:204
+#: ../sales/inquiry/customer_allocation_inquiry.php:148
+#: ../sales/inquiry/customer_inquiry.php:204
msgid "Date"
msgstr ""
#: ../admin/view_print_transaction.php:130
#: ../admin/void_transaction.php:184
#: ../includes/ui/ui_view.inc:51
-#: ../includes/ui/ui_view.inc.orig:51
msgid "GL"
msgstr ""
#: ../gl/inquiry/journal_inquiry.php:56
#: ../gl/manage/revaluate_currencies.php:106
#: ../includes/ui/ui_view.inc:344
-#: ../includes/ui/ui_view.inc.orig:308
-#: ../manufacturing/work_order_add_finished.php:210
+#: ../manufacturing/work_order_add_finished.php:207
#: ../manufacturing/work_order_costs.php:146
-#: ../manufacturing/work_order_entry.php:451
+#: ../manufacturing/work_order_entry.php:449
#: ../manufacturing/work_order_release.php:103
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:180
-#: ../purchasing/includes/ui/po_ui.inc.orig:490
-#: ../purchasing/po_entry_items.php.orig:562
-#: ../purchasing/supplier_payment.php.orig:316
-#: ../sales/customer_invoice.php:680
-#: ../sales/customer_payments.php.orig:413
+#: ../purchasing/includes/ui/invoice_ui.inc:195
+#: ../purchasing/includes/ui/po_ui.inc:494
+#: ../purchasing/po_entry_items.php:485
+#: ../purchasing/supplier_payment.php:325
+#: ../sales/customer_invoice.php:689
+#: ../sales/customer_payments.php:402
msgid "Memo:"
msgstr ""
#: ../admin/void_transaction.php:248
#: ../gl/accruals.php:32
#: ../gl/bank_transfer.php:115
-#: ../gl/gl_journal.php:161
+#: ../gl/gl_journal.php:162
#: ../gl/manage/close_period.php:34
#: ../gl/manage/exchange_rates.php:33
#: ../gl/manage/revaluate_currencies.php:53
#: ../manufacturing/work_order_costs.php:80
#: ../purchasing/po_receive_items.php:174
#: ../purchasing/supplier_payment.php:185
-#: ../purchasing/supplier_payment.php.orig:174
#: ../sales/customer_credit_invoice.php:91
-#: ../sales/sales_order_entry.php:360
+#: ../sales/sales_order_entry.php:366
#: ../sales/manage/recurrent_invoices.php:41
#: ../sales/manage/recurrent_invoices.php:46
#: ../sales/manage/recurrent_invoices.php:51
msgid "Selected transaction has been voided."
msgstr ""
+#: ../admin/db/attachments_db.inc:67
+msgid "Attached File:"
+msgstr ""
+
#: ../admin/db/fiscalyears_db.inc:136
msgid ""
"The Retained Earnings Account or the Profit and Loss Year Account has not "
msgid "Closing Year"
msgstr ""
-#: ../admin/db/fiscalyears_db.inc:214
-#: ../reporting/rep101.php:175
-#: ../reporting/rep201.php:170
+#: ../admin/db/fiscalyears_db.inc:219
+#: ../reporting/rep101.php:173
+#: ../reporting/rep201.php:165
#: ../reporting/rep706.php:185
msgid "Open Balance"
msgstr ""
msgid "The language files folder "
msgstr ""
-#: ../admin/db/maintenance_db.inc:389
+#: ../admin/db/maintenance_db.inc:391
msgid ""
"This is new format backup file which cannot be restored on database not "
"migrated to utf8."
msgstr ""
-#: ../admin/db/maintenance_db.inc:471
+#: ../admin/db/maintenance_db.inc:473
#, php-format
msgid "SQL script execution failed in line %d: %s"
msgstr ""
-#: ../admin/db/users_db.inc:210
+#: ../admin/db/users_db.inc:221
msgid "user online"
msgstr ""
-#: ../admin/db/users_db.inc:210
+#: ../admin/db/users_db.inc:221
msgid "users online"
msgstr ""
#: ../admin/db/voiding_db.inc:114
-#: ../sales/includes/db/sales_invoice_db.inc.orig:249
+#: ../sales/includes/db/sales_invoice_db.inc:251
msgid "Voided."
msgstr ""
msgstr ""
#: ../applications/generalledger.php:44
+#: ../reporting/reports_main.php:390
+#: ../reporting/reports_main.php:440
+#: ../reporting/reports_main.php:485
msgid "Trial &Balance"
msgstr ""
msgstr ""
#: ../applications/inventory.php:47
+#: ../inventory/manage/items.php:469
msgid "&Reorder Levels"
msgstr ""
msgstr ""
#: ../applications/inventory.php:55
+#: ../inventory/manage/items.php:468
msgid "Standard &Costs"
msgstr ""
#: ../dimensions/dimension_entry.php:123
#: ../gl/bank_transfer.php:176
#: ../gl/gl_bank.php:257
-#: ../gl/gl_journal.php:181
+#: ../gl/gl_journal.php:182
#: ../gl/manage/revaluate_currencies.php:72
#: ../inventory/adjustments.php:101
-#: ../inventory/transfers.php:97
+#: ../inventory/transfers.php:96
#: ../manufacturing/work_order_add_finished.php:84
#: ../manufacturing/work_order_entry.php:139
#: ../manufacturing/work_order_issue.php:97
-#: ../purchasing/po_entry_items.php:368
-#: ../purchasing/po_entry_items.php.orig:368
+#: ../manufacturing/work_order_issue.php.orig:97
+#: ../purchasing/po_entry_items.php:365
#: ../purchasing/po_receive_items.php:193
-#: ../purchasing/supplier_credit.php:172
-#: ../purchasing/supplier_invoice.php:179
+#: ../purchasing/supplier_credit.php:182
+#: ../purchasing/supplier_invoice.php:190
#: ../purchasing/supplier_payment.php:214
-#: ../purchasing/supplier_payment.php.orig:203
#: ../sales/create_recurrent_invoices.php:57
#: ../sales/credit_note_entry.php:181
#: ../sales/customer_credit_invoice.php:205
-#: ../sales/customer_delivery.php:324
-#: ../sales/customer_invoice.php:379
+#: ../sales/customer_delivery.php:334
+#: ../sales/customer_invoice.php:388
#: ../sales/customer_payments.php:169
#: ../sales/customer_payments.php:176
-#: ../sales/customer_payments.php.orig:158
-#: ../sales/customer_payments.php.orig:165
-#: ../sales/customer_payments.php.orig:248
-#: ../sales/sales_order_entry.php:458
+#: ../sales/sales_order_entry.php:475
msgid "The entered reference is already in use."
msgstr ""
#: ../dimensions/dimension_entry.php:138
#: ../manufacturing/work_order_entry.php:154
-#: ../manufacturing/work_order_entry.php:234
-#: ../purchasing/po_entry_items.php:241
-#: ../purchasing/po_entry_items.php.orig:241
+#: ../manufacturing/work_order_entry.php:232
+#: ../purchasing/po_entry_items.php:238
msgid "The date entered is in an invalid format."
msgstr ""
#: ../reporting/reports_main.php:80
#: ../reporting/reports_main.php:89
#: ../reporting/reports_main.php:151
+#: ../reporting/reports_main.php:233
+#: ../reporting/reports_main.php:242
+#: ../reporting/reports_main.php:248
+#: ../reporting/reports_main.php:258
+#: ../reporting/reports_main.php:266
+#: ../reporting/reports_main.php:274
+#: ../reporting/reports_main.php:318
+#: ../reporting/reports_main.php:326
+#: ../reporting/reports_main.php:338
+#: ../reporting/reports_main.php:350
+#: ../reporting/reports_main.php:368
+#: ../reporting/reports_main.php:379
+#: ../reporting/reports_main.php:391
+#: ../reporting/reports_main.php:404
+#: ../reporting/reports_main.php:420
+#: ../reporting/reports_main.php:430
+#: ../reporting/reports_main.php:441
+#: ../reporting/reports_main.php:453
+#: ../reporting/reports_main.php:467
+#: ../reporting/reports_main.php:476
+#: ../reporting/reports_main.php:486
+#: ../reporting/reports_main.php:495
+#: ../reporting/reports_main.php:502
msgid "Start Date"
msgstr ""
#: ../dimensions/dimension_entry.php:279
-#: ../manufacturing/work_order_entry.php:420
+#: ../manufacturing/work_order_entry.php:418
msgid "Date Required By"
msgstr ""
#: ../dimensions/dimension_entry.php:302
#: ../includes/ui/simple_crud_class.inc:225
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:206
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:412
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:414
+#: ../purchasing/includes/ui/invoice_ui.inc:221
+#: ../purchasing/includes/ui/invoice_ui.inc:427
+#: ../purchasing/includes/ui/invoice_ui.inc:429
#: ../taxes/sav.tax_types.php:172
msgid "Add"
msgstr ""
#: ../dimensions/includes/dimensions_ui.inc:31
#: ../gl/accruals.php:94
#: ../gl/inquiry/gl_account_inquiry.php:129
+#: ../gl/inquiry/gl_trial_balance.php:184
#: ../gl/manage/gl_quick_entries.php:241
#: ../gl/manage/gl_quick_entries.php:333
#: ../includes/sysnames.inc:165
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:265
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:267
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:269
+#: ../purchasing/includes/ui/invoice_ui.inc:280
+#: ../purchasing/includes/ui/invoice_ui.inc:282
+#: ../purchasing/includes/ui/invoice_ui.inc:284
#: ../reporting/rep701.php:111
#: ../reporting/rep705.php:238
#: ../reporting/rep706.php:185
#: ../gl/inquiry/bank_inquiry.php:71
#: ../gl/inquiry/gl_account_inquiry.php:141
#: ../gl/inquiry/gl_account_inquiry.php:143
+#: ../gl/inquiry/gl_trial_balance.php:190
+#: ../gl/inquiry/gl_trial_balance.php:192
+#: ../gl/inquiry/gl_trial_balance.php:194
#: ../gl/view/accrual_trans.php:60
#: ../gl/view/gl_trans_view.php:69
#: ../gl/view/gl_trans_view.php:72
#: ../gl/includes/ui/gl_journal_ui.inc:87
#: ../gl/includes/ui/gl_journal_ui.inc:90
#: ../gl/includes/ui/gl_journal_ui.inc:93
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:133
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:134
#: ../purchasing/inquiry/supplier_inquiry.php:181
#: ../reporting/rep601.php:80
#: ../reporting/rep602.php:81
#: ../reporting/rep704.php:90
#: ../reporting/rep708.php:192
#: ../reporting/rep708.php:193
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:152
-#: ../sales/inquiry/customer_inquiry.php.orig:209
+#: ../sales/inquiry/customer_allocation_inquiry.php:152
+#: ../sales/inquiry/customer_inquiry.php:209
msgid "Debit"
msgstr ""
#: ../gl/inquiry/bank_inquiry.php:71
#: ../gl/inquiry/gl_account_inquiry.php:141
#: ../gl/inquiry/gl_account_inquiry.php:143
+#: ../gl/inquiry/gl_trial_balance.php:191
+#: ../gl/inquiry/gl_trial_balance.php:193
+#: ../gl/inquiry/gl_trial_balance.php:195
#: ../gl/view/accrual_trans.php:60
#: ../gl/view/gl_trans_view.php:69
#: ../gl/view/gl_trans_view.php:72
#: ../gl/includes/ui/gl_journal_ui.inc:90
#: ../gl/includes/ui/gl_journal_ui.inc:93
#: ../includes/sysnames.inc:85
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:134
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:135
#: ../purchasing/inquiry/supplier_inquiry.php:182
#: ../reporting/rep601.php:80
#: ../reporting/rep602.php:81
#: ../reporting/rep704.php:90
#: ../reporting/rep708.php:192
#: ../reporting/rep708.php:193
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:153
-#: ../sales/inquiry/customer_inquiry.php.orig:210
+#: ../sales/inquiry/customer_allocation_inquiry.php:153
+#: ../sales/inquiry/customer_inquiry.php:210
msgid "Credit"
msgstr ""
#: ../dimensions/inquiry/search_dimensions.php:134
#: ../gl/inquiry/bank_inquiry.php:71
#: ../gl/inquiry/gl_account_inquiry.php:141
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:136
+#: ../gl/inquiry/gl_trial_balance.php:188
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:137
#: ../reporting/rep101.php:122
#: ../reporting/rep201.php:114
#: ../reporting/rep203.php:94
#: ../reporting/rep704.php:87
#: ../reporting/rep704.php:90
#: ../reporting/rep708.php:185
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:155
+#: ../sales/inquiry/customer_allocation_inquiry.php:155
msgid "Balance"
msgstr ""
#: ../inventory/includes/item_adjustments_ui.inc:35
#: ../inventory/includes/stock_transfers_ui.inc:40
#: ../manufacturing/search_work_orders.php:67
-#: ../manufacturing/work_order_add_finished.php:198
+#: ../manufacturing/work_order_add_finished.php:195
#: ../manufacturing/work_order_costs.php:134
-#: ../manufacturing/work_order_entry.php:378
-#: ../manufacturing/work_order_entry.php:385
-#: ../manufacturing/includes/work_order_issue_ui.inc:156
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:104
-#: ../purchasing/includes/ui/po_ui.inc.orig:166
-#: ../purchasing/includes/ui/po_ui.inc.orig:171
-#: ../purchasing/supplier_payment.php.orig:289
-#: ../sales/customer_payments.php.orig:382
+#: ../manufacturing/work_order_entry.php:376
+#: ../manufacturing/work_order_entry.php:383
+#: ../manufacturing/includes/work_order_issue_ui.inc:163
+#: ../purchasing/includes/ui/invoice_ui.inc:119
+#: ../purchasing/includes/ui/po_ui.inc:188
+#: ../purchasing/includes/ui/po_ui.inc:193
+#: ../purchasing/supplier_payment.php:298
+#: ../sales/customer_payments.php:371
msgid "Reference:"
msgstr ""
#: ../dimensions/inquiry/search_dimensions.php:75
-#: ../includes/ui/allocation_cart.inc.orig:286
-#: ../includes/ui/ui_lists.inc:1927
+#: ../includes/ui/allocation_cart.inc:314
+#: ../includes/ui/ui_lists.inc:1929
#: ../reporting/rep101.php:100
#: ../reporting/rep102.php:96
#: ../reporting/rep104.php:97
#: ../reporting/rep202.php:100
#: ../reporting/rep203.php:74
#: ../reporting/rep204.php:77
-#: ../reporting/rep301.php:92
-#: ../reporting/rep301.php:99
+#: ../reporting/rep301.php:156
+#: ../reporting/rep301.php:163
#: ../reporting/rep302.php:105
#: ../reporting/rep302.php:112
#: ../reporting/rep303.php:96
#: ../reporting/rep306.php:135
#: ../reporting/rep307.php:103
#: ../reporting/rep307.php:110
-#: ../reporting/rep308.php:138
-#: ../reporting/rep308.php:143
+#: ../reporting/rep308.php:219
+#: ../reporting/rep308.php:224
#: ../reporting/rep309.php:92
+#: ../reporting/rep402.php:87
+#: ../reporting/rep402.php:95
#: ../reporting/rep702.php:61
#: ../reporting/rep710.php:86
#: ../reporting/rep710.php:87
#: ../gl/includes/ui/gl_bank_ui.inc:120
#: ../inventory/inquiry/stock_movements.php:58
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:50
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:50
#: ../purchasing/inquiry/supplier_inquiry.php:50
#: ../sales/inquiry/customer_inquiry.php:46
-#: ../sales/inquiry/customer_inquiry.php.orig:46
msgid "From:"
msgstr ""
#: ../gl/inquiry/profit_loss.php:169
#: ../inventory/inquiry/stock_movements.php:59
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:51
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:51
#: ../purchasing/inquiry/supplier_inquiry.php:51
#: ../sales/inquiry/customer_inquiry.php:47
-#: ../sales/inquiry/customer_inquiry.php.orig:47
msgid "To:"
msgstr ""
#: ../dimensions/inquiry/search_dimensions.php:132
#: ../dimensions/view/view_dimension.php:55
-#: ../includes/ui/allocation_cart.inc.orig:264
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:123
+#: ../includes/ui/allocation_cart.inc:290
+#: ../purchasing/includes/ui/invoice_ui.inc:138
#: ../purchasing/view/view_supp_credit.php:48
#: ../purchasing/view/view_supp_invoice.php:52
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:131
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:132
#: ../purchasing/inquiry/supplier_inquiry.php:179
#: ../reporting/rep101.php:118
#: ../reporting/rep201.php:110
#: ../reporting/includes/doctext.inc:167
#: ../reporting/includes/doctext.inc:206
#: ../reporting/includes/doctext.inc:208
-#: ../sales/customer_invoice.php:510
+#: ../sales/customer_invoice.php:519
#: ../sales/view/view_dispatch.php:97
#: ../sales/view/view_invoice.php:96
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:149
-#: ../sales/inquiry/customer_inquiry.php.orig:205
-#: ../sales/includes/ui/sales_order_ui.inc:602
+#: ../sales/inquiry/customer_allocation_inquiry.php:149
+#: ../sales/inquiry/customer_inquiry.php:205
+#: ../sales/includes/ui/sales_order_ui.inc:587
msgid "Due Date"
msgstr ""
#: ../gl/inquiry/gl_account_inquiry.php:71
#: ../gl/inquiry/tax_inquiry.php:61
#: ../purchasing/inquiry/po_search_completed.php:62
-#: ../purchasing/inquiry/po_search_completed.php.orig:63
#: ../purchasing/inquiry/po_search.php:64
#: ../sales/inquiry/customer_allocation_inquiry.php:44
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:44
#: ../sales/inquiry/sales_deliveries_view.php:104
-#: ../sales/inquiry/sales_orders_view.php.orig:251
+#: ../sales/inquiry/sales_orders_view.php:251
msgid "from:"
msgstr ""
#: ../gl/inquiry/gl_account_inquiry.php:72
#: ../gl/inquiry/tax_inquiry.php:62
#: ../purchasing/inquiry/po_search_completed.php:63
-#: ../purchasing/inquiry/po_search_completed.php.orig:64
#: ../purchasing/inquiry/po_search.php:65
#: ../sales/inquiry/customer_allocation_inquiry.php:45
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:45
#: ../sales/inquiry/sales_deliveries_view.php:105
-#: ../sales/inquiry/sales_orders_view.php.orig:252
+#: ../sales/inquiry/sales_orders_view.php:252
msgid "to:"
msgstr ""
#: ../gl/accruals.php:38
#: ../gl/bank_transfer.php:121
#: ../gl/gl_bank.php:269
-#: ../gl/gl_journal.php:167
+#: ../gl/gl_journal.php:168
#: ../gl/manage/revaluate_currencies.php:59
#: ../inventory/adjustments.php:114
-#: ../inventory/transfers.php:109
+#: ../inventory/transfers.php:108
#: ../manufacturing/work_order_add_finished.php:104
#: ../manufacturing/work_order_costs.php:86
#: ../manufacturing/work_order_entry.php:160
#: ../manufacturing/work_order_issue.php:84
-#: ../purchasing/po_entry_items.php:345
-#: ../purchasing/po_entry_items.php.orig:345
+#: ../manufacturing/work_order_issue.php.orig:84
+#: ../purchasing/po_entry_items.php:342
#: ../purchasing/po_receive_items.php:179
-#: ../purchasing/supplier_credit.php:192
-#: ../purchasing/supplier_invoice.php:199
+#: ../purchasing/supplier_credit.php:202
+#: ../purchasing/supplier_invoice.php:210
#: ../purchasing/supplier_payment.php:191
-#: ../purchasing/supplier_payment.php.orig:180
#: ../sales/create_recurrent_invoices.php:121
#: ../sales/credit_note_entry.php:157
#: ../sales/customer_credit_invoice.php:95
#: ../sales/customer_delivery.php:165
-#: ../sales/customer_invoice.php:318
+#: ../sales/customer_invoice.php:327
#: ../sales/customer_payments.php:156
-#: ../sales/customer_payments.php.orig:145
-#: ../sales/sales_order_entry.php:365
+#: ../sales/sales_order_entry.php:371
msgid ""
"The entered date is out of fiscal year or is closed for further data entry."
msgstr ""
#: ../includes/sysnames.inc:166
#: ../inventory/manage/item_categories.php:220
#: ../inventory/manage/item_categories.php:222
-#: ../inventory/manage/items.php.orig:355
-#: ../inventory/manage/items.php.orig:357
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:265
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:267
-#: ../purchasing/manage/suppliers.php:145
-#: ../purchasing/manage/suppliers.php:146
+#: ../inventory/manage/items.php:354
+#: ../inventory/manage/items.php:356
+#: ../purchasing/includes/ui/invoice_ui.inc:280
+#: ../purchasing/includes/ui/invoice_ui.inc:282
+#: ../purchasing/manage/suppliers.php:147
#: ../purchasing/manage/suppliers.php:148
-#: ../purchasing/manage/suppliers.php.orig:145
-#: ../purchasing/manage/suppliers.php.orig:146
-#: ../purchasing/manage/suppliers.php.orig:148
+#: ../purchasing/manage/suppliers.php:150
#: ../reporting/rep103.php:243
#: ../reporting/rep103.php:255
#: ../reporting/rep205.php:161
#: ../reporting/rep708.php:201
#: ../reporting/rep708.php:203
#: ../reporting/rep708.php:210
-#: ../sales/customer_delivery.php:409
-#: ../sales/customer_delivery.php:417
-#: ../sales/customer_invoice.php:475
-#: ../sales/customer_invoice.php:518
-#: ../sales/manage/customers.php:273
-#: ../sales/manage/customers.php:275
-#: ../sales/manage/sav.customers.php:269
-#: ../sales/manage/sav.customers.php:271
+#: ../reporting/reports_main.php:354
+#: ../reporting/reports_main.php:355
+#: ../reporting/reports_main.php:361
+#: ../reporting/reports_main.php:362
+#: ../reporting/reports_main.php:370
+#: ../reporting/reports_main.php:371
+#: ../reporting/reports_main.php:382
+#: ../reporting/reports_main.php:383
+#: ../reporting/reports_main.php:395
+#: ../reporting/reports_main.php:396
+#: ../reporting/reports_main.php:408
+#: ../reporting/reports_main.php:414
+#: ../reporting/reports_main.php:422
+#: ../reporting/reports_main.php:433
+#: ../reporting/reports_main.php:445
+#: ../sales/customer_delivery.php:419
+#: ../sales/customer_delivery.php:427
+#: ../sales/customer_invoice.php:484
+#: ../sales/customer_invoice.php:527
+#: ../sales/manage/customers.php:274
+#: ../sales/manage/customers.php:276
#: ../sales/includes/ui/sales_credit_ui.inc:132
#: ../sales/includes/ui/sales_credit_ui.inc:137
-#: ../sales/includes/ui/sales_order_ui.inc:457
-#: ../sales/includes/ui/sales_order_ui.inc:462
+#: ../sales/includes/ui/sales_order_ui.inc:442
+#: ../sales/includes/ui/sales_order_ui.inc:447
msgid "Dimension"
msgstr ""
#: ../gl/includes/ui/gl_journal_ui.inc:90
#: ../gl/includes/ui/gl_journal_ui.inc:93
#: ../gl/includes/ui/gl_journal_ui.inc:276
-#: ../inventory/includes/item_adjustments_ui.inc:181
-#: ../inventory/includes/stock_transfers_ui.inc:161
+#: ../inventory/includes/item_adjustments_ui.inc:187
+#: ../inventory/includes/stock_transfers_ui.inc:167
#: ../manufacturing/view/wo_costs_view.php:46
-#: ../manufacturing/includes/work_order_issue_ui.inc:169
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:265
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:267
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:269
+#: ../manufacturing/includes/work_order_issue_ui.inc:176
+#: ../purchasing/includes/ui/invoice_ui.inc:280
+#: ../purchasing/includes/ui/invoice_ui.inc:282
+#: ../purchasing/includes/ui/invoice_ui.inc:284
#: ../sales/customer_credit_invoice.php:364
-#: ../sales/customer_delivery.php:543
+#: ../sales/customer_delivery.php:559
#: ../sales/includes/ui/sales_credit_ui.inc:339
msgid "Memo"
msgstr ""
#: ../gl/includes/ui/gl_bank_ui.inc:156
#: ../gl/includes/ui/gl_bank_ui.inc:159
#: ../includes/sysnames.inc:133
-#: ../includes/ui/allocation_cart.inc.orig:264
-#: ../includes/ui/ui_lists.inc:1185
+#: ../includes/ui/allocation_cart.inc:290
+#: ../includes/ui/ui_lists.inc:1187
#: ../manufacturing/view/wo_costs_view.php:46
#: ../manufacturing/includes/manufacturing_ui.inc:236
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:265
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:267
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:269
+#: ../purchasing/includes/ui/invoice_ui.inc:280
+#: ../purchasing/includes/ui/invoice_ui.inc:282
+#: ../purchasing/includes/ui/invoice_ui.inc:284
#: ../purchasing/view/view_supp_payment.php:60
#: ../purchasing/view/view_supp_payment.php:72
#: ../reporting/rep102.php:245
-#: ../reporting/rep109.php:190
+#: ../reporting/rep107.php:204
+#: ../reporting/rep107.php:265
+#: ../reporting/rep109.php:195
#: ../reporting/rep110.php:193
-#: ../reporting/rep111.php:173
+#: ../reporting/rep111.php:192
#: ../reporting/rep113.php:178
#: ../reporting/rep202.php:253
#: ../reporting/rep209.php:195
#: ../gl/gl_bank.php:49
#: ../gl/inquiry/bank_inquiry.php:30
#: ../purchasing/supplier_payment.php:42
-#: ../purchasing/supplier_payment.php.orig:42
#: ../sales/customer_payments.php:38
-#: ../sales/customer_payments.php.orig:39
msgid "There are no bank accounts defined in the system."
msgstr ""
#: ../gl/bank_transfer.php:87
#: ../gl/bank_transfer.php:94
-#: ../sales/customer_payments.php.orig:411
+#: ../sales/customer_payments.php:400
msgid "Amount:"
msgstr ""
#: ../gl/bank_transfer.php:88
#: ../gl/bank_transfer.php:95
-#: ../purchasing/supplier_payment.php.orig:302
-#: ../sales/customer_payments.php.orig:396
+#: ../purchasing/supplier_payment.php:313
+#: ../sales/customer_payments.php:386
msgid "Bank Charge:"
msgstr ""
#: ../gl/bank_transfer.php:190
#: ../purchasing/supplier_payment.php:135
#: ../purchasing/supplier_payment.php:141
-#: ../purchasing/supplier_payment.php.orig:125
-#: ../purchasing/supplier_payment.php.orig:131
msgid "The entered amount is invalid or less than zero."
msgstr ""
#: ../gl/bank_transfer.php:163
#: ../purchasing/supplier_payment.php:149
-#: ../purchasing/supplier_payment.php.orig:139
#: ../sales/customer_payments.php:195
-#: ../sales/customer_payments.php.orig:184
msgid ""
"The Bank Charge Account has not been set in System and General GL Setup."
msgstr ""
#: ../gl/bank_transfer.php:169
#: ../gl/gl_bank.php:251
-#: ../gl/gl_journal.php:173
+#: ../gl/gl_journal.php:174
#: ../gl/manage/revaluate_currencies.php:65
#: ../inventory/adjustments.php:94
-#: ../inventory/transfers.php:91
+#: ../inventory/transfers.php:90
#: ../manufacturing/work_order_add_finished.php:77
#: ../manufacturing/work_order_entry.php:132
#: ../manufacturing/work_order_issue.php:90
+#: ../manufacturing/work_order_issue.php.orig:90
#: ../purchasing/po_receive_items.php:186
#: ../purchasing/supplier_payment.php:207
-#: ../purchasing/supplier_payment.php.orig:196
#: ../sales/credit_note_entry.php:147
#: ../sales/customer_credit_invoice.php:102
#: ../sales/customer_delivery.php:178
-#: ../sales/customer_invoice.php:332
+#: ../sales/customer_invoice.php:341
#: ../sales/customer_payments.php:162
-#: ../sales/customer_payments.php.orig:151
-#: ../sales/sales_order_entry.php:429
+#: ../sales/sales_order_entry.php:446
msgid "You must enter a reference."
msgstr ""
msgstr ""
#: ../gl/gl_bank.php:85
-#: ../gl/gl_journal.php:63
+#: ../gl/gl_journal.php:64
#: ../inventory/adjustments.php:50
#: ../manufacturing/work_order_entry.php:68
#: ../purchasing/po_entry_items.php:115
-#: ../purchasing/po_entry_items.php:139
-#: ../purchasing/po_entry_items.php.orig:115
-#: ../purchasing/po_entry_items.php.orig:139
+#: ../purchasing/po_entry_items.php:136
#: ../purchasing/supplier_credit.php:83
-#: ../purchasing/supplier_invoice.php:75
+#: ../purchasing/supplier_invoice.php:76
#: ../sales/credit_note_entry.php:77
#: ../sales/customer_credit_invoice.php:62
-#: ../sales/customer_invoice.php:69
-#: ../sales/sales_order_entry.php:240
+#: ../sales/customer_invoice.php:78
+#: ../sales/sales_order_entry.php:243
msgid "Add an Attachment"
msgstr ""
#: ../gl/gl_bank.php:238
#: ../purchasing/supplier_payment.php:200
-#: ../purchasing/supplier_payment.php.orig:189
#, php-format
msgid "The total bank amount exceeds allowed limit (%s)."
msgstr ""
msgid "Settled amount have to be positive number."
msgstr ""
-#: ../gl/gl_bank.php:332
+#: ../gl/gl_bank.php:333
msgid "The amount entered is not a valid number or is less than zero."
msgstr ""
-#: ../gl/gl_bank.php:338
+#: ../gl/gl_bank.php:339
#: ../gl/manage/exchange_rates.php:39
msgid "The exchange rate cannot be zero or a negative number."
msgstr ""
-#: ../gl/gl_bank.php:410
+#: ../gl/gl_bank.php:411
msgid "Payment Items"
msgstr ""
-#: ../gl/gl_bank.php:410
+#: ../gl/gl_bank.php:411
msgid "Deposit Items"
msgstr ""
-#: ../gl/gl_bank.php:418
+#: ../gl/gl_bank.php:419
msgid "Process Payment"
msgstr ""
-#: ../gl/gl_bank.php:418
+#: ../gl/gl_bank.php:419
msgid "Process Deposit"
msgstr ""
#: ../reporting/rep305.php:106
#: ../reporting/rep306.php:148
#: ../reporting/rep307.php:122
-#: ../reporting/rep308.php:155
+#: ../reporting/rep308.php:236
#: ../reporting/rep309.php:103
#: ../reporting/rep601.php:85
#: ../reporting/rep602.php:86
#: ../reporting/rep708.php:200
#: ../reporting/rep708.php:209
#: ../reporting/rep708.php:216
-#: ../reporting/rep709.php:106
+#: ../reporting/rep709.php:111
#: ../reporting/rep710.php:85
msgid "Period"
msgstr ""
#: ../gl/inquiry/balance_sheet.php:98
#: ../gl/inquiry/balance_sheet.php:205
#: ../gl/inquiry/balance_sheet.php:236
+#: ../gl/inquiry/gl_trial_balance.php:223
#: ../gl/inquiry/profit_loss.php:115
#: ../gl/inquiry/profit_loss.php:288
#: ../gl/view/gl_deposit_view.php:137
#: ../gl/includes/ui/gl_bank_ui.inc:202
#: ../gl/includes/ui/gl_journal_ui.inc:153
#: ../inventory/includes/item_adjustments_ui.inc:63
-#: ../inventory/includes/item_adjustments_ui.inc:102
+#: ../inventory/includes/item_adjustments_ui.inc:106
#: ../manufacturing/includes/manufacturing_ui.inc:178
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:329
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:495
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:566
+#: ../purchasing/includes/ui/invoice_ui.inc:344
+#: ../purchasing/includes/ui/invoice_ui.inc:510
+#: ../purchasing/includes/ui/invoice_ui.inc:581
#: ../purchasing/po_receive_items.php:63
#: ../purchasing/view/view_po.php:140
#: ../purchasing/allocations/supplier_allocation_main.php:100
#: ../reporting/rep106.php:119
#: ../reporting/rep106.php:162
#: ../reporting/rep114.php:161
-#: ../reporting/rep201.php:223
+#: ../reporting/rep201.php:224
#: ../reporting/rep203.php:94
#: ../reporting/rep203.php:171
#: ../reporting/rep204.php:113
#: ../reporting/rep204.php:141
-#: ../reporting/rep301.php:133
-#: ../reporting/rep301.php:170
+#: ../reporting/rep301.php:197
+#: ../reporting/rep301.php:245
#: ../reporting/rep304.php:146
#: ../reporting/rep304.php:188
#: ../reporting/rep305.php:101
#: ../reporting/rep306.php:261
#: ../reporting/rep306.php:276
#: ../reporting/rep306.php:287
+#: ../reporting/rep308.php:311
#: ../reporting/rep309.php:126
#: ../reporting/rep309.php:153
#: ../reporting/rep702.php:142
#: ../reporting/includes/doctext.inc:30
#: ../reporting/includes/doctext.inc:192
#: ../sales/customer_credit_invoice.php:281
-#: ../sales/customer_delivery.php:447
-#: ../sales/customer_invoice.php:542
-#: ../sales/customer_invoice.php:545
+#: ../sales/customer_delivery.php:457
+#: ../sales/customer_invoice.php:551
+#: ../sales/customer_invoice.php:554
#: ../sales/allocations/customer_allocation_main.php:99
#: ../sales/view/view_credit.php:91
#: ../sales/view/view_dispatch.php:113
#: ../sales/view/view_sales_order.php:179
#: ../sales/view/view_sales_order.php:220
#: ../sales/includes/ui/sales_credit_ui.inc:168
-#: ../sales/includes/ui/sales_order_ui.inc:147
+#: ../sales/includes/ui/sales_order_ui.inc:148
msgid "Total"
msgstr ""
-#: ../gl/gl_journal.php:32
+#: ../gl/gl_journal.php:33
#, php-format
msgid "Modifying Journal Transaction # %d."
msgstr ""
-#: ../gl/gl_journal.php:36
+#: ../gl/gl_journal.php:37
#: ../includes/sysnames.inc:22
#: ../includes/sysnames.inc:150
msgid "Journal Entry"
msgstr ""
-#: ../gl/gl_journal.php:56
+#: ../gl/gl_journal.php:57
msgid "Journal entry has been entered"
msgstr ""
-#: ../gl/gl_journal.php:58
-#: ../gl/gl_journal.php:73
+#: ../gl/gl_journal.php:59
+#: ../gl/gl_journal.php:74
msgid "&View this Journal Entry"
msgstr ""
-#: ../gl/gl_journal.php:61
+#: ../gl/gl_journal.php:62
msgid "Enter &New Journal Entry"
msgstr ""
-#: ../gl/gl_journal.php:71
+#: ../gl/gl_journal.php:72
msgid "Journal entry has been updated"
msgstr ""
-#: ../gl/gl_journal.php:75
+#: ../gl/gl_journal.php:76
msgid "Return to Journal &Inquiry"
msgstr ""
-#: ../gl/gl_journal.php:90
+#: ../gl/gl_journal.php:91
msgid ""
"You can edit directly only journal entries created via Journal Entry page."
msgstr ""
-#: ../gl/gl_journal.php:91
+#: ../gl/gl_journal.php:92
msgid "Entry &New Journal Entry"
msgstr ""
-#: ../gl/gl_journal.php:148
+#: ../gl/gl_journal.php:149
msgid "You must enter at least one journal line."
msgstr ""
-#: ../gl/gl_journal.php:154
+#: ../gl/gl_journal.php:155
#: ../includes/ui/gl_cart.inc:128
msgid ""
"The journal must balance (debits equal to credits) before it can be "
"processed."
msgstr ""
-#: ../gl/gl_journal.php:216
-#: ../gl/gl_journal.php:223
+#: ../gl/gl_journal.php:217
+#: ../gl/gl_journal.php:224
msgid "Dimension is closed."
msgstr ""
-#: ../gl/gl_journal.php:230
+#: ../gl/gl_journal.php:231
msgid "You must enter either a debit amount or a credit amount."
msgstr ""
-#: ../gl/gl_journal.php:237
+#: ../gl/gl_journal.php:238
msgid "The debit amount entered is not a valid number or is less than zero."
msgstr ""
-#: ../gl/gl_journal.php:242
+#: ../gl/gl_journal.php:243
msgid "The credit amount entered is not a valid number or is less than zero."
msgstr ""
-#: ../gl/gl_journal.php:248
-#: ../includes/ui/ui_view.inc.orig:674
-#: ../purchasing/supplier_credit.php:135
-#: ../purchasing/supplier_invoice.php:144
+#: ../gl/gl_journal.php:249
+#: ../includes/ui/ui_view.inc:733
+#: ../purchasing/supplier_credit.php:144
+#: ../purchasing/supplier_invoice.php:154
msgid "Cannot post to GL account used by more than one tax type."
msgstr ""
-#: ../gl/gl_journal.php:255
+#: ../gl/gl_journal.php:256
msgid ""
"You cannot make a journal entry for a bank account. Please use one of the "
"banking functions for bank transactions."
msgstr ""
-#: ../gl/gl_journal.php:334
+#: ../gl/gl_journal.php:335
msgid "Rows"
msgstr ""
-#: ../gl/gl_journal.php:340
+#: ../gl/gl_journal.php:341
msgid "Process Journal Entry"
msgstr ""
-#: ../gl/gl_journal.php:341
+#: ../gl/gl_journal.php:342
msgid "Process journal entry only if debits equal to credits"
msgstr ""
msgstr ""
#: ../gl/inquiry/bank_inquiry.php:124
-#: ../gl/inquiry/gl_account_inquiry.php:211
+#: ../gl/inquiry/gl_account_inquiry.php:213
+#: ../gl/inquiry/gl_trial_balance.php:233
#: ../reporting/rep601.php:157
#: ../reporting/rep602.php:157
#: ../reporting/rep704.php:192
msgid "Amount max:"
msgstr ""
-#: ../gl/inquiry/gl_account_inquiry.php:220
+#: ../gl/inquiry/gl_account_inquiry.php:222
msgid ""
"No general ledger transactions have been created for the specified criteria."
msgstr ""
msgstr ""
#: ../gl/inquiry/gl_trial_balance.php:61
+#: ../reporting/reports_main.php:394
+#: ../reporting/reports_main.php:444
+#: ../reporting/reports_main.php:489
msgid "Only balances"
msgstr ""
+#: ../gl/inquiry/gl_trial_balance.php:93
+#: ../gl/inquiry/gl_trial_balance.php:154
+#: ../reporting/rep706.php:308
+#: ../reporting/rep707.php:326
+#: ../reporting/rep708.php:51
+#: ../reporting/rep708.php:126
+#: ../sales/create_recurrent_invoices.php:134
+#: ../sales/manage/recurrent_invoices.php:102
+msgid "Group"
+msgstr ""
+
+#: ../gl/inquiry/gl_trial_balance.php:172
+msgid "The from date cannot be bigger than the fiscal year end."
+msgstr ""
+
+#: ../gl/inquiry/gl_trial_balance.php:185
+#: ../gl/manage/bank_accounts.php:109
+#: ../gl/view/gl_trans_view.php:68
+#: ../gl/view/gl_trans_view.php:71
+#: ../gl/view/gl_trans_view.php:74
+#: ../reporting/rep701.php:111
+#: ../reporting/rep702.php:53
+#: ../reporting/rep705.php:238
+#: ../reporting/rep706.php:185
+#: ../reporting/rep707.php:210
+#: ../reporting/rep708.php:192
+msgid "Account Name"
+msgstr ""
+
+#: ../gl/inquiry/gl_trial_balance.php:186
+#: ../reporting/rep708.php:185
+msgid "Brought Forward"
+msgstr ""
+
+#: ../gl/inquiry/gl_trial_balance.php:187
+#: ../reporting/rep708.php:185
+msgid "This Period"
+msgstr ""
+
+#: ../gl/inquiry/gl_trial_balance.php:206
+#: ../gl/manage/gl_account_types.php:128
+msgid "Class"
+msgstr ""
+
+#: ../gl/inquiry/gl_trial_balance.php:241
+#: ../reporting/rep708.php:283
+msgid ""
+"The Opening Balance is not in balance, probably due to a non closed Previous "
+"Fiscalyear."
+msgstr ""
+
#: ../gl/inquiry/journal_inquiry.php:27
msgid "Journal Inquiry"
msgstr ""
#: ../gl/inquiry/journal_inquiry.php:134
#: ../reporting/rep710.php:77
#: ../reporting/rep710.php:87
+#: ../reporting/reports_main.php:505
msgid "User"
msgstr ""
#: ../gl/inquiry/profit_loss.php:173
#: ../reporting/rep707.php:210
-#: ../reporting/includes/reports_classes.inc:245
+#: ../reporting/includes/reports_classes.inc:248
msgid "Accumulated"
msgstr ""
#: ../gl/inquiry/profit_loss.php:173
#: ../reporting/rep707.php:255
-#: ../reporting/includes/reports_classes.inc:245
+#: ../reporting/includes/reports_classes.inc:248
msgid "Period Y-1"
msgstr ""
#: ../gl/inquiry/profit_loss.php:173
#: ../reporting/rep707.php:246
-#: ../reporting/includes/reports_classes.inc:245
+#: ../reporting/includes/reports_classes.inc:248
msgid "Budget"
msgstr ""
#: ../gl/inquiry/profit_loss.php:174
+#: ../reporting/reports_main.php:381
+#: ../reporting/reports_main.php:432
+#: ../reporting/reports_main.php:478
msgid "Compare to"
msgstr ""
msgstr ""
#: ../gl/inquiry/tax_inquiry.php:82
-#: ../reporting/rep709.php:183
+#: ../reporting/rep709.php:188
msgid "Outputs"
msgstr ""
#: ../gl/inquiry/tax_inquiry.php:82
-#: ../reporting/rep709.php:183
+#: ../reporting/rep709.php:188
msgid "Inputs"
msgstr ""
msgstr ""
#: ../gl/inquiry/tax_inquiry.php:100
-#: ../reporting/rep709.php:183
+#: ../reporting/rep709.php:188
msgid "Output Tax"
msgstr ""
msgstr ""
#: ../gl/inquiry/tax_inquiry.php:106
-#: ../reporting/rep709.php:183
+#: ../reporting/rep709.php:188
msgid "Input Tax"
msgstr ""
msgstr ""
#: ../gl/inquiry/tax_inquiry.php:119
-#: ../reporting/rep709.php:214
+#: ../reporting/rep709.php:219
msgid "Total payable or refund"
msgstr ""
#: ../gl/manage/bank_accounts.php:16
+#: ../reporting/reports_main.php:317
+#: ../reporting/reports_main.php:325
msgid "Bank Accounts"
msgstr ""
msgid "Selected bank account has been deleted"
msgstr ""
-#: ../gl/manage/bank_accounts.php:109
-#: ../gl/view/gl_trans_view.php:68
-#: ../gl/view/gl_trans_view.php:71
-#: ../gl/view/gl_trans_view.php:74
-#: ../reporting/rep701.php:111
-#: ../reporting/rep702.php:53
-#: ../reporting/rep705.php:238
-#: ../reporting/rep706.php:185
-#: ../reporting/rep707.php:210
-#: ../reporting/rep708.php:192
-msgid "Account Name"
-msgstr ""
-
#: ../gl/manage/bank_accounts.php:109
#: ../gl/view/bank_transfer_view.php:69
#: ../gl/view/bank_transfer_view.php:78
#: ../gl/view/gl_deposit_view.php:66
#: ../gl/view/gl_payment_view.php:64
-#: ../inventory/prices.php:146
-#: ../inventory/purchasing_data.php:147
+#: ../inventory/prices.php:147
+#: ../inventory/purchasing_data.php:148
#: ../purchasing/view/view_supp_credit.php:49
#: ../purchasing/view/view_supp_invoice.php:54
-#: ../purchasing/inquiry/po_search_completed.php:126
-#: ../purchasing/inquiry/po_search_completed.php.orig:125
-#: ../purchasing/inquiry/po_search.php:136
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:132
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:142
+#: ../purchasing/inquiry/po_search_completed.php:129
+#: ../purchasing/inquiry/po_search.php:138
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:133
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:143
#: ../purchasing/inquiry/supplier_inquiry.php:73
#: ../purchasing/inquiry/supplier_inquiry.php:180
#: ../purchasing/inquiry/supplier_inquiry.php:192
#: ../reporting/rep203.php:101
#: ../reporting/rep205.php:150
#: ../sales/customer_credit_invoice.php:237
-#: ../sales/customer_delivery.php:354
-#: ../sales/customer_invoice.php:470
+#: ../sales/customer_delivery.php:364
+#: ../sales/customer_invoice.php:479
#: ../sales/allocations/customer_allocation_main.php:98
#: ../sales/allocations/customer_allocation_main.php:106
#: ../sales/view/view_credit.php:70
#: ../sales/view/view_dispatch.php:86
#: ../sales/view/view_invoice.php:86
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:151
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:161
+#: ../sales/inquiry/customer_allocation_inquiry.php:151
+#: ../sales/inquiry/customer_allocation_inquiry.php:161
#: ../sales/inquiry/customer_inquiry.php:76
-#: ../sales/inquiry/customer_inquiry.php.orig:76
-#: ../sales/inquiry/customer_inquiry.php.orig:208
-#: ../sales/inquiry/customer_inquiry.php.orig:221
-#: ../sales/inquiry/sales_deliveries_view.php:189
-#: ../sales/inquiry/sales_orders_view.php.orig:294
-#: ../sales/inquiry/sales_orders_view.php.orig:308
+#: ../sales/inquiry/customer_inquiry.php:208
+#: ../sales/inquiry/customer_inquiry.php:221
+#: ../sales/inquiry/sales_deliveries_view.php:191
+#: ../sales/inquiry/sales_orders_view.php:295
+#: ../sales/inquiry/sales_orders_view.php:309
msgid "Currency"
msgstr ""
msgstr ""
#: ../gl/manage/bank_accounts.php:110
-#: ../includes/ui/ui_view.inc.orig:488
+#: ../includes/ui/ui_view.inc:547
msgid "Number"
msgstr ""
#: ../gl/manage/exchange_rates.php:141
#: ../includes/ui/ui_view.inc:325
-#: ../includes/ui/ui_view.inc.orig:288
-#: ../includes/ui/ui_view.inc.orig:290
msgid "Exchange Rate:"
msgstr ""
msgid "Subgroup Of"
msgstr ""
-#: ../gl/manage/gl_account_types.php:128
-msgid "Class"
-msgstr ""
-
#: ../gl/manage/gl_account_types.php:187
msgid "ID:"
msgstr ""
msgstr ""
#: ../gl/manage/gl_quick_entries.php:329
-#: ../sales/customer_delivery.php:447
-#: ../sales/customer_invoice.php:542
-#: ../sales/customer_invoice.php:545
+#: ../sales/customer_delivery.php:457
+#: ../sales/customer_invoice.php:551
+#: ../sales/customer_invoice.php:554
msgid "Tax Type"
msgstr ""
#: ../reporting/reports_main.php:136
#: ../reporting/reports_main.php:143
#: ../reporting/reports_main.php:192
+#: ../reporting/reports_main.php:199
+#: ../reporting/reports_main.php:296
msgid "From"
msgstr ""
#: ../reporting/reports_main.php:137
#: ../reporting/reports_main.php:144
#: ../reporting/reports_main.php:193
+#: ../reporting/reports_main.php:200
+#: ../reporting/reports_main.php:297
msgid "To"
msgstr ""
#: ../gl/includes/db/gl_db_banking.inc:444
-#: ../purchasing/includes/db/invoice_db.inc.orig:136
+#: ../purchasing/includes/db/invoice_db.inc:136
msgid "Document reentered."
msgstr ""
#: ../gl/includes/ui/gl_journal_ui.inc:27
#: ../inventory/includes/item_adjustments_ui.inc:39
#: ../inventory/includes/stock_transfers_ui.inc:42
-#: ../manufacturing/work_order_add_finished.php:208
+#: ../manufacturing/work_order_add_finished.php:205
#: ../manufacturing/work_order_costs.php:133
#: ../purchasing/allocations/supplier_allocate.php:56
#: ../sales/allocations/customer_allocate.php:54
#: ../gl/includes/ui/gl_bank_ui.inc:64
#: ../inventory/purchasing_data.php:208
#: ../inventory/purchasing_data.php:212
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:80
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:88
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:90
-#: ../purchasing/includes/ui/po_ui.inc.orig:125
-#: ../purchasing/includes/ui/po_ui.inc.orig:130
+#: ../purchasing/includes/ui/invoice_ui.inc:95
+#: ../purchasing/includes/ui/invoice_ui.inc:103
+#: ../purchasing/includes/ui/invoice_ui.inc:105
+#: ../purchasing/includes/ui/po_ui.inc:137
+#: ../purchasing/includes/ui/po_ui.inc:142
msgid "Supplier:"
msgstr ""
#: ../gl/includes/ui/gl_bank_ui.inc:67
#: ../sales/manage/recurrent_invoices.php:169
#: ../sales/includes/ui/sales_credit_ui.inc:29
-#: ../sales/includes/ui/sales_order_ui.inc:285
+#: ../sales/includes/ui/sales_order_ui.inc:270
msgid "Customer:"
msgstr ""
#: ../gl/includes/ui/gl_bank_ui.inc:71
-#: ../sales/customer_payments.php.orig:363
+#: ../sales/customer_payments.php:348
#: ../sales/manage/recurrent_invoices.php:172
#: ../sales/includes/ui/sales_credit_ui.inc:37
-#: ../sales/includes/ui/sales_order_ui.inc:292
+#: ../sales/includes/ui/sales_order_ui.inc:277
msgid "Branch:"
msgstr ""
#: ../gl/includes/ui/gl_bank_ui.inc:85
#: ../gl/includes/ui/gl_bank_ui.inc:88
-#: ../sales/customer_payments.php.orig:372
+#: ../sales/customer_payments.php:364
msgid "This customer account is on hold."
msgstr ""
#: ../gl/includes/ui/gl_bank_ui.inc:101
#: ../gl/includes/ui/gl_journal_ui.inc:58
#: ../gl/includes/ui/gl_journal_ui.inc:62
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:251
+#: ../purchasing/includes/ui/invoice_ui.inc:266
msgid "Go"
msgstr ""
#: ../gl/includes/ui/gl_bank_ui.inc:187
#: ../includes/ui/simple_crud_class.inc:52
-#: ../inventory/includes/item_adjustments_ui.inc:88
-#: ../inventory/includes/stock_transfers_ui.inc:80
-#: ../manufacturing/includes/work_order_issue_ui.inc:59
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:542
-#: ../purchasing/includes/ui/po_ui.inc.orig:274
+#: ../inventory/includes/item_adjustments_ui.inc:92
+#: ../inventory/includes/stock_transfers_ui.inc:84
+#: ../manufacturing/includes/work_order_issue_ui.inc:64
+#: ../purchasing/includes/ui/invoice_ui.inc:557
+#: ../purchasing/includes/ui/po_ui.inc:276
#: ../sales/includes/ui/sales_credit_ui.inc:198
-#: ../sales/includes/ui/sales_order_ui.inc:210
+#: ../sales/includes/ui/sales_order_ui.inc:198
msgid "Edit document line"
msgstr ""
#: ../gl/includes/ui/gl_bank_ui.inc:189
#: ../includes/ui/simple_crud_class.inc:54
-#: ../inventory/includes/item_adjustments_ui.inc:90
-#: ../inventory/includes/stock_transfers_ui.inc:82
-#: ../manufacturing/includes/work_order_issue_ui.inc:61
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:305
-#: ../purchasing/includes/ui/po_ui.inc.orig:276
+#: ../inventory/includes/item_adjustments_ui.inc:94
+#: ../inventory/includes/stock_transfers_ui.inc:86
+#: ../manufacturing/includes/work_order_issue_ui.inc:66
+#: ../purchasing/includes/ui/invoice_ui.inc:320
+#: ../purchasing/includes/ui/po_ui.inc:278
#: ../sales/includes/ui/sales_credit_ui.inc:200
-#: ../sales/includes/ui/sales_order_ui.inc:212
+#: ../sales/includes/ui/sales_order_ui.inc:200
msgid "Remove line from document"
msgstr ""
#: ../gl/includes/ui/gl_bank_ui.inc:278
#: ../gl/includes/ui/gl_journal_ui.inc:258
#: ../includes/ui/simple_crud_class.inc:56
-#: ../inventory/includes/item_adjustments_ui.inc:158
-#: ../inventory/includes/stock_transfers_ui.inc:138
-#: ../manufacturing/includes/work_order_issue_ui.inc:132
-#: ../purchasing/includes/ui/po_ui.inc.orig:456
+#: ../inventory/includes/item_adjustments_ui.inc:164
+#: ../inventory/includes/stock_transfers_ui.inc:144
+#: ../manufacturing/includes/work_order_issue_ui.inc:139
+#: ../purchasing/includes/ui/po_ui.inc:460
#: ../sales/includes/ui/sales_credit_ui.inc:294
-#: ../sales/includes/ui/sales_order_ui.inc:562
+#: ../sales/includes/ui/sales_order_ui.inc:547
msgid "Confirm changes"
msgstr ""
#: ../gl/includes/ui/gl_bank_ui.inc:280
#: ../gl/includes/ui/gl_journal_ui.inc:260
#: ../includes/ui/simple_crud_class.inc:58
-#: ../inventory/includes/item_adjustments_ui.inc:160
-#: ../inventory/includes/stock_transfers_ui.inc:140
-#: ../manufacturing/includes/work_order_issue_ui.inc:134
-#: ../purchasing/includes/ui/po_ui.inc.orig:458
+#: ../inventory/includes/item_adjustments_ui.inc:166
+#: ../inventory/includes/stock_transfers_ui.inc:146
+#: ../manufacturing/includes/work_order_issue_ui.inc:141
+#: ../purchasing/includes/ui/po_ui.inc:462
#: ../sales/includes/ui/sales_credit_ui.inc:296
-#: ../sales/includes/ui/sales_order_ui.inc:564
+#: ../sales/includes/ui/sales_order_ui.inc:549
msgid "Cancel changes"
msgstr ""
#: ../gl/includes/ui/gl_bank_ui.inc:285
#: ../gl/includes/ui/gl_journal_ui.inc:264
-#: ../inventory/includes/item_adjustments_ui.inc:166
-#: ../inventory/includes/stock_transfers_ui.inc:146
-#: ../manufacturing/includes/work_order_issue_ui.inc:140
-#: ../purchasing/includes/ui/po_ui.inc.orig:464
+#: ../inventory/includes/item_adjustments_ui.inc:172
+#: ../inventory/includes/stock_transfers_ui.inc:152
+#: ../manufacturing/includes/work_order_issue_ui.inc:147
+#: ../purchasing/includes/ui/po_ui.inc:468
#: ../sales/includes/ui/sales_credit_ui.inc:302
-#: ../sales/includes/ui/sales_order_ui.inc:570
+#: ../sales/includes/ui/sales_order_ui.inc:555
msgid "Add Item"
msgstr ""
#: ../gl/includes/ui/gl_bank_ui.inc:286
-#: ../inventory/includes/item_adjustments_ui.inc:167
-#: ../inventory/includes/stock_transfers_ui.inc:147
-#: ../manufacturing/includes/work_order_issue_ui.inc:141
-#: ../purchasing/includes/ui/po_ui.inc.orig:465
+#: ../inventory/includes/item_adjustments_ui.inc:173
+#: ../inventory/includes/stock_transfers_ui.inc:153
+#: ../manufacturing/includes/work_order_issue_ui.inc:148
+#: ../purchasing/includes/ui/po_ui.inc:469
#: ../sales/includes/ui/sales_credit_ui.inc:303
-#: ../sales/includes/ui/sales_order_ui.inc:571
+#: ../sales/includes/ui/sales_order_ui.inc:556
msgid "Add new item to document"
msgstr ""
msgstr ""
#: ../includes/access_levels.inc:72
-#: ../inventory/manage/items.php.orig:353
+#: ../inventory/manage/items.php:352
+#: ../reporting/reports_main.php:301
msgid "Dimensions"
msgstr ""
#: ../includes/current_user.inc:102
#: ../includes/ui/ui_controls.inc:197
-#: ../includes/ui/ui_view.inc.orig:845
+#: ../includes/ui/ui_view.inc:904
msgid "Back"
msgstr ""
msgid "System is available for site admin only until full database upgrade"
msgstr ""
-#: ../includes/current_user.inc:544
+#: ../includes/current_user.inc:163
+msgid "New password for"
+msgstr ""
+
+#: ../includes/current_user.inc:570
msgid "Requesting data..."
msgstr ""
msgid "You have no edit access to transactions created by other users."
msgstr ""
-#: ../includes/errors.inc:125
+#: ../includes/errors.inc:126
msgid "in file"
msgstr ""
-#: ../includes/errors.inc:125
+#: ../includes/errors.inc:126
msgid "at line "
msgstr ""
-#: ../includes/errors.inc:179
+#: ../includes/errors.inc:180
msgid "Debug mode database warning:"
msgstr ""
-#: ../includes/errors.inc:181
+#: ../includes/errors.inc:182
msgid "DATABASE ERROR :"
msgstr ""
-#: ../includes/errors.inc:212
+#: ../includes/errors.inc:217
msgid ""
"The entered information is a duplicate. Please go back and enter different "
"values."
msgstr ""
#: ../includes/session.inc:136
-#: ../includes/session.inc.orig:132
msgid "Incorrect Password"
msgstr ""
#: ../includes/session.inc:137
-#: ../includes/session.inc.orig:133
msgid "The user and password combination is not valid for the system."
msgstr ""
#: ../includes/session.inc:139
-#: ../includes/session.inc.orig:135
+#: ../includes/session.inc:154
msgid ""
"If you are not an authorized user, please contact your system administrator "
"to obtain an account to enable you to use the system."
msgstr ""
#: ../includes/session.inc:140
-#: ../includes/session.inc.orig:136
+#: ../includes/session.inc:155
msgid "Try again"
msgstr ""
-#: ../includes/session.inc:180
-#: ../includes/session.inc.orig:176
+#: ../includes/session.inc:151
+msgid "Incorrect Email"
+msgstr ""
+
+#: ../includes/session.inc:152
+msgid "The email address does not exist in the system."
+msgstr ""
+
+#: ../includes/session.inc:166
+msgid "New password sent"
+msgstr ""
+
+#: ../includes/session.inc:167
+msgid "A new password has been sent to your mailbox."
+msgstr ""
+
+#: ../includes/session.inc:169
+msgid "Login here"
+msgstr ""
+
+#: ../includes/session.inc:209
#, php-format
msgid ""
"Brute force attack on account '%s' detected. Access for non-logged users "
"temporarily blocked."
msgstr ""
-#: ../includes/session.inc:211
-#: ../includes/session.inc.orig:207
+#: ../includes/session.inc:240
msgid "Security settings have not been defined for your user account."
msgstr ""
-#: ../includes/session.inc:212
-#: ../includes/session.inc.orig:208
+#: ../includes/session.inc:241
msgid "Please contact your system administrator."
msgstr ""
-#: ../includes/session.inc:213
-#: ../includes/session.inc.orig:209
+#: ../includes/session.inc:242
msgid ""
"Please remove $security_groups and $security_headings arrays from config.php "
"file!"
msgstr ""
-#: ../includes/session.inc:215
-#: ../includes/session.inc.orig:211
+#: ../includes/session.inc:244
msgid ""
"Access to application has been blocked until database upgrade is completed "
"by system administrator."
msgstr ""
-#: ../includes/session.inc:229
-#: ../includes/session.inc.orig:225
+#: ../includes/session.inc:258
msgid ""
"The security settings on your account do not permit you to access this "
"function"
msgstr ""
-#: ../includes/session.inc:238
-#: ../includes/session.inc.orig:234
+#: ../includes/session.inc:267
msgid ""
"System is blocked after source upgrade until database is updated on System/"
"Software Upgrade page"
msgstr ""
#: ../includes/sysnames.inc:32
-#: ../purchasing/includes/ui/po_ui.inc.orig:330
+#: ../purchasing/includes/ui/po_ui.inc:332
#: ../purchasing/view/view_po.php:30
msgid "Purchase Order"
msgstr ""
msgstr ""
#: ../includes/sysnames.inc:40
-#: ../sales/inquiry/sales_orders_view.php.orig:151
-#: ../sales/inquiry/sales_orders_view.php.orig:173
+#: ../sales/inquiry/sales_orders_view.php:151
+#: ../sales/inquiry/sales_orders_view.php:173
msgid "Sales Order"
msgstr ""
#: ../includes/sysnames.inc:41
-#: ../sales/sales_order_entry.php:653
+#: ../sales/sales_order_entry.php:658
msgid "Sales Quotation"
msgstr ""
msgstr ""
#: ../includes/sysnames.inc:54
-#: ../sales/customer_invoice.php:547
+#: ../sales/customer_invoice.php:556
msgid "DN"
msgstr ""
#: ../reporting/reports_main.php:45
#: ../reporting/reports_main.php:102
#: ../reporting/reports_main.php:121
+#: ../reporting/reports_main.php:237
#: ../sales/create_recurrent_invoices.php:134
#: ../sales/customer_credit_invoice.php:235
-#: ../sales/customer_delivery.php:352
-#: ../sales/customer_invoice.php:446
+#: ../sales/customer_delivery.php:362
+#: ../sales/customer_invoice.php:455
#: ../sales/allocations/customer_allocation_main.php:97
#: ../sales/allocations/customer_allocation_main.php:105
#: ../sales/manage/recurrent_invoices.php:102
#: ../sales/view/view_credit.php:47
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:150
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:160
-#: ../sales/inquiry/customer_inquiry.php.orig:206
-#: ../sales/inquiry/customer_inquiry.php.orig:220
-#: ../sales/inquiry/sales_deliveries_view.php:180
-#: ../sales/inquiry/sales_orders_view.php.orig:286
-#: ../sales/inquiry/sales_orders_view.php.orig:300
+#: ../sales/inquiry/customer_allocation_inquiry.php:150
+#: ../sales/inquiry/customer_allocation_inquiry.php:160
+#: ../sales/inquiry/customer_inquiry.php:206
+#: ../sales/inquiry/customer_inquiry.php:220
+#: ../sales/inquiry/sales_deliveries_view.php:182
+#: ../sales/inquiry/sales_orders_view.php:287
+#: ../sales/inquiry/sales_orders_view.php:301
msgid "Customer"
msgstr ""
#: ../includes/sysnames.inc:97
#: ../includes/sysnames.inc:173
#: ../includes/sysnames.inc:196
-#: ../inventory/purchasing_data.php:147
+#: ../inventory/purchasing_data.php:148
#: ../purchasing/includes/ui/grn_ui.inc:20
#: ../purchasing/includes/ui/grn_ui.inc:52
-#: ../purchasing/includes/ui/po_ui.inc.orig:323
+#: ../purchasing/includes/ui/po_ui.inc:325
#: ../purchasing/view/view_supp_credit.php:42
#: ../purchasing/view/view_supp_invoice.php:46
-#: ../purchasing/inquiry/po_search_completed.php:122
-#: ../purchasing/inquiry/po_search_completed.php.orig:121
-#: ../purchasing/inquiry/po_search.php:132
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:128
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:141
+#: ../purchasing/inquiry/po_search_completed.php:125
+#: ../purchasing/inquiry/po_search.php:134
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:129
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:142
#: ../purchasing/inquiry/supplier_inquiry.php:176
#: ../purchasing/inquiry/supplier_inquiry.php:191
#: ../purchasing/allocations/supplier_allocation_main.php:98
#: ../reporting/reports_main.php:162
#: ../reporting/reports_main.php:173
#: ../reporting/reports_main.php:180
+#: ../reporting/reports_main.php:252
msgid "Supplier"
msgstr ""
#: ../includes/sysnames.inc:157
#: ../manufacturing/search_work_orders.php:165
#: ../manufacturing/includes/manufacturing_ui.inc:278
+#: ../reporting/rep402.php:103
msgid "Manufactured"
msgstr ""
msgstr ""
#: ../includes/sysnames.inc:200
-#: ../includes/ui/ui_view.inc.orig:842
+#: ../includes/ui/ui_view.inc:901
msgid "May"
msgstr ""
#: ../includes/system_tests.inc:15
#: ../includes/ui/ui_view.inc:210
-#: ../includes/ui/ui_view.inc.orig:210
#: ../reporting/rep705.php:254
#: ../reporting/rep705.php:265
#: ../reporting/rep705.php:274
#: ../includes/system_tests.inc:420
#: ../includes/ui/view_package.php:47
#: ../reporting/rep204.php:85
-#: ../reporting/rep301.php:105
-#: ../reporting/rep308.php:150
+#: ../reporting/rep301.php:169
+#: ../reporting/rep308.php:231
msgid "Value"
msgstr ""
#: ../reporting/reports_main.php:176
#: ../reporting/reports_main.php:181
#: ../reporting/reports_main.php:188
+#: ../reporting/reports_main.php:196
+#: ../reporting/reports_main.php:203
+#: ../reporting/reports_main.php:212
+#: ../reporting/reports_main.php:218
+#: ../reporting/reports_main.php:229
+#: ../reporting/reports_main.php:238
+#: ../reporting/reports_main.php:244
+#: ../reporting/reports_main.php:254
+#: ../reporting/reports_main.php:262
+#: ../reporting/reports_main.php:270
+#: ../reporting/reports_main.php:277
+#: ../reporting/reports_main.php:285
+#: ../reporting/reports_main.php:292
+#: ../reporting/reports_main.php:299
+#: ../reporting/reports_main.php:308
+#: ../reporting/reports_main.php:321
+#: ../reporting/reports_main.php:328
+#: ../reporting/reports_main.php:334
+#: ../reporting/reports_main.php:341
+#: ../reporting/reports_main.php:356
+#: ../reporting/reports_main.php:364
+#: ../reporting/reports_main.php:375
+#: ../reporting/reports_main.php:387
+#: ../reporting/reports_main.php:397
+#: ../reporting/reports_main.php:409
+#: ../reporting/reports_main.php:416
+#: ../reporting/reports_main.php:426
+#: ../reporting/reports_main.php:437
+#: ../reporting/reports_main.php:446
+#: ../reporting/reports_main.php:457
+#: ../reporting/reports_main.php:463
+#: ../reporting/reports_main.php:472
+#: ../reporting/reports_main.php:482
+#: ../reporting/reports_main.php:490
+#: ../reporting/reports_main.php:498
+#: ../reporting/reports_main.php:506
#: ../reporting/includes/excel_report.inc:295
#: ../reporting/includes/excel_report.inc:428
#: ../reporting/includes/pdf_report.inc:346
-#: ../reporting/includes/pdf_report.inc:619
+#: ../reporting/includes/pdf_report.inc:618
#: ../sales/view/view_sales_order.php:98
msgid "Comments"
msgstr ""
"trail record."
msgstr ""
-#: ../includes/db/inventory_db.inc:253
+#: ../includes/db/inventory_db.inc:284
#: ../inventory/includes/db/items_trans_db.inc:66
#, php-format
msgid "Cost was %s changed to %s x quantity on hand for item '%s'"
msgstr ""
-#: ../includes/db/inventory_db.inc:294
-#: ../includes/db/inventory_db.inc.orig:292
+#: ../includes/db/inventory_db.inc:325
msgid "Zero/negative inventory handling"
msgstr ""
-#: ../includes/db/inventory_db.inc.orig:252
-msgid "Cost was "
-msgstr ""
-
-#: ../includes/db/inventory_db.inc.orig:252
-msgid " changed to "
-msgstr ""
-
-#: ../includes/db/inventory_db.inc.orig:252
-msgid " for item "
+#: ../includes/ui/allocation_cart.inc:288
+#, php-format
+msgid "Allocated amounts in %s:"
msgstr ""
-#: ../includes/ui/allocation_cart.inc.orig:264
+#: ../includes/ui/allocation_cart.inc:290
#: ../purchasing/allocations/supplier_allocation_main.php:94
#: ../sales/allocations/customer_allocation_main.php:93
msgid "Transaction Type"
msgstr ""
-#: ../includes/ui/allocation_cart.inc.orig:264
+#: ../includes/ui/allocation_cart.inc:290
+msgid "Supplier Ref"
+msgstr ""
+
+#: ../includes/ui/allocation_cart.inc:290
#: ../reporting/rep704.php:83
#: ../reporting/rep704.php:86
#: ../reporting/rep704.php:89
-#: ../reporting/rep709.php:111
+#: ../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/inquiry/sales_orders_view.php.orig:248
-#: ../sales/inquiry/sales_orders_view.php.orig:285
-#: ../sales/inquiry/sales_orders_view.php.orig:299
+#: ../sales/inquiry/sales_orders_view.php:248
+#: ../sales/inquiry/sales_orders_view.php:286
+#: ../sales/inquiry/sales_orders_view.php:300
msgid "Ref"
msgstr ""
-#: ../includes/ui/allocation_cart.inc.orig:265
+#: ../includes/ui/allocation_cart.inc:291
msgid "Other Allocations"
msgstr ""
-#: ../includes/ui/allocation_cart.inc.orig:265
-#: ../includes/ui/ui_view.inc.orig:489
-#: ../reporting/includes/doctext.inc:167
-#: ../reporting/includes/doctext.inc:208
-msgid "This Allocation"
-msgstr ""
-
-#: ../includes/ui/allocation_cart.inc.orig:265
-#: ../includes/ui/allocation_cart.inc.orig:314
-#: ../includes/ui/ui_view.inc.orig:489
+#: ../includes/ui/allocation_cart.inc:291
+#: ../includes/ui/allocation_cart.inc:344
+#: ../includes/ui/ui_view.inc:548
#: ../purchasing/allocations/supplier_allocation_main.php:101
#: ../reporting/rep112.php:145
#: ../reporting/rep210.php:152
msgid "Left to Allocate"
msgstr ""
-#: ../includes/ui/allocation_cart.inc.orig:297
+#: ../includes/ui/allocation_cart.inc:291
+#: ../includes/ui/ui_view.inc:548
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
+msgid "This Allocation"
+msgstr ""
+
+#: ../includes/ui/allocation_cart.inc:324
#: ../reporting/rep112.php:142
#: ../reporting/rep210.php:149
msgid "Total Allocated"
msgstr ""
-#: ../includes/ui/allocation_cart.inc.orig:334
+#: ../includes/ui/allocation_cart.inc:366
msgid "The entry for one or more amounts is invalid or negative."
msgstr ""
-#: ../includes/ui/allocation_cart.inc.orig:343
+#: ../includes/ui/allocation_cart.inc:377
msgid "At least one transaction is overallocated."
msgstr ""
-#: ../includes/ui/allocation_cart.inc.orig:361
+#: ../includes/ui/allocation_cart.inc:396
msgid ""
"These allocations cannot be processed because the amount allocated is more "
"than the total amount left to allocate."
#: ../includes/ui/contacts_view.inc:41
#: ../reporting/rep103.php:266
#: ../reporting/rep205.php:184
-#: ../reporting/includes/header2.inc:104
+#: ../reporting/includes/header2.inc:107
#: ../sales/manage/sales_people.php:99
msgid "Fax"
msgstr ""
msgstr ""
#: ../includes/ui/contacts_view.inc:102
-#: ../sales/manage/customers.php:255
-#: ../sales/manage/sav.customers.php:252
+#: ../sales/manage/customers.php:256
msgid "Phone:"
msgstr ""
#: ../includes/ui/contacts_view.inc:105
#: ../inventory/manage/locations.php:207
-#: ../purchasing/manage/suppliers.php:139
-#: ../purchasing/manage/suppliers.php.orig:139
+#: ../purchasing/manage/suppliers.php:141
#: ../sales/manage/customer_branches.php:265
-#: ../sales/manage/customers.php:258
+#: ../sales/manage/customers.php:259
#: ../sales/manage/sales_people.php:158
-#: ../sales/manage/sav.customers.php:255
msgid "E-mail:"
msgstr ""
#: ../includes/ui/contacts_view.inc:110
-#: ../purchasing/manage/suppliers.php:140
-#: ../purchasing/manage/suppliers.php.orig:140
+#: ../purchasing/manage/suppliers.php:142
#: ../sales/manage/customer_branches.php:266
msgid "Document Language:"
msgstr ""
msgid "to continue"
msgstr ""
-#: ../includes/ui/ui_controls.inc:194
-msgid "View Attachment"
-msgstr ""
-
#: ../includes/ui/ui_controls.inc:197
msgid "Close"
msgstr ""
#: ../includes/ui/ui_controls.inc:459
#: ../sales/manage/customers.php:23
-#: ../sales/manage/sav.customers.php:23
msgid "Customers"
msgstr ""
#: ../includes/ui/ui_controls.inc:463
#: ../purchasing/manage/suppliers.php:22
-#: ../purchasing/manage/suppliers.php.orig:22
msgid "Suppliers"
msgstr ""
#: ../includes/ui/ui_controls.inc:465
-#: ../inventory/transfers.php:228
+#: ../inventory/transfers.php:224
#: ../inventory/manage/items.php:22
-#: ../inventory/manage/items.php.orig:22
+#: ../reporting/rep402.php:108
+#: ../reporting/reports_main.php:253
+#: ../reporting/reports_main.php:289
msgid "Items"
msgstr ""
msgstr ""
#: ../includes/ui/ui_input.inc:632
-#: ../reporting/includes/reports_classes.inc:219
+#: ../reporting/includes/reports_classes.inc:222
msgid "Click Here to Pick up the date"
msgstr ""
#: ../includes/ui/ui_input.inc:916
-#: ../includes/ui/ui_lists.inc:2160
-#: ../reporting/rep301.php:155
+#: ../includes/ui/ui_lists.inc:2162
+#: ../reporting/rep301.php:229
#: ../reporting/rep302.php:170
#: ../reporting/rep303.php:184
#: ../reporting/rep304.php:170
msgid "Enter description fragment to search or * for all"
msgstr ""
-#: ../includes/ui/ui_lists.inc:453
-#: ../includes/ui/ui_lists.inc:1389
+#: ../includes/ui/ui_lists.inc:454
+#: ../includes/ui/ui_lists.inc:1391
msgid "All Suppliers"
msgstr ""
-#: ../includes/ui/ui_lists.inc:457
+#: ../includes/ui/ui_lists.inc:458
msgid "Press Space tab to filter by name fragment"
msgstr ""
-#: ../includes/ui/ui_lists.inc:458
+#: ../includes/ui/ui_lists.inc:459
msgid "Select supplier"
msgstr ""
-#: ../includes/ui/ui_lists.inc:505
+#: ../includes/ui/ui_lists.inc:507
msgid "All Customers"
msgstr ""
-#: ../includes/ui/ui_lists.inc:509
+#: ../includes/ui/ui_lists.inc:511
msgid "Press Space tab to filter by name fragment; F2 - entry new customer"
msgstr ""
-#: ../includes/ui/ui_lists.inc:510
+#: ../includes/ui/ui_lists.inc:512
msgid "Select customer"
msgstr ""
-#: ../includes/ui/ui_lists.inc:557
+#: ../includes/ui/ui_lists.inc:559
msgid "All branches"
msgstr ""
-#: ../includes/ui/ui_lists.inc:560
+#: ../includes/ui/ui_lists.inc:562
msgid "Select customer branch"
msgstr ""
-#: ../includes/ui/ui_lists.inc:600
+#: ../includes/ui/ui_lists.inc:602
msgid "All Locations"
msgstr ""
-#: ../includes/ui/ui_lists.inc:752
-#: ../includes/ui/ui_lists.inc:820
+#: ../includes/ui/ui_lists.inc:754
+#: ../includes/ui/ui_lists.inc:822
msgid "All Items"
msgstr ""
-#: ../includes/ui/ui_lists.inc:1296
+#: ../includes/ui/ui_lists.inc:1298
msgid "All Sales Types"
msgstr ""
-#: ../includes/ui/ui_lists.inc:1633
+#: ../includes/ui/ui_lists.inc:1635
msgid "Use Item Sales Accounts"
msgstr ""
-#: ../includes/ui/ui_lists.inc:1944
-#: ../includes/ui/ui_lists.inc:1961
-#: ../includes/ui/ui_lists.inc:1978
+#: ../includes/ui/ui_lists.inc:1946
+#: ../includes/ui/ui_lists.inc:1963
+#: ../includes/ui/ui_lists.inc:1980
msgid "All Types"
msgstr ""
-#: ../includes/ui/ui_lists.inc:1945
+#: ../includes/ui/ui_lists.inc:1947
#: ../sales/view/view_sales_order.php:140
msgid "Sales Invoices"
msgstr ""
-#: ../includes/ui/ui_lists.inc:1946
-#: ../includes/ui/ui_lists.inc:1963
-#: ../includes/ui/ui_lists.inc:1981
+#: ../includes/ui/ui_lists.inc:1948
+#: ../includes/ui/ui_lists.inc:1965
+#: ../includes/ui/ui_lists.inc:1983
msgid "Overdue Invoices"
msgstr ""
-#: ../includes/ui/ui_lists.inc:1947
-#: ../includes/ui/ui_lists.inc:1964
-#: ../includes/ui/ui_lists.inc:1982
-#: ../includes/ui/ui_view.inc.orig:551
-#: ../includes/ui/ui_view.inc.orig:555
+#: ../includes/ui/ui_lists.inc:1949
+#: ../includes/ui/ui_lists.inc:1966
+#: ../includes/ui/ui_lists.inc:1984
+#: ../includes/ui/ui_view.inc:610
+#: ../includes/ui/ui_view.inc:614
msgid "Payments"
msgstr ""
-#: ../includes/ui/ui_lists.inc:1948
-#: ../includes/ui/ui_lists.inc:1965
-#: ../includes/ui/ui_lists.inc:1983
+#: ../includes/ui/ui_lists.inc:1950
+#: ../includes/ui/ui_lists.inc:1967
+#: ../includes/ui/ui_lists.inc:1985
#: ../sales/view/view_sales_order.php:176
msgid "Credit Notes"
msgstr ""
-#: ../includes/ui/ui_lists.inc:1949
+#: ../includes/ui/ui_lists.inc:1951
#: ../sales/view/view_sales_order.php:106
msgid "Delivery Notes"
msgstr ""
-#: ../includes/ui/ui_lists.inc:1962
-#: ../includes/ui/ui_lists.inc:1980
+#: ../includes/ui/ui_lists.inc:1964
+#: ../includes/ui/ui_lists.inc:1982
msgid "Invoices"
msgstr ""
-#: ../includes/ui/ui_lists.inc:1966
-#: ../includes/ui/ui_lists.inc:1984
+#: ../includes/ui/ui_lists.inc:1968
+#: ../includes/ui/ui_lists.inc:1986
msgid "Overdue Credit Notes"
msgstr ""
-#: ../includes/ui/ui_lists.inc:1979
+#: ../includes/ui/ui_lists.inc:1981
msgid "GRNs"
msgstr ""
-#: ../includes/ui/ui_lists.inc:1997
+#: ../includes/ui/ui_lists.inc:1999
msgid "Automatically put balance on back order"
msgstr ""
-#: ../includes/ui/ui_lists.inc:1998
+#: ../includes/ui/ui_lists.inc:2000
msgid "Cancel any quantites not delivered"
msgstr ""
-#: ../includes/ui/ui_lists.inc:2015
+#: ../includes/ui/ui_lists.inc:2017
msgid "Items Returned to Inventory Location"
msgstr ""
-#: ../includes/ui/ui_lists.inc:2016
+#: ../includes/ui/ui_lists.inc:2018
msgid "Items Written Off"
msgstr ""
-#: ../includes/ui/ui_lists.inc:2186
+#: ../includes/ui/ui_lists.inc:2188
msgid "New role"
msgstr ""
-#: ../includes/ui/ui_lists.inc:2238
+#: ../includes/ui/ui_lists.inc:2240
msgid "No tags defined."
msgstr ""
-#: ../includes/ui/ui_lists.inc:2238
+#: ../includes/ui/ui_lists.inc:2240
msgid "No active tags defined."
msgstr ""
-#: ../includes/ui/ui_lists.inc:2276
+#: ../includes/ui/ui_lists.inc:2278
#, php-format
msgid "Activated for '%s'"
msgstr ""
-#: ../includes/ui/ui_lists.inc:2279
+#: ../includes/ui/ui_lists.inc:2281
msgid "Available and/or installed"
msgstr ""
-#: ../includes/ui/ui_lists.inc:2349
+#: ../includes/ui/ui_lists.inc:2351
msgid "Standard new company American COA (4 digit)"
msgstr ""
-#: ../includes/ui/ui_lists.inc:2351
+#: ../includes/ui/ui_lists.inc:2353
msgid "Standard American COA (4 digit) with demo data"
msgstr ""
-#: ../includes/ui/ui_lists.inc:2372
+#: ../includes/ui/ui_lists.inc:2374
msgid "No payment Link"
msgstr ""
msgstr ""
#: ../includes/ui/ui_view.inc:342
-#: ../includes/ui/ui_view.inc.orig:306
msgid "Date Voided:"
msgstr ""
#: ../includes/ui/ui_view.inc:443
-#: ../includes/ui/ui_view.inc.orig:407
-#: ../reporting/rep109.php:181
+#: ../reporting/rep107.php:256
+#: ../reporting/rep109.php:186
#: ../reporting/rep110.php:184
-#: ../reporting/rep111.php:164
+#: ../reporting/rep111.php:183
#: ../reporting/rep113.php:169
#: ../reporting/rep209.php:186
msgid "Total Tax Excluded"
#: ../includes/ui/ui_view.inc:468
#: ../includes/ui/ui_view.inc:492
#: ../includes/ui/ui_view.inc:509
-#: ../includes/ui/ui_view.inc.orig:413
-#: ../includes/ui/ui_view.inc.orig:432
-#: ../includes/ui/ui_view.inc.orig:451
-#: ../reporting/rep109.php:190
+#: ../reporting/rep107.php:265
+#: ../reporting/rep109.php:195
#: ../reporting/rep110.php:193
-#: ../reporting/rep111.php:173
+#: ../reporting/rep111.php:192
#: ../reporting/rep113.php:178
#: ../reporting/rep209.php:195
msgid "Included"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:488
+#: ../includes/ui/ui_view.inc:547
#: ../reporting/includes/doctext.inc:167
#: ../reporting/includes/doctext.inc:208
msgid "Total Amount"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:512
+#: ../includes/ui/ui_view.inc:571
msgid "Total Allocated:"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:518
+#: ../includes/ui/ui_view.inc:577
msgid "Left to Allocate:"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:534
-#: ../includes/ui/ui_view.inc.orig:538
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:99
+#: ../includes/ui/ui_view.inc:593
+#: ../includes/ui/ui_view.inc:597
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:100
msgid "Allocations"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:551
-#: ../includes/ui/ui_view.inc.orig:555
+#: ../includes/ui/ui_view.inc:610
+#: ../includes/ui/ui_view.inc:614
msgid "Pre-Payments"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:571
+#: ../includes/ui/ui_view.inc:630
msgid "No Quick Entries are defined."
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:599
+#: ../includes/ui/ui_view.inc:658
msgid "No Quick Entry lines are defined."
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:781
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:473
+#: ../includes/ui/ui_view.inc:840
+#: ../purchasing/includes/ui/invoice_ui.inc:488
msgid "and"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:842
+#: ../includes/ui/ui_view.inc:901
msgid "January"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:842
+#: ../includes/ui/ui_view.inc:901
msgid "February"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:842
+#: ../includes/ui/ui_view.inc:901
msgid "March"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:842
+#: ../includes/ui/ui_view.inc:901
msgid "April"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:842
+#: ../includes/ui/ui_view.inc:901
msgid "June"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:842
+#: ../includes/ui/ui_view.inc:901
msgid "July"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:842
+#: ../includes/ui/ui_view.inc:901
msgid "August"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:842
+#: ../includes/ui/ui_view.inc:901
msgid "September"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:842
+#: ../includes/ui/ui_view.inc:901
msgid "October"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:842
+#: ../includes/ui/ui_view.inc:901
msgid "November"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:842
+#: ../includes/ui/ui_view.inc:901
msgid "December"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:843
+#: ../includes/ui/ui_view.inc:902
msgid "Su"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:843
+#: ../includes/ui/ui_view.inc:902
msgid "Mo"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:843
+#: ../includes/ui/ui_view.inc:902
msgid "Tu"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:843
+#: ../includes/ui/ui_view.inc:902
msgid "We"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:843
+#: ../includes/ui/ui_view.inc:902
msgid "Th"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:843
+#: ../includes/ui/ui_view.inc:902
msgid "Fr"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:843
+#: ../includes/ui/ui_view.inc:902
msgid "Sa"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:844
+#: ../includes/ui/ui_view.inc:903
msgid "W"
msgstr ""
msgstr ""
#: ../inventory/adjustments.php:88
-#: ../inventory/transfers.php:85
-#: ../sales/sales_order_entry.php:370
+#: ../inventory/transfers.php:84
+#: ../sales/sales_order_entry.php:376
msgid "You must enter at least one non empty item line."
msgstr ""
msgid "The entered date for the adjustment is invalid."
msgstr ""
-#: ../inventory/adjustments.php:122
+#: ../inventory/adjustments.php:124
msgid ""
-"The adjustment cannot be processed because an adjustment item would cause a "
-"negative inventory balance :"
+"The adjustment cannot be processed because it would cause negative inventory "
+"balance for marked items as of document date or later."
msgstr ""
-#: ../inventory/adjustments.php:152
-#: ../manufacturing/work_order_issue.php:141
+#: ../inventory/adjustments.php:153
+#: ../manufacturing/work_order_issue.php.orig:141
msgid "The quantity entered is negative or invalid."
msgstr ""
-#: ../inventory/adjustments.php:159
-#: ../manufacturing/work_order_issue.php:148
+#: ../inventory/adjustments.php:160
+#: ../manufacturing/work_order_issue.php.orig:148
msgid "The entered standard cost is negative or invalid."
msgstr ""
-#: ../inventory/adjustments.php:228
+#: ../inventory/adjustments.php:229
msgid "Adjustment Items"
msgstr ""
-#: ../inventory/adjustments.php:234
+#: ../inventory/adjustments.php:235
msgid "Process Adjustment"
msgstr ""
-#: ../inventory/cost_update.php:31
+#: ../inventory/cost_update.php:29
msgid "Inventory Item Cost Update"
msgstr ""
-#: ../inventory/cost_update.php:36
+#: ../inventory/cost_update.php:33
msgid ""
"There are no costable inventory items defined in the system (Purchased or "
"manufactured items)."
msgstr ""
-#: ../inventory/cost_update.php:57
+#: ../inventory/cost_update.php:54
msgid "The entered cost is not numeric."
msgstr ""
-#: ../inventory/cost_update.php:63
+#: ../inventory/cost_update.php:60
msgid "The new cost is the same as the old cost. Cost was not updated."
msgstr ""
-#: ../inventory/cost_update.php:73
+#: ../inventory/cost_update.php:70
msgid "Cost has been updated."
msgstr ""
-#: ../inventory/cost_update.php:77
+#: ../inventory/cost_update.php:74
msgid "View the GL Journal Entries for this Cost Update"
msgstr ""
-#: ../inventory/cost_update.php:95
-#: ../inventory/prices.php:61
-#: ../inventory/purchasing_data.php:117
-#: ../inventory/reorder_level.php:48
+#: ../inventory/cost_update.php:94
+#: ../inventory/prices.php:62
+#: ../inventory/purchasing_data.php:118
+#: ../inventory/reorder_level.php:50
#: ../inventory/inquiry/stock_movements.php:49
#: ../inventory/inquiry/stock_status.php:41
-#: ../inventory/inquiry/stock_status.php.orig:47
#: ../inventory/manage/item_codes.php:105
-#: ../manufacturing/work_order_entry.php:396
-#: ../manufacturing/work_order_entry.php:401
+#: ../manufacturing/work_order_entry.php:394
+#: ../manufacturing/work_order_entry.php:399
#: ../purchasing/inquiry/po_search.php:74
#: ../sales/inquiry/sales_deliveries_view.php:114
-#: ../sales/inquiry/sales_orders_view.php.orig:263
+#: ../sales/inquiry/sales_orders_view.php:263
msgid "Item:"
msgstr ""
-#: ../inventory/cost_update.php:116
+#: ../inventory/cost_update.php:115
msgid "Standard Material Cost Per Unit"
msgstr ""
-#: ../inventory/cost_update.php:125
+#: ../inventory/cost_update.php:123
msgid "Standard Labour Cost Per Unit"
msgstr ""
-#: ../inventory/cost_update.php:126
+#: ../inventory/cost_update.php:124
msgid "Standard Overhead Cost Per Unit"
msgstr ""
-#: ../inventory/prices.php:26
+#: ../inventory/prices.php:25
msgid "Inventory Item Sales prices"
msgstr ""
-#: ../inventory/prices.php:30
+#: ../inventory/prices.php:29
#: ../inventory/inquiry/stock_movements.php:29
#: ../inventory/inquiry/stock_status.php:32
-#: ../inventory/inquiry/stock_status.php.orig:37
#: ../inventory/manage/sales_kits.php:24
#: ../manufacturing/inquiry/where_used_inquiry.php:21
#: ../sales/credit_note_entry.php:49
msgid "There are no items defined in the system."
msgstr ""
-#: ../inventory/prices.php:32
+#: ../inventory/prices.php:31
msgid ""
"There are no sales types in the system. Please set up sales types befor "
"entering pricing."
msgstr ""
-#: ../inventory/prices.php:77
+#: ../inventory/prices.php:78
msgid "The price entered must be numeric."
msgstr ""
-#: ../inventory/prices.php:83
+#: ../inventory/prices.php:84
msgid ""
"The sales pricing for this item, sales type and currency has already been "
"added."
msgstr ""
-#: ../inventory/prices.php:96
+#: ../inventory/prices.php:97
msgid "This price has been updated."
msgstr ""
-#: ../inventory/prices.php:104
+#: ../inventory/prices.php:105
msgid "The new price has been added."
msgstr ""
-#: ../inventory/prices.php:118
+#: ../inventory/prices.php:119
msgid "The selected price has been deleted."
msgstr ""
-#: ../inventory/prices.php:146
+#: ../inventory/prices.php:147
#: ../reporting/rep104.php:118
-#: ../sales/customer_delivery.php:369
-#: ../sales/customer_invoice.php:468
+#: ../sales/customer_delivery.php:379
+#: ../sales/customer_invoice.php:477
#: ../sales/view/view_credit.php:73
#: ../sales/view/view_dispatch.php:93
#: ../sales/view/view_invoice.php:93
msgid "Sales Type"
msgstr ""
-#: ../inventory/prices.php:146
-#: ../inventory/purchasing_data.php:147
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:505
+#: ../inventory/prices.php:147
+#: ../inventory/purchasing_data.php:148
+#: ../purchasing/includes/ui/invoice_ui.inc:520
#: ../purchasing/po_receive_items.php:63
#: ../purchasing/view/view_grn.php:41
#: ../purchasing/view/view_po.php:45
#: ../reporting/includes/doctext.inc:30
#: ../reporting/includes/doctext.inc:192
#: ../sales/customer_credit_invoice.php:281
-#: ../sales/customer_delivery.php:447
-#: ../sales/customer_invoice.php:542
-#: ../sales/customer_invoice.php:545
+#: ../sales/customer_delivery.php:457
+#: ../sales/customer_invoice.php:551
+#: ../sales/customer_invoice.php:554
#: ../sales/view/view_credit.php:91
#: ../sales/view/view_dispatch.php:113
#: ../sales/view/view_invoice.php:116
msgid "Price"
msgstr ""
-#: ../inventory/prices.php:168
+#: ../inventory/prices.php:169
msgid "There are no prices set up for this part."
msgstr ""
msgid "The price is calculated."
msgstr ""
-#: ../inventory/purchasing_data.php:25
+#: ../inventory/purchasing_data.php:24
msgid "Supplier Purchasing Data"
msgstr ""
-#: ../inventory/purchasing_data.php:27
+#: ../inventory/purchasing_data.php:26
#: ../purchasing/po_entry_items.php:70
-#: ../purchasing/po_entry_items.php.orig:70
msgid "There are no purchasable inventory items defined in the system."
msgstr ""
-#: ../inventory/purchasing_data.php:28
+#: ../inventory/purchasing_data.php:27
#: ../purchasing/po_entry_items.php:68
-#: ../purchasing/po_entry_items.php.orig:68
#: ../purchasing/supplier_credit.php:31
#: ../purchasing/supplier_invoice.php:30
#: ../purchasing/supplier_payment.php:40
-#: ../purchasing/supplier_payment.php.orig:40
msgid "There are no suppliers defined in the system."
msgstr ""
-#: ../inventory/purchasing_data.php:46
+#: ../inventory/purchasing_data.php:45
#: ../inventory/manage/item_codes.php:35
msgid "There is no item selected."
msgstr ""
-#: ../inventory/purchasing_data.php:52
+#: ../inventory/purchasing_data.php:51
msgid "The price entered was not numeric."
msgstr ""
-#: ../inventory/purchasing_data.php:58
+#: ../inventory/purchasing_data.php:57
msgid ""
"The conversion factor entered was not numeric. The conversion factor is the "
"number by which the price must be divided by to get the unit price in our "
"unit of measure."
msgstr ""
-#: ../inventory/purchasing_data.php:64
+#: ../inventory/purchasing_data.php:63
msgid "The purchasing data for this supplier has already been added."
msgstr ""
-#: ../inventory/purchasing_data.php:73
+#: ../inventory/purchasing_data.php:72
msgid "This supplier purchasing data has been added."
msgstr ""
-#: ../inventory/purchasing_data.php:79
+#: ../inventory/purchasing_data.php:78
msgid "Supplier purchasing data has been updated."
msgstr ""
-#: ../inventory/purchasing_data.php:90
+#: ../inventory/purchasing_data.php:89
msgid "The purchasing data item has been sucessfully deleted."
msgstr ""
-#: ../inventory/purchasing_data.php:132
+#: ../inventory/purchasing_data.php:133
msgid "Entered item is not defined. Please re-enter."
msgstr ""
-#: ../inventory/purchasing_data.php:141
+#: ../inventory/purchasing_data.php:142
msgid "There is no purchasing data set up for the part selected"
msgstr ""
-#: ../inventory/purchasing_data.php:148
+#: ../inventory/purchasing_data.php:149
msgid "Supplier's Unit"
msgstr ""
-#: ../inventory/purchasing_data.php:148
+#: ../inventory/purchasing_data.php:149
msgid "Conversion Factor"
msgstr ""
-#: ../inventory/purchasing_data.php:148
+#: ../inventory/purchasing_data.php:149
msgid "Supplier's Description"
msgstr ""
msgid "Supplier's Code or Description:"
msgstr ""
-#: ../inventory/reorder_level.php:25
+#: ../inventory/reorder_level.php:24
msgid "Reorder Levels"
msgstr ""
-#: ../inventory/reorder_level.php:27
+#: ../inventory/reorder_level.php:26
#: ../inventory/transfers.php:32
msgid ""
"There are no inventory items defined in the system (Purchased or "
"manufactured items)."
msgstr ""
-#: ../inventory/reorder_level.php:65
+#: ../inventory/reorder_level.php:67
#: ../inventory/inquiry/stock_movements.php:79
#: ../inventory/inquiry/stock_status.php:66
#: ../inventory/inquiry/stock_status.php:70
-#: ../inventory/inquiry/stock_status.php.orig:72
-#: ../inventory/inquiry/stock_status.php.orig:76
#: ../manufacturing/search_work_orders.php:162
#: ../manufacturing/inquiry/where_used_inquiry.php:45
#: ../manufacturing/manage/bom_edit.php:70
-#: ../purchasing/inquiry/po_search_completed.php:123
-#: ../purchasing/inquiry/po_search_completed.php:133
-#: ../purchasing/inquiry/po_search_completed.php.orig:122
-#: ../purchasing/inquiry/po_search_completed.php.orig:132
-#: ../purchasing/inquiry/po_search.php:133
-#: ../purchasing/inquiry/po_search.php:144
+#: ../purchasing/inquiry/po_search_completed.php:126
+#: ../purchasing/inquiry/po_search_completed.php:136
+#: ../purchasing/inquiry/po_search.php:135
+#: ../purchasing/inquiry/po_search.php:146
#: ../reporting/rep105.php:120
-#: ../reporting/rep301.php:112
+#: ../reporting/rep301.php:176
#: ../reporting/rep302.php:132
#: ../reporting/rep303.php:134
#: ../reporting/rep304.php:123
#: ../reporting/rep306.php:150
#: ../reporting/rep307.php:124
-#: ../reporting/rep308.php:157
+#: ../reporting/rep308.php:238
+#: ../reporting/rep402.php:103
+#: ../reporting/rep402.php:109
+#: ../reporting/reports_main.php:210
+#: ../reporting/reports_main.php:217
+#: ../reporting/reports_main.php:223
+#: ../reporting/reports_main.php:236
+#: ../reporting/reports_main.php:251
+#: ../reporting/reports_main.php:261
+#: ../reporting/reports_main.php:269
+#: ../reporting/reports_main.php:290
#: ../sales/manage/sales_points.php:84
msgid "Location"
msgstr ""
-#: ../inventory/reorder_level.php:65
+#: ../inventory/reorder_level.php:67
#: ../inventory/inquiry/stock_movements.php:80
#: ../inventory/inquiry/stock_status.php:70
-#: ../inventory/inquiry/stock_status.php.orig:76
-#: ../purchasing/supplier_credit.php:219
-#: ../sales/sales_order_entry.php:531
-#: ../sales/includes/ui/sales_order_ui.inc:182
+#: ../purchasing/supplier_credit.php:228
msgid "Quantity On Hand"
msgstr ""
-#: ../inventory/reorder_level.php:65
+#: ../inventory/reorder_level.php:67
+#: ../inventory/includes/inventory_db.inc:72
#: ../inventory/inquiry/stock_status.php:70
-#: ../inventory/inquiry/stock_status.php.orig:76
#: ../sales/includes/db/old.sales_order_db.inc:110
#: ../sales/includes/db/old.sales_order_db.inc:263
-#: ../sales/includes/db/sales_order_db.inc:112
-#: ../sales/includes/db/sales_order_db.inc.orig:112
-#: ../sales/includes/db/sales_order_db.inc.orig:275
msgid "Re-Order Level"
msgstr ""
-#: ../inventory/reorder_level.php:89
+#: ../inventory/reorder_level.php:90
msgid "Reorder levels has been updated."
msgstr ""
msgid "Enter &Another Inventory Transfer"
msgstr ""
-#: ../inventory/transfers.php:103
+#: ../inventory/transfers.php:102
msgid "The entered transfer date is invalid."
msgstr ""
-#: ../inventory/transfers.php:115
+#: ../inventory/transfers.php:114
msgid "The locations to transfer from and to must be different."
msgstr ""
-#: ../inventory/transfers.php:125
+#: ../inventory/transfers.php:124
msgid ""
-"The quantity entered is greater than the available quantity for this item at "
-"the source location :"
+"The transfer cannot be processed because it would cause negative inventory "
+"balance in source location for marked items as of document date or later."
msgstr ""
-#: ../inventory/transfers.php:158
+#: ../inventory/transfers.php:154
msgid "The quantity entered must be a positive number."
msgstr ""
-#: ../inventory/transfers.php:235
+#: ../inventory/transfers.php:231
msgid "Process Transfer"
msgstr ""
+#: ../inventory/includes/inventory_db.inc:69
+#: ../sales/includes/db/old.sales_order_db.inc:107
+#: ../sales/includes/db/old.sales_order_db.inc:259
+msgid "Stocks below Re-Order Level at "
+msgstr ""
+
+#: ../inventory/includes/inventory_db.inc:72
+#: ../sales/includes/db/old.sales_order_db.inc:110
+#: ../sales/includes/db/old.sales_order_db.inc:264
+msgid "Below"
+msgstr ""
+
+#: ../inventory/includes/inventory_db.inc:73
+#: ../sales/includes/db/old.sales_order_db.inc:111
+#: ../sales/includes/db/old.sales_order_db.inc:265
+msgid "Please reorder"
+msgstr ""
+
#: ../inventory/includes/item_adjustments_ui.inc:20
#: ../inventory/includes/stock_transfers_ui.inc:20
#: ../manufacturing/includes/work_order_issue_ui.inc:20
msgstr ""
#: ../inventory/includes/item_adjustments_ui.inc:34
-#: ../manufacturing/work_order_entry.php:210
+#: ../manufacturing/work_order_entry.php:209
#: ../purchasing/inquiry/po_search.php:67
#: ../sales/inquiry/sales_deliveries_view.php:107
-#: ../sales/inquiry/sales_orders_view.php.orig:254
+#: ../sales/inquiry/sales_orders_view.php:254
msgid "Location:"
msgstr ""
#: ../inventory/includes/item_adjustments_ui.inc:62
#: ../inventory/includes/stock_transfers_ui.inc:60
#: ../manufacturing/includes/work_order_issue_ui.inc:33
-#: ../purchasing/includes/ui/po_ui.inc.orig:243
+#: ../purchasing/includes/ui/po_ui.inc:245
#: ../purchasing/po_receive_items.php:62
#: ../purchasing/view/view_grn.php:40
#: ../purchasing/view/view_po.php:45
#: ../reporting/includes/doctext.inc:191
#: ../reporting/includes/doctext.inc:228
#: ../sales/customer_credit_invoice.php:280
-#: ../sales/customer_delivery.php:445
-#: ../sales/customer_invoice.php:541
-#: ../sales/customer_invoice.php:544
+#: ../sales/customer_delivery.php:455
+#: ../sales/customer_invoice.php:550
+#: ../sales/customer_invoice.php:553
#: ../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/includes/ui/sales_credit_ui.inc:167
-#: ../sales/includes/ui/sales_order_ui.inc:145
+#: ../sales/includes/ui/sales_order_ui.inc:146
msgid "Item Code"
msgstr ""
#: ../inventory/includes/item_adjustments_ui.inc:62
#: ../inventory/includes/stock_transfers_ui.inc:60
#: ../manufacturing/includes/work_order_issue_ui.inc:33
-#: ../purchasing/includes/ui/po_ui.inc.orig:243
+#: ../purchasing/includes/ui/po_ui.inc:245
#: ../purchasing/view/view_grn.php:40
#: ../purchasing/view/view_po.php:45
#: ../reporting/includes/doctext.inc:29
#: ../reporting/includes/doctext.inc:191
#: ../reporting/includes/doctext.inc:228
#: ../sales/customer_credit_invoice.php:280
-#: ../sales/customer_delivery.php:445
-#: ../sales/customer_invoice.php:541
-#: ../sales/customer_invoice.php:544
+#: ../sales/customer_delivery.php:455
+#: ../sales/customer_invoice.php:550
+#: ../sales/customer_invoice.php:553
#: ../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/includes/ui/sales_credit_ui.inc:167
-#: ../sales/includes/ui/sales_order_ui.inc:145
+#: ../sales/includes/ui/sales_order_ui.inc:146
msgid "Item Description"
msgstr ""
#: ../manufacturing/includes/manufacturing_ui.inc:157
#: ../manufacturing/includes/manufacturing_ui.inc:332
#: ../manufacturing/includes/work_order_issue_ui.inc:33
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:505
-#: ../purchasing/includes/ui/po_ui.inc.orig:243
+#: ../purchasing/includes/ui/invoice_ui.inc:520
+#: ../purchasing/includes/ui/po_ui.inc:245
#: ../purchasing/view/view_grn.php:40
#: ../purchasing/view/view_po.php:45
-#: ../reporting/rep301.php:105
+#: ../reporting/rep301.php:169
#: ../reporting/rep303.php:121
#: ../reporting/rep303.php:127
#: ../reporting/rep401.php:71
#: ../reporting/includes/doctext.inc:29
#: ../reporting/includes/doctext.inc:192
#: ../reporting/includes/doctext.inc:225
-#: ../sales/customer_invoice.php:541
+#: ../sales/customer_invoice.php:550
#: ../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/includes/ui/sales_credit_ui.inc:167
-#: ../sales/includes/ui/sales_order_ui.inc:145
+#: ../sales/includes/ui/sales_order_ui.inc:146
msgid "Quantity"
msgstr ""
#: ../inventory/includes/stock_transfers_ui.inc:60
#: ../inventory/manage/item_units.php:94
#: ../manufacturing/includes/work_order_issue_ui.inc:34
-#: ../purchasing/includes/ui/po_ui.inc.orig:244
+#: ../purchasing/includes/ui/po_ui.inc:246
#: ../purchasing/view/view_grn.php:41
#: ../purchasing/view/view_po.php:45
#: ../reporting/includes/doctext.inc:30
#: ../sales/view/view_invoice.php:116
#: ../sales/view/view_sales_order.php:219
#: ../sales/includes/ui/sales_credit_ui.inc:167
-#: ../sales/includes/ui/sales_order_ui.inc:147
+#: ../sales/includes/ui/sales_order_ui.inc:148
msgid "Unit"
msgstr ""
#: ../inventory/view/view_adjustment.php:57
#: ../manufacturing/includes/manufacturing_ui.inc:29
#: ../manufacturing/includes/work_order_issue_ui.inc:34
-#: ../reporting/rep301.php:105
+#: ../reporting/rep301.php:169
msgid "Unit Cost"
msgstr ""
+#: ../inventory/includes/item_adjustments_ui.inc:110
+msgid ""
+"Marked items have insufficient quantities in stock as on day of adjustment."
+msgstr ""
+
#: ../inventory/includes/stock_transfers_ui.inc:35
#: ../inventory/inquiry/stock_movements.php:56
-#: ../manufacturing/includes/work_order_issue_ui.inc:164
+#: ../manufacturing/includes/work_order_issue_ui.inc:171
msgid "From Location:"
msgstr ""
msgid "Transfer Type:"
msgstr ""
+#: ../inventory/includes/stock_transfers_ui.inc:100
+msgid ""
+"Marked items have insufficient quantities in stock as on day of transfer."
+msgstr ""
+
#: ../inventory/includes/db/items_db.inc:121
msgid ""
"Cannot delete this item because there are stock movements that refer to this "
msgstr ""
#: ../inventory/inquiry/stock_movements.php:61
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:474
+#: ../purchasing/includes/ui/invoice_ui.inc:489
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:57
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:57
#: ../purchasing/inquiry/supplier_inquiry.php:55
#: ../sales/inquiry/customer_allocation_inquiry.php:51
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:51
#: ../sales/inquiry/customer_inquiry.php:54
-#: ../sales/inquiry/customer_inquiry.php.orig:54
msgid "Refresh Inquiry"
msgstr ""
msgstr ""
#: ../inventory/inquiry/stock_status.php:16
-#: ../inventory/inquiry/stock_status.php.orig:19
-#: ../inventory/inquiry/stock_status.php.orig:21
msgid "Inventory Item Status"
msgstr ""
#: ../inventory/inquiry/stock_status.php:56
-#: ../inventory/inquiry/stock_status.php.orig:62
msgid ""
"This is a service and cannot have a stock holding, only the total quantity "
"on outstanding sales orders is shown."
#: ../inventory/inquiry/stock_status.php:66
#: ../inventory/inquiry/stock_status.php:71
-#: ../inventory/inquiry/stock_status.php.orig:72
-#: ../inventory/inquiry/stock_status.php.orig:77
#: ../reporting/rep303.php:121
#: ../reporting/rep303.php:127
msgid "Demand"
msgstr ""
#: ../inventory/inquiry/stock_status.php:71
-#: ../inventory/inquiry/stock_status.php.orig:77
#: ../reporting/rep303.php:121
#: ../reporting/rep303.php:127
msgid "On Order"
#: ../manufacturing/manage/bom_edit.php:71
#: ../purchasing/po_receive_items.php:62
#: ../sales/customer_credit_invoice.php:280
-#: ../sales/customer_delivery.php:446
-#: ../sales/customer_invoice.php:541
-#: ../sales/customer_invoice.php:544
+#: ../sales/customer_delivery.php:456
+#: ../sales/customer_invoice.php:550
+#: ../sales/customer_invoice.php:553
msgid "Units"
msgstr ""
msgstr ""
#: ../inventory/manage/item_categories.php:186
-#: ../inventory/manage/items.php.orig:336
+#: ../inventory/manage/items.php:335
msgid "Item Tax Type:"
msgstr ""
#: ../inventory/manage/item_categories.php:188
-#: ../inventory/manage/items.php.orig:338
+#: ../inventory/manage/items.php:337
msgid "Item Type:"
msgstr ""
#: ../inventory/manage/item_categories.php:190
-#: ../inventory/manage/items.php.orig:340
+#: ../inventory/manage/items.php:339
msgid "Units of Measure:"
msgstr ""
#: ../inventory/manage/item_categories.php:192
-#: ../inventory/manage/items.php.orig:344
+#: ../inventory/manage/items.php:343
msgid "Exclude from sales:"
msgstr ""
#: ../inventory/manage/item_categories.php:194
-#: ../inventory/manage/items.php.orig:346
+#: ../inventory/manage/items.php:345
msgid "Exclude from purchases:"
msgstr ""
msgstr ""
#: ../inventory/manage/item_codes.php:23
-#: ../sales/sales_order_entry.php:698
+#: ../sales/sales_order_entry.php:703
msgid "There are no inventory items defined in the system."
msgstr ""
msgstr ""
#: ../inventory/manage/item_codes.php:55
-#: ../inventory/manage/items.php.orig:164
+#: ../inventory/manage/items.php:163
#: ../inventory/manage/sales_kits.php:88
msgid "This item code is already assigned to stock item or sale kit."
msgstr ""
#: ../inventory/manage/item_codes.php:125
#: ../reporting/rep104.php:117
#: ../reporting/rep105.php:119
-#: ../reporting/rep301.php:105
-#: ../reporting/rep301.php:111
+#: ../reporting/rep301.php:169
+#: ../reporting/rep301.php:175
#: ../reporting/rep302.php:124
#: ../reporting/rep302.php:131
#: ../reporting/rep303.php:133
#: ../reporting/rep306.php:149
#: ../reporting/rep307.php:117
#: ../reporting/rep307.php:123
-#: ../reporting/rep308.php:149
-#: ../reporting/rep308.php:156
+#: ../reporting/rep308.php:230
+#: ../reporting/rep308.php:237
#: ../reporting/rep309.php:104
msgid "Category"
msgstr ""
#: ../inventory/manage/item_codes.php:179
#: ../inventory/manage/sales_kits.php:245
-#: ../manufacturing/work_order_add_finished.php:206
-#: ../manufacturing/work_order_entry.php:424
+#: ../manufacturing/work_order_add_finished.php:203
+#: ../manufacturing/work_order_entry.php:422
#: ../manufacturing/manage/bom_edit.php:228
msgid "Quantity:"
msgstr ""
#: ../inventory/manage/item_codes.php:180
-#: ../inventory/manage/items.php.orig:310
+#: ../inventory/manage/items.php:309
#: ../inventory/manage/movement_types.php:129
#: ../inventory/manage/sales_kits.php:206
#: ../inventory/manage/sales_kits.php:232
msgstr ""
#: ../inventory/manage/item_codes.php:181
-#: ../inventory/manage/items.php.orig:312
+#: ../inventory/manage/items.php:311
#: ../inventory/manage/sales_kits.php:207
#: ../inventory/manage/sales_kits.php:233
msgid "Category:"
msgstr ""
-#: ../inventory/manage/items.php.orig:82
+#: ../inventory/manage/items.php:81
msgid ""
"Only graphics files are supported - a file extension of .jpg, .png or .gif "
"is expected"
msgstr ""
-#: ../inventory/manage/items.php.orig:113
+#: ../inventory/manage/items.php:112
msgid ""
"There are no item categories defined in the system. At least one item "
"category is required to add a item."
msgstr ""
-#: ../inventory/manage/items.php.orig:115
+#: ../inventory/manage/items.php:114
msgid ""
"There are no item tax types defined in the system. At least one item tax "
"type is required to add a item."
msgstr ""
-#: ../inventory/manage/items.php.orig:143
+#: ../inventory/manage/items.php:142
msgid "The item name must be entered."
msgstr ""
-#: ../inventory/manage/items.php.orig:149
+#: ../inventory/manage/items.php:148
msgid "The item code cannot be empty"
msgstr ""
-#: ../inventory/manage/items.php.orig:157
+#: ../inventory/manage/items.php:156
msgid ""
"The item code cannot contain any of the following characters - & + OR a "
"space OR quotes"
msgstr ""
-#: ../inventory/manage/items.php.orig:193
+#: ../inventory/manage/items.php:192
msgid "Item has been updated."
msgstr ""
-#: ../inventory/manage/items.php.orig:206
+#: ../inventory/manage/items.php:205
msgid "A new item has been added."
msgstr ""
-#: ../inventory/manage/items.php.orig:249
+#: ../inventory/manage/items.php:248
msgid "Selected item has been deleted."
msgstr ""
-#: ../inventory/manage/items.php.orig:266
+#: ../inventory/manage/items.php:265
#: ../inventory/view/view_adjustment.php:56
#: ../inventory/view/view_transfer.php:39
#: ../inventory/view/view_transfer.php:56
#: ../manufacturing/search_work_orders.php:163
#: ../manufacturing/view/wo_issue_view.php:44
#: ../manufacturing/view/wo_production_view.php:45
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:492
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:504
+#: ../purchasing/includes/ui/invoice_ui.inc:507
+#: ../purchasing/includes/ui/invoice_ui.inc:519
#: ../reporting/rep204.php:84
#: ../reporting/rep306.php:152
+#: ../reporting/rep402.php:103
msgid "Item"
msgstr ""
-#: ../inventory/manage/items.php.orig:271
-#: ../inventory/manage/items.php.orig:303
+#: ../inventory/manage/items.php:270
+#: ../inventory/manage/items.php:302
msgid "Item Code:"
msgstr ""
-#: ../inventory/manage/items.php.orig:342
+#: ../inventory/manage/items.php:341
msgid "Editable description:"
msgstr ""
-#: ../inventory/manage/items.php.orig:364
+#: ../inventory/manage/items.php:363
#: ../sales/manage/customer_branches.php:249
msgid "GL Accounts"
msgstr ""
-#: ../inventory/manage/items.php.orig:387
+#: ../inventory/manage/items.php:386
msgid "Other"
msgstr ""
-#: ../inventory/manage/items.php.orig:390
+#: ../inventory/manage/items.php:389
msgid "Image File (.jpg)"
msgstr ""
-#: ../inventory/manage/items.php.orig:405
+#: ../inventory/manage/items.php:404
msgid "No image"
msgstr ""
-#: ../inventory/manage/items.php.orig:410
+#: ../inventory/manage/items.php:409
msgid "Delete Image:"
msgstr ""
-#: ../inventory/manage/items.php.orig:412
+#: ../inventory/manage/items.php:411
msgid "Item status:"
msgstr ""
-#: ../inventory/manage/items.php.orig:418
+#: ../inventory/manage/items.php:417
msgid "Insert New Item"
msgstr ""
-#: ../inventory/manage/items.php.orig:422
+#: ../inventory/manage/items.php:421
msgid "Update Item"
msgstr ""
-#: ../inventory/manage/items.php.orig:425
+#: ../inventory/manage/items.php:424
msgid "Select this items and return to document entry."
msgstr ""
-#: ../inventory/manage/items.php.orig:426
+#: ../inventory/manage/items.php:425
msgid "Clone This Item"
msgstr ""
-#: ../inventory/manage/items.php.orig:427
+#: ../inventory/manage/items.php:426
msgid "Delete This Item"
msgstr ""
-#: ../inventory/manage/items.php.orig:442
+#: ../inventory/manage/items.php:441
msgid "Select an item:"
msgstr ""
-#: ../inventory/manage/items.php.orig:443
+#: ../inventory/manage/items.php:442
msgid "New item"
msgstr ""
-#: ../inventory/manage/items.php.orig:466
-#: ../purchasing/manage/suppliers.php.orig:308
+#: ../inventory/manage/items.php:465
+#: ../purchasing/manage/suppliers.php:310
#: ../sales/manage/customer_branches.php:324
-#: ../sales/manage/customers.php:347
-#: ../sales/manage/sav.customers.php:342
+#: ../sales/manage/customers.php:348
msgid "&General settings"
msgstr ""
-#: ../inventory/manage/items.php.orig:467
-#: ../purchasing/manage/suppliers.php.orig:310
-#: ../sales/manage/customers.php:349
-#: ../sales/manage/sav.customers.php:344
+#: ../inventory/manage/items.php:466
+msgid "S&ales Pricing"
+msgstr ""
+
+#: ../inventory/manage/items.php:467
+msgid "&Purchasing Pricing"
+msgstr ""
+
+#: ../inventory/manage/items.php:470
+#: ../purchasing/manage/suppliers.php:312
+#: ../sales/manage/customers.php:350
msgid "&Transactions"
msgstr ""
-#: ../inventory/manage/items.php.orig:468
+#: ../inventory/manage/items.php:471
msgid "&Status"
msgstr ""
#: ../manufacturing/search_work_orders.php:76
#: ../purchasing/inquiry/po_search_completed.php:72
-#: ../purchasing/inquiry/po_search_completed.php.orig:73
msgid "for item:"
msgstr ""
#: ../manufacturing/search_work_orders.php:78
-#: ../purchasing/inquiry/po_search_completed.php:74
-#: ../purchasing/inquiry/po_search_completed.php.orig:75
-#: ../purchasing/inquiry/po_search.php:76
-#: ../sales/inquiry/sales_deliveries_view.php:116
-#: ../sales/inquiry/sales_orders_view.php.orig:269
+#: ../purchasing/inquiry/po_search_completed.php:77
+#: ../purchasing/inquiry/po_search.php:78
+#: ../sales/inquiry/sales_deliveries_view.php:118
+#: ../sales/inquiry/sales_orders_view.php:270
msgid "Select documents"
msgstr ""
msgstr ""
#: ../manufacturing/search_work_orders.php:164
+#: ../reporting/rep402.php:103
msgid "Required"
msgstr ""
#: ../manufacturing/search_work_orders.php:167
#: ../manufacturing/includes/manufacturing_ui.inc:277
#: ../manufacturing/includes/manufacturing_ui.inc:281
+#: ../reporting/rep402.php:103
#: ../reporting/includes/doctext.inc:227
-#: ../sales/inquiry/sales_orders_view.php.orig:290
+#: ../sales/inquiry/sales_orders_view.php:291
msgid "Required By"
msgstr ""
#: ../manufacturing/work_order_costs.php:45
#: ../manufacturing/work_order_entry.php:56
#: ../manufacturing/work_order_issue.php:40
+#: ../manufacturing/work_order_issue.php.orig:40
#: ../manufacturing/work_order_release.php:75
msgid "View this Work Order"
msgstr ""
#: ../manufacturing/work_order_add_finished.php:48
#: ../manufacturing/work_order_entry.php:64
#: ../manufacturing/work_order_issue.php:42
+#: ../manufacturing/work_order_issue.php.orig:42
msgid "View the GL Journal Entries for this Work Order"
msgstr ""
#: ../manufacturing/work_order_add_finished.php:52
#: ../manufacturing/work_order_costs.php:49
#: ../manufacturing/work_order_issue.php:44
+#: ../manufacturing/work_order_issue.php.orig:44
msgid "Select another &Work Order to Process"
msgstr ""
#: ../manufacturing/work_order_add_finished.php:65
#: ../manufacturing/work_order_costs.php:62
-#: ../manufacturing/work_order_entry.php:341
+#: ../manufacturing/work_order_entry.php:339
#: ../manufacturing/includes/db/work_order_issues_db.inc:30
#: ../manufacturing/includes/db/work_order_produce_items_db.inc:27
msgid "The order number sent is not valid."
"The production exceeds the quantity needed. Please change the Work Order."
msgstr ""
-#: ../manufacturing/work_order_add_finished.php:129
+#: ../manufacturing/work_order_add_finished.php:126
msgid ""
"The unassembling cannot be processed because there is insufficient stock."
msgstr ""
-#: ../manufacturing/work_order_add_finished.php:147
+#: ../manufacturing/work_order_add_finished.php:144
msgid ""
"The production cannot be processed because a required item would cause a "
"negative inventory balance :"
msgstr ""
-#: ../manufacturing/work_order_add_finished.php:204
+#: ../manufacturing/work_order_add_finished.php:201
msgid "Produce Finished Items"
msgstr ""
-#: ../manufacturing/work_order_add_finished.php:204
+#: ../manufacturing/work_order_add_finished.php:201
msgid "Return Items to Work Order"
msgstr ""
-#: ../manufacturing/work_order_add_finished.php:214
-#: ../purchasing/allocations/supplier_allocate.php:74
-#: ../sales/allocations/customer_allocate.php:72
+#: ../manufacturing/work_order_add_finished.php:211
+#: ../purchasing/allocations/supplier_allocate.php:75
+#: ../sales/allocations/customer_allocate.php:73
msgid "Process"
msgstr ""
-#: ../manufacturing/work_order_add_finished.php:215
+#: ../manufacturing/work_order_add_finished.php:212
msgid "Process And Close Order"
msgstr ""
msgid "The cost entered is invalid or less than zero."
msgstr ""
-#: ../manufacturing/work_order_entry.php:209
+#: ../manufacturing/work_order_entry.php:208
msgid ""
"The work order cannot be processed because there is an insufficient quantity "
"for component:"
msgstr ""
-#: ../manufacturing/work_order_entry.php:223
+#: ../manufacturing/work_order_entry.php:221
msgid ""
"The selected item cannot be unassembled because there is insufficient stock."
msgstr ""
-#: ../manufacturing/work_order_entry.php:249
+#: ../manufacturing/work_order_entry.php:247
msgid ""
"The quantity cannot be changed to be less than the quantity already "
"manufactured for this order."
msgstr ""
-#: ../manufacturing/work_order_entry.php:298
+#: ../manufacturing/work_order_entry.php:296
msgid ""
"This work order cannot be deleted because it has already been processed."
msgstr ""
-#: ../manufacturing/work_order_entry.php:349
+#: ../manufacturing/work_order_entry.php:347
msgid "This work order is closed and cannot be edited."
msgstr ""
-#: ../manufacturing/work_order_entry.php:397
-#: ../manufacturing/work_order_entry.php:405
+#: ../manufacturing/work_order_entry.php:395
+#: ../manufacturing/work_order_entry.php:403
msgid "Destination Location:"
msgstr ""
-#: ../manufacturing/work_order_entry.php:416
+#: ../manufacturing/work_order_entry.php:414
msgid "Quantity Required:"
msgstr ""
-#: ../manufacturing/work_order_entry.php:418
+#: ../manufacturing/work_order_entry.php:416
msgid "Quantity Manufactured:"
msgstr ""
-#: ../manufacturing/work_order_entry.php:437
+#: ../manufacturing/work_order_entry.php:435
msgid "Credit Labour Account"
msgstr ""
-#: ../manufacturing/work_order_entry.php:444
+#: ../manufacturing/work_order_entry.php:442
msgid "Credit Overhead Account"
msgstr ""
-#: ../manufacturing/work_order_entry.php:449
+#: ../manufacturing/work_order_entry.php:447
msgid "Released On:"
msgstr ""
-#: ../manufacturing/work_order_entry.php:459
+#: ../manufacturing/work_order_entry.php:457
msgid "Save changes to work order"
msgstr ""
-#: ../manufacturing/work_order_entry.php:462
+#: ../manufacturing/work_order_entry.php:460
msgid "Close This Work Order"
msgstr ""
-#: ../manufacturing/work_order_entry.php:464
+#: ../manufacturing/work_order_entry.php:462
msgid "Delete This Work Order"
msgstr ""
-#: ../manufacturing/work_order_entry.php:470
+#: ../manufacturing/work_order_entry.php:468
msgid "Add Workorder"
msgstr ""
#: ../manufacturing/work_order_issue.php:31
+#: ../manufacturing/work_order_issue.php.orig:31
msgid "Issue Items to Work Order"
msgstr ""
#: ../manufacturing/work_order_issue.php:38
+#: ../manufacturing/work_order_issue.php.orig:38
msgid "The work order issue has been entered."
msgstr ""
#: ../manufacturing/work_order_issue.php:78
+#: ../manufacturing/work_order_issue.php.orig:78
msgid "The entered date for the issue is invalid."
msgstr ""
-#: ../manufacturing/work_order_issue.php:106
+#: ../manufacturing/work_order_issue.php.orig:106
msgid ""
"The issue cannot be processed because an entered item would cause a negative "
"inventory balance :"
msgstr ""
-#: ../manufacturing/work_order_issue.php:124
+#: ../manufacturing/work_order_issue.php.orig:124
msgid ""
"The process cannot be completed because there is an insufficient total "
"quantity for a component."
msgstr ""
-#: ../manufacturing/work_order_issue.php:125
+#: ../manufacturing/work_order_issue.php.orig:125
msgid "Component is :"
msgstr ""
-#: ../manufacturing/work_order_issue.php:126
+#: ../manufacturing/work_order_issue.php.orig:126
msgid "From location :"
msgstr ""
-#: ../manufacturing/work_order_issue.php:219
+#: ../manufacturing/work_order_issue.php.orig:219
msgid "Items to Issue"
msgstr ""
-#: ../manufacturing/work_order_issue.php:225
+#: ../manufacturing/work_order_issue.php.orig:225
msgid "Process Issue"
msgstr ""
msgstr ""
#: ../manufacturing/view/work_order_view.php:56
-#: ../reporting/rep409.php:88
+#: ../reporting/rep409.php:87
msgid "Work Order Requirements"
msgstr ""
msgid "This work order is closed."
msgstr ""
-#: ../manufacturing/includes/work_order_issue_ui.inc:162
+#: ../manufacturing/includes/work_order_issue_ui.inc:82
+msgid "Marked items have insufficient quantities in stock as on day of issue."
+msgstr ""
+
+#: ../manufacturing/includes/work_order_issue_ui.inc:169
msgid "Return Items to Location"
msgstr ""
-#: ../manufacturing/includes/work_order_issue_ui.inc:162
+#: ../manufacturing/includes/work_order_issue_ui.inc:169
msgid "Issue Items to Work order"
msgstr ""
-#: ../manufacturing/includes/work_order_issue_ui.inc:165
+#: ../manufacturing/includes/work_order_issue_ui.inc:172
msgid "To Work Centre:"
msgstr ""
-#: ../manufacturing/includes/work_order_issue_ui.inc:167
+#: ../manufacturing/includes/work_order_issue_ui.inc:174
msgid "Issue Date:"
msgstr ""
#: ../manufacturing/includes/db/work_orders_db.inc.orig:79
#: ../purchasing/includes/db/po_db.inc:123
-#: ../sales/includes/db/cust_trans_db.inc:118
-#: ../sales/includes/db/cust_trans_db.inc.orig:114
+#: ../sales/includes/db/cust_trans_db.inc:114
#: ../sales/includes/db/old.sales_order_db.inc:249
-#: ../sales/includes/db/sales_order_db.inc.orig:261
+#: ../sales/includes/db/sales_order_db.inc:213
msgid "Updated."
msgstr ""
msgid "Released."
msgstr ""
-#: ../manufacturing/includes/db/work_orders_quick_db.inc.orig:89
+#: ../manufacturing/includes/db/work_orders_quick_db.inc:104
msgid "Quick production."
msgstr ""
-#: ../manufacturing/includes/db/work_orders_quick_db.inc.orig:169
+#: ../manufacturing/includes/db/work_orders_quick_db.inc:184
msgid "Produced"
msgstr ""
-#: ../purchasing/includes/db/invoice_db.inc.orig:298
+#: ../purchasing/includes/purchasing_db.inc:219
+msgid "Payment for:"
+msgstr ""
+
+#: ../purchasing/includes/db/invoice_db.inc:334
msgid "Supplier invoice adjustment for zero inventory of "
msgstr ""
-#: ../purchasing/includes/db/invoice_db.inc.orig:298
+#: ../purchasing/includes/db/invoice_db.inc:334
#: ../reporting/rep106.php:83
-#: ../sales/inquiry/sales_deliveries_view.php:166
-#: ../sales/inquiry/sales_orders_view.php.orig:159
+#: ../sales/inquiry/sales_deliveries_view.php:168
+#: ../sales/inquiry/sales_orders_view.php:159
msgid "Invoice"
msgstr ""
-#: ../purchasing/includes/db/invoice_db.inc.orig:716
-#: ../purchasing/includes/db/invoice_db.inc.orig:718
+#: ../purchasing/includes/db/invoice_db.inc:693
+#: ../purchasing/includes/db/invoice_db.inc:695
msgid "GRN Removal"
msgstr ""
#: ../purchasing/includes/ui/grn_ui.inc:23
#: ../purchasing/includes/ui/grn_ui.inc:55
-#: ../purchasing/includes/ui/po_ui.inc.orig:326
+#: ../purchasing/includes/ui/po_ui.inc:328
#: ../sales/view/view_sales_order.php:74
msgid "Order Currency"
msgstr ""
#: ../purchasing/includes/ui/grn_ui.inc:33
#: ../purchasing/includes/ui/grn_ui.inc:69
-#: ../purchasing/includes/ui/po_ui.inc.orig:341
-#: ../purchasing/includes/ui/po_ui.inc.orig:346
+#: ../purchasing/includes/ui/po_ui.inc:343
+#: ../purchasing/includes/ui/po_ui.inc:348
msgid "Deliver Into Location"
msgstr ""
#: ../purchasing/includes/ui/grn_ui.inc:34
#: ../purchasing/includes/ui/grn_ui.inc:79
-#: ../purchasing/includes/ui/po_ui.inc.orig:351
+#: ../purchasing/includes/ui/po_ui.inc:353
#: ../purchasing/view/view_supp_credit.php:44
#: ../purchasing/view/view_supp_invoice.php:48
-#: ../purchasing/inquiry/po_search_completed.php:124
-#: ../purchasing/inquiry/po_search_completed.php.orig:123
-#: ../purchasing/inquiry/po_search.php:134
+#: ../purchasing/inquiry/po_search_completed.php:127
+#: ../purchasing/inquiry/po_search.php:136
#: ../purchasing/inquiry/supplier_inquiry.php:177
#: ../reporting/includes/doctext.inc:164
#: ../reporting/includes/doctext.inc:187
#: ../purchasing/includes/ui/grn_ui.inc:38
#: ../purchasing/includes/ui/grn_ui.inc:81
-#: ../purchasing/includes/ui/po_ui.inc.orig:355
+#: ../purchasing/includes/ui/po_ui.inc:357
#: ../sales/view/view_sales_order.php:92
msgid "Delivery Address"
msgstr ""
#: ../purchasing/includes/ui/grn_ui.inc:41
#: ../purchasing/includes/ui/grn_ui.inc:84
-#: ../purchasing/includes/ui/po_ui.inc.orig:367
+#: ../purchasing/includes/ui/po_ui.inc:369
msgid "Order Comments"
msgstr ""
msgid "Date Items Received"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:108
+#: ../purchasing/includes/ui/invoice_ui.inc:123
msgid "Source Invoices:"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:110
+#: ../purchasing/includes/ui/invoice_ui.inc:125
msgid "Supplier's Ref.:"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:125
+#: ../purchasing/includes/ui/invoice_ui.inc:140
msgid "Terms:"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:137
-#: ../purchasing/manage/suppliers.php:100
-#: ../purchasing/manage/suppliers.php:105
-#: ../purchasing/manage/suppliers.php.orig:100
-#: ../purchasing/manage/suppliers.php.orig:105
+#: ../purchasing/includes/ui/invoice_ui.inc:152
+#: ../purchasing/manage/suppliers.php:101
+#: ../purchasing/manage/suppliers.php:106
msgid "Supplier's Currency:"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:141
-#: ../purchasing/manage/suppliers.php:107
-#: ../purchasing/manage/suppliers.php.orig:107
+#: ../purchasing/includes/ui/invoice_ui.inc:156
+#: ../purchasing/manage/suppliers.php:108
#: ../sales/manage/customer_branches.php:247
-#: ../sales/manage/customers.php:297
-#: ../sales/manage/sav.customers.php:292
+#: ../sales/manage/customers.php:298
msgid "Tax Group:"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:159
+#: ../purchasing/includes/ui/invoice_ui.inc:174
msgid "Sub-total:"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:167
+#: ../purchasing/includes/ui/invoice_ui.inc:182
msgid "Invoice Total:"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:170
+#: ../purchasing/includes/ui/invoice_ui.inc:185
#: ../sales/customer_credit_invoice.php:330
#: ../sales/includes/ui/sales_credit_ui.inc:233
msgid "Credit Note Total"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:175
-#: ../purchasing/includes/ui/po_ui.inc.orig:485
-#: ../purchasing/po_entry_items.php.orig:558
+#: ../purchasing/includes/ui/invoice_ui.inc:190
+#: ../purchasing/includes/ui/po_ui.inc:489
+#: ../purchasing/po_entry_items.php:481
msgid "Tax algorithm:"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:207
+#: ../purchasing/includes/ui/invoice_ui.inc:222
msgid "Add GL Line"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:208
+#: ../purchasing/includes/ui/invoice_ui.inc:223
msgid "Reset"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:209
+#: ../purchasing/includes/ui/invoice_ui.inc:224
#: ../purchasing/po_receive_items.php:333
msgid "Clear all GL entry fields"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:227
+#: ../purchasing/includes/ui/invoice_ui.inc:242
msgid "GL Items for this Invoice"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:229
+#: ../purchasing/includes/ui/invoice_ui.inc:244
msgid "GL Items for this Credit Note"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:239
+#: ../purchasing/includes/ui/invoice_ui.inc:254
msgid "Quick Entry:"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:412
+#: ../purchasing/includes/ui/invoice_ui.inc:427
msgid "Add to Invoice"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:414
+#: ../purchasing/includes/ui/invoice_ui.inc:429
msgid "Add to Credit Note"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:416
-#: ../sales/customer_invoice.php:603
+#: ../purchasing/includes/ui/invoice_ui.inc:431
+#: ../sales/customer_invoice.php:612
msgid "Remove"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:416
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:451
+#: ../purchasing/includes/ui/invoice_ui.inc:431
+#: ../purchasing/includes/ui/invoice_ui.inc:466
msgid ""
"WARNING! Be careful with removal. The operation is executed immediately and "
"cannot be undone !!!"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:418
+#: ../purchasing/includes/ui/invoice_ui.inc:433
#, php-format
msgid ""
"You are about to remove all yet non-invoiced items from delivery line #%d. "
"continue ?"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:449
+#: ../purchasing/includes/ui/invoice_ui.inc:464
msgid "Items Received Yet to be Invoiced"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:454
+#: ../purchasing/includes/ui/invoice_ui.inc:469
msgid "Delivery Item Selected For Adding To A Supplier Credit Note"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:459
+#: ../purchasing/includes/ui/invoice_ui.inc:474
msgid "Received Items Charged on this Invoice"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:461
+#: ../purchasing/includes/ui/invoice_ui.inc:476
msgid "Received Items Credited on this Note"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:471
+#: ../purchasing/includes/ui/invoice_ui.inc:486
msgid "Received between"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:483
+#: ../purchasing/includes/ui/invoice_ui.inc:498
msgid "Add All Items"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:492
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:504
-#: ../reporting/rep308.php:149
-#: ../sales/inquiry/sales_orders_view.php.orig:167
+#: ../purchasing/includes/ui/invoice_ui.inc:507
+#: ../purchasing/includes/ui/invoice_ui.inc:519
+#: ../reporting/rep308.php:230
+#: ../sales/inquiry/sales_orders_view.php:167
msgid "Delivery"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:492
+#: ../purchasing/includes/ui/invoice_ui.inc:507
msgid "Sequence #"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:492
+#: ../purchasing/includes/ui/invoice_ui.inc:507
msgid "P.O."
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:493
+#: ../purchasing/includes/ui/invoice_ui.inc:508
msgid "Received On"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:493
+#: ../purchasing/includes/ui/invoice_ui.inc:508
#: ../purchasing/view/view_po.php:46
msgid "Quantity Received"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:493
+#: ../purchasing/includes/ui/invoice_ui.inc:508
#: ../purchasing/view/view_grn.php:41
#: ../purchasing/view/view_po.php:46
msgid "Quantity Invoiced"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:494
+#: ../purchasing/includes/ui/invoice_ui.inc:509
msgid "Qty Yet To Invoice"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:494
-#: ../purchasing/includes/ui/po_ui.inc.orig:245
-#: ../sales/includes/ui/sales_order_ui.inc:147
+#: ../purchasing/includes/ui/invoice_ui.inc:509
+#: ../purchasing/includes/ui/po_ui.inc:247
+#: ../sales/includes/ui/sales_order_ui.inc:148
msgid "Price after Tax"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:494
-#: ../purchasing/includes/ui/po_ui.inc.orig:245
-#: ../sales/includes/ui/sales_order_ui.inc:147
+#: ../purchasing/includes/ui/invoice_ui.inc:509
+#: ../purchasing/includes/ui/po_ui.inc:247
+#: ../sales/includes/ui/sales_order_ui.inc:148
msgid "Price before Tax"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:500
+#: ../purchasing/includes/ui/invoice_ui.inc:515
msgid "Qty Yet To Credit"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:505
+#: ../purchasing/includes/ui/invoice_ui.inc:520
msgid "Line Value"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:573
+#: ../purchasing/includes/ui/invoice_ui.inc:588
msgid ""
"There are no outstanding items received from this supplier that have not "
"been invoiced by them."
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:576
+#: ../purchasing/includes/ui/invoice_ui.inc:591
msgid ""
"There are no received items for the selected supplier that have been "
"invoiced."
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:577
+#: ../purchasing/includes/ui/invoice_ui.inc:592
msgid "Credits can only be applied to invoiced items."
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:156
-msgid "Supplier Currency:"
-msgstr ""
-
-#: ../purchasing/includes/ui/po_ui.inc.orig:185
-#: ../sales/sales_order_entry.php:722
+#: ../purchasing/includes/ui/po_ui.inc:166
+#: ../sales/sales_order_entry.php:727
msgid "Order Date:"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:186
-#: ../sales/sales_order_entry.php:709
+#: ../purchasing/includes/ui/po_ui.inc:167
+#: ../sales/sales_order_entry.php:714
msgid "Delivery Date:"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:186
-#: ../sales/sales_order_entry.php:703
+#: ../purchasing/includes/ui/po_ui.inc:167
+#: ../sales/sales_order_entry.php:708
msgid "Invoice Date:"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:197
+#: ../purchasing/includes/ui/po_ui.inc:180
+msgid "Supplier Currency:"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:199
msgid "Due Date:"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:199
+#: ../purchasing/includes/ui/po_ui.inc:201
msgid "Supplier's Reference:"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:200
+#: ../purchasing/includes/ui/po_ui.inc:202
msgid "Receive Into:"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:225
+#: ../purchasing/includes/ui/po_ui.inc:227
msgid ""
"The default stock location set up for this user is not a currently defined "
"stock location. Your system administrator needs to amend your user record."
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:229
+#: ../purchasing/includes/ui/po_ui.inc:231
msgid "Deliver to:"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:238
+#: ../purchasing/includes/ui/po_ui.inc:240
msgid "Order Items"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:244
+#: ../purchasing/includes/ui/po_ui.inc:246
#: ../purchasing/po_receive_items.php:62
msgid "Received"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:245
-#: ../sales/includes/ui/sales_order_ui.inc:617
+#: ../purchasing/includes/ui/po_ui.inc:247
+#: ../sales/includes/ui/sales_order_ui.inc:602
msgid "Required Delivery Date"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:245
+#: ../purchasing/includes/ui/po_ui.inc:247
#: ../purchasing/view/view_grn.php:41
#: ../purchasing/view/view_po.php:46
msgid "Line Total"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:296
+#: ../purchasing/includes/ui/po_ui.inc:298
#: ../purchasing/po_receive_items.php:114
-#: ../reporting/rep109.php:150
+#: ../reporting/rep107.php:231
+#: ../reporting/rep109.php:155
#: ../reporting/rep110.php:159
-#: ../reporting/rep111.php:133
+#: ../reporting/rep111.php:152
#: ../reporting/rep113.php:144
#: ../reporting/rep209.php:162
#: ../sales/customer_credit_invoice.php:322
-#: ../sales/customer_delivery.php:525
-#: ../sales/customer_invoice.php:647
+#: ../sales/customer_delivery.php:541
+#: ../sales/customer_invoice.php:656
#: ../sales/view/view_dispatch.php:146
#: ../sales/view/view_invoice.php:150
#: ../sales/includes/ui/sales_credit_ui.inc:217
-#: ../sales/includes/ui/sales_order_ui.inc:236
+#: ../sales/includes/ui/sales_order_ui.inc:224
msgid "Sub-total"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:305
+#: ../purchasing/includes/ui/po_ui.inc:307
#: ../purchasing/po_receive_items.php:122
#: ../purchasing/view/view_grn.php:79
#: ../purchasing/view/view_po.php:93
-#: ../sales/customer_delivery.php:532
+#: ../sales/customer_delivery.php:548
#: ../sales/view/view_sales_order.php:262
-#: ../sales/includes/ui/sales_order_ui.inc:243
+#: ../sales/includes/ui/sales_order_ui.inc:231
msgid "Amount Total"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:306
-#: ../purchasing/allocations/supplier_allocate.php:73
-#: ../sales/allocations/customer_allocate.php:71
-#: ../sales/includes/ui/sales_order_ui.inc:244
+#: ../purchasing/includes/ui/po_ui.inc:308
+#: ../purchasing/allocations/supplier_allocate.php:74
+#: ../sales/allocations/customer_allocate.php:72
+#: ../sales/includes/ui/sales_order_ui.inc:232
msgid "Refresh"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:361
+#: ../purchasing/includes/ui/po_ui.inc:363
#: ../sales/view/view_sales_order.php:83
msgid "Required Pre-Payment"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:362
+#: ../purchasing/includes/ui/po_ui.inc:364
msgid "Pre-Payments Allocated"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:486
-#: ../purchasing/po_entry_items.php.orig:559
-#: ../sales/customer_invoice.php:454
-#: ../sales/includes/ui/sales_order_ui.inc:413
-#: ../sales/includes/ui/sales_order_ui.inc:415
+#: ../purchasing/includes/ui/po_ui.inc:490
+#: ../purchasing/po_entry_items.php:482
+#: ../sales/customer_invoice.php:463
+#: ../sales/includes/ui/sales_order_ui.inc:398
+#: ../sales/includes/ui/sales_order_ui.inc:400
msgid "Payment:"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:486
-#: ../purchasing/po_entry_items.php.orig:559
+#: ../purchasing/includes/ui/po_ui.inc:490
+#: ../purchasing/po_entry_items.php:482
msgid "Delayed"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:488
-#: ../sales/includes/ui/sales_order_ui.inc:628
-#: ../sales/includes/ui/sales_order_ui.inc:630
+#: ../purchasing/includes/ui/po_ui.inc:492
+#: ../sales/includes/ui/sales_order_ui.inc:613
+#: ../sales/includes/ui/sales_order_ui.inc:615
msgid "Pre-Payment Required:"
msgstr ""
#: ../purchasing/po_entry_items.php:41
-#: ../purchasing/po_entry_items.php.orig:41
msgid "Modify Purchase Order #"
msgstr ""
#: ../purchasing/po_entry_items.php:46
-#: ../purchasing/po_entry_items.php.orig:46
msgid "Purchase Order Entry"
msgstr ""
#: ../purchasing/po_entry_items.php:51
-#: ../purchasing/po_entry_items.php.orig:51
msgid "Direct GRN Entry"
msgstr ""
#: ../purchasing/po_entry_items.php:56
-#: ../purchasing/po_entry_items.php.orig:56
msgid "Direct Purchase Invoice Entry"
msgstr ""
#: ../purchasing/po_entry_items.php:80
-#: ../purchasing/po_entry_items.php.orig:80
msgid "Purchase Order has been entered"
msgstr ""
#: ../purchasing/po_entry_items.php:82
-#: ../purchasing/po_entry_items.php.orig:82
msgid "Purchase Order has been updated"
msgstr ""
#: ../purchasing/po_entry_items.php:83
-#: ../purchasing/po_entry_items.php.orig:83
msgid "&View this order"
msgstr ""
#: ../purchasing/po_entry_items.php:85
-#: ../purchasing/po_entry_items.php.orig:85
#: ../sales/sales_order_entry.php:119
#: ../sales/sales_order_entry.php:139
msgid "&Print This Order"
msgstr ""
#: ../purchasing/po_entry_items.php:87
-#: ../purchasing/po_entry_items.php.orig:87
#: ../sales/sales_order_entry.php:120
#: ../sales/sales_order_entry.php:140
msgid "&Email This Order"
msgstr ""
#: ../purchasing/po_entry_items.php:89
-#: ../purchasing/po_entry_items.php.orig:89
msgid "&Receive Items on this Purchase Order"
msgstr ""
#: ../purchasing/po_entry_items.php:91
-#: ../purchasing/po_entry_items.php.orig:91
msgid "Enter &Another Purchase Order"
msgstr ""
#: ../purchasing/po_entry_items.php:93
-#: ../purchasing/po_entry_items.php.orig:93
msgid "Select An &Outstanding Purchase Order"
msgstr ""
#: ../purchasing/po_entry_items.php:102
-#: ../purchasing/po_entry_items.php.orig:102
msgid "Direct GRN has been entered"
msgstr ""
#: ../purchasing/po_entry_items.php:104
-#: ../purchasing/po_entry_items.php.orig:104
msgid "&View this GRN"
msgstr ""
#: ../purchasing/po_entry_items.php:108
-#: ../purchasing/po_entry_items.php.orig:108
#: ../purchasing/po_receive_items.php:40
msgid "View the GL Journal Entries for this Delivery"
msgstr ""
#: ../purchasing/po_entry_items.php:113
-#: ../purchasing/po_entry_items.php.orig:113
#: ../purchasing/po_receive_items.php:42
msgid "Entry purchase &invoice for this receival"
msgstr ""
#: ../purchasing/po_entry_items.php:118
-#: ../purchasing/po_entry_items.php.orig:118
msgid "Enter &Another GRN"
msgstr ""
#: ../purchasing/po_entry_items.php:127
-#: ../purchasing/po_entry_items.php.orig:127
msgid "Direct Purchase Invoice has been entered"
msgstr ""
#: ../purchasing/po_entry_items.php:129
-#: ../purchasing/po_entry_items.php.orig:129
msgid "&View this Invoice"
msgstr ""
#: ../purchasing/po_entry_items.php:134
-#: ../purchasing/po_entry_items.php.orig:134
#: ../purchasing/supplier_invoice.php:69
msgid "View the GL Journal Entries for this Invoice"
msgstr ""
-#: ../purchasing/po_entry_items.php:136
-#: ../purchasing/po_entry_items.php.orig:136
-#: ../purchasing/supplier_invoice.php:71
-msgid "Entry supplier &payment for this invoice"
-msgstr ""
-
-#: ../purchasing/po_entry_items.php:142
-#: ../purchasing/po_entry_items.php.orig:142
+#: ../purchasing/po_entry_items.php:139
msgid "Enter &Another Direct Invoice"
msgstr ""
-#: ../purchasing/po_entry_items.php:174
-#: ../purchasing/po_entry_items.php.orig:174
+#: ../purchasing/po_entry_items.php:171
msgid ""
"This item cannot be deleted because some of it has already been received."
msgstr ""
-#: ../purchasing/po_entry_items.php:189
-#: ../purchasing/po_entry_items.php.orig:189
+#: ../purchasing/po_entry_items.php:186
msgid ""
"This order cannot be cancelled because some of it has already been received."
msgstr ""
-#: ../purchasing/po_entry_items.php:190
-#: ../purchasing/po_entry_items.php.orig:190
+#: ../purchasing/po_entry_items.php:187
msgid ""
"The line item quantities may be modified to quantities more than already "
"received. prices cannot be altered for lines that have already been received "
"and quantities cannot be reduced below the quantity already received."
msgstr ""
-#: ../purchasing/po_entry_items.php:205
-#: ../purchasing/po_entry_items.php.orig:205
+#: ../purchasing/po_entry_items.php:202
msgid "This purchase order has been cancelled."
msgstr ""
-#: ../purchasing/po_entry_items.php:207
-#: ../purchasing/po_entry_items.php.orig:207
+#: ../purchasing/po_entry_items.php:204
msgid "Enter a new purchase order"
msgstr ""
-#: ../purchasing/po_entry_items.php:219
-#: ../purchasing/po_entry_items.php.orig:219
-#: ../sales/sales_order_entry.php:503
+#: ../purchasing/po_entry_items.php:216
+#: ../sales/sales_order_entry.php:520
msgid "Item description cannot be empty."
msgstr ""
-#: ../purchasing/po_entry_items.php:229
-#: ../purchasing/po_entry_items.php.orig:229
+#: ../purchasing/po_entry_items.php:226
msgid "The quantity of the order item must be numeric and not less than "
msgstr ""
-#: ../purchasing/po_entry_items.php:236
-#: ../purchasing/po_entry_items.php.orig:236
+#: ../purchasing/po_entry_items.php:233
msgid "The price entered must be numeric and not less than zero."
msgstr ""
-#: ../purchasing/po_entry_items.php:260
-#: ../purchasing/po_entry_items.php.orig:260
+#: ../purchasing/po_entry_items.php:257
msgid ""
"You are attempting to make the quantity ordered a quantity less than has "
"already been invoiced or received. This is prohibited."
msgstr ""
-#: ../purchasing/po_entry_items.php:261
-#: ../purchasing/po_entry_items.php.orig:261
+#: ../purchasing/po_entry_items.php:258
msgid ""
"The quantity received can only be modified by entering a negative receipt "
"and the quantity invoiced can only be reduced by entering a credit note "
"against this item."
msgstr ""
-#: ../purchasing/po_entry_items.php:289
-#: ../purchasing/po_entry_items.php.orig:289
+#: ../purchasing/po_entry_items.php:286
msgid "The selected item is already on this order."
msgstr ""
-#: ../purchasing/po_entry_items.php:316
-#: ../purchasing/po_entry_items.php.orig:316
+#: ../purchasing/po_entry_items.php:313
msgid ""
"The selected item does not exist or it is a kit part and therefore cannot be "
"purchased."
msgstr ""
-#: ../purchasing/po_entry_items.php:332
-#: ../purchasing/po_entry_items.php.orig:332
-#: ../purchasing/supplier_invoice.php:384
+#: ../purchasing/po_entry_items.php:329
+#: ../purchasing/supplier_invoice.php:394
#: ../purchasing/supplier_payment.php:123
-#: ../purchasing/supplier_payment.php.orig:113
msgid "There is no supplier selected."
msgstr ""
-#: ../purchasing/po_entry_items.php:339
-#: ../purchasing/po_entry_items.php.orig:339
+#: ../purchasing/po_entry_items.php:336
msgid "The entered order date is invalid."
msgstr ""
-#: ../purchasing/po_entry_items.php:352
-#: ../purchasing/po_entry_items.php.orig:352
+#: ../purchasing/po_entry_items.php:349
msgid "The entered due date is invalid."
msgstr ""
-#: ../purchasing/po_entry_items.php:361
-#: ../purchasing/po_entry_items.php.orig:361
+#: ../purchasing/po_entry_items.php:358
msgid "There is no reference entered for this purchase order."
msgstr ""
-#: ../purchasing/po_entry_items.php:376
-#: ../purchasing/po_entry_items.php.orig:376
-#: ../purchasing/supplier_invoice.php:186
+#: ../purchasing/po_entry_items.php:373
+#: ../purchasing/supplier_invoice.php:197
msgid "You must enter a supplier's invoice reference."
msgstr ""
-#: ../purchasing/po_entry_items.php:383
-#: ../purchasing/po_entry_items.php.orig:383
-#: ../purchasing/supplier_invoice.php:212
+#: ../purchasing/po_entry_items.php:380
+#: ../purchasing/supplier_invoice.php:223
msgid ""
"This invoice number has already been entered. It cannot be entered again."
msgstr ""
-#: ../purchasing/po_entry_items.php:389
-#: ../purchasing/po_entry_items.php.orig:389
+#: ../purchasing/po_entry_items.php:386
msgid "There is no delivery address specified."
msgstr ""
-#: ../purchasing/po_entry_items.php:395
-#: ../purchasing/po_entry_items.php.orig:395
+#: ../purchasing/po_entry_items.php:392
msgid "There is no location specified to move any items into."
msgstr ""
-#: ../purchasing/po_entry_items.php:403
-#: ../purchasing/po_entry_items.php.orig:403
+#: ../purchasing/po_entry_items.php:400
msgid ""
"The order cannot be placed because there are no lines entered on this order."
msgstr ""
-#: ../purchasing/po_entry_items.php:408
-#: ../purchasing/po_entry_items.php.orig:408
+#: ../purchasing/po_entry_items.php:405
msgid "Required prepayment is greater than total invoice value."
msgstr ""
-#: ../purchasing/po_entry_items.php.orig:496
-msgid "Payment for:"
-msgstr ""
-
-#: ../purchasing/po_entry_items.php.orig:567
-#: ../sales/sales_order_entry.php:726
+#: ../purchasing/po_entry_items.php:490
+#: ../sales/sales_order_entry.php:731
msgid "Place Order"
msgstr ""
-#: ../purchasing/po_entry_items.php.orig:568
+#: ../purchasing/po_entry_items.php:491
msgid "Update Order"
msgstr ""
-#: ../purchasing/po_entry_items.php.orig:569
-#: ../sales/sales_order_entry.php:725
+#: ../purchasing/po_entry_items.php:492
+#: ../sales/sales_order_entry.php:730
msgid "Cancel Order"
msgstr ""
-#: ../purchasing/po_entry_items.php.orig:571
+#: ../purchasing/po_entry_items.php:494
msgid "Process GRN"
msgstr ""
-#: ../purchasing/po_entry_items.php.orig:572
+#: ../purchasing/po_entry_items.php:495
msgid "Update GRN"
msgstr ""
-#: ../purchasing/po_entry_items.php.orig:573
+#: ../purchasing/po_entry_items.php:496
msgid "Cancel GRN"
msgstr ""
-#: ../purchasing/po_entry_items.php.orig:576
-#: ../sales/customer_invoice.php:686
+#: ../purchasing/po_entry_items.php:499
+#: ../sales/customer_invoice.php:695
msgid "Process Invoice"
msgstr ""
-#: ../purchasing/po_entry_items.php.orig:577
+#: ../purchasing/po_entry_items.php:500
msgid "Update Invoice"
msgstr ""
-#: ../purchasing/po_entry_items.php.orig:578
-#: ../sales/sales_order_entry.php:706
+#: ../purchasing/po_entry_items.php:501
+#: ../sales/sales_order_entry.php:711
msgid "Cancel Invoice"
msgstr ""
#: ../purchasing/po_receive_items.php:62
#: ../reporting/rep105.php:114
-#: ../sales/customer_delivery.php:446
+#: ../sales/customer_delivery.php:456
msgid "Ordered"
msgstr ""
msgstr ""
#: ../purchasing/po_receive_items.php:63
-#: ../sales/customer_delivery.php:447
+#: ../sales/customer_delivery.php:457
msgid "This Delivery"
msgstr ""
msgid "Enter Another Credit Note"
msgstr ""
-#: ../purchasing/supplier_credit.php:118
-#: ../purchasing/supplier_invoice.php:127
+#: ../purchasing/supplier_credit.php:127
+#: ../purchasing/supplier_invoice.php:137
msgid ""
"The account code entered is not a valid code, this line cannot be added to "
"the transaction."
msgstr ""
-#: ../purchasing/supplier_credit.php:128
-#: ../purchasing/supplier_invoice.php:137
+#: ../purchasing/supplier_credit.php:137
+#: ../purchasing/supplier_invoice.php:147
msgid ""
"The amount entered is not numeric. This line cannot be added to the "
"transaction."
msgstr ""
-#: ../purchasing/supplier_credit.php:158
+#: ../purchasing/supplier_credit.php:168
msgid ""
"The credit note cannot be processed because the there are no items or values "
"on the invoice. Credit notes are expected to have a charge."
msgstr ""
-#: ../purchasing/supplier_credit.php:165
+#: ../purchasing/supplier_credit.php:175
msgid "You must enter an credit note reference."
msgstr ""
-#: ../purchasing/supplier_credit.php:179
+#: ../purchasing/supplier_credit.php:189
msgid "You must enter a supplier's credit note reference."
msgstr ""
-#: ../purchasing/supplier_credit.php:186
+#: ../purchasing/supplier_credit.php:196
msgid ""
"The credit note as entered cannot be processed because the date entered is "
"not valid."
msgstr ""
-#: ../purchasing/supplier_credit.php:198
-#: ../purchasing/supplier_invoice.php:205
+#: ../purchasing/supplier_credit.php:208
+#: ../purchasing/supplier_invoice.php:216
msgid ""
"The invoice as entered cannot be processed because the due date is in an "
"incorrect format."
msgstr ""
-#: ../purchasing/supplier_credit.php:205
+#: ../purchasing/supplier_credit.php:215
msgid ""
"The credit note total as entered is less than the sum of the the general "
"ledger entires (if any) and the charges for goods received. There must be a "
"mistake somewhere, the credit note as entered will not be processed."
msgstr ""
-#: ../purchasing/supplier_credit.php:217
+#: ../purchasing/supplier_credit.php:226
msgid ""
"The return cannot be processed because there is an insufficient quantity for "
"item:"
msgstr ""
-#: ../purchasing/supplier_credit.php:260
+#: ../purchasing/supplier_credit.php:269
msgid "The quantity to credit must be numeric and greater than zero."
msgstr ""
-#: ../purchasing/supplier_credit.php:267
+#: ../purchasing/supplier_credit.php:276
msgid "The price is either not numeric or negative."
msgstr ""
-#: ../purchasing/supplier_credit.php:369
+#: ../purchasing/supplier_credit.php:378
msgid "Enter Credit Note"
msgstr ""
msgid "View this Invoice"
msgstr ""
-#: ../purchasing/supplier_invoice.php:73
+#: ../purchasing/supplier_invoice.php:71
+msgid "Entry supplier &payment for this invoice"
+msgstr ""
+
+#: ../purchasing/supplier_invoice.php:74
msgid "Enter Another Invoice"
msgstr ""
-#: ../purchasing/supplier_invoice.php:166
+#: ../purchasing/supplier_invoice.php:177
msgid ""
"The invoice cannot be processed because the there are no items or values on "
"the invoice. Invoices are expected to have a charge."
msgstr ""
-#: ../purchasing/supplier_invoice.php:172
+#: ../purchasing/supplier_invoice.php:183
msgid "You must enter an invoice reference."
msgstr ""
-#: ../purchasing/supplier_invoice.php:193
+#: ../purchasing/supplier_invoice.php:204
msgid ""
"The invoice as entered cannot be processed because the invoice date is in an "
"incorrect format."
msgstr ""
-#: ../purchasing/supplier_invoice.php:254
+#: ../purchasing/supplier_invoice.php:265
msgid "The quantity to invoice must be numeric and greater than zero."
msgstr ""
-#: ../purchasing/supplier_invoice.php:261
+#: ../purchasing/supplier_invoice.php:272
msgid "The price is not numeric."
msgstr ""
-#: ../purchasing/supplier_invoice.php:274
+#: ../purchasing/supplier_invoice.php:285
msgid ""
"The price being invoiced is more than the purchase order price by more than "
"the allowed over-charge percentage. The system is set up to prohibit this. "
"See the system administrator to modify the set up parameters if necessary."
msgstr ""
-#: ../purchasing/supplier_invoice.php:275
-#: ../purchasing/supplier_invoice.php:288
+#: ../purchasing/supplier_invoice.php:286
+#: ../purchasing/supplier_invoice.php:299
msgid "The over-charge percentage allowance is :"
msgstr ""
-#: ../purchasing/supplier_invoice.php:287
+#: ../purchasing/supplier_invoice.php:298
msgid ""
"The quantity being invoiced is more than the outstanding quantity by more "
"than the allowed over-charge percentage. The system is set up to prohibit "
"necessary."
msgstr ""
-#: ../purchasing/supplier_invoice.php:366
+#: ../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:408
+#: ../purchasing/supplier_invoice.php:418
msgid "Enter Invoice"
msgstr ""
#: ../purchasing/supplier_payment.php:31
-#: ../purchasing/supplier_payment.php.orig:31
msgid "Supplier Payment Entry"
msgstr ""
#: ../purchasing/supplier_payment.php:92
-#: ../purchasing/supplier_payment.php.orig:85
msgid "Invalid purchase invoice number."
msgstr ""
#: ../purchasing/supplier_payment.php:98
-#: ../purchasing/supplier_payment.php.orig:91
msgid "Payment has been sucessfully entered"
msgstr ""
#: ../purchasing/supplier_payment.php:100
-#: ../purchasing/supplier_payment.php.orig:93
msgid "&Print This Remittance"
msgstr ""
#: ../purchasing/supplier_payment.php:101
-#: ../purchasing/supplier_payment.php.orig:94
msgid "&Email This Remittance"
msgstr ""
msgstr ""
#: ../purchasing/supplier_payment.php:104
-#: ../purchasing/supplier_payment.php.orig:96
msgid "View the GL &Journal Entries for this Payment"
msgstr ""
#: ../purchasing/supplier_payment.php:106
-#: ../purchasing/supplier_payment.php.orig:100
msgid "Enter another supplier &payment"
msgstr ""
msgstr ""
#: ../purchasing/supplier_payment.php:162
-#: ../purchasing/supplier_payment.php.orig:159
msgid "The entered discount is invalid or less than zero."
msgstr ""
#: ../purchasing/supplier_payment.php:170
-#: ../purchasing/supplier_payment.php.orig:167
msgid ""
"The total of the amount and the discount is zero or negative. Please enter "
"positive values."
msgid "The entered bank amount is zero or negative."
msgstr ""
-#: ../purchasing/supplier_payment.php:274
-#: ../purchasing/supplier_payment.php.orig:270
+#: ../purchasing/supplier_payment.php:275
msgid "Payment To:"
msgstr ""
-#: ../purchasing/supplier_payment.php.orig:147
-#: ../sales/customer_payments.php.orig:192
-msgid "The exchange rate must be numeric and greater than zero."
-msgstr ""
-
-#: ../purchasing/supplier_payment.php.orig:283
+#: ../purchasing/supplier_payment.php:290
msgid "From Bank Account:"
msgstr ""
-#: ../purchasing/supplier_payment.php.orig:291
+#: ../purchasing/supplier_payment.php:296
#: ../purchasing/view/view_supp_payment.php:55
msgid "Date Paid"
msgstr ""
-#: ../purchasing/supplier_payment.php.orig:314
-#: ../sales/customer_payments.php.orig:409
-msgid "Amount of Discount:"
+#: ../purchasing/supplier_payment.php:310
+msgid "Bank Amount:"
msgstr ""
-#: ../purchasing/supplier_payment.php.orig:315
-msgid "Amount of Payment:"
+#: ../purchasing/supplier_payment.php:323
+#: ../sales/customer_payments.php:398
+msgid "Amount of Discount:"
msgstr ""
-#: ../purchasing/supplier_payment.php.orig:321
-msgid "The amount and discount are in the bank account's currency."
+#: ../purchasing/supplier_payment.php:324
+msgid "Amount of Payment:"
msgstr ""
-#: ../purchasing/supplier_payment.php.orig:324
+#: ../purchasing/supplier_payment.php:328
msgid "Enter Payment"
msgstr ""
#: ../reporting/includes/doctext.inc:77
#: ../reporting/includes/doctext.inc:192
#: ../reporting/includes/doctext.inc:244
-#: ../sales/inquiry/sales_deliveries_view.php:186
+#: ../sales/inquiry/sales_deliveries_view.php:188
msgid "Delivery Date"
msgstr ""
msgstr ""
#: ../purchasing/view/view_po.php:100
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:147
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:148
#: ../purchasing/inquiry/supplier_inquiry.php:197
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:165
-#: ../sales/inquiry/customer_inquiry.php.orig:227
-#: ../sales/inquiry/sales_deliveries_view.php:206
-#: ../sales/inquiry/sales_orders_view.php.orig:344
+#: ../sales/inquiry/customer_allocation_inquiry.php:165
+#: ../sales/inquiry/customer_inquiry.php:227
+#: ../sales/inquiry/sales_deliveries_view.php:208
+#: ../sales/inquiry/sales_orders_view.php:345
msgid "Marked items are overdue."
msgstr ""
msgstr ""
#: ../purchasing/view/view_supp_invoice.php:73
+#: ../reporting/rep107.php:280
+#: ../reporting/rep107.php:286
#: ../sales/view/view_invoice.php:166
msgid "TOTAL INVOICE"
msgstr ""
#: ../purchasing/view/view_supp_payment.php:62
#: ../reporting/rep112.php:150
#: ../reporting/rep210.php:159
-#: ../sales/customer_delivery.php:447
-#: ../sales/customer_invoice.php:542
-#: ../sales/customer_invoice.php:545
+#: ../sales/customer_delivery.php:457
+#: ../sales/customer_invoice.php:551
+#: ../sales/customer_invoice.php:554
#: ../sales/view/view_receipt.php:45
#: ../sales/view/view_sales_order.php:220
msgid "Discount"
msgstr ""
#: ../purchasing/manage/suppliers.php:27
-#: ../purchasing/manage/suppliers.php.orig:27
#: ../sales/manage/customer_branches.php:33
msgid ""
"There are no tax groups defined in the system. At least one tax group is "
msgstr ""
#: ../purchasing/manage/suppliers.php:91
-#: ../purchasing/manage/suppliers.php.orig:91
msgid "Basic Data"
msgstr ""
#: ../purchasing/manage/suppliers.php:93
-#: ../purchasing/manage/suppliers.php.orig:93
msgid "Supplier Name:"
msgstr ""
#: ../purchasing/manage/suppliers.php:94
-#: ../purchasing/manage/suppliers.php.orig:94
msgid "Supplier Short Name:"
msgstr ""
#: ../purchasing/manage/suppliers.php:97
-#: ../purchasing/manage/suppliers.php.orig:97
msgid "Website:"
msgstr ""
-#: ../purchasing/manage/suppliers.php:108
-#: ../purchasing/manage/suppliers.php.orig:108
+#: ../purchasing/manage/suppliers.php:109
msgid "Our Customer No:"
msgstr ""
-#: ../purchasing/manage/suppliers.php:110
-#: ../purchasing/manage/suppliers.php.orig:110
+#: ../purchasing/manage/suppliers.php:111
msgid "Purchasing"
msgstr ""
-#: ../purchasing/manage/suppliers.php:111
-#: ../purchasing/manage/suppliers.php.orig:111
+#: ../purchasing/manage/suppliers.php:112
msgid "Bank Name/Account:"
msgstr ""
-#: ../purchasing/manage/suppliers.php:112
-#: ../purchasing/manage/suppliers.php.orig:112
-#: ../sales/manage/customers.php:267
-#: ../sales/manage/sav.customers.php:263
+#: ../purchasing/manage/suppliers.php:113
+#: ../sales/manage/customers.php:268
msgid "Credit Limit:"
msgstr ""
-#: ../purchasing/manage/suppliers.php:113
-#: ../purchasing/manage/suppliers.php.orig:113
-#: ../sales/manage/customers.php:269
-#: ../sales/manage/sav.customers.php:265
+#: ../purchasing/manage/suppliers.php:114
+#: ../sales/manage/customers.php:270
msgid "Payment Terms:"
msgstr ""
-#: ../purchasing/manage/suppliers.php:119
-#: ../purchasing/manage/suppliers.php:122
-#: ../purchasing/manage/suppliers.php.orig:119
-#: ../purchasing/manage/suppliers.php.orig:122
+#: ../purchasing/manage/suppliers.php:120
+#: ../purchasing/manage/suppliers.php:123
msgid "Prices contain tax included:"
msgstr ""
-#: ../purchasing/manage/suppliers.php:124
-#: ../purchasing/manage/suppliers.php.orig:124
+#: ../purchasing/manage/suppliers.php:125
msgid "Tax Calculation Algorithm:"
msgstr ""
-#: ../purchasing/manage/suppliers.php:128
-#: ../purchasing/manage/suppliers.php.orig:128
+#: ../purchasing/manage/suppliers.php:129
#: ../reporting/rep704.php:96
#: ../reporting/rep704.php:106
#: ../reporting/rep704.php:114
msgid "Accounts"
msgstr ""
-#: ../purchasing/manage/suppliers.php:129
-#: ../purchasing/manage/suppliers.php.orig:129
+#: ../purchasing/manage/suppliers.php:130
msgid "Accounts Payable Account:"
msgstr ""
-#: ../purchasing/manage/suppliers.php:130
-#: ../purchasing/manage/suppliers.php.orig:130
+#: ../purchasing/manage/suppliers.php:131
msgid "Purchase Account:"
msgstr ""
-#: ../purchasing/manage/suppliers.php:131
-#: ../purchasing/manage/suppliers.php.orig:131
+#: ../purchasing/manage/suppliers.php:132
msgid "Use Item Inventory/COGS Account"
msgstr ""
-#: ../purchasing/manage/suppliers.php:134
-#: ../purchasing/manage/suppliers.php:137
-#: ../purchasing/manage/suppliers.php.orig:134
-#: ../purchasing/manage/suppliers.php.orig:137
+#: ../purchasing/manage/suppliers.php:135
+#: ../purchasing/manage/suppliers.php:139
msgid "Contact Data"
msgstr ""
-#: ../purchasing/manage/suppliers.php:140
-#: ../purchasing/manage/suppliers.php.orig:140
+#: ../purchasing/manage/suppliers.php:142
msgid "System default"
msgstr ""
-#: ../purchasing/manage/suppliers.php:157
-#: ../purchasing/manage/suppliers.php.orig:157
+#: ../purchasing/manage/suppliers.php:159
#: ../sales/manage/customer_branches.php:268
msgid "Addresses"
msgstr ""
-#: ../purchasing/manage/suppliers.php:158
-#: ../purchasing/manage/suppliers.php.orig:158
+#: ../purchasing/manage/suppliers.php:160
#: ../reporting/rep205.php:102
#: ../sales/manage/customer_branches.php:269
msgid "Mailing Address:"
msgstr ""
-#: ../purchasing/manage/suppliers.php:159
-#: ../purchasing/manage/suppliers.php.orig:159
+#: ../purchasing/manage/suppliers.php:161
msgid "Physical Address:"
msgstr ""
-#: ../purchasing/manage/suppliers.php:161
-#: ../purchasing/manage/suppliers.php.orig:161
+#: ../purchasing/manage/suppliers.php:163
msgid "General"
msgstr ""
-#: ../purchasing/manage/suppliers.php:162
-#: ../purchasing/manage/suppliers.php.orig:162
+#: ../purchasing/manage/suppliers.php:164
#: ../sales/manage/customer_branches.php:271
-#: ../sales/manage/customers.php:290
-#: ../sales/manage/sav.customers.php:286
+#: ../sales/manage/customers.php:291
msgid "General Notes:"
msgstr ""
-#: ../purchasing/manage/suppliers.php:164
-#: ../purchasing/manage/suppliers.php.orig:164
+#: ../purchasing/manage/suppliers.php:166
msgid "Supplier status:"
msgstr ""
-#: ../purchasing/manage/suppliers.php:170
-#: ../purchasing/manage/suppliers.php.orig:170
+#: ../purchasing/manage/suppliers.php:172
msgid "Update Supplier"
msgstr ""
-#: ../purchasing/manage/suppliers.php:171
-#: ../purchasing/manage/suppliers.php.orig:171
+#: ../purchasing/manage/suppliers.php:173
msgid "Update supplier data"
msgstr ""
-#: ../purchasing/manage/suppliers.php:172
-#: ../purchasing/manage/suppliers.php.orig:172
+#: ../purchasing/manage/suppliers.php:174
msgid "Select this supplier and return to document entry."
msgstr ""
-#: ../purchasing/manage/suppliers.php:173
-#: ../purchasing/manage/suppliers.php.orig:173
+#: ../purchasing/manage/suppliers.php:175
msgid "Delete Supplier"
msgstr ""
-#: ../purchasing/manage/suppliers.php:174
-#: ../purchasing/manage/suppliers.php.orig:174
+#: ../purchasing/manage/suppliers.php:176
msgid "Delete supplier data if have been never used"
msgstr ""
-#: ../purchasing/manage/suppliers.php:178
-#: ../purchasing/manage/suppliers.php.orig:178
+#: ../purchasing/manage/suppliers.php:180
msgid "Add New Supplier Details"
msgstr ""
-#: ../purchasing/manage/suppliers.php:197
-#: ../purchasing/manage/suppliers.php.orig:197
+#: ../purchasing/manage/suppliers.php:199
msgid "The supplier name must be entered."
msgstr ""
-#: ../purchasing/manage/suppliers.php:204
-#: ../purchasing/manage/suppliers.php.orig:204
+#: ../purchasing/manage/suppliers.php:206
msgid "The supplier short name must be entered."
msgstr ""
-#: ../purchasing/manage/suppliers.php.orig:224
+#: ../purchasing/manage/suppliers.php:226
msgid "Supplier has been updated."
msgstr ""
-#: ../purchasing/manage/suppliers.php.orig:242
+#: ../purchasing/manage/suppliers.php:244
msgid "A new supplier has been added."
msgstr ""
-#: ../purchasing/manage/suppliers.php.orig:260
+#: ../purchasing/manage/suppliers.php:262
msgid ""
"Cannot delete this supplier because there are transactions that refer to "
"this supplier."
msgstr ""
-#: ../purchasing/manage/suppliers.php.orig:268
+#: ../purchasing/manage/suppliers.php:270
msgid ""
"Cannot delete the supplier record because purchase orders have been created "
"against this supplier."
msgstr ""
-#: ../purchasing/manage/suppliers.php.orig:289
+#: ../purchasing/manage/suppliers.php:291
+#: ../purchasing/inquiry/po_search_completed.php:75
+#: ../purchasing/inquiry/po_search.php:76
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:48
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:48
msgid "Select a supplier: "
msgstr ""
-#: ../purchasing/manage/suppliers.php.orig:290
+#: ../purchasing/manage/suppliers.php:292
msgid "New supplier"
msgstr ""
-#: ../purchasing/manage/suppliers.php.orig:309
+#: ../purchasing/manage/suppliers.php:311
#: ../sales/manage/customer_branches.php:325
-#: ../sales/manage/customers.php:348
-#: ../sales/manage/sav.customers.php:343
+#: ../sales/manage/customers.php:349
msgid "&Contacts"
msgstr ""
-#: ../purchasing/manage/suppliers.php.orig:311
+#: ../purchasing/manage/suppliers.php:313
msgid "Purchase &Orders"
msgstr ""
#: ../purchasing/inquiry/po_search_completed.php:24
-#: ../purchasing/inquiry/po_search_completed.php.orig:25
msgid "Search Purchase Orders"
msgstr ""
#: ../purchasing/inquiry/po_search_completed.php:60
-#: ../purchasing/inquiry/po_search_completed.php.orig:61
#: ../purchasing/inquiry/po_search.php:62
#: ../sales/inquiry/sales_deliveries_view.php:103
-#: ../sales/inquiry/sales_orders_view.php.orig:247
+#: ../sales/inquiry/sales_orders_view.php:247
msgid "#:"
msgstr ""
#: ../purchasing/inquiry/po_search_completed.php:65
-#: ../purchasing/inquiry/po_search_completed.php.orig:66
msgid "into location:"
msgstr ""
-#: ../purchasing/inquiry/po_search_completed.php:125
-#: ../purchasing/inquiry/po_search_completed.php.orig:124
-#: ../purchasing/inquiry/po_search.php:135
+#: ../purchasing/inquiry/po_search_completed.php:128
+#: ../purchasing/inquiry/po_search.php:137
#: ../reporting/includes/doctext.inc:188
-#: ../sales/inquiry/sales_orders_view.php.orig:289
+#: ../sales/inquiry/sales_orders_view.php:290
msgid "Order Date"
msgstr ""
-#: ../purchasing/inquiry/po_search_completed.php:127
-#: ../purchasing/inquiry/po_search_completed.php.orig:126
-#: ../purchasing/inquiry/po_search.php:137
-#: ../sales/inquiry/sales_orders_view.php.orig:292
+#: ../purchasing/inquiry/po_search_completed.php:130
+#: ../purchasing/inquiry/po_search.php:139
+#: ../sales/inquiry/sales_orders_view.php:293
msgid "Order Total"
msgstr ""
msgid "Search Outstanding Purchase Orders"
msgstr ""
-#: ../purchasing/inquiry/po_search.php:98
+#: ../purchasing/inquiry/po_search.php:100
msgid "Receive"
msgstr ""
-#: ../purchasing/inquiry/po_search.php:148
+#: ../purchasing/inquiry/po_search.php:150
msgid "Marked orders have overdue items."
msgstr ""
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:23
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:23
msgid "Supplier Allocation Inquiry"
msgstr ""
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:55
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:55
#: ../sales/inquiry/customer_allocation_inquiry.php:49
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:49
msgid "show settled:"
msgstr ""
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:129
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:103
+msgid "Pay"
+msgstr ""
+
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:130
msgid "Supp Reference"
msgstr ""
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:135
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:136
#: ../reporting/rep101.php:119
#: ../reporting/rep201.php:111
#: ../reporting/includes/doctext.inc:247
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:154
+#: ../sales/inquiry/customer_allocation_inquiry.php:154
msgid "Allocated"
msgstr ""
#: ../sales/inquiry/customer_inquiry.php:71
#: ../sales/inquiry/customer_inquiry.php:72
#: ../sales/inquiry/customer_inquiry.php:73
-#: ../sales/inquiry/customer_inquiry.php.orig:71
-#: ../sales/inquiry/customer_inquiry.php.orig:72
-#: ../sales/inquiry/customer_inquiry.php.orig:73
msgid "Days"
msgstr ""
#: ../reporting/rep202.php:126
#: ../reporting/rep202.php:160
#: ../sales/inquiry/customer_inquiry.php:73
-#: ../sales/inquiry/customer_inquiry.php.orig:73
msgid "Over"
msgstr ""
#: ../purchasing/inquiry/supplier_inquiry.php:73
#: ../sales/inquiry/customer_inquiry.php:76
-#: ../sales/inquiry/customer_inquiry.php.orig:76
msgid "Terms"
msgstr ""
#: ../reporting/rep202.php:130
#: ../reporting/rep202.php:250
#: ../sales/inquiry/customer_inquiry.php:76
-#: ../sales/inquiry/customer_inquiry.php.orig:76
msgid "Current"
msgstr ""
#: ../reporting/rep108.php:155
#: ../reporting/rep202.php:131
#: ../sales/inquiry/customer_inquiry.php:77
-#: ../sales/inquiry/customer_inquiry.php.orig:77
msgid "Total Balance"
msgstr ""
#: ../purchasing/inquiry/supplier_inquiry.php:133
#: ../sales/inquiry/customer_inquiry.php:162
-#: ../sales/inquiry/customer_inquiry.php.orig:162
msgid "Credit This"
msgstr ""
#: ../purchasing/allocations/supplier_allocate.php:62
#: ../sales/allocations/customer_allocate.php:59
-msgid "Total in clearing currency:"
-msgstr ""
-
-#: ../purchasing/allocations/supplier_allocate.php:73
-#: ../sales/allocations/customer_allocate.php:71
-msgid "Start again allocation of selected amount"
+msgid "Amount ot be settled:"
msgstr ""
#: ../purchasing/allocations/supplier_allocate.php:74
#: ../sales/allocations/customer_allocate.php:72
-msgid "Process allocations"
+msgid "Start again allocation of selected amount"
msgstr ""
#: ../purchasing/allocations/supplier_allocate.php:75
-#: ../purchasing/allocations/supplier_allocate.php:81
#: ../sales/allocations/customer_allocate.php:73
-#: ../sales/allocations/customer_allocate.php:79
-msgid "Back to Allocations"
+msgid "Process allocations"
msgstr ""
#: ../purchasing/allocations/supplier_allocate.php:76
#: ../purchasing/allocations/supplier_allocate.php:82
-#: ../sales/allocations/customer_allocate.php:73
+#: ../sales/allocations/customer_allocate.php:74
#: ../sales/allocations/customer_allocate.php:80
+msgid "Back to Allocations"
+msgstr ""
+
+#: ../purchasing/allocations/supplier_allocate.php:77
+#: ../purchasing/allocations/supplier_allocate.php:83
+#: ../sales/allocations/customer_allocate.php:74
+#: ../sales/allocations/customer_allocate.php:81
msgid "Abandon allocations and return to selection of allocatable amounts"
msgstr ""
-#: ../purchasing/allocations/supplier_allocate.php:80
-#: ../sales/allocations/customer_allocate.php:77
+#: ../purchasing/allocations/supplier_allocate.php:81
+#: ../sales/allocations/customer_allocate.php:78
msgid "There are no unsettled transactions to allocate."
msgstr ""
#: ../reporting/rep101.php:118
#: ../reporting/rep201.php:110
#: ../reporting/rep203.php:93
-#: ../reporting/rep709.php:111
+#: ../reporting/rep709.php:116
#: ../reporting/includes/doctext.inc:167
#: ../reporting/includes/doctext.inc:208
#: ../reporting/includes/doctext.inc:246
#: ../reporting/reports_main.php:156
#: ../reporting/reports_main.php:166
#: ../reporting/reports_main.php:175
+#: ../reporting/reports_main.php:227
msgid "Suppress Zeros"
msgstr ""
#: ../reporting/rep101.php:241
#: ../reporting/rep102.php:228
#: ../reporting/rep106.php:171
-#: ../reporting/rep201.php:233
+#: ../reporting/rep201.php:234
#: ../reporting/rep202.php:235
#: ../reporting/rep203.php:181
#: ../reporting/rep204.php:148
-#: ../reporting/rep301.php:179
+#: ../reporting/rep301.php:254
#: ../reporting/rep304.php:195
#: ../reporting/rep305.php:188
#: ../reporting/rep306.php:293
#: ../reporting/rep102.php:102
#: ../reporting/rep106.php:93
#: ../reporting/rep202.php:106
-#: ../reporting/rep709.php:95
+#: ../reporting/rep709.php:100
#: ../reporting/reports_main.php:48
#: ../reporting/reports_main.php:91
#: ../reporting/reports_main.php:165
+#: ../reporting/reports_main.php:211
+#: ../reporting/reports_main.php:497
msgid "Summary Only"
msgstr ""
#: ../reporting/rep102.php:104
#: ../reporting/rep202.php:108
-#: ../reporting/rep709.php:97
+#: ../reporting/rep709.php:102
msgid "Detailed Report"
msgstr ""
#: ../reporting/rep102.php:131
#: ../reporting/rep202.php:136
#: ../reporting/rep203.php:99
-#: ../reporting/rep301.php:110
+#: ../reporting/rep301.php:174
#: ../reporting/reports_main.php:35
#: ../reporting/reports_main.php:44
#: ../reporting/reports_main.php:65
#: ../reporting/reports_main.php:152
#: ../reporting/reports_main.php:161
#: ../reporting/reports_main.php:172
+#: ../reporting/reports_main.php:208
+#: ../reporting/reports_main.php:234
+#: ../reporting/reports_main.php:243
+#: ../reporting/reports_main.php:249
+#: ../reporting/reports_main.php:259
+#: ../reporting/reports_main.php:267
+#: ../reporting/reports_main.php:275
+#: ../reporting/reports_main.php:319
+#: ../reporting/reports_main.php:327
+#: ../reporting/reports_main.php:339
+#: ../reporting/reports_main.php:351
+#: ../reporting/reports_main.php:369
+#: ../reporting/reports_main.php:380
+#: ../reporting/reports_main.php:392
+#: ../reporting/reports_main.php:405
+#: ../reporting/reports_main.php:421
+#: ../reporting/reports_main.php:431
+#: ../reporting/reports_main.php:442
+#: ../reporting/reports_main.php:454
+#: ../reporting/reports_main.php:468
+#: ../reporting/reports_main.php:477
+#: ../reporting/reports_main.php:487
+#: ../reporting/reports_main.php:496
+#: ../reporting/reports_main.php:503
msgid "End Date"
msgstr ""
msgid "Turnover"
msgstr ""
-#: ../reporting/rep103.php:277
-#: ../reporting/rep106.php:88
-#: ../reporting/rep205.php:195
-#: ../reporting/includes/header2.inc:110
-#: ../sales/manage/sales_people.php:99
-msgid "Email"
-msgstr ""
-
#: ../reporting/rep104.php:111
msgid "Category/Items"
msgstr ""
#: ../reporting/rep104.php:111
-#: ../reporting/rep301.php:105
+#: ../reporting/rep301.php:169
#: ../reporting/rep303.php:121
#: ../reporting/rep303.php:127
#: ../reporting/rep307.php:117
-#: ../reporting/rep308.php:149
+#: ../reporting/rep308.php:230
msgid "UOM"
msgstr ""
#: ../reporting/rep105.php:109
#: ../reporting/rep204.php:84
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:147
-#: ../sales/inquiry/customer_inquiry.php.orig:202
+#: ../sales/inquiry/customer_allocation_inquiry.php:147
+#: ../sales/inquiry/customer_inquiry.php:202
msgid "Order"
msgstr ""
#: ../reporting/rep112.php:175
#: ../sales/create_recurrent_invoices.php:134
#: ../sales/customer_credit_invoice.php:236
-#: ../sales/customer_delivery.php:353
-#: ../sales/customer_invoice.php:447
-#: ../sales/manage/customers.php:254
-#: ../sales/manage/customers.php:293
+#: ../sales/customer_delivery.php:363
+#: ../sales/customer_invoice.php:456
+#: ../sales/manage/customers.php:255
+#: ../sales/manage/customers.php:294
#: ../sales/manage/recurrent_invoices.php:102
-#: ../sales/manage/sav.customers.php:251
-#: ../sales/manage/sav.customers.php:289
#: ../sales/view/view_credit.php:58
-#: ../sales/inquiry/customer_inquiry.php.orig:207
-#: ../sales/inquiry/sales_deliveries_view.php:182
-#: ../sales/inquiry/sales_orders_view.php.orig:287
-#: ../sales/inquiry/sales_orders_view.php.orig:301
+#: ../sales/inquiry/customer_inquiry.php:207
+#: ../sales/inquiry/sales_deliveries_view.php:184
+#: ../sales/inquiry/sales_orders_view.php:288
+#: ../sales/inquiry/sales_orders_view.php:302
msgid "Branch"
msgstr ""
msgstr ""
#: ../reporting/rep105.php:114
-#: ../sales/customer_delivery.php:446
-#: ../sales/customer_invoice.php:544
-#: ../sales/includes/ui/sales_order_ui.inc:146
+#: ../sales/customer_delivery.php:456
+#: ../sales/customer_invoice.php:553
+#: ../sales/includes/ui/sales_order_ui.inc:147
msgid "Delivered"
msgstr ""
msgid "Salesman Listing"
msgstr ""
-#: ../reporting/rep108.php:85
-#: ../reporting/rep108.php:110
-#: ../reporting/includes/doctext.inc:238
-msgid "STATEMENT"
+#: ../reporting/rep107.php:88
+#: ../reporting/rep107.php:111
+#: ../reporting/includes/doctext.inc:118
+msgid "INVOICE"
msgstr ""
-#: ../reporting/rep108.php:127
-msgid "Outstanding Transactions"
+#: ../reporting/rep107.php:196
+msgid "Prepayments invoiced to this order up to day:"
msgstr ""
-#: ../reporting/rep108.php:170
-msgid "Statement"
+#: ../reporting/rep107.php:203
+msgid "Invoice reference"
msgstr ""
-#: ../reporting/rep108.php:170
-msgid "as of"
+#: ../reporting/rep107.php:220
+msgid "Total payments:"
msgstr ""
-#: ../reporting/rep109.php:66
-#: ../reporting/rep109.php:89
-#: ../reporting/rep109.php:94
-#: ../reporting/includes/doctext.inc:65
-msgid "SALES ORDER"
-msgstr ""
-
-#: ../reporting/rep109.php:68
-#: ../reporting/rep109.php:84
-#: ../reporting/rep109.php:94
-#: ../reporting/includes/doctext.inc:65
-msgid "QUOTE"
-msgstr ""
-
-#: ../reporting/rep109.php:153
+#: ../reporting/rep107.php:234
+#: ../reporting/rep109.php:158
#: ../reporting/rep110.php:162
-#: ../reporting/rep111.php:136
+#: ../reporting/rep111.php:155
#: ../reporting/rep113.php:147
#: ../sales/view/view_credit.php:138
#: ../sales/view/view_dispatch.php:155
msgid "Shipping"
msgstr ""
-#: ../reporting/rep109.php:159
-#: ../reporting/rep111.php:142
-msgid "TOTAL ORDER EX VAT"
+#: ../reporting/rep107.php:280
+#: ../reporting/rep109.php:210
+#: ../reporting/rep111.php:207
+msgid "TOTAL ORDER VAT INCL."
msgstr ""
-#: ../reporting/rep109.php:205
-#: ../reporting/rep111.php:188
-msgid "TOTAL ORDER VAT INCL."
+#: ../reporting/rep107.php:286
+msgid "THIS INVOICE"
+msgstr ""
+
+#: ../reporting/rep108.php:85
+#: ../reporting/rep108.php:110
+#: ../reporting/includes/doctext.inc:238
+msgid "STATEMENT"
+msgstr ""
+
+#: ../reporting/rep108.php:127
+msgid "Outstanding Transactions"
+msgstr ""
+
+#: ../reporting/rep108.php:170
+msgid "Statement"
+msgstr ""
+
+#: ../reporting/rep108.php:170
+msgid "as of"
+msgstr ""
+
+#: ../reporting/rep109.php:66
+#: ../reporting/rep109.php:94
+#: ../reporting/rep109.php:99
+#: ../reporting/includes/doctext.inc:65
+msgid "SALES ORDER"
+msgstr ""
+
+#: ../reporting/rep109.php:68
+#: ../reporting/rep109.php:89
+#: ../reporting/rep109.php:99
+#: ../reporting/includes/doctext.inc:65
+msgid "QUOTE"
+msgstr ""
+
+#: ../reporting/rep109.php:164
+#: ../reporting/rep111.php:161
+msgid "TOTAL ORDER EX VAT"
msgstr ""
#: ../reporting/rep110.php:70
msgid "TOTAL DELIVERY INCL. VAT"
msgstr ""
-#: ../reporting/rep111.php:60
+#: ../reporting/rep111.php:64
#: ../reporting/includes/doctext.inc:50
msgid "SALES QUOTATION"
msgstr ""
msgstr ""
#: ../reporting/rep114.php:95
-#: ../reporting/rep709.php:112
+#: ../reporting/rep709.php:117
#: ../taxes/tax_groups.php:171
msgid "Tax"
msgstr ""
msgid "TOTAL REMITTANCE"
msgstr ""
-#: ../reporting/rep301.php:114
+#: ../reporting/rep301.php:178
msgid "Inventory Valuation Report"
msgstr ""
#: ../reporting/rep304.php:114
#: ../reporting/rep309.php:98
#: ../sales/manage/customer_branches.php:241
-#: ../sales/manage/customers.php:263
-#: ../sales/manage/sav.customers.php:259
+#: ../sales/manage/customers.php:264
msgid "Sales"
msgstr ""
msgid "Inventory Movements"
msgstr ""
-#: ../reporting/rep308.php:149
+#: ../reporting/rep308.php:230
msgid "OpeningStock"
msgstr ""
-#: ../reporting/rep308.php:149
+#: ../reporting/rep308.php:230
msgid "StockIn"
msgstr ""
-#: ../reporting/rep308.php:149
+#: ../reporting/rep308.php:230
msgid "ClosingStock"
msgstr ""
-#: ../reporting/rep308.php:150
+#: ../reporting/rep308.php:231
msgid "QTY"
msgstr ""
-#: ../reporting/rep308.php:150
-#: ../reporting/rep709.php:112
+#: ../reporting/rep308.php:231
+#: ../reporting/rep709.php:117
#: ../taxes/item_tax_types.php:185
msgid "Rate"
msgstr ""
-#: ../reporting/rep308.php:159
+#: ../reporting/rep308.php:240
msgid "Costed Inventory Movements"
msgstr ""
msgid "Bill of Material Listing"
msgstr ""
-#: ../reporting/rep409.php:60
-#: ../reporting/rep409.php:73
+#: ../reporting/rep402.php:110
+msgid "Open Only"
+msgstr ""
+
+#: ../reporting/rep402.php:112
+msgid "Work Order Listing"
+msgstr ""
+
+#: ../reporting/rep409.php:59
+#: ../reporting/rep409.php:72
#: ../reporting/includes/doctext.inc:214
msgid "WORK ORDER"
msgstr ""
-#: ../reporting/rep409.php:129
+#: ../reporting/rep409.php:128
msgid "Insufficient stock"
msgstr ""
#: ../reporting/rep705.php:247
#: ../reporting/rep705.php:260
#: ../reporting/rep705.php:271
+#: ../reporting/reports_main.php:360
+#: ../reporting/reports_main.php:413
+#: ../reporting/reports_main.php:461
msgid "Year"
msgstr ""
msgid "Close Balance"
msgstr ""
-#: ../reporting/rep706.php:308
-#: ../reporting/rep707.php:326
-#: ../reporting/rep708.php:51
-#: ../reporting/rep708.php:126
-#: ../sales/create_recurrent_invoices.php:134
-#: ../sales/manage/recurrent_invoices.php:102
-msgid "Group"
-msgstr ""
-
#: ../reporting/rep707.php:258
msgid "Profit and Loss Statement"
msgstr ""
-#: ../reporting/rep708.php:185
-msgid "Brought Forward"
-msgstr ""
-
-#: ../reporting/rep708.php:185
-msgid "This Period"
-msgstr ""
-
-#: ../reporting/rep708.php:283
-msgid ""
-"The Opening Balance is not in balance, probably due to a non closed Previous "
-"Fiscalyear."
-msgstr ""
-
-#: ../reporting/rep709.php:93
+#: ../reporting/rep709.php:98
msgid "Tax Report"
msgstr ""
-#: ../reporting/rep709.php:111
+#: ../reporting/rep709.php:116
msgid "Branch Name"
msgstr ""
-#: ../reporting/rep709.php:112
+#: ../reporting/rep709.php:117
msgid "Net"
msgstr ""
-#: ../reporting/rep709.php:183
+#: ../reporting/rep709.php:188
msgid "Tax Rate"
msgstr ""
-#: ../reporting/rep709.php:183
+#: ../reporting/rep709.php:188
msgid "Net Tax"
msgstr ""
msgstr ""
#: ../reporting/rep710.php:89
+#: ../reporting/reports_main.php:501
msgid "Audit Trail"
msgstr ""
#: ../reporting/reports_main.php:37
#: ../reporting/reports_main.php:154
+#: ../reporting/reports_main.php:307
msgid "Show Balance"
msgstr ""
#: ../reporting/reports_main.php:163
#: ../reporting/reports_main.php:174
#: ../reporting/reports_main.php:194
+#: ../reporting/reports_main.php:201
msgid "Currency Filter"
msgstr ""
#: ../reporting/reports_main.php:177
#: ../reporting/reports_main.php:182
#: ../reporting/reports_main.php:189
+#: ../reporting/reports_main.php:197
+#: ../reporting/reports_main.php:204
+#: ../reporting/reports_main.php:213
+#: ../reporting/reports_main.php:219
+#: ../reporting/reports_main.php:230
+#: ../reporting/reports_main.php:239
+#: ../reporting/reports_main.php:245
+#: ../reporting/reports_main.php:255
+#: ../reporting/reports_main.php:263
+#: ../reporting/reports_main.php:271
+#: ../reporting/reports_main.php:278
+#: ../reporting/reports_main.php:286
+#: ../reporting/reports_main.php:293
+#: ../reporting/reports_main.php:300
+#: ../reporting/reports_main.php:309
+#: ../reporting/reports_main.php:322
+#: ../reporting/reports_main.php:335
+#: ../reporting/reports_main.php:342
+#: ../reporting/reports_main.php:357
+#: ../reporting/reports_main.php:365
+#: ../reporting/reports_main.php:376
+#: ../reporting/reports_main.php:388
+#: ../reporting/reports_main.php:398
+#: ../reporting/reports_main.php:410
+#: ../reporting/reports_main.php:417
+#: ../reporting/reports_main.php:427
+#: ../reporting/reports_main.php:438
+#: ../reporting/reports_main.php:447
+#: ../reporting/reports_main.php:458
+#: ../reporting/reports_main.php:464
+#: ../reporting/reports_main.php:473
+#: ../reporting/reports_main.php:483
+#: ../reporting/reports_main.php:491
+#: ../reporting/reports_main.php:499
+#: ../reporting/reports_main.php:507
msgid "Orientation"
msgstr ""
#: ../reporting/reports_main.php:178
#: ../reporting/reports_main.php:183
#: ../reporting/reports_main.php:190
+#: ../reporting/reports_main.php:214
+#: ../reporting/reports_main.php:220
+#: ../reporting/reports_main.php:231
+#: ../reporting/reports_main.php:240
+#: ../reporting/reports_main.php:246
+#: ../reporting/reports_main.php:256
+#: ../reporting/reports_main.php:264
+#: ../reporting/reports_main.php:272
+#: ../reporting/reports_main.php:279
+#: ../reporting/reports_main.php:287
+#: ../reporting/reports_main.php:294
+#: ../reporting/reports_main.php:310
+#: ../reporting/reports_main.php:323
+#: ../reporting/reports_main.php:329
+#: ../reporting/reports_main.php:336
+#: ../reporting/reports_main.php:343
+#: ../reporting/reports_main.php:358
+#: ../reporting/reports_main.php:366
+#: ../reporting/reports_main.php:377
+#: ../reporting/reports_main.php:389
+#: ../reporting/reports_main.php:399
+#: ../reporting/reports_main.php:411
+#: ../reporting/reports_main.php:418
+#: ../reporting/reports_main.php:428
+#: ../reporting/reports_main.php:439
+#: ../reporting/reports_main.php:448
+#: ../reporting/reports_main.php:459
+#: ../reporting/reports_main.php:465
+#: ../reporting/reports_main.php:474
+#: ../reporting/reports_main.php:484
+#: ../reporting/reports_main.php:492
+#: ../reporting/reports_main.php:500
+#: ../reporting/reports_main.php:508
msgid "Destination"
msgstr ""
#: ../reporting/reports_main.php:50
#: ../reporting/reports_main.php:167
+#: ../reporting/reports_main.php:374
+#: ../reporting/reports_main.php:386
+#: ../reporting/reports_main.php:425
+#: ../reporting/reports_main.php:436
+#: ../reporting/reports_main.php:471
+#: ../reporting/reports_main.php:481
msgid "Graphics"
msgstr ""
#: ../reporting/reports_main.php:72
#: ../reporting/reports_main.php:82
+#: ../reporting/reports_main.php:209
+#: ../reporting/reports_main.php:216
+#: ../reporting/reports_main.php:222
+#: ../reporting/reports_main.php:235
+#: ../reporting/reports_main.php:250
+#: ../reporting/reports_main.php:260
+#: ../reporting/reports_main.php:268
+#: ../reporting/reports_main.php:276
msgid "Inventory Category"
msgstr ""
msgstr ""
#: ../reporting/reports_main.php:74
+#: ../reporting/reports_main.php:224
msgid "Show Pictures"
msgstr ""
#: ../reporting/reports_main.php:124
#: ../reporting/reports_main.php:131
#: ../reporting/reports_main.php:139
-#: ../reporting/reports_main.php:195
msgid "Email Customers"
msgstr ""
msgid "Print Purchase &Orders"
msgstr ""
+#: ../reporting/reports_main.php:195
+#: ../reporting/reports_main.php:202
+msgid "Email Suppliers"
+msgstr ""
+
+#: ../reporting/reports_main.php:198
+msgid "Print Remi&ttances"
+msgstr ""
+
+#: ../reporting/reports_main.php:207
+msgid "Inventory &Valuation Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:215
+msgid "Inventory &Planning Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:221
+msgid "Stock &Check Sheets"
+msgstr ""
+
+#: ../reporting/reports_main.php:225
+msgid "Inventory Column"
+msgstr ""
+
+#: ../reporting/reports_main.php:226
+msgid "Show Shortage"
+msgstr ""
+
+#: ../reporting/reports_main.php:228
+msgid "Item Like"
+msgstr ""
+
+#: ../reporting/reports_main.php:232
+msgid "Inventory &Sales Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:241
+msgid "&GRN Valuation Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:247
+msgid "Inventory P&urchasing Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:257
+msgid "Inventory &Movement Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:265
+msgid "C&osted Inventory Movement Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:273
+msgid "Item &Sales Summary Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:281
+msgid "Manufacturing"
+msgstr ""
+
+#: ../reporting/reports_main.php:282
+msgid "&Bill of Material Listing"
+msgstr ""
+
+#: ../reporting/reports_main.php:283
+msgid "From product"
+msgstr ""
+
+#: ../reporting/reports_main.php:284
+msgid "To product"
+msgstr ""
+
+#: ../reporting/reports_main.php:288
+msgid "Work Order &Listing"
+msgstr ""
+
+#: ../reporting/reports_main.php:291
+msgid "Outstanding Only"
+msgstr ""
+
+#: ../reporting/reports_main.php:295
+msgid "Print &Work Orders"
+msgstr ""
+
+#: ../reporting/reports_main.php:298
+msgid "Email Locations"
+msgstr ""
+
+#: ../reporting/reports_main.php:304
+msgid "Dimension &Summary"
+msgstr ""
+
+#: ../reporting/reports_main.php:305
+msgid "From Dimension"
+msgstr ""
+
+#: ../reporting/reports_main.php:306
+msgid "To Dimension"
+msgstr ""
+
+#: ../reporting/reports_main.php:315
+msgid "Banking"
+msgstr ""
+
+#: ../reporting/reports_main.php:316
+msgid "Bank &Statement"
+msgstr ""
+
+#: ../reporting/reports_main.php:320
+#: ../reporting/reports_main.php:393
+#: ../reporting/reports_main.php:443
+#: ../reporting/reports_main.php:488
+msgid "Zero values"
+msgstr ""
+
+#: ../reporting/reports_main.php:324
+msgid "Bank Statement w/ &Reconcile"
+msgstr ""
+
+#: ../reporting/reports_main.php:331
+msgid "General Ledger"
+msgstr ""
+
+#: ../reporting/reports_main.php:332
+msgid "Chart of &Accounts"
+msgstr ""
+
+#: ../reporting/reports_main.php:333
+msgid "Show Balances"
+msgstr ""
+
+#: ../reporting/reports_main.php:337
+msgid "List of &Journal Entries"
+msgstr ""
+
+#: ../reporting/reports_main.php:349
+#: ../reporting/reports_main.php:403
+#: ../reporting/reports_main.php:452
+msgid "GL Account &Transactions"
+msgstr ""
+
+#: ../reporting/reports_main.php:352
+#: ../reporting/reports_main.php:406
+#: ../reporting/reports_main.php:455
+msgid "From Account"
+msgstr ""
+
+#: ../reporting/reports_main.php:353
+#: ../reporting/reports_main.php:407
+#: ../reporting/reports_main.php:456
+msgid "To Account"
+msgstr ""
+
+#: ../reporting/reports_main.php:359
+#: ../reporting/reports_main.php:412
+#: ../reporting/reports_main.php:460
+msgid "Annual &Expense Breakdown"
+msgstr ""
+
+#: ../reporting/reports_main.php:367
+#: ../reporting/reports_main.php:419
+#: ../reporting/reports_main.php:466
+msgid "&Balance Sheet"
+msgstr ""
+
+#: ../reporting/reports_main.php:373
+#: ../reporting/reports_main.php:385
+#: ../reporting/reports_main.php:424
+#: ../reporting/reports_main.php:435
+#: ../reporting/reports_main.php:470
+#: ../reporting/reports_main.php:480
+msgid "Decimal values"
+msgstr ""
+
+#: ../reporting/reports_main.php:378
+#: ../reporting/reports_main.php:429
+#: ../reporting/reports_main.php:475
+msgid "&Profit and Loss Statement"
+msgstr ""
+
+#: ../reporting/reports_main.php:494
+msgid "Ta&x Report"
+msgstr ""
+
#: ../reporting/includes/doctext.inc:18
#: ../reporting/includes/doctext.inc:156
#: ../sales/view/view_dispatch.php:51
#: ../sales/view/view_dispatch.php:113
#: ../sales/view/view_invoice.php:116
#: ../sales/includes/ui/sales_credit_ui.inc:168
-#: ../sales/includes/ui/sales_order_ui.inc:147
+#: ../sales/includes/ui/sales_order_ui.inc:148
msgid "Discount %"
msgstr ""
#: ../reporting/includes/doctext.inc:60
#: ../sales/view/view_sales_order.php:69
-#: ../sales/inquiry/sales_orders_view.php.orig:304
-#: ../sales/includes/ui/sales_order_ui.inc:612
+#: ../sales/inquiry/sales_orders_view.php:305
+#: ../sales/includes/ui/sales_order_ui.inc:597
msgid "Valid until"
msgstr ""
msgid "FINAL INVOICE"
msgstr ""
-#: ../reporting/includes/doctext.inc:118
-msgid "INVOICE"
-msgstr ""
-
#: ../reporting/includes/doctext.inc:119
msgid "Invoice No."
msgstr ""
msgstr ""
#: ../reporting/includes/doctext.inc:272
-#: ../reporting/includes/pdf_report.inc:1020
+#: ../reporting/includes/pdf_report.inc:1019
msgid "You can pay through"
msgstr ""
msgstr ""
#: ../reporting/includes/excel_report.inc:413
-#: ../reporting/includes/pdf_report.inc:601
+#: ../reporting/includes/pdf_report.inc:600
msgid "Generated At"
msgstr ""
#: ../reporting/includes/excel_report.inc:419
-#: ../reporting/includes/pdf_report.inc:610
+#: ../reporting/includes/pdf_report.inc:609
msgid "Generated By"
msgstr ""
-#: ../reporting/includes/header2.inc:122
+#: ../reporting/includes/header2.inc:125
msgid "Our VAT No."
msgstr ""
-#: ../reporting/includes/header2.inc:128
+#: ../reporting/includes/header2.inc:131
msgid "Domicile"
msgstr ""
-#: ../reporting/includes/header2.inc:143
+#: ../reporting/includes/header2.inc:146
#: ../reporting/includes/pdf_report.inc:352
#: ../reporting/includes/pdf_report.inc:501
-#: ../reporting/includes/pdf_report.inc:629
+#: ../reporting/includes/pdf_report.inc:628
msgid "Page"
msgstr ""
-#: ../reporting/includes/pdf_report.inc:584
+#: ../reporting/includes/pdf_report.inc:583
msgid "Report Period"
msgstr ""
-#: ../reporting/includes/pdf_report.inc:987
-#: ../reporting/includes/pdf_report.inc:1035
+#: ../reporting/includes/pdf_report.inc:986
+#: ../reporting/includes/pdf_report.inc:1034
#, php-format
msgid "You have no email contact defined for this type of document for '%s'."
msgstr ""
-#: ../reporting/includes/pdf_report.inc:1006
+#: ../reporting/includes/pdf_report.inc:1005
msgid "Dear"
msgstr ""
-#: ../reporting/includes/pdf_report.inc:1007
+#: ../reporting/includes/pdf_report.inc:1006
msgid "Attached you will find "
msgstr ""
-#: ../reporting/includes/pdf_report.inc:1023
+#: ../reporting/includes/pdf_report.inc:1022
msgid "Kindest regards"
msgstr ""
-#: ../reporting/includes/pdf_report.inc:1038
+#: ../reporting/includes/pdf_report.inc:1037
msgid "Sending document by email failed"
msgstr ""
-#: ../reporting/includes/pdf_report.inc:1038
-#: ../reporting/includes/pdf_report.inc:1041
+#: ../reporting/includes/pdf_report.inc:1037
+#: ../reporting/includes/pdf_report.inc:1040
msgid "Email:"
msgstr ""
-#: ../reporting/includes/pdf_report.inc:1041
+#: ../reporting/includes/pdf_report.inc:1040
msgid "has been sent by email to destination."
msgstr ""
-#: ../reporting/includes/pdf_report.inc:1071
+#: ../reporting/includes/pdf_report.inc:1070
msgid "Report has been sent to network printer "
msgstr ""
msgid "Display: "
msgstr ""
-#: ../reporting/includes/reports_classes.inc:149
+#: ../reporting/includes/reports_classes.inc:152
msgid "Unknown report parameter type:"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:175
+#: ../reporting/includes/reports_classes.inc:178
msgid "No Currency Filter"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:231
+#: ../reporting/includes/reports_classes.inc:234
msgid "PDF/Printer"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:238
+#: ../reporting/includes/reports_classes.inc:241
msgid "Portrait"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:238
+#: ../reporting/includes/reports_classes.inc:241
msgid "Landscape"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:249
+#: ../reporting/includes/reports_classes.inc:252
msgid "No Graphics"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:249
+#: ../reporting/includes/reports_classes.inc:252
msgid "Vertical bars"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:249
+#: ../reporting/includes/reports_classes.inc:252
msgid "Horizontal bars"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:250
+#: ../reporting/includes/reports_classes.inc:253
msgid "Dots"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:250
+#: ../reporting/includes/reports_classes.inc:253
msgid "Lines"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:250
+#: ../reporting/includes/reports_classes.inc:253
msgid "Pie"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:250
+#: ../reporting/includes/reports_classes.inc:253
msgid "Donut"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:254
#: ../reporting/includes/reports_classes.inc:257
+#: ../reporting/includes/reports_classes.inc:260
msgid "No Type Filter"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:267
+#: ../reporting/includes/reports_classes.inc:270
msgid "No Account Group Filter"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:282
-#: ../reporting/includes/reports_classes.inc:288
-#: ../reporting/includes/reports_classes.inc:294
+#: ../reporting/includes/reports_classes.inc:285
+#: ../reporting/includes/reports_classes.inc:291
+#: ../reporting/includes/reports_classes.inc:297
msgid "No Dimension Filter"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:300
+#: ../reporting/includes/reports_classes.inc:303
msgid "No Customer Filter"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:308
+#: ../reporting/includes/reports_classes.inc:311
msgid "No Supplier Filter"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:393
+#: ../reporting/includes/reports_classes.inc:399
msgid "No Location Filter"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:396
+#: ../reporting/includes/reports_classes.inc:402
msgid "No Category Filter"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:405
+#: ../reporting/includes/reports_classes.inc:411
msgid "No Sales Folk Filter"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:412
+#: ../reporting/includes/reports_classes.inc:418
msgid "No Users Filter"
msgstr ""
msgstr ""
#: ../sales/credit_note_entry.php:51
-#: ../sales/sales_order_entry.php:700
+#: ../sales/sales_order_entry.php:705
msgid ""
"There are no customers, or there are no customers with branches. Please "
"define customers and customer branches."
msgstr ""
#: ../sales/customer_delivery.php:94
-#: ../sales/customer_invoice.php:152
+#: ../sales/customer_invoice.php:161
msgid ""
"You have to set Deferred Income Account in GL Setup to entry prepayment "
"invoices."
msgstr ""
-#: ../sales/customer_delivery.php:97
-msgid "This order has no items. There is nothing to delivery."
+#: ../sales/customer_delivery.php:98
+#: ../sales/customer_delivery.php:103
+msgid "Select a different sales order to delivery"
msgstr ""
-#: ../sales/customer_delivery.php:100
-#: ../sales/customer_delivery.php:105
-msgid "Select a different sales order to delivery"
+#: ../sales/customer_delivery.php:99
+msgid "This order has no items. There is nothing to delivery."
msgstr ""
-#: ../sales/customer_delivery.php:103
+#: ../sales/customer_delivery.php:105
msgid ""
"This prepayment order is not yet ready for delivery due to insufficient "
"amount received."
msgstr ""
#: ../sales/customer_delivery.php:188
-#: ../sales/customer_invoice.php:345
+#: ../sales/customer_invoice.php:354
msgid "The entered shipping value is not numeric."
msgstr ""
msgid "There are no item quantities on this delivery note."
msgstr ""
-#: ../sales/customer_delivery.php:297
-#: ../sales/sales_order_entry.php:529
-#: ../sales/includes/ui/sales_order_ui.inc:251
+#: ../sales/customer_delivery.php:206
+msgid ""
+"This document cannot be processed because there is insufficient quantity "
+"for: "
+msgstr ""
+
+#: ../sales/customer_delivery.php:305
msgid ""
"The delivery cannot be processed because there is an insufficient quantity "
"for item:"
msgstr ""
-#: ../sales/customer_delivery.php:367
+#: ../sales/customer_delivery.php:377
msgid "For Sales Order"
msgstr ""
-#: ../sales/customer_delivery.php:376
+#: ../sales/customer_delivery.php:386
msgid "Delivery From"
msgstr ""
-#: ../sales/customer_delivery.php:425
+#: ../sales/customer_delivery.php:435
msgid "Invoice Dead-line"
msgstr ""
-#: ../sales/customer_delivery.php:435
-#: ../sales/customer_invoice.php:530
+#: ../sales/customer_delivery.php:445
+#: ../sales/customer_invoice.php:539
#: ../sales/includes/ui/sales_order_ui.inc:84
-#: ../sales/includes/ui/sales_order_ui.inc:375
+#: ../sales/includes/ui/sales_order_ui.inc:360
msgid ""
"The selected customer account is currently on hold. Please contact the "
"credit control personnel to discuss."
msgstr ""
-#: ../sales/customer_delivery.php:440
+#: ../sales/customer_delivery.php:450
msgid "Delivery Items"
msgstr ""
-#: ../sales/customer_delivery.php:446
+#: ../sales/customer_delivery.php:456
msgid "Max. delivery"
msgstr ""
-#: ../sales/customer_delivery.php:446
-#: ../sales/customer_invoice.php:544
+#: ../sales/customer_delivery.php:456
+#: ../sales/customer_invoice.php:553
msgid "Invoiced"
msgstr ""
-#: ../sales/customer_delivery.php:517
-#: ../sales/customer_invoice.php:633
+#: ../sales/customer_delivery.php:533
+#: ../sales/customer_invoice.php:642
msgid "Shipping Cost"
msgstr ""
-#: ../sales/customer_delivery.php:537
-#: ../sales/includes/ui/sales_order_ui.inc:249
+#: ../sales/customer_delivery.php:553
+#: ../sales/includes/ui/sales_order_ui.inc:237
msgid ""
"Marked items have insufficient quantities in stock as on day of delivery."
msgstr ""
-#: ../sales/customer_delivery.php:541
+#: ../sales/customer_delivery.php:557
msgid "Action For Balance"
msgstr ""
-#: ../sales/customer_delivery.php:548
-#: ../sales/customer_delivery.php:550
-#: ../sales/customer_delivery.php:553
-#: ../sales/customer_invoice.php:685
+#: ../sales/customer_delivery.php:564
+#: ../sales/customer_delivery.php:566
+#: ../sales/customer_delivery.php:569
+#: ../sales/customer_invoice.php:694
msgid "Refresh document page"
msgstr ""
-#: ../sales/customer_delivery.php:550
+#: ../sales/customer_delivery.php:566
msgid "Reset quantity"
msgstr ""
-#: ../sales/customer_delivery.php:553
+#: ../sales/customer_delivery.php:569
msgid "Clear quantity"
msgstr ""
-#: ../sales/customer_delivery.php:555
+#: ../sales/customer_delivery.php:571
msgid "Process Dispatch"
msgstr ""
-#: ../sales/customer_delivery.php:556
-#: ../sales/customer_invoice.php:687
-#: ../sales/sales_order_entry.php:747
+#: ../sales/customer_delivery.php:572
+#: ../sales/customer_invoice.php:696
+#: ../sales/sales_order_entry.php:752
msgid "Check entered data and save document"
msgstr ""
msgstr ""
#: ../sales/customer_invoice.php:60
-#: ../sales/customer_invoice.php:80
+#: ../sales/customer_invoice.php:89
#: ../sales/sales_order_entry.php:218
msgid "&View This Invoice"
msgstr ""
#: ../sales/customer_invoice.php:62
-#: ../sales/customer_invoice.php:82
+#: ../sales/customer_invoice.php:91
msgid "&Print This Invoice"
msgstr ""
#: ../sales/customer_invoice.php:63
-#: ../sales/customer_invoice.php:83
+#: ../sales/customer_invoice.php:92
msgid "&Email This Invoice"
msgstr ""
msgid "Select Another &Delivery For Invoicing"
msgstr ""
-#: ../sales/customer_invoice.php:78
+#: ../sales/customer_invoice.php:75
+#: ../sales/sales_order_entry.php:241
+msgid "Entry &customer payment for this invoice"
+msgstr ""
+
+#: ../sales/customer_invoice.php:87
#, php-format
msgid "Sales Invoice # %d has been updated."
msgstr ""
-#: ../sales/customer_invoice.php:85
+#: ../sales/customer_invoice.php:94
msgid "Select Another &Invoice to Modify"
msgstr ""
-#: ../sales/customer_invoice.php:124
+#: ../sales/customer_invoice.php:133
msgid "Select a different delivery to invoice"
msgstr ""
-#: ../sales/customer_invoice.php:125
+#: ../sales/customer_invoice.php:134
msgid ""
"There are no delivered items with a quantity left to invoice. There is "
"nothing left to invoice."
msgstr ""
-#: ../sales/customer_invoice.php:146
+#: ../sales/customer_invoice.php:155
msgid ""
"All quantities on this invoice has been credited. There is nothing to modify "
"on this invoice"
msgstr ""
-#: ../sales/customer_invoice.php:160
+#: ../sales/customer_invoice.php:169
msgid ""
"Please select correct Sales Order Prepayment to be invoiced and try again."
msgstr ""
-#: ../sales/customer_invoice.php:191
+#: ../sales/customer_invoice.php:200
msgid ""
"This page can only be opened after delivery selection. Please select "
"delivery to invoicing first."
msgstr ""
-#: ../sales/customer_invoice.php:193
+#: ../sales/customer_invoice.php:202
msgid "Select Delivery to Invoice"
msgstr ""
-#: ../sales/customer_invoice.php:198
-#: ../sales/customer_invoice.php:356
+#: ../sales/customer_invoice.php:207
+#: ../sales/customer_invoice.php:365
msgid ""
"Selected quantity cannot be less than quantity credited nor more than "
"quantity not invoiced yet."
msgstr ""
-#: ../sales/customer_invoice.php:312
+#: ../sales/customer_invoice.php:321
msgid "The entered invoice date is invalid."
msgstr ""
-#: ../sales/customer_invoice.php:325
+#: ../sales/customer_invoice.php:334
msgid "The entered invoice due date is invalid."
msgstr ""
-#: ../sales/customer_invoice.php:351
+#: ../sales/customer_invoice.php:360
msgid "There are no item quantities on this invoice."
msgstr ""
-#: ../sales/customer_invoice.php:361
+#: ../sales/customer_invoice.php:370
msgid ""
"There is no non-invoiced payments for this order. If you want to issue final "
"invoice, select delayed or cash payment terms."
msgstr ""
-#: ../sales/customer_invoice.php:451
+#: ../sales/customer_invoice.php:460
msgid "Payment terms:"
msgstr ""
-#: ../sales/customer_invoice.php:536
-#: ../sales/sales_order_entry.php:723
+#: ../sales/customer_invoice.php:545
+#: ../sales/sales_order_entry.php:728
msgid "Sales Order Items"
msgstr ""
-#: ../sales/customer_invoice.php:536
+#: ../sales/customer_invoice.php:545
msgid "Invoice Items"
msgstr ""
-#: ../sales/customer_invoice.php:545
+#: ../sales/customer_invoice.php:554
msgid "This Invoice"
msgstr ""
-#: ../sales/customer_invoice.php:552
+#: ../sales/customer_invoice.php:561
msgid "Credited"
msgstr ""
-#: ../sales/customer_invoice.php:654
+#: ../sales/customer_invoice.php:663
msgid "Invoice Total"
msgstr ""
-#: ../sales/customer_invoice.php:663
+#: ../sales/customer_invoice.php:672
msgid "Sales order:"
msgstr ""
-#: ../sales/customer_invoice.php:675
+#: ../sales/customer_invoice.php:684
msgid "Payments received:"
msgstr ""
-#: ../sales/customer_invoice.php:676
+#: ../sales/customer_invoice.php:685
msgid "Invoiced here:"
msgstr ""
-#: ../sales/customer_invoice.php:677
+#: ../sales/customer_invoice.php:686
msgid "Left to be invoiced:"
msgstr ""
#: ../sales/customer_payments.php:32
-#: ../sales/customer_payments.php.orig:33
msgid "Customer Payment Entry"
msgstr ""
#: ../sales/customer_payments.php:36
-#: ../sales/customer_payments.php.orig:37
msgid "There are no customers defined in the system."
msgstr ""
#: ../sales/customer_payments.php:70
-#: ../sales/customer_payments.php.orig:68
msgid "Invalid sales invoice number."
msgstr ""
#: ../sales/customer_payments.php:97
-#: ../sales/customer_payments.php.orig:92
msgid "The customer payment has been successfully entered."
msgstr ""
#: ../sales/customer_payments.php:99
#: ../sales/customer_payments.php:118
-#: ../sales/customer_payments.php.orig:94
-#: ../sales/customer_payments.php.orig:109
msgid "&Print This Receipt"
msgstr ""
#: ../sales/customer_payments.php:103
#: ../sales/customer_payments.php:126
-#: ../sales/customer_payments.php.orig:100
-#: ../sales/customer_payments.php.orig:115
msgid "Enter Another &Customer Payment"
msgstr ""
#: ../sales/customer_payments.php:109
#: ../sales/customer_payments.php:120
-#: ../sales/customer_payments.php.orig:96
-#: ../sales/customer_payments.php.orig:111
msgid "&View the GL Journal Entries for this Customer Payment"
msgstr ""
#: ../sales/customer_payments.php:116
-#: ../sales/customer_payments.php.orig:107
msgid "The customer payment has been successfully updated."
msgstr ""
msgstr ""
#: ../sales/customer_payments.php:139
-#: ../sales/customer_payments.php.orig:128
-#: ../sales/sales_order_entry.php:347
+#: ../sales/sales_order_entry.php:353
msgid "There is no customer selected."
msgstr ""
#: ../sales/customer_payments.php:146
-#: ../sales/customer_payments.php.orig:135
-#: ../sales/sales_order_entry.php:354
+#: ../sales/sales_order_entry.php:360
msgid "This customer has no branch defined."
msgstr ""
#: ../sales/customer_payments.php:152
-#: ../sales/customer_payments.php.orig:141
msgid "The entered date is invalid. Please enter a valid date for the payment."
msgstr ""
#: ../sales/customer_payments.php:182
#: ../sales/customer_payments.php:188
-#: ../sales/customer_payments.php.orig:171
-#: ../sales/customer_payments.php.orig:177
msgid "The entered amount is invalid or negative and cannot be processed."
msgstr ""
#: ../sales/customer_payments.php:214
-#: ../sales/customer_payments.php.orig:203
msgid "The entered discount is not a valid number."
msgstr ""
msgid "The entered payment amount is zero or negative."
msgstr ""
-#: ../sales/customer_payments.php.orig:210
-msgid ""
-"The balance of the amount and discout is zero or negative. Please enter "
-"valid amounts."
+#: ../sales/customer_payments.php:332
+msgid "Into Bank Account:"
msgstr ""
-#: ../sales/customer_payments.php.orig:338
-#: ../sales/customer_payments.php.orig:340
+#: ../sales/customer_payments.php:335
+#: ../sales/customer_payments.php:337
msgid "From Customer:"
msgstr ""
-#: ../sales/customer_payments.php.orig:381
-msgid "Into Bank Account:"
+#: ../sales/customer_payments.php:369
+msgid "Date of Deposit:"
msgstr ""
-#: ../sales/customer_payments.php.orig:386
-msgid "Date of Deposit:"
+#: ../sales/customer_payments.php:383
+msgid "Payment Amount:"
msgstr ""
-#: ../sales/customer_payments.php.orig:408
+#: ../sales/customer_payments.php:396
msgid "Customer prompt payment discount :"
msgstr ""
-#: ../sales/customer_payments.php.orig:417
-msgid "Amount and discount are in customer's currency."
+#: ../sales/customer_payments.php:406
+msgid "Add Payment"
msgstr ""
-#: ../sales/customer_payments.php.orig:422
+#: ../sales/customer_payments.php:408
msgid "Update Payment"
msgstr ""
-#: ../sales/customer_payments.php.orig:424
-msgid "Add Payment"
-msgstr ""
-
#: ../sales/sales_order_entry.php:64
msgid "Direct Sales Delivery"
msgstr ""
msgid "Enter a &New Direct Invoice"
msgstr ""
-#: ../sales/sales_order_entry.php:377
+#: ../sales/sales_order_entry.php:383
msgid "Pre-payment required have to be positive and less than total amount."
msgstr ""
-#: ../sales/sales_order_entry.php:382
+#: ../sales/sales_order_entry.php:388
+#: ../sales/sales_order_entry.php:402
msgid ""
"You must enter the person or company to whom delivery should be made to."
msgstr ""
-#: ../sales/sales_order_entry.php:389
+#: ../sales/sales_order_entry.php:395
+msgid ""
+"This document cannot be processed because there is insufficient quantity for "
+"items marked."
+msgstr ""
+
+#: ../sales/sales_order_entry.php:407
msgid ""
"You should enter the street address in the box provided. Orders cannot be "
"accepted without a valid street address."
msgstr ""
-#: ../sales/sales_order_entry.php:398
+#: ../sales/sales_order_entry.php:416
msgid "The shipping cost entered is expected to be numeric."
msgstr ""
-#: ../sales/sales_order_entry.php:404
+#: ../sales/sales_order_entry.php:422
msgid "The Valid date is invalid."
msgstr ""
-#: ../sales/sales_order_entry.php:406
+#: ../sales/sales_order_entry.php:424
msgid "The delivery date is invalid."
msgstr ""
-#: ../sales/sales_order_entry.php:413
+#: ../sales/sales_order_entry.php:430
msgid "The requested valid date is before the date of the quotation."
msgstr ""
-#: ../sales/sales_order_entry.php:415
+#: ../sales/sales_order_entry.php:432
msgid "The requested delivery date is before the date of the order."
msgstr ""
-#: ../sales/sales_order_entry.php:424
+#: ../sales/sales_order_entry.php:441
msgid "You need to define a cash account for your Sales Point."
msgstr ""
-#: ../sales/sales_order_entry.php:462
+#: ../sales/sales_order_entry.php:479
msgid ""
"The reference number field has been increased. Please save the document "
"again."
msgstr ""
-#: ../sales/sales_order_entry.php:508
+#: ../sales/sales_order_entry.php:525
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:512
+#: ../sales/sales_order_entry.php:529
msgid "Price for inventory item must be entered and can not be less than 0"
msgstr ""
-#: ../sales/sales_order_entry.php:519
+#: ../sales/sales_order_entry.php:536
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:550
+#: ../sales/sales_order_entry.php:554
#, php-format
msgid "Price %s is below Standard Cost %s"
msgstr ""
-#: ../sales/sales_order_entry.php:575
+#: ../sales/sales_order_entry.php:579
msgid ""
"This item cannot be deleted because some of it has already been delivered."
msgstr ""
-#: ../sales/sales_order_entry.php:604
+#: ../sales/sales_order_entry.php:608
msgid "Direct delivery entry has been cancelled as requested."
msgstr ""
-#: ../sales/sales_order_entry.php:605
+#: ../sales/sales_order_entry.php:609
msgid "Enter a New Sales Delivery"
msgstr ""
-#: ../sales/sales_order_entry.php:607
+#: ../sales/sales_order_entry.php:611
msgid "Direct invoice entry has been cancelled as requested."
msgstr ""
-#: ../sales/sales_order_entry.php:608
+#: ../sales/sales_order_entry.php:612
msgid "Enter a New Sales Invoice"
msgstr ""
-#: ../sales/sales_order_entry.php:612
+#: ../sales/sales_order_entry.php:617
msgid "This sales quotation has been cancelled as requested."
msgstr ""
-#: ../sales/sales_order_entry.php:613
+#: ../sales/sales_order_entry.php:618
msgid "Enter a New Sales Quotation"
msgstr ""
-#: ../sales/sales_order_entry.php:620
+#: ../sales/sales_order_entry.php:625
msgid "Undelivered part of order has been cancelled as requested."
msgstr ""
-#: ../sales/sales_order_entry.php:621
+#: ../sales/sales_order_entry.php:626
msgid "Select Another Sales Order for Edition"
msgstr ""
-#: ../sales/sales_order_entry.php:625
+#: ../sales/sales_order_entry.php:630
msgid "This sales order has been cancelled as requested."
msgstr ""
-#: ../sales/sales_order_entry.php:626
+#: ../sales/sales_order_entry.php:631
msgid "Enter a New Sales Order"
msgstr ""
-#: ../sales/sales_order_entry.php:704
+#: ../sales/sales_order_entry.php:709
msgid "Sales Invoice Items"
msgstr ""
-#: ../sales/sales_order_entry.php:705
+#: ../sales/sales_order_entry.php:710
msgid "Enter Delivery Details and Confirm Invoice"
msgstr ""
-#: ../sales/sales_order_entry.php:707
+#: ../sales/sales_order_entry.php:712
msgid "Place Invoice"
msgstr ""
-#: ../sales/sales_order_entry.php:710
+#: ../sales/sales_order_entry.php:715
msgid "Delivery Note Items"
msgstr ""
-#: ../sales/sales_order_entry.php:711
+#: ../sales/sales_order_entry.php:716
msgid "Enter Delivery Details and Confirm Dispatch"
msgstr ""
-#: ../sales/sales_order_entry.php:712
+#: ../sales/sales_order_entry.php:717
msgid "Cancel Delivery"
msgstr ""
-#: ../sales/sales_order_entry.php:713
+#: ../sales/sales_order_entry.php:718
msgid "Place Delivery"
msgstr ""
-#: ../sales/sales_order_entry.php:715
+#: ../sales/sales_order_entry.php:720
msgid "Quotation Date:"
msgstr ""
-#: ../sales/sales_order_entry.php:716
+#: ../sales/sales_order_entry.php:721
msgid "Sales Quotation Items"
msgstr ""
-#: ../sales/sales_order_entry.php:717
+#: ../sales/sales_order_entry.php:722
msgid "Enter Delivery Details and Confirm Quotation"
msgstr ""
-#: ../sales/sales_order_entry.php:718
+#: ../sales/sales_order_entry.php:723
msgid "Cancel Quotation"
msgstr ""
-#: ../sales/sales_order_entry.php:719
+#: ../sales/sales_order_entry.php:724
msgid "Place Quotation"
msgstr ""
-#: ../sales/sales_order_entry.php:720
+#: ../sales/sales_order_entry.php:725
msgid "Commit Quotations Changes"
msgstr ""
-#: ../sales/sales_order_entry.php:724
+#: ../sales/sales_order_entry.php:729
msgid "Enter Delivery Details and Confirm Order"
msgstr ""
-#: ../sales/sales_order_entry.php:727
+#: ../sales/sales_order_entry.php:732
msgid "Commit Order Changes"
msgstr ""
-#: ../sales/sales_order_entry.php:748
-msgid "You are about to void this Document.\\nDo you want to continue?"
+#: ../sales/sales_order_entry.php:754
+#: ../sales/sales_order_entry.php:760
+msgid ""
+"Cancels document entry or removes sales order when editing an old document"
msgstr ""
-#: ../sales/sales_order_entry.php:751
-msgid ""
-"You are about to cancel undelivered part of this order.\\nDo you want to "
-"continue?"
+#: ../sales/sales_order_entry.php:755
+#: ../sales/sales_order_entry.php:764
+msgid "You are about to void this Document.\\nDo you want to continue?"
msgstr ""
-#: ../sales/sales_order_entry.php:753
+#: ../sales/sales_order_entry.php:758
msgid "Validate changes and update document"
msgstr ""
-#: ../sales/sales_order_entry.php:757
+#: ../sales/sales_order_entry.php:762
msgid ""
-"Cancels document entry or removes sales order when editing an old document"
+"You are about to cancel undelivered part of this order.\\nDo you want to "
+"continue?"
msgstr ""
#: ../sales/allocations/customer_allocate.php:28
#: ../sales/allocations/customer_allocation_main.php:32
#: ../sales/manage/customer_branches.php:282
-#: ../sales/manage/customers.php:327
-#: ../sales/manage/sav.customers.php:322
+#: ../sales/manage/customers.php:328
#: ../sales/inquiry/customer_allocation_inquiry.php:42
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:42
#: ../sales/inquiry/customer_inquiry.php:44
-#: ../sales/inquiry/customer_inquiry.php.orig:44
-#: ../sales/inquiry/sales_orders_view.php.orig:265
+#: ../sales/inquiry/sales_deliveries_view.php:116
+#: ../sales/inquiry/sales_orders_view.php:266
msgid "Select a customer: "
msgstr ""
msgstr ""
#: ../sales/manage/customer_branches.php:242
-#: ../sales/manage/customers.php:259
-#: ../sales/manage/sav.customers.php:290
+#: ../sales/manage/customers.php:260
msgid "Sales Person:"
msgstr ""
#: ../sales/manage/customer_branches.php:243
-#: ../sales/manage/customers.php:296
-#: ../sales/manage/sav.customers.php:291
+#: ../sales/manage/customers.php:297
msgid "Sales Area:"
msgstr ""
msgstr ""
#: ../sales/manage/customer_branches.php:245
-#: ../sales/manage/customers.php:294
+#: ../sales/manage/customers.php:295
msgid "Default Inventory Location:"
msgstr ""
#: ../sales/manage/customer_branches.php:246
-#: ../sales/manage/customers.php:295
+#: ../sales/manage/customers.php:296
msgid "Default Shipping Company:"
msgstr ""
msgstr ""
#: ../sales/manage/customer_branches.php:297
-#: ../sales/inquiry/sales_deliveries_view.php:183
+#: ../sales/inquiry/sales_deliveries_view.php:185
msgid "Contact"
msgstr ""
msgstr ""
#: ../sales/manage/customer_branches.php:321
-#: ../sales/includes/ui/sales_order_ui.inc:306
+#: ../sales/includes/ui/sales_order_ui.inc:291
msgid ""
"The selected customer does not have any branches. Please create at least one "
"branch."
msgstr ""
#: ../sales/manage/customers.php:42
-#: ../sales/manage/sav.customers.php:42
msgid "The customer name cannot be empty."
msgstr ""
#: ../sales/manage/customers.php:49
-#: ../sales/manage/sav.customers.php:49
msgid "The customer short name cannot be empty."
msgstr ""
#: ../sales/manage/customers.php:56
-#: ../sales/manage/sav.customers.php:56
msgid "The credit limit must be numeric and not less than zero."
msgstr ""
#: ../sales/manage/customers.php:63
-#: ../sales/manage/sav.customers.php:63
msgid ""
"The payment discount must be numeric and is expected to be less than 100% "
"and greater than or equal to 0."
msgstr ""
#: ../sales/manage/customers.php:70
-#: ../sales/manage/sav.customers.php:70
msgid ""
"The discount percentage must be numeric and is expected to be less than 100% "
"and greater than or equal to 0."
msgstr ""
#: ../sales/manage/customers.php:98
-#: ../sales/manage/sav.customers.php:98
msgid "Customer has been updated."
msgstr ""
#: ../sales/manage/customers.php:130
-#: ../sales/manage/sav.customers.php:127
msgid "A new customer has been added."
msgstr ""
#: ../sales/manage/customers.php:133
-#: ../sales/manage/sav.customers.php:130
msgid ""
"A default Branch has been automatically created, please check default Branch "
"values by using link below."
msgstr ""
#: ../sales/manage/customers.php:156
-#: ../sales/manage/sav.customers.php:153
msgid ""
"This customer cannot be deleted because there are transactions that refer to "
"it."
msgstr ""
#: ../sales/manage/customers.php:163
-#: ../sales/manage/sav.customers.php:160
msgid ""
"Cannot delete the customer record because orders have been created against "
"it."
msgstr ""
#: ../sales/manage/customers.php:170
-#: ../sales/manage/sav.customers.php:167
msgid ""
"Cannot delete this customer because there are branch records set up against "
"it."
msgstr ""
#: ../sales/manage/customers.php:181
-#: ../sales/manage/sav.customers.php:178
msgid "Selected customer has been deleted."
msgstr ""
#: ../sales/manage/customers.php:230
-#: ../sales/manage/sav.customers.php:227
msgid "Name and Address"
msgstr ""
#: ../sales/manage/customers.php:232
-#: ../sales/manage/sav.customers.php:229
msgid "Customer Name:"
msgstr ""
#: ../sales/manage/customers.php:233
-#: ../sales/manage/sav.customers.php:230
msgid "Customer Short Name:"
msgstr ""
-#: ../sales/manage/customers.php:241
-#: ../sales/manage/customers.php:245
-#: ../sales/manage/sav.customers.php:238
-#: ../sales/manage/sav.customers.php:242
+#: ../sales/manage/customers.php:242
+#: ../sales/manage/customers.php:246
msgid "Customer's Currency:"
msgstr ""
-#: ../sales/manage/customers.php:248
-#: ../sales/manage/sav.customers.php:245
+#: ../sales/manage/customers.php:249
msgid "Sales Type/Price List:"
msgstr ""
-#: ../sales/manage/customers.php:251
-#: ../sales/manage/sav.customers.php:248
+#: ../sales/manage/customers.php:252
msgid "Customer status:"
msgstr ""
-#: ../sales/manage/customers.php:265
-#: ../sales/manage/sav.customers.php:261
+#: ../sales/manage/customers.php:266
msgid "Discount Percent:"
msgstr ""
-#: ../sales/manage/customers.php:266
-#: ../sales/manage/sav.customers.php:262
+#: ../sales/manage/customers.php:267
msgid "Prompt Payment Discount Percent:"
msgstr ""
-#: ../sales/manage/customers.php:270
-#: ../sales/manage/sav.customers.php:266
+#: ../sales/manage/customers.php:271
msgid "Credit Status:"
msgstr ""
-#: ../sales/manage/customers.php:283
-#: ../sales/manage/sav.customers.php:279
+#: ../sales/manage/customers.php:284
msgid "Customer branches"
msgstr ""
-#: ../sales/manage/customers.php:285
-#: ../sales/manage/sav.customers.php:281
+#: ../sales/manage/customers.php:286
msgid "Select or &Add"
msgstr ""
-#: ../sales/manage/customers.php:285
-#: ../sales/manage/sav.customers.php:281
+#: ../sales/manage/customers.php:286
msgid "&Add or Edit "
msgstr ""
-#: ../sales/manage/customers.php:304
-#: ../sales/manage/sav.customers.php:299
+#: ../sales/manage/customers.php:305
msgid "Add New Customer"
msgstr ""
-#: ../sales/manage/customers.php:308
-#: ../sales/manage/sav.customers.php:303
+#: ../sales/manage/customers.php:309
msgid "Update Customer"
msgstr ""
-#: ../sales/manage/customers.php:309
-#: ../sales/manage/sav.customers.php:304
+#: ../sales/manage/customers.php:310
msgid "Update customer data"
msgstr ""
-#: ../sales/manage/customers.php:310
-#: ../sales/manage/sav.customers.php:305
+#: ../sales/manage/customers.php:311
msgid "Select this customer and return to document entry."
msgstr ""
-#: ../sales/manage/customers.php:311
-#: ../sales/manage/sav.customers.php:306
+#: ../sales/manage/customers.php:312
msgid "Delete Customer"
msgstr ""
-#: ../sales/manage/customers.php:312
-#: ../sales/manage/sav.customers.php:307
+#: ../sales/manage/customers.php:313
msgid "Delete customer data if have been never used"
msgstr ""
-#: ../sales/manage/customers.php:319
-#: ../sales/manage/sav.customers.php:314
+#: ../sales/manage/customers.php:320
msgid ""
"There are no sales types defined. Please define at least one sales type "
"before adding a customer."
msgstr ""
-#: ../sales/manage/customers.php:328
-#: ../sales/manage/sav.customers.php:323
+#: ../sales/manage/customers.php:329
msgid "New customer"
msgstr ""
-#: ../sales/manage/customers.php:350
-#: ../sales/manage/sav.customers.php:345
+#: ../sales/manage/customers.php:351
msgid "Sales &Orders"
msgstr ""
msgstr ""
#: ../sales/inquiry/customer_allocation_inquiry.php:25
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:25
msgid "Customer Allocation Inquiry"
msgstr ""
#: ../sales/inquiry/customer_allocation_inquiry.php:96
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:96
msgid "Allocation"
msgstr ""
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:116
+#: ../sales/inquiry/customer_allocation_inquiry.php:116
msgid "Payment"
msgstr ""
#: ../sales/inquiry/customer_inquiry.php:26
-#: ../sales/inquiry/customer_inquiry.php.orig:26
msgid "Customer Transactions"
msgstr ""
#: ../sales/inquiry/customer_inquiry.php:68
-#: ../sales/inquiry/customer_inquiry.php.orig:68
msgid "CUSTOMER ACCOUNT IS ON HOLD"
msgstr ""
-#: ../sales/inquiry/customer_inquiry.php.orig:181
+#: ../sales/inquiry/customer_inquiry.php:181
msgid "Print Receipt"
msgstr ""
-#: ../sales/inquiry/customer_inquiry.php.orig:211
-#: ../sales/inquiry/customer_inquiry.php.orig:224
+#: ../sales/inquiry/customer_inquiry.php:211
+#: ../sales/inquiry/customer_inquiry.php:224
msgid "RB"
msgstr ""
"\t\t the same customer branch."
msgstr ""
-#: ../sales/inquiry/sales_deliveries_view.php:179
+#: ../sales/inquiry/sales_deliveries_view.php:181
msgid "Delivery #"
msgstr ""
-#: ../sales/inquiry/sales_deliveries_view.php:185
+#: ../sales/inquiry/sales_deliveries_view.php:187
msgid "Cust Ref"
msgstr ""
-#: ../sales/inquiry/sales_deliveries_view.php:187
+#: ../sales/inquiry/sales_deliveries_view.php:189
msgid "Due By"
msgstr ""
-#: ../sales/inquiry/sales_deliveries_view.php:188
+#: ../sales/inquiry/sales_deliveries_view.php:190
msgid "Delivery Total"
msgstr ""
-#: ../sales/inquiry/sales_deliveries_view.php:190
+#: ../sales/inquiry/sales_deliveries_view.php:192
msgid "Batch"
msgstr ""
-#: ../sales/inquiry/sales_deliveries_view.php:190
+#: ../sales/inquiry/sales_deliveries_view.php:192
msgid "Batch Invoicing"
msgstr ""
#: ../sales/inquiry/sales_orders_view.php:44
-#: ../sales/inquiry/sales_orders_view.php.orig:44
msgid "Search Outstanding Sales Orders"
msgstr ""
#: ../sales/inquiry/sales_orders_view.php:49
-#: ../sales/inquiry/sales_orders_view.php.orig:49
msgid "Search Template for Invoicing"
msgstr ""
#: ../sales/inquiry/sales_orders_view.php:54
-#: ../sales/inquiry/sales_orders_view.php.orig:54
msgid "Select Template for Delivery"
msgstr ""
#: ../sales/inquiry/sales_orders_view.php:59
-#: ../sales/inquiry/sales_orders_view.php.orig:59
msgid "Invoicing Prepayment Orders"
msgstr ""
#: ../sales/inquiry/sales_orders_view.php:64
-#: ../sales/inquiry/sales_orders_view.php.orig:64
msgid "Search All Sales Orders"
msgstr ""
#: ../sales/inquiry/sales_orders_view.php:70
-#: ../sales/inquiry/sales_orders_view.php.orig:70
msgid "Search All Sales Quotations"
msgstr ""
-#: ../sales/inquiry/sales_orders_view.php.orig:148
+#: ../sales/inquiry/sales_orders_view.php:148
msgid "Dispatch"
msgstr ""
-#: ../sales/inquiry/sales_orders_view.php.orig:191
+#: ../sales/inquiry/sales_orders_view.php:191
msgid "Set this order as a template for direct deliveries/invoices"
msgstr ""
-#: ../sales/inquiry/sales_orders_view.php.orig:200
+#: ../sales/inquiry/sales_orders_view.php:200
msgid "Prepayment Invoice"
msgstr ""
-#: ../sales/inquiry/sales_orders_view.php.orig:200
+#: ../sales/inquiry/sales_orders_view.php:200
msgid "Final Invoice"
msgstr ""
-#: ../sales/inquiry/sales_orders_view.php.orig:267
+#: ../sales/inquiry/sales_orders_view.php:268
msgid "Show All:"
msgstr ""
-#: ../sales/inquiry/sales_orders_view.php.orig:284
+#: ../sales/inquiry/sales_orders_view.php:285
msgid "Order #"
msgstr ""
-#: ../sales/inquiry/sales_orders_view.php.orig:288
-#: ../sales/inquiry/sales_orders_view.php.orig:302
+#: ../sales/inquiry/sales_orders_view.php:289
+#: ../sales/inquiry/sales_orders_view.php:303
msgid "Cust Order Ref"
msgstr ""
-#: ../sales/inquiry/sales_orders_view.php.orig:291
-#: ../sales/inquiry/sales_orders_view.php.orig:305
+#: ../sales/inquiry/sales_orders_view.php:292
+#: ../sales/inquiry/sales_orders_view.php:306
msgid "Delivery To"
msgstr ""
-#: ../sales/inquiry/sales_orders_view.php.orig:298
+#: ../sales/inquiry/sales_orders_view.php:299
msgid "Quote #"
msgstr ""
-#: ../sales/inquiry/sales_orders_view.php.orig:303
+#: ../sales/inquiry/sales_orders_view.php:304
msgid "Quote Date"
msgstr ""
-#: ../sales/inquiry/sales_orders_view.php.orig:306
+#: ../sales/inquiry/sales_orders_view.php:307
msgid "Quote Total"
msgstr ""
-#: ../sales/inquiry/sales_orders_view.php.orig:337
+#: ../sales/inquiry/sales_orders_view.php:338
msgid "Tmpl"
msgstr ""
+#: ../sales/includes/cart_class.inc:391
+msgid "You have to enter valid stock code or nonempty description"
+msgstr ""
+
#: ../sales/includes/sales_ui.inc:50
msgid ""
"This edit session has been abandoned by opening sales document in another "
"browser tab. You cannot edit more than one sales document at once."
msgstr ""
-#: ../sales/includes/db/custalloc_db.inc.orig:351
+#: ../sales/includes/db/custalloc_db.inc:351
msgid ""
"Unsuspected overallocation happened due to sparse credit notes exists for "
"this invoice.\n"
"charges."
msgstr ""
-#: ../sales/includes/db/old.sales_order_db.inc:107
-#: ../sales/includes/db/old.sales_order_db.inc:259
-#: ../sales/includes/db/sales_order_db.inc:109
-#: ../sales/includes/db/sales_order_db.inc.orig:109
-#: ../sales/includes/db/sales_order_db.inc.orig:271
-msgid "Stocks below Re-Order Level at "
-msgstr ""
-
-#: ../sales/includes/db/old.sales_order_db.inc:110
-#: ../sales/includes/db/old.sales_order_db.inc:264
-#: ../sales/includes/db/sales_order_db.inc:112
-#: ../sales/includes/db/sales_order_db.inc.orig:112
-#: ../sales/includes/db/sales_order_db.inc.orig:276
-msgid "Below"
-msgstr ""
-
-#: ../sales/includes/db/old.sales_order_db.inc:111
-#: ../sales/includes/db/old.sales_order_db.inc:265
-#: ../sales/includes/db/sales_order_db.inc:113
-#: ../sales/includes/db/sales_order_db.inc.orig:113
-#: ../sales/includes/db/sales_order_db.inc.orig:277
-msgid "Please reorder"
-msgstr ""
-
#: ../sales/includes/db/old.sales_order_db.inc:139
-#: ../sales/includes/db/sales_order_db.inc:141
-#: ../sales/includes/db/sales_order_db.inc.orig:141
+#: ../sales/includes/db/sales_order_db.inc:103
msgid "Deleted."
msgstr ""
#: ../sales/includes/db/sales_invoice_db.inc:198
-#: ../sales/includes/db/sales_invoice_db.inc.orig:196
msgid "Cash invoice"
msgstr ""
#: ../sales/includes/ui/sales_credit_ui.inc:94
-#: ../sales/includes/ui/sales_order_ui.inc:385
+#: ../sales/includes/ui/sales_order_ui.inc:370
msgid "Customer Currency:"
msgstr ""
#: ../sales/includes/ui/sales_credit_ui.inc:112
-#: ../sales/includes/ui/sales_order_ui.inc:653
+#: ../sales/includes/ui/sales_order_ui.inc:638
msgid "Shipping Company:"
msgstr ""
#: ../sales/includes/ui/sales_credit_ui.inc:114
-#: ../sales/includes/ui/sales_order_ui.inc:392
+#: ../sales/includes/ui/sales_order_ui.inc:377
msgid "Customer Discount:"
msgstr ""
"have any branches."
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:231
+#: ../sales/includes/ui/sales_order_ui.inc:219
msgid "Shipping Charge"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:304
+#: ../sales/includes/ui/sales_order_ui.inc:289
msgid "No customer found for entered text."
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:330
+#: ../sales/includes/ui/sales_order_ui.inc:315
#, php-format
msgid "Customer's payment terms '%s' cannot be selected on this POS"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:379
+#: ../sales/includes/ui/sales_order_ui.inc:364
msgid "Reference number unique for this document type"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:419
-#: ../sales/includes/ui/sales_order_ui.inc:421
+#: ../sales/includes/ui/sales_order_ui.inc:404
+#: ../sales/includes/ui/sales_order_ui.inc:406
msgid "Price List:"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:438
+#: ../sales/includes/ui/sales_order_ui.inc:423
msgid "Date of order receive"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:588
+#: ../sales/includes/ui/sales_order_ui.inc:573
msgid "Cash payment"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:591
-#: ../sales/includes/ui/sales_order_ui.inc:623
+#: ../sales/includes/ui/sales_order_ui.inc:576
+#: ../sales/includes/ui/sales_order_ui.inc:608
msgid "Deliver from Location:"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:594
+#: ../sales/includes/ui/sales_order_ui.inc:579
msgid "Cash account:"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:601
+#: ../sales/includes/ui/sales_order_ui.inc:586
msgid "Delivery Details"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:606
+#: ../sales/includes/ui/sales_order_ui.inc:591
msgid "Invoice Delivery Details"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:607
+#: ../sales/includes/ui/sales_order_ui.inc:592
msgid "Invoice before"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:611
+#: ../sales/includes/ui/sales_order_ui.inc:596
msgid "Quotation Delivery Details"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:616
+#: ../sales/includes/ui/sales_order_ui.inc:601
msgid "Order Delivery Details"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:637
+#: ../sales/includes/ui/sales_order_ui.inc:622
msgid "Enter requested day of delivery"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:638
+#: ../sales/includes/ui/sales_order_ui.inc:623
msgid "Enter Valid until Date"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:639
+#: ../sales/includes/ui/sales_order_ui.inc:624
msgid "Deliver To:"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:640
+#: ../sales/includes/ui/sales_order_ui.inc:625
msgid "Additional identifier for delivery e.g. name of receiving person"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:643
+#: ../sales/includes/ui/sales_order_ui.inc:628
msgid "Delivery address. Default is address of customer branch"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:647
+#: ../sales/includes/ui/sales_order_ui.inc:632
msgid "Contact Phone Number:"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:648
+#: ../sales/includes/ui/sales_order_ui.inc:633
msgid "Phone number of ordering person. Defaults to branch phone number"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:649
+#: ../sales/includes/ui/sales_order_ui.inc:634
msgid "Customer Reference:"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:650
+#: ../sales/includes/ui/sales_order_ui.inc:635
msgid "Customer reference number for this order (if any)"
msgstr ""
projects / fa-stable.git / blobdiff