msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-18 11:00+0100\n"
+"POT-Creation-Date: 2012-06-16 10:52+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../frontaccounting.php:84
-#: ../frontaccounting.php:85
+#: ../frontaccounting.php:73
+#: ../frontaccounting.php:74
msgid "Main Menu"
msgstr ""
-#: ../frontaccounting.php:86
-#: ../access/logout.php:17
-#: ../themes/default/renderer.php:42
-#: ../themes/default/renderer.php:68
-#: ../themes/exclusive/renderer.php:42
-#: ../themes/exclusive/renderer.php:51
+#: ../frontaccounting.php:75
+#: ../access/logout.php:18
+#: ../themes/default/renderer.php:52
+#: ../themes/default/renderer.php:78
msgid "Logout"
msgstr ""
msgid "Restricted access"
msgstr ""
-#: ../access/login.php:33
+#: ../access/login.php:27
msgid "Login as user: demouser and password: password"
msgstr ""
-#: ../access/login.php:37
+#: ../access/login.php:31
msgid "Please login here"
msgstr ""
-#: ../access/login.php:45
-#: ../access/login.php:75
+#: ../access/login.php:39
+#: ../access/login.php:69
msgid "Authorization timeout"
msgstr ""
-#: ../access/login.php:45
-#: ../access/login.php:82
+#: ../access/login.php:39
+#: ../access/login.php:76
msgid "Login"
msgstr ""
-#: ../access/login.php:82
-#: ../admin/inst_upgrade.php:171
+#: ../access/login.php:76
+#: ../admin/inst_upgrade.php:137
msgid "Version"
msgstr ""
-#: ../access/login.php:85
+#: ../access/login.php:79
msgid "User name"
msgstr ""
-#: ../access/login.php:89
+#: ../access/login.php:83
#: ../admin/change_current_user_password.php:78
#: ../admin/users.php:191
msgid "Password:"
msgstr ""
-#: ../access/login.php:98
-#: ../admin/create_coy.php:237
-#: ../admin/create_coy.php:313
+#: ../access/login.php:92
+#: ../admin/create_coy.php:249
+#: ../admin/create_coy.php:331
+#: ../includes/sysnames.inc:194
msgid "Company"
msgstr ""
-#: ../access/login.php:107
+#: ../access/login.php:101
msgid "Login -->"
msgstr ""
-#: ../access/login.php:136
-#: ../admin/display_prefs.php:110
-#: ../themes/default/renderer.php:113
-#: ../themes/exclusive/renderer.php:154
+#: ../access/login.php:132
+#: ../admin/display_prefs.php:111
+#: ../themes/default/renderer.php:123
msgid "Theme:"
msgstr ""
-#: ../access/logout.php:28
+#: ../access/logout.php:29
msgid "Thank you for using"
msgstr ""
-#: ../access/logout.php:39
+#: ../access/logout.php:40
msgid "Click here to Login Again."
msgstr ""
msgid "Attach Documents"
msgstr ""
-#: ../admin/attachments.php:116
+#: ../admin/attachments.php:123
msgid "Attachment has been inserted."
msgstr ""
-#: ../admin/attachments.php:122
+#: ../admin/attachments.php:129
msgid "Attachment has been updated."
msgstr ""
-#: ../admin/attachments.php:134
+#: ../admin/attachments.php:141
msgid "Attachment has been deleted."
msgstr ""
-#: ../admin/attachments.php:152
+#: ../admin/attachments.php:159
#: ../admin/view_print_transaction.php:72
#: ../gl/inquiry/journal_inquiry.php:47
#: ../inventory/includes/item_adjustments_ui.inc:47
#: ../manufacturing/work_order_add_finished.php:203
-#: ../manufacturing/work_order_costs.php:142
-#: ../manufacturing/work_order_entry.php:377
-#: ../manufacturing/work_order_entry.php:385
-#: ../manufacturing/includes/work_order_issue_ui.inc:157
+#: ../manufacturing/work_order_costs.php:136
+#: ../manufacturing/work_order_entry.php:379
+#: ../manufacturing/work_order_entry.php:387
+#: ../manufacturing/includes/work_order_issue_ui.inc:161
#: ../sales/inquiry/customer_allocation_inquiry.php:47
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:47
msgid "Type:"
msgstr ""
-#: ../admin/attachments.php:164
+#: ../admin/attachments.php:171
#: ../admin/view_print_transaction.php:126
-#: ../admin/void_transaction.php:160
+#: ../admin/void_transaction.php:181
#: ../dimensions/inquiry/search_dimensions.php:127
#: ../dimensions/view/view_dimension.php:54
-#: ../gl/bank_account_reconcile.php:234
-#: ../gl/inquiry/bank_inquiry.php:67
-#: ../gl/inquiry/gl_account_inquiry.php:125
-#: ../gl/inquiry/journal_inquiry.php:120
-#: ../gl/inquiry/journal_inquiry.php:133
-#: ../includes/ui/allocation_cart.inc:263
-#: ../inventory/inquiry/stock_movements.php:76
+#: ../gl/bank_account_reconcile.php:232
+#: ../gl/inquiry/bank_inquiry.php:70
+#: ../gl/inquiry/gl_account_inquiry.php:126
+#: ../gl/inquiry/journal_inquiry.php:127
+#: ../gl/inquiry/journal_inquiry.php:140
+#: ../includes/ui/allocation_cart.inc:264
+#: ../inventory/inquiry/stock_movements.php:77
+#: ../inventory/inquiry/stock_movements.php.orig:79
#: ../manufacturing/search_work_orders.php:159
#: ../manufacturing/includes/manufacturing_ui.inc:157
#: ../manufacturing/includes/manufacturing_ui.inc:200
#: ../manufacturing/includes/manufacturing_ui.inc:331
#: ../purchasing/view/view_po.php:115
#: ../purchasing/view/view_po.php:140
-#: ../purchasing/inquiry/po_search_completed.php:116
+#: ../purchasing/inquiry/po_search_completed.php:120
+#: ../purchasing/inquiry/po_search_completed.php.orig:119
#: ../purchasing/inquiry/po_search.php:130
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:126
-#: ../purchasing/inquiry/supplier_inquiry.php:163
+#: ../purchasing/inquiry/supplier_inquiry.php:174
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:171
#: ../purchasing/allocations/supplier_allocation_main.php:95
#: ../reporting/rep101.php:130
#: ../reporting/rep201.php:118
#: ../reporting/rep203.php:91
#: ../reporting/rep601.php:76
-#: ../reporting/rep704.php:78
-#: ../reporting/rep704.php:81
-#: ../reporting/rep704.php:84
+#: ../reporting/rep602.php:80
+#: ../reporting/rep704.php:79
+#: ../reporting/rep704.php:82
+#: ../reporting/rep704.php:85
#: ../reporting/rep710.php:76
-#: ../reporting/includes/doctext.inc:108
-#: ../reporting/includes/doctext.inc:116
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
+#: ../reporting/includes/doctext.inc:246
#: ../sales/allocations/customer_allocation_main.php:94
-#: ../sales/view/view_sales_order.php:95
-#: ../sales/view/view_sales_order.php:128
-#: ../sales/view/view_sales_order.php:160
-#: ../sales/inquiry/customer_allocation_inquiry.php:142
-#: ../sales/inquiry/customer_inquiry.php:213
+#: ../sales/view/view_sales_order.php:109
+#: ../sales/view/view_sales_order.php:142
+#: ../sales/view/view_sales_order.php:179
+#: ../sales/view/view_sales_order.php.orig:96
+#: ../sales/view/view_sales_order.php.orig:129
+#: ../sales/view/view_sales_order.php.orig:161
+#: ../sales/inquiry/customer_allocation_inquiry.php:145
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:145
+#: ../sales/inquiry/customer_inquiry.php:201
+#: ../sales/inquiry/customer_inquiry.php.orig:225
msgid "#"
msgstr ""
-#: ../admin/attachments.php:164
-#: ../admin/attachments.php:214
+#: ../admin/attachments.php:171
+#: ../admin/attachments.php:221
#: ../admin/crm_categories.php:88
-#: ../admin/inst_upgrade.php:171
+#: ../admin/inst_upgrade.php:137
#: ../admin/payment_terms.php:127
#: ../admin/printers.php:84
#: ../admin/print_profiles.php:148
#: ../gl/inquiry/tax_inquiry.php:82
#: ../gl/manage/gl_quick_entries.php:186
-#: ../gl/manage/gl_quick_entries.php:223
+#: ../gl/manage/gl_quick_entries.php:224
#: ../includes/ui/view_package.php:22
-#: ../inventory/manage/item_codes.php:123
+#: ../inventory/manage/item_codes.php:125
#: ../inventory/manage/item_units.php:94
#: ../inventory/manage/movement_types.php:95
#: ../inventory/manage/sales_kits.php:40
#: ../inventory/view/view_transfer.php:56
#: ../manufacturing/manage/bom_edit.php:70
#: ../manufacturing/includes/manufacturing_ui.inc:28
-#: ../purchasing/includes/ui/invoice_ui.inc:465
-#: ../purchasing/includes/ui/invoice_ui.inc:477
-#: ../purchasing/po_receive_items.php:58
+#: ../purchasing/includes/ui/invoice_ui.inc:492
+#: ../purchasing/includes/ui/invoice_ui.inc:504
+#: ../purchasing/po_receive_items.php:62
#: ../reporting/rep104.php:109
#: ../reporting/rep105.php:112
#: ../reporting/rep204.php:82
#: ../reporting/rep303.php:109
#: ../reporting/rep303.php:115
-#: ../reporting/rep304.php:114
-#: ../reporting/rep305.php:72
+#: ../reporting/rep304.php:112
+#: ../reporting/rep305.php:95
#: ../reporting/rep401.php:69
-#: ../sales/create_recurrent_invoices.php:98
+#: ../sales/create_recurrent_invoices.php:115
#: ../sales/manage/credit_status.php:97
-#: ../sales/manage/recurrent_invoices.php:85
-#: ../sales/inquiry/sales_orders_view.php:289
-#: ../sales/inquiry/sales_orders_view.php:293
-#: ../taxes/tax_groups.php:146
+#: ../sales/manage/recurrent_invoices.php:102
+#: ../sales/inquiry/sales_orders_view.php:317
+#: ../sales/inquiry/sales_orders_view.php:321
+#: ../sales/inquiry/sales_orders_view.php.orig:294
+#: ../sales/inquiry/sales_orders_view.php.orig:298
+#: ../taxes/tax_groups.php:123
+#: ../taxes/tax_groups.php.orig:125
+#: ../taxes/tax_groups.php.sav:125
#: ../taxes/tax_types.php:115
msgid "Description"
msgstr ""
-#: ../admin/attachments.php:164
-#: ../admin/backups.php:60
-#: ../admin/backups.php:139
+#: ../admin/attachments.php:171
+#: ../admin/backups.php:63
+#: ../admin/backups.php:149
msgid "Filename"
msgstr ""
-#: ../admin/attachments.php:164
+#: ../admin/attachments.php:171
msgid "Size"
msgstr ""
-#: ../admin/attachments.php:164
+#: ../admin/attachments.php:171
msgid "Filetype"
msgstr ""
-#: ../admin/attachments.php:164
+#: ../admin/attachments.php:171
msgid "Date Uploaded"
msgstr ""
-#: ../admin/attachments.php:179
-#: ../admin/create_coy.php:261
+#: ../admin/attachments.php:186
+#: ../admin/create_coy.php:273
#: ../admin/crm_categories.php:106
-#: ../admin/fiscalyears.php:158
+#: ../admin/fiscalyears.php:164
#: ../admin/inst_lang.php:100
-#: ../admin/inst_module.php:217
#: ../admin/payment_terms.php:142
#: ../admin/printers.php:96
#: ../admin/shipping_companies.php:106
#: ../admin/tags.php:140
#: ../admin/users.php:144
#: ../dimensions/inquiry/search_dimensions.php:120
-#: ../gl/inquiry/journal_inquiry.php:111
-#: ../gl/manage/bank_accounts.php:126
-#: ../gl/manage/currencies.php:166
+#: ../gl/inquiry/journal_inquiry.php:118
+#: ../gl/manage/bank_accounts.php:133
+#: ../gl/manage/currencies.php:164
#: ../gl/manage/exchange_rates.php:94
#: ../gl/manage/gl_account_classes.php:132
-#: ../gl/manage/gl_account_types.php:148
+#: ../gl/manage/gl_account_types.php:154
#: ../gl/manage/gl_quick_entries.php:196
#: ../gl/manage/gl_quick_entries.php:295
-#: ../gl/includes/ui/gl_bank_ui.inc:155
-#: ../gl/includes/ui/gl_journal_ui.inc:122
+#: ../gl/includes/ui/gl_bank_ui.inc:184
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:158
+#: ../gl/includes/ui/gl_journal_ui.inc:134
#: ../includes/ui/contacts_view.inc:64
#: ../includes/ui/simple_crud_class.inc:52
+#: ../includes/ui/ui_input.inc:956
#: ../inventory/prices.php:145
-#: ../inventory/purchasing_data.php:144
+#: ../inventory/purchasing_data.php:146
+#: ../inventory/purchasing_data.php.orig:75
#: ../inventory/includes/item_adjustments_ui.inc:87
#: ../inventory/includes/stock_transfers_ui.inc:79
#: ../inventory/manage/item_categories.php:121
-#: ../inventory/manage/item_codes.php:138
+#: ../inventory/manage/item_codes.php:140
#: ../inventory/manage/item_units.php:110
#: ../inventory/manage/locations.php:161
#: ../inventory/manage/movement_types.php:106
#: ../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:514
-#: ../purchasing/includes/ui/po_ui.inc:266
-#: ../purchasing/inquiry/po_search_completed.php:101
+#: ../purchasing/includes/ui/invoice_ui.inc:542
+#: ../purchasing/includes/ui/po_ui.inc:273
+#: ../purchasing/inquiry/po_search_completed.php:105
+#: ../purchasing/inquiry/po_search_completed.php.orig:104
#: ../purchasing/inquiry/po_search.php:87
#: ../sales/manage/credit_status.php:119
#: ../sales/manage/customer_branches.php:159
-#: ../sales/manage/recurrent_invoices.php:113
+#: ../sales/manage/recurrent_invoices.php:130
#: ../sales/manage/sales_areas.php:103
#: ../sales/manage/sales_groups.php:99
#: ../sales/manage/sales_people.php:119
#: ../sales/manage/sales_points.php:99
#: ../sales/manage/sales_types.php:121
-#: ../sales/inquiry/customer_inquiry.php:186
#: ../sales/inquiry/sales_deliveries_view.php:154
-#: ../sales/inquiry/sales_orders_view.php:123
+#: ../sales/inquiry/sales_deliveries_view.php.orig:154
+#: ../sales/inquiry/sales_orders_view.php:136
+#: ../sales/inquiry/sales_orders_view.php.orig:127
#: ../sales/includes/ui/sales_credit_ui.inc:197
-#: ../sales/includes/ui/sales_order_ui.inc:203
-#: ../taxes/item_tax_types.php:134
-#: ../taxes/tax_groups.php:168
+#: ../sales/includes/ui/sales_order_ui.inc:202
+#: ../sales/includes/ui/sales_order_ui.inc.orig:202
+#: ../taxes/item_tax_types.php:139
+#: ../taxes/tax_groups.php:137
+#: ../taxes/tax_groups.php.orig:139
+#: ../taxes/tax_groups.php.sav:139
#: ../taxes/tax_types.php:132
msgid "Edit"
msgstr ""
-#: ../admin/attachments.php:180
-#: ../gl/inquiry/journal_inquiry.php:128
+#: ../admin/attachments.php:187
+#: ../gl/inquiry/journal_inquiry.php:135
msgid "View"
msgstr ""
-#: ../admin/attachments.php:181
+#: ../admin/attachments.php:188
msgid "Download"
msgstr ""
-#: ../admin/attachments.php:182
-#: ../admin/create_coy.php:262
+#: ../admin/attachments.php:189
+#: ../admin/create_coy.php:274
#: ../admin/crm_categories.php:110
-#: ../admin/fiscalyears.php:160
+#: ../admin/fiscalyears.php:166
#: ../admin/inst_chart.php:80
#: ../admin/inst_lang.php:109
-#: ../admin/inst_module.php:226
+#: ../admin/inst_module.php:144
#: ../admin/inst_theme.php:102
#: ../admin/payment_terms.php:143
#: ../admin/printers.php:97
#: ../admin/tags.php:141
#: ../admin/users.php:146
#: ../gl/gl_budget.php:137
-#: ../gl/manage/bank_accounts.php:127
-#: ../gl/manage/currencies.php:168
+#: ../gl/manage/bank_accounts.php:134
+#: ../gl/manage/currencies.php:166
#: ../gl/manage/exchange_rates.php:99
#: ../gl/manage/gl_account_classes.php:133
-#: ../gl/manage/gl_account_types.php:149
+#: ../gl/manage/gl_account_types.php:155
#: ../gl/manage/gl_quick_entries.php:197
#: ../gl/manage/gl_quick_entries.php:296
-#: ../gl/includes/ui/gl_bank_ui.inc:157
-#: ../gl/includes/ui/gl_journal_ui.inc:124
+#: ../gl/includes/ui/gl_bank_ui.inc:186
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:160
+#: ../gl/includes/ui/gl_journal_ui.inc:136
#: ../includes/ui/contacts_view.inc:67
#: ../includes/ui/simple_crud_class.inc:54
-#: ../includes/ui/ui_input.inc:281
+#: ../includes/ui/ui_input.inc:285
#: ../inventory/prices.php:146
-#: ../inventory/purchasing_data.php:145
+#: ../inventory/purchasing_data.php:147
+#: ../inventory/purchasing_data.php.orig:80
#: ../inventory/includes/item_adjustments_ui.inc:89
#: ../inventory/includes/stock_transfers_ui.inc:81
#: ../inventory/manage/item_categories.php:122
-#: ../inventory/manage/item_codes.php:139
+#: ../inventory/manage/item_codes.php:141
#: ../inventory/manage/item_units.php:111
#: ../inventory/manage/locations.php:162
#: ../inventory/manage/movement_types.php:107
#: ../manufacturing/manage/bom_edit.php:87
#: ../manufacturing/manage/work_centres.php:115
#: ../manufacturing/includes/work_order_issue_ui.inc:60
-#: ../purchasing/includes/ui/invoice_ui.inc:284
-#: ../purchasing/includes/ui/po_ui.inc:268
+#: ../purchasing/includes/ui/invoice_ui.inc:304
+#: ../purchasing/includes/ui/po_ui.inc:275
#: ../sales/manage/credit_status.php:120
#: ../sales/manage/customer_branches.php:163
-#: ../sales/manage/recurrent_invoices.php:114
+#: ../sales/manage/recurrent_invoices.php:131
#: ../sales/manage/sales_areas.php:104
#: ../sales/manage/sales_groups.php:100
#: ../sales/manage/sales_people.php:120
#: ../sales/manage/sales_points.php:100
#: ../sales/manage/sales_types.php:122
#: ../sales/includes/ui/sales_credit_ui.inc:199
-#: ../sales/includes/ui/sales_order_ui.inc:205
-#: ../taxes/item_tax_types.php:135
-#: ../taxes/tax_groups.php:169
+#: ../sales/includes/ui/sales_order_ui.inc:204
+#: ../sales/includes/ui/sales_order_ui.inc.orig:204
+#: ../taxes/item_tax_types.php:140
+#: ../taxes/tax_groups.php:138
+#: ../taxes/tax_groups.php.orig:140
+#: ../taxes/tax_groups.php.sav:140
#: ../taxes/tax_types.php:133
msgid "Delete"
msgstr ""
-#: ../admin/attachments.php:208
-#: ../admin/attachments.php:213
+#: ../admin/attachments.php:215
+#: ../admin/attachments.php:220
msgid "Transaction #"
msgstr ""
-#: ../admin/attachments.php:215
+#: ../admin/attachments.php:222
msgid "Attached File"
msgstr ""
#: ../admin/backups.php:21
-#: ../admin/backups.php:111
+#: ../admin/backups.php:40
+#: ../admin/backups.php:114
+#: ../admin/backups.php:142
+#: ../admin/backups.php:155
+#: ../admin/backups.php:173
msgid "Select backup file first."
msgstr ""
-#: ../admin/backups.php:40
+#: ../admin/backups.php:43
msgid "Backup and Restore Database"
msgstr ""
-#: ../admin/backups.php:47
+#: ../admin/backups.php:50
msgid "Backup paths have not been set correctly."
msgstr ""
-#: ../admin/backups.php:48
+#: ../admin/backups.php:51
msgid "Please contact System Administrator."
msgstr ""
-#: ../admin/backups.php:49
+#: ../admin/backups.php:52
msgid "cannot find backup directory"
msgstr ""
-#: ../admin/backups.php:59
+#: ../admin/backups.php:62
msgid "Backup successfully generated."
msgstr ""
-#: ../admin/backups.php:62
+#: ../admin/backups.php:65
msgid "Database backup failed."
msgstr ""
-#: ../admin/backups.php:95
-#: ../admin/create_coy.php:249
-#: ../admin/fiscalyears.php:149
+#: ../admin/backups.php:98
+#: ../admin/create_coy.php:261
+#: ../admin/fiscalyears.php:155
#: ../admin/inst_lang.php:85
#: ../admin/inst_lang.php:97
#: ../dimensions/inquiry/search_dimensions.php:107
-#: ../gl/manage/bank_accounts.php:123
-#: ../gl/manage/currencies.php:164
+#: ../gl/manage/bank_accounts.php:130
+#: ../gl/manage/currencies.php:162
#: ../gl/manage/gl_account_classes.php:127
-#: ../gl/manage/gl_quick_entries.php:229
+#: ../gl/manage/gl_quick_entries.php:230
#: ../includes/system_tests.inc:38
#: ../includes/system_tests.inc:113
#: ../includes/system_tests.inc:126
-#: ../includes/ui/ui_lists.inc:1638
-#: ../purchasing/manage/suppliers.php:123
+#: ../includes/ui/ui_lists.inc:1674
+#: ../includes/ui/ui_lists.inc.orig:1672
+#: ../purchasing/manage/suppliers.php:122
+#: ../purchasing/manage/suppliers.php.orig:132
#: ../reporting/rep101.php:126
-#: ../reporting/rep102.php:106
+#: ../reporting/rep102.php:112
+#: ../reporting/rep102.php:114
#: ../reporting/rep104.php:103
#: ../reporting/rep106.php:73
+#: ../reporting/rep114.php:73
#: ../reporting/rep201.php:114
-#: ../reporting/rep202.php:108
+#: ../reporting/rep202.php:116
+#: ../reporting/rep202.php:118
#: ../reporting/rep203.php:87
#: ../reporting/rep303.php:101
#: ../reporting/rep303.php:105
#: ../sales/manage/sales_points.php:94
#: ../sales/manage/sales_points.php:95
#: ../sales/manage/sales_types.php:119
-#: ../taxes/item_tax_types.php:124
-#: ../taxes/tax_groups.php:161
+#: ../taxes/item_tax_types.php:129
msgid "No"
msgstr ""
-#: ../admin/backups.php:133
+#: ../admin/backups.php:139
msgid "Restore backup completed."
msgstr ""
-#: ../admin/backups.php:138
+#: ../admin/backups.php:148
msgid "File successfully deleted."
msgstr ""
-#: ../admin/backups.php:143
+#: ../admin/backups.php:153
msgid "Can't delete backup file."
msgstr ""
-#: ../admin/backups.php:152
+#: ../admin/backups.php:165
msgid "You can only upload *.sql backup files"
msgstr ""
-#: ../admin/backups.php:158
+#: ../admin/backups.php:171
msgid "File was not uploaded into the system."
msgstr ""
-#: ../admin/backups.php:164
+#: ../admin/backups.php:180
msgid "Create backup"
msgstr ""
-#: ../admin/backups.php:165
-#: ../sales/includes/ui/sales_order_ui.inc:596
-#: ../sales/includes/ui/sales_order_ui.inc:643
+#: ../admin/backups.php:181
+#: ../sales/includes/ui/sales_order_ui.inc:589
+#: ../sales/includes/ui/sales_order_ui.inc:645
+#: ../sales/includes/ui/sales_order_ui.inc.orig:589
+#: ../sales/includes/ui/sales_order_ui.inc.orig:637
msgid "Comments:"
msgstr ""
-#: ../admin/backups.php:166
+#: ../admin/backups.php:182
msgid "Compression:"
msgstr ""
-#: ../admin/backups.php:168
+#: ../admin/backups.php:184
msgid "Create Backup"
msgstr ""
-#: ../admin/backups.php:170
+#: ../admin/backups.php:186
msgid "Backup scripts maintenance"
msgstr ""
-#: ../admin/backups.php:176
+#: ../admin/backups.php:192
msgid "View Backup"
msgstr ""
-#: ../admin/backups.php:177
+#: ../admin/backups.php:193
msgid "Download Backup"
msgstr ""
-#: ../admin/backups.php:178
+#: ../admin/backups.php:194
msgid "Restore Backup"
msgstr ""
-#: ../admin/backups.php:179
+#: ../admin/backups.php:195
msgid ""
"You are about to restore database from backup file.\n"
"Do you want to continue?"
msgstr ""
-#: ../admin/backups.php:181
+#: ../admin/backups.php:197
msgid "Delete Backup"
msgstr ""
-#: ../admin/backups.php:183
+#: ../admin/backups.php:199
#, php-format
msgid ""
"You are about to remove selected backup file.\n"
"Do you want to continue ?"
msgstr ""
-#: ../admin/backups.php:189
+#: ../admin/backups.php:205
msgid "Upload file"
msgstr ""
#: ../admin/change_current_user_password.php:16
#: ../admin/change_current_user_password.php:85
-#: ../themes/default/renderer.php:62
-#: ../themes/exclusive/renderer.php:47
+#: ../themes/default/renderer.php:72
msgid "Change password"
msgstr ""
msgid "The company name must be entered."
msgstr ""
-#: ../admin/company_preferences.php:55
+#: ../admin/company_preferences.php:54
msgid ""
"Only jpg and png files are supported - a file extension of .jpg or .png is "
"expected"
msgstr ""
-#: ../admin/company_preferences.php:60
-#: ../inventory/manage/items.php:74
+#: ../admin/company_preferences.php:59
+#: ../inventory/manage/items.php:87
+#: ../inventory/manage/items.php.orig:85
msgid ""
"The file size is over the maximum allowed. The maximum size allowed in KB is"
msgstr ""
-#: ../admin/company_preferences.php:65
-#: ../inventory/manage/items.php:79
+#: ../admin/company_preferences.php:64
+#: ../inventory/manage/items.php:77
+#: ../inventory/manage/items.php:92
+#: ../inventory/manage/items.php.orig:75
msgid "Only graphics files can be uploaded"
msgstr ""
-#: ../admin/company_preferences.php:73
-#: ../admin/company_preferences.php:94
-#: ../inventory/manage/items.php:87
+#: ../admin/company_preferences.php:72
+#: ../admin/company_preferences.php:93
+#: ../inventory/manage/items.php:100
+#: ../inventory/manage/items.php.orig:93
msgid "The existing image could not be removed"
msgstr ""
-#: ../admin/company_preferences.php:83
+#: ../admin/company_preferences.php:82
msgid "Error uploading logo file"
msgstr ""
-#: ../admin/company_preferences.php:117
+#: ../admin/company_preferences.php:115
msgid "Company setup has been updated."
msgstr ""
-#: ../admin/company_preferences.php:161
+#: ../admin/company_preferences.php:159
msgid "Name (to appear on reports):"
msgstr ""
-#: ../admin/company_preferences.php:162
+#: ../admin/company_preferences.php:160
#: ../admin/shipping_companies.php:142
#: ../includes/ui/contacts_view.inc:109
#: ../inventory/manage/locations.php:202
-#: ../sales/manage/customers.php:203
-#: ../sales/includes/ui/sales_order_ui.inc:634
+#: ../sales/manage/customers.php:231
+#: ../sales/manage/sav.customers.php:231
+#: ../sales/includes/ui/sales_order_ui.inc:636
+#: ../sales/includes/ui/sales_order_ui.inc.orig:628
msgid "Address:"
msgstr ""
-#: ../admin/company_preferences.php:163
+#: ../admin/company_preferences.php:161
msgid "Domicile:"
msgstr ""
-#: ../admin/company_preferences.php:165
+#: ../admin/company_preferences.php:163
#: ../admin/shipping_companies.php:138
-#: ../purchasing/manage/suppliers.php:105
-#: ../sales/manage/customer_branches.php:261
+#: ../purchasing/manage/suppliers.php:135
+#: ../purchasing/manage/suppliers.php.orig:114
+#: ../sales/manage/customer_branches.php:262
msgid "Phone Number:"
msgstr ""
-#: ../admin/company_preferences.php:166
+#: ../admin/company_preferences.php:164
#: ../includes/ui/contacts_view.inc:104
-#: ../purchasing/manage/suppliers.php:107
-#: ../sales/manage/customer_branches.php:263
+#: ../purchasing/manage/suppliers.php:138
+#: ../purchasing/manage/suppliers.php.orig:116
+#: ../sales/manage/customer_branches.php:264
+#: ../sales/manage/customers.php:254
+#: ../sales/manage/sav.customers.php:254
msgid "Fax Number:"
msgstr ""
-#: ../admin/company_preferences.php:167
+#: ../admin/company_preferences.php:165
#: ../admin/users.php:202
msgid "Email Address:"
msgstr ""
-#: ../admin/company_preferences.php:169
+#: ../admin/company_preferences.php:167
msgid "Official Company Number:"
msgstr ""
-#: ../admin/company_preferences.php:170
-#: ../purchasing/manage/suppliers.php:88
-#: ../sales/manage/customers.php:205
+#: ../admin/company_preferences.php:168
+#: ../purchasing/manage/suppliers.php:96
+#: ../purchasing/manage/suppliers.php.orig:97
+#: ../sales/manage/customers.php:233
+#: ../sales/manage/sav.customers.php:233
msgid "GSTNo:"
msgstr ""
-#: ../admin/company_preferences.php:172
+#: ../admin/company_preferences.php:170
msgid "Home Currency:"
msgstr ""
-#: ../admin/company_preferences.php:173
+#: ../admin/company_preferences.php:171
#: ../gl/gl_budget.php:63
msgid "Fiscal Year:"
msgstr ""
-#: ../admin/company_preferences.php:174
+#: ../admin/company_preferences.php:172
msgid "Tax Periods:"
msgstr ""
-#: ../admin/company_preferences.php:174
+#: ../admin/company_preferences.php:172
msgid "Months."
msgstr ""
-#: ../admin/company_preferences.php:175
+#: ../admin/company_preferences.php:173
msgid "Tax Last Period:"
msgstr ""
-#: ../admin/company_preferences.php:175
+#: ../admin/company_preferences.php:173
msgid "Months back."
msgstr ""
-#: ../admin/company_preferences.php:179
+#: ../admin/company_preferences.php:177
msgid "Company Logo:"
msgstr ""
-#: ../admin/company_preferences.php:180
+#: ../admin/company_preferences.php:178
msgid "New Company Logo (.jpg)"
msgstr ""
-#: ../admin/company_preferences.php:181
+#: ../admin/company_preferences.php:179
msgid "Delete Company Logo:"
msgstr ""
-#: ../admin/company_preferences.php:183
+#: ../admin/company_preferences.php:181
msgid "Use Dimensions:"
msgstr ""
-#: ../admin/company_preferences.php:184
+#: ../admin/company_preferences.php:182
msgid "Base for auto price calculations:"
msgstr ""
-#: ../admin/company_preferences.php:185
+#: ../admin/company_preferences.php:183
msgid "No base price list"
msgstr ""
-#: ../admin/company_preferences.php:186
+#: ../admin/company_preferences.php:184
msgid "Add Price from Std Cost:"
msgstr ""
-#: ../admin/company_preferences.php:188
+#: ../admin/company_preferences.php:186
msgid "Round to nearest:"
msgstr ""
-#: ../admin/company_preferences.php:191
+#: ../admin/company_preferences.php:189
msgid "Search Item List"
msgstr ""
-#: ../admin/company_preferences.php:192
+#: ../admin/company_preferences.php:190
msgid "Search Customer List"
msgstr ""
-#: ../admin/company_preferences.php:193
+#: ../admin/company_preferences.php:191
msgid "Search Supplier List"
msgstr ""
-#: ../admin/company_preferences.php:195
+#: ../admin/company_preferences.php:193
msgid "Automatic Revaluation Currency Accounts"
msgstr ""
-#: ../admin/company_preferences.php:196
+#: ../admin/company_preferences.php:194
msgid "Time Zone on Reports"
msgstr ""
-#: ../admin/company_preferences.php:197
+#: ../admin/company_preferences.php:195
msgid "Login Timeout:"
msgstr ""
-#: ../admin/company_preferences.php:197
+#: ../admin/company_preferences.php:195
msgid "seconds"
msgstr ""
-#: ../admin/company_preferences.php:198
+#: ../admin/company_preferences.php:196
msgid "Version Id"
msgstr ""
-#: ../admin/company_preferences.php:203
-#: ../admin/display_prefs.php:141
+#: ../admin/company_preferences.php:201
+#: ../admin/display_prefs.php:144
#: ../admin/forms_setup.php:61
-#: ../admin/gl_setup.php:203
+#: ../admin/gl_setup.php:235
+#: ../admin/gl_setup.php.orig:231
#: ../admin/inst_chart.php:74
#: ../admin/inst_lang.php:103
-#: ../admin/inst_module.php:220
-#: ../admin/inst_module.php:238
-#: ../admin/inst_module.php:282
+#: ../admin/inst_module.php:138
+#: ../admin/inst_module.php:156
+#: ../admin/inst_module.php:199
#: ../admin/inst_theme.php:96
#: ../dimensions/dimension_entry.php:293
-#: ../gl/gl_bank.php:381
+#: ../gl/gl_bank.php:403
#: ../gl/gl_budget.php:135
#: ../gl/manage/gl_quick_entries.php:60
-#: ../gl/includes/ui/gl_bank_ui.inc:246
-#: ../gl/includes/ui/gl_journal_ui.inc:221
+#: ../gl/includes/ui/gl_bank_ui.inc:275
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:249
+#: ../gl/includes/ui/gl_journal_ui.inc:257
#: ../includes/ui/db_pager_view.inc:174
#: ../includes/ui/simple_crud_class.inc:56
#: ../includes/ui/simple_crud_class.inc:227
-#: ../includes/ui/ui_input.inc:203
-#: ../includes/ui/ui_input.inc:894
-#: ../inventory/adjustments.php:233
-#: ../inventory/cost_update.php:125
+#: ../includes/ui/ui_input.inc:207
+#: ../includes/ui/ui_input.inc:901
+#: ../inventory/adjustments.php:235
+#: ../inventory/cost_update.php:116
#: ../inventory/reorder_level.php:97
#: ../inventory/transfers.php:236
#: ../inventory/includes/item_adjustments_ui.inc:157
#: ../inventory/includes/stock_transfers_ui.inc:137
#: ../inventory/manage/sales_kits.php:208
-#: ../manufacturing/work_order_entry.php:457
-#: ../manufacturing/includes/work_order_issue_ui.inc:127
-#: ../purchasing/includes/ui/po_ui.inc:299
-#: ../purchasing/includes/ui/po_ui.inc:434
-#: ../purchasing/po_receive_items.php:322
-#: ../sales/credit_note_entry.php:280
-#: ../sales/customer_credit_invoice.php:391
-#: ../sales/customer_delivery.php:521
-#: ../sales/customer_invoice.php:555
-#: ../sales/inquiry/sales_orders_view.php:317
+#: ../manufacturing/work_order_entry.php:459
+#: ../manufacturing/includes/work_order_issue_ui.inc:131
+#: ../purchasing/includes/ui/po_ui.inc:306
+#: ../purchasing/includes/ui/po_ui.inc:457
+#: ../purchasing/po_receive_items.php:331
+#: ../sales/credit_note_entry.php:282
+#: ../sales/customer_credit_invoice.php:382
+#: ../sales/customer_delivery.php:531
+#: ../sales/customer_invoice.php:682
+#: ../sales/inquiry/sales_orders_view.php:349
+#: ../sales/inquiry/sales_orders_view.php.orig:322
#: ../sales/includes/ui/sales_credit_ui.inc:293
-#: ../sales/includes/ui/sales_order_ui.inc:238
-#: ../sales/includes/ui/sales_order_ui.inc:564
+#: ../sales/includes/ui/sales_order_ui.inc:237
+#: ../sales/includes/ui/sales_order_ui.inc:555
+#: ../sales/includes/ui/sales_order_ui.inc.orig:237
+#: ../sales/includes/ui/sales_order_ui.inc.orig:555
msgid "Update"
msgstr ""
msgid "Create/Update Company"
msgstr ""
-#: ../admin/create_coy.php:53
+#: ../admin/create_coy.php:46
+#: ../admin/create_coy.php:52
+msgid "Database settings are not specified."
+msgstr ""
+
+#: ../admin/create_coy.php:62
msgid "This database settings are already used by another company."
msgstr ""
-#: ../admin/create_coy.php:58
+#: ../admin/create_coy.php:67
msgid ""
"You cannot have table set without prefix together with prefixed sets in the "
"same database."
msgstr ""
-#: ../admin/create_coy.php:116
+#: ../admin/create_coy.php:127
msgid "Error creating Database: "
msgstr ""
-#: ../admin/create_coy.php:116
+#: ../admin/create_coy.php:127
msgid ", Please create it manually"
msgstr ""
-#: ../admin/create_coy.php:120
+#: ../admin/create_coy.php:131
msgid "Cannot create new company due to bugs in sql file."
msgstr ""
-#: ../admin/create_coy.php:133
-#: ../admin/create_coy.php:200
+#: ../admin/create_coy.php:145
+#: ../admin/create_coy.php:212
msgid "Cannot open the configuration file - "
msgstr ""
-#: ../admin/create_coy.php:135
-#: ../admin/create_coy.php:202
+#: ../admin/create_coy.php:147
+#: ../admin/create_coy.php:214
msgid "Cannot write to the configuration file - "
msgstr ""
-#: ../admin/create_coy.php:137
-#: ../admin/create_coy.php:173
-#: ../admin/create_coy.php:204
+#: ../admin/create_coy.php:149
+#: ../admin/create_coy.php:185
+#: ../admin/create_coy.php:216
msgid "The configuration file "
msgstr ""
-#: ../admin/create_coy.php:137
-#: ../admin/create_coy.php:173
-#: ../admin/create_coy.php:204
-#: ../admin/db/maintenance_db.inc:248
+#: ../admin/create_coy.php:149
+#: ../admin/create_coy.php:185
+#: ../admin/create_coy.php:216
+#: ../admin/db/maintenance_db.inc:250
+#: ../admin/db/maintenance_db.inc.orig:248
msgid ""
" is not writable. Change its permissions so it is, then re-run the operation."
msgstr ""
-#: ../admin/create_coy.php:149
+#: ../admin/create_coy.php:161
msgid "New company has been created."
msgstr ""
-#: ../admin/create_coy.php:149
+#: ../admin/create_coy.php:161
msgid "Company has been updated."
msgstr ""
-#: ../admin/create_coy.php:166
+#: ../admin/create_coy.php:178
msgid ""
"Broken company subdirectories system. You have to remove this company "
"manually."
msgstr ""
-#: ../admin/create_coy.php:182
+#: ../admin/create_coy.php:194
msgid "Cannot rename subdirectory to temporary name."
msgstr ""
-#: ../admin/create_coy.php:188
+#: ../admin/create_coy.php:200
msgid "Cannot rename company subdirectory"
msgstr ""
-#: ../admin/create_coy.php:194
+#: ../admin/create_coy.php:206
msgid "Error removing Database: "
msgstr ""
-#: ../admin/create_coy.php:194
+#: ../admin/create_coy.php:206
msgid ", please remove it manually"
msgstr ""
-#: ../admin/create_coy.php:213
+#: ../admin/create_coy.php:225
msgid "Cannot remove temporary renamed company data directory "
msgstr ""
-#: ../admin/create_coy.php:216
+#: ../admin/create_coy.php:228
msgid "Selected company has been deleted"
msgstr ""
-#: ../admin/create_coy.php:230
+#: ../admin/create_coy.php:242
msgid "Are you sure you want to delete company no. "
msgstr ""
-#: ../admin/create_coy.php:237
+#: ../admin/create_coy.php:249
msgid "Database Host"
msgstr ""
-#: ../admin/create_coy.php:237
-#: ../admin/create_coy.php:315
+#: ../admin/create_coy.php:249
+#: ../admin/create_coy.php:336
+#: ../admin/create_coy.php:342
msgid "Database User"
msgstr ""
-#: ../admin/create_coy.php:238
-#: ../admin/create_coy.php:318
+#: ../admin/create_coy.php:250
+#: ../admin/create_coy.php:338
+#: ../admin/create_coy.php:343
msgid "Database Name"
msgstr ""
-#: ../admin/create_coy.php:238
-#: ../admin/create_coy.php:320
-#: ../admin/create_coy.php:322
+#: ../admin/create_coy.php:250
+#: ../admin/create_coy.php:339
+#: ../admin/create_coy.php:344
msgid "Table Pref"
msgstr ""
-#: ../admin/create_coy.php:238
-#: ../admin/create_coy.php:323
+#: ../admin/create_coy.php:250
+#: ../admin/create_coy.php:346
#: ../admin/inst_lang.php:36
#: ../admin/print_profiles.php:162
msgid "Default"
msgstr ""
-#: ../admin/create_coy.php:247
-#: ../admin/fiscalyears.php:153
+#: ../admin/create_coy.php:259
+#: ../admin/fiscalyears.php:159
#: ../admin/inst_lang.php:85
#: ../admin/inst_lang.php:97
#: ../dimensions/inquiry/search_dimensions.php:107
-#: ../gl/manage/bank_accounts.php:121
-#: ../gl/manage/currencies.php:164
+#: ../gl/manage/bank_accounts.php:128
+#: ../gl/manage/currencies.php:162
#: ../gl/manage/gl_account_classes.php:127
-#: ../gl/manage/gl_quick_entries.php:229
+#: ../gl/manage/gl_quick_entries.php:230
#: ../includes/system_tests.inc:38
#: ../includes/system_tests.inc:113
#: ../includes/system_tests.inc:126
-#: ../includes/ui/ui_lists.inc:1639
-#: ../purchasing/manage/suppliers.php:123
+#: ../includes/ui/ui_lists.inc:1675
+#: ../includes/ui/ui_lists.inc.orig:1673
+#: ../purchasing/manage/suppliers.php:122
+#: ../purchasing/manage/suppliers.php.orig:132
#: ../reporting/rep101.php:125
-#: ../reporting/rep102.php:105
+#: ../reporting/rep102.php:111
+#: ../reporting/rep102.php:113
#: ../reporting/rep104.php:105
#: ../reporting/rep106.php:75
+#: ../reporting/rep114.php:75
#: ../reporting/rep201.php:113
-#: ../reporting/rep202.php:107
+#: ../reporting/rep202.php:115
+#: ../reporting/rep202.php:117
#: ../reporting/rep203.php:86
#: ../reporting/rep303.php:96
#: ../reporting/rep303.php:104
#: ../sales/manage/sales_points.php:94
#: ../sales/manage/sales_points.php:95
#: ../sales/manage/sales_types.php:119
-#: ../taxes/item_tax_types.php:128
-#: ../taxes/tax_groups.php:159
+#: ../taxes/item_tax_types.php:133
msgid "Yes"
msgstr ""
-#: ../admin/create_coy.php:275
+#: ../admin/create_coy.php:288
msgid "The marked company is the current company which cannot be deleted."
msgstr ""
-#: ../admin/create_coy.php:314
+#: ../admin/create_coy.php:335
+#: ../admin/create_coy.php:341
#: ../admin/printers.php:84
msgid "Host"
msgstr ""
-#: ../admin/create_coy.php:317
+#: ../admin/create_coy.php:337
msgid "Database Password"
msgstr ""
-#: ../admin/create_coy.php:320
+#: ../admin/create_coy.php:339
#: ../admin/inst_chart.php:68
#: ../admin/inst_chart.php:70
#: ../admin/inst_lang.php:87
#: ../admin/inst_lang.php:90
-#: ../admin/inst_module.php:212
-#: ../admin/inst_module.php:214
+#: ../admin/inst_module.php:127
#: ../admin/inst_theme.php:91
#: ../admin/inst_theme.php:93
-#: ../admin/inst_upgrade.php:183
-#: ../gl/manage/gl_account_types.php:184
-#: ../includes/ui/allocation_cart.inc:286
-#: ../taxes/tax_groups.php:221
+#: ../admin/inst_upgrade.php:149
+#: ../gl/manage/gl_account_types.php:190
+#: ../includes/ui/allocation_cart.inc:288
msgid "None"
msgstr ""
-#: ../admin/create_coy.php:325
+#: ../admin/create_coy.php:350
msgid "Database Script"
msgstr ""
-#: ../admin/create_coy.php:327
+#: ../admin/create_coy.php:351
msgid "New script Admin Password"
msgstr ""
-#: ../admin/create_coy.php:330
+#: ../admin/create_coy.php:355
#: ../gl/gl_budget.php:136
msgid "Save"
msgstr ""
-#: ../admin/create_coy.php:354
+#: ../admin/create_coy.php:377
msgid "Create a new company"
msgstr ""
msgstr ""
#: ../admin/crm_categories.php:88
-#: ../sales/manage/customer_branches.php:294
+#: ../sales/manage/customer_branches.php:295
msgid "Short Name"
msgstr ""
msgid "Query size must be integer and greater than zero."
msgstr ""
-#: ../admin/display_prefs.php:58
+#: ../admin/display_prefs.php:59
msgid ""
"Display settings have been updated. Keep in mind that changed settings are "
"restored on every login in demo mode."
msgstr ""
-#: ../admin/display_prefs.php:60
+#: ../admin/display_prefs.php:61
msgid "Display settings have been updated."
msgstr ""
-#: ../admin/display_prefs.php:69
+#: ../admin/display_prefs.php:70
msgid "Decimal Places"
msgstr ""
-#: ../admin/display_prefs.php:71
+#: ../admin/display_prefs.php:72
msgid "Prices/Amounts:"
msgstr ""
-#: ../admin/display_prefs.php:72
+#: ../admin/display_prefs.php:73
msgid "Quantities:"
msgstr ""
-#: ../admin/display_prefs.php:73
+#: ../admin/display_prefs.php:74
msgid "Exchange Rates:"
msgstr ""
-#: ../admin/display_prefs.php:74
+#: ../admin/display_prefs.php:75
msgid "Percentages:"
msgstr ""
-#: ../admin/display_prefs.php:76
+#: ../admin/display_prefs.php:77
msgid "Dateformat and Separators"
msgstr ""
-#: ../admin/display_prefs.php:78
+#: ../admin/display_prefs.php:79
msgid "Dateformat:"
msgstr ""
-#: ../admin/display_prefs.php:80
+#: ../admin/display_prefs.php:81
msgid "Date Separator:"
msgstr ""
-#: ../admin/display_prefs.php:85
+#: ../admin/display_prefs.php:86
msgid "Thousand Separator:"
msgstr ""
-#: ../admin/display_prefs.php:90
+#: ../admin/display_prefs.php:91
msgid "Decimal Separator:"
msgstr ""
-#: ../admin/display_prefs.php:97
+#: ../admin/display_prefs.php:98
#: ../admin/inst_lang.php:35
msgid "Language"
msgstr ""
-#: ../admin/display_prefs.php:99
+#: ../admin/display_prefs.php:100
#: ../admin/users.php:206
msgid "Language:"
msgstr ""
-#: ../admin/display_prefs.php:102
+#: ../admin/display_prefs.php:103
#: ../applications/setup.php:42
-#: ../includes/sysnames.inc:68
+#: ../includes/sysnames.inc:94
msgid "Miscellaneous"
msgstr ""
-#: ../admin/display_prefs.php:104
+#: ../admin/display_prefs.php:105
msgid "Show hints for new users:"
msgstr ""
-#: ../admin/display_prefs.php:106
+#: ../admin/display_prefs.php:107
msgid "Show GL Information:"
msgstr ""
-#: ../admin/display_prefs.php:108
+#: ../admin/display_prefs.php:109
msgid "Show Item Codes:"
msgstr ""
-#: ../admin/display_prefs.php:115
+#: ../admin/display_prefs.php:116
msgid "Page Size:"
msgstr ""
-#: ../admin/display_prefs.php:117
+#: ../admin/display_prefs.php:118
msgid "Start-up Tab"
msgstr ""
-#: ../admin/display_prefs.php:125
+#: ../admin/display_prefs.php:126
#: ../admin/users.php:210
msgid "Printing profile"
msgstr ""
-#: ../admin/display_prefs.php:126
+#: ../admin/display_prefs.php:127
#: ../admin/users.php:211
msgid "Browser printing support"
msgstr ""
-#: ../admin/display_prefs.php:128
+#: ../admin/display_prefs.php:129
msgid "Use popup window to display reports:"
msgstr ""
-#: ../admin/display_prefs.php:129
+#: ../admin/display_prefs.php:130
#: ../admin/users.php:214
msgid "Set this option to on if your browser directly supports pdf files"
msgstr ""
-#: ../admin/display_prefs.php:131
+#: ../admin/display_prefs.php:132
msgid "Use icons instead of text links:"
msgstr ""
-#: ../admin/display_prefs.php:132
+#: ../admin/display_prefs.php:133
msgid "Set this option to on for using icons instead of text links"
msgstr ""
-#: ../admin/display_prefs.php:134
+#: ../admin/display_prefs.php:135
msgid "Query page size:"
msgstr ""
-#: ../admin/display_prefs.php:136
+#: ../admin/display_prefs.php:137
msgid "Remember last document date:"
msgstr ""
-#: ../admin/display_prefs.php:137
+#: ../admin/display_prefs.php:138
msgid ""
"If set document date is remembered on subsequent documents, otherwise "
"default is current date"
msgstr ""
+#: ../admin/display_prefs.php:140
+msgid "Transaction days:"
+msgstr ""
+
#: ../admin/fiscalyears.php:25
msgid "Fiscal Years"
msgstr ""
msgstr ""
#: ../admin/fiscalyears.php:46
+msgid "Invalid BEGIN or END date in fiscal year."
+msgstr ""
+
+#: ../admin/fiscalyears.php:52
msgid "BEGIN date bigger than END date."
msgstr ""
-#: ../admin/fiscalyears.php:64
+#: ../admin/fiscalyears.php:70
msgid "Cannot CLOSE this year because there are open fiscal years before"
msgstr ""
-#: ../admin/fiscalyears.php:75
+#: ../admin/fiscalyears.php:81
msgid "Selected fiscal year has been updated"
msgstr ""
-#: ../admin/fiscalyears.php:83
+#: ../admin/fiscalyears.php:89
msgid "New fiscal year has been added"
msgstr ""
-#: ../admin/fiscalyears.php:96
+#: ../admin/fiscalyears.php:102
msgid "Cannot delete this fiscal year because thera are fiscal years before."
msgstr ""
-#: ../admin/fiscalyears.php:101
+#: ../admin/fiscalyears.php:107
msgid "Cannot delete this fiscal year because the fiscal year is not closed."
msgstr ""
-#: ../admin/fiscalyears.php:114
+#: ../admin/fiscalyears.php:120
msgid "Selected fiscal year has been deleted"
msgstr ""
-#: ../admin/fiscalyears.php:127
+#: ../admin/fiscalyears.php:133
msgid ""
"Warning: Deleting a fiscal year all transactions \n"
"\t\tare removed and converted into relevant balances. This process is "
"irreversible!"
msgstr ""
-#: ../admin/fiscalyears.php:132
+#: ../admin/fiscalyears.php:138
msgid "Fiscal Year Begin"
msgstr ""
-#: ../admin/fiscalyears.php:132
+#: ../admin/fiscalyears.php:138
msgid "Fiscal Year End"
msgstr ""
-#: ../admin/fiscalyears.php:132
+#: ../admin/fiscalyears.php:138
#: ../dimensions/inquiry/search_dimensions.php:133
#: ../dimensions/inquiry/search_dimensions.php:139
-#: ../includes/ui/ui_lists.inc:648
+#: ../includes/ui/ui_input.inc:954
+#: ../includes/ui/ui_lists.inc:675
+#: ../includes/ui/ui_lists.inc.orig:675
#: ../manufacturing/search_work_orders.php:108
#: ../reporting/rep501.php:85
#: ../reporting/rep710.php:109
-#: ../reporting/includes/excel_report.inc:227
+#: ../reporting/includes/excel_report.inc:234
#: ../reporting/includes/pdf_report.inc:266
msgid "Closed"
msgstr ""
-#: ../admin/fiscalyears.php:162
+#: ../admin/fiscalyears.php:168
#, php-format
msgid ""
"Are you sure you want to delete fiscal year %s - %s? All transactions are "
"deleted and converted into relevant balances. Do you want to continue ?"
msgstr ""
-#: ../admin/fiscalyears.php:170
+#: ../admin/fiscalyears.php:176
msgid ""
"The marked fiscal year is the current fiscal year which cannot be deleted."
msgstr ""
-#: ../admin/fiscalyears.php:194
-#: ../admin/fiscalyears.php:205
-#: ../admin/fiscalyears.php:208
+#: ../admin/fiscalyears.php:200
+#: ../admin/fiscalyears.php:211
msgid "Fiscal Year Begin:"
msgstr ""
-#: ../admin/fiscalyears.php:195
-#: ../admin/fiscalyears.php:209
+#: ../admin/fiscalyears.php:201
+#: ../admin/fiscalyears.php:212
msgid "Fiscal Year End:"
msgstr ""
-#: ../admin/fiscalyears.php:213
+#: ../admin/fiscalyears.php:216
msgid "Is Closed:"
msgstr ""
msgstr ""
#: ../admin/gl_setup.php:16
+#: ../admin/gl_setup.php.orig:16
msgid "System and General GL Setup"
msgstr ""
#: ../admin/gl_setup.php:30
+#: ../admin/gl_setup.php.orig:30
msgid "The delivery over-receive allowance must be between 0 and 100."
msgstr ""
#: ../admin/gl_setup.php:37
+#: ../admin/gl_setup.php.orig:37
msgid "The invoice over-charge allowance must be between 0 and 100."
msgstr ""
#: ../admin/gl_setup.php:44
+#: ../admin/gl_setup.php.orig:44
msgid "The past due days interval allowance must be between 0 and 100."
msgstr ""
-#: ../admin/gl_setup.php:66
+#: ../admin/gl_setup.php:52
+#: ../admin/gl_setup.php.orig:52
+msgid "Before GRN Clearing Account can be changed all GRNs have to be invoiced"
+msgstr ""
+
+#: ../admin/gl_setup.php:75
+#: ../admin/gl_setup.php.orig:75
msgid "The general GL setup has been updated."
msgstr ""
-#: ../admin/gl_setup.php:116
+#: ../admin/gl_setup.php:138
+#: ../admin/gl_setup.php.orig:137
msgid "General GL"
msgstr ""
-#: ../admin/gl_setup.php:118
+#: ../admin/gl_setup.php:140
+#: ../admin/gl_setup.php.orig:139
msgid "Past Due Days Interval:"
msgstr ""
-#: ../admin/gl_setup.php:118
-#: ../admin/gl_setup.php:153
-#: ../admin/gl_setup.php:161
-#: ../admin/gl_setup.php:196
+#: ../admin/gl_setup.php:140
+#: ../admin/gl_setup.php:180
+#: ../admin/gl_setup.php:188
+#: ../admin/gl_setup.php:206
+#: ../admin/gl_setup.php:228
+#: ../admin/gl_setup.php.orig:139
+#: ../admin/gl_setup.php.orig:176
+#: ../admin/gl_setup.php.orig:184
+#: ../admin/gl_setup.php.orig:202
+#: ../admin/gl_setup.php.orig:224
#: ../admin/payment_terms.php:140
msgid "days"
msgstr ""
-#: ../admin/gl_setup.php:120
+#: ../admin/gl_setup.php:142
+#: ../admin/gl_setup.php.orig:141
msgid "Retained Earnings:"
msgstr ""
-#: ../admin/gl_setup.php:122
+#: ../admin/gl_setup.php:144
+#: ../admin/gl_setup.php.orig:143
msgid "Profit/Loss Year:"
msgstr ""
-#: ../admin/gl_setup.php:124
+#: ../admin/gl_setup.php:146
+#: ../admin/gl_setup.php.orig:145
msgid "Exchange Variances Account:"
msgstr ""
-#: ../admin/gl_setup.php:126
+#: ../admin/gl_setup.php:148
+#: ../admin/gl_setup.php.orig:147
+#: ../gl/manage/bank_accounts.php:193
msgid "Bank Charges Account:"
msgstr ""
-#: ../admin/gl_setup.php:130
+#: ../admin/gl_setup.php:150
+#: ../admin/gl_setup.php.orig:149
+msgid "Tax Algorithm:"
+msgstr ""
+
+#: ../admin/gl_setup.php:154
+#: ../admin/gl_setup.php.orig:153
msgid "Customers and Sales"
msgstr ""
-#: ../admin/gl_setup.php:132
+#: ../admin/gl_setup.php:156
+#: ../admin/gl_setup.php.orig:155
msgid "Default Credit Limit:"
msgstr ""
-#: ../admin/gl_setup.php:134
+#: ../admin/gl_setup.php:158
+#: ../admin/gl_setup.php.orig:157
msgid "Accumulate batch shipping:"
msgstr ""
-#: ../admin/gl_setup.php:136
+#: ../admin/gl_setup.php:160
+#: ../admin/gl_setup.php.orig:159
msgid "Legal Text on Invoice:"
msgstr ""
-#: ../admin/gl_setup.php:138
+#: ../admin/gl_setup.php:162
+#: ../admin/gl_setup.php.orig:161
msgid "Shipping Charged Account:"
msgstr ""
-#: ../admin/gl_setup.php:142
+#: ../admin/gl_setup.php:164
+msgid "Deferred Income Account:"
+msgstr ""
+
+#: ../admin/gl_setup.php:165
+msgid "Not used"
+msgstr ""
+
+#: ../admin/gl_setup.php:169
+#: ../admin/gl_setup.php.orig:165
msgid "Customers and Sales Defaults"
msgstr ""
-#: ../admin/gl_setup.php:144
+#: ../admin/gl_setup.php:171
+#: ../admin/gl_setup.php.orig:167
msgid "Receivable Account:"
msgstr ""
-#: ../admin/gl_setup.php:146
-#: ../admin/gl_setup.php:182
+#: ../admin/gl_setup.php:173
+#: ../admin/gl_setup.php:214
+#: ../admin/gl_setup.php.orig:169
+#: ../admin/gl_setup.php.orig:210
#: ../inventory/manage/item_categories.php:192
-#: ../inventory/manage/items.php:363
+#: ../inventory/manage/items.php:361
+#: ../inventory/manage/items.php.orig:354
#: ../sales/manage/customer_branches.php:251
msgid "Sales Account:"
msgstr ""
-#: ../admin/gl_setup.php:149
+#: ../admin/gl_setup.php:176
+#: ../admin/gl_setup.php.orig:172
#: ../sales/manage/customer_branches.php:252
msgid "Sales Discount Account:"
msgstr ""
-#: ../admin/gl_setup.php:151
+#: ../admin/gl_setup.php:178
+#: ../admin/gl_setup.php.orig:174
#: ../sales/manage/customer_branches.php:254
msgid "Prompt Payment Discount Account:"
msgstr ""
-#: ../admin/gl_setup.php:153
+#: ../admin/gl_setup.php:180
+#: ../admin/gl_setup.php.orig:176
msgid "Delivery Required By:"
msgstr ""
-#: ../admin/gl_setup.php:159
+#: ../admin/gl_setup.php:186
+#: ../admin/gl_setup.php.orig:182
msgid "Dimension Defaults"
msgstr ""
-#: ../admin/gl_setup.php:161
+#: ../admin/gl_setup.php:188
+#: ../admin/gl_setup.php.orig:184
msgid "Dimension Required By After:"
msgstr ""
-#: ../admin/gl_setup.php:164
+#: ../admin/gl_setup.php:192
+#: ../admin/gl_setup.php.orig:188
msgid "Suppliers and Purchasing"
msgstr ""
-#: ../admin/gl_setup.php:166
+#: ../admin/gl_setup.php:194
+#: ../admin/gl_setup.php.orig:190
msgid "Delivery Over-Receive Allowance:"
msgstr ""
-#: ../admin/gl_setup.php:168
+#: ../admin/gl_setup.php:196
+#: ../admin/gl_setup.php.orig:192
msgid "Invoice Over-Charge Allowance:"
msgstr ""
-#: ../admin/gl_setup.php:170
+#: ../admin/gl_setup.php:198
+#: ../admin/gl_setup.php.orig:194
msgid "Suppliers and Purchasing Defaults"
msgstr ""
-#: ../admin/gl_setup.php:172
+#: ../admin/gl_setup.php:200
+#: ../admin/gl_setup.php.orig:196
msgid "Payable Account:"
msgstr ""
-#: ../admin/gl_setup.php:174
-#: ../purchasing/manage/suppliers.php:129
+#: ../admin/gl_setup.php:202
+#: ../admin/gl_setup.php.orig:198
+#: ../purchasing/manage/suppliers.php:132
+#: ../purchasing/manage/suppliers.php.orig:142
msgid "Purchase Discount Account:"
msgstr ""
-#: ../admin/gl_setup.php:176
-#: ../reporting/reports_main.php:163
+#: ../admin/gl_setup.php:204
+#: ../admin/gl_setup.php.orig:200
+msgid "GRN Clearing Account:"
+msgstr ""
+
+#: ../admin/gl_setup.php:204
+#: ../admin/gl_setup.php.orig:200
+msgid "No postings on GRN"
+msgstr ""
+
+#: ../admin/gl_setup.php:206
+#: ../admin/gl_setup.php.orig:202
+msgid "Receival Required By:"
+msgstr ""
+
+#: ../admin/gl_setup.php:208
+#: ../admin/gl_setup.php.orig:204
+#: ../reporting/reports_main.php:175
msgid "Inventory"
msgstr ""
-#: ../admin/gl_setup.php:178
+#: ../admin/gl_setup.php:210
+#: ../admin/gl_setup.php.orig:206
msgid "Allow Negative Inventory:"
msgstr ""
-#: ../admin/gl_setup.php:179
+#: ../admin/gl_setup.php:211
+#: ../admin/gl_setup.php.orig:207
msgid "Warning: This may cause a delay in GL postings"
msgstr ""
-#: ../admin/gl_setup.php:181
+#: ../admin/gl_setup.php:213
+#: ../admin/gl_setup.php.orig:209
msgid "Items Defaults"
msgstr ""
-#: ../admin/gl_setup.php:184
+#: ../admin/gl_setup.php:216
+#: ../admin/gl_setup.php.orig:212
#: ../inventory/manage/item_categories.php:202
-#: ../inventory/manage/items.php:367
+#: ../inventory/manage/items.php:365
+#: ../inventory/manage/items.php.orig:358
msgid "Inventory Account:"
msgstr ""
-#: ../admin/gl_setup.php:186
+#: ../admin/gl_setup.php:218
+#: ../admin/gl_setup.php.orig:214
#: ../inventory/manage/item_categories.php:196
#: ../inventory/manage/item_categories.php:204
-#: ../inventory/manage/items.php:368
-#: ../inventory/manage/items.php:373
+#: ../inventory/manage/items.php:366
+#: ../inventory/manage/items.php:371
+#: ../inventory/manage/items.php.orig:359
+#: ../inventory/manage/items.php.orig:364
msgid "C.O.G.S. Account:"
msgstr ""
-#: ../admin/gl_setup.php:188
+#: ../admin/gl_setup.php:220
+#: ../admin/gl_setup.php.orig:216
#: ../inventory/manage/item_categories.php:205
-#: ../inventory/manage/items.php:369
+#: ../inventory/manage/items.php:367
+#: ../inventory/manage/items.php.orig:360
msgid "Inventory Adjustments Account:"
msgstr ""
-#: ../admin/gl_setup.php:190
+#: ../admin/gl_setup.php:222
+#: ../admin/gl_setup.php.orig:218
#: ../inventory/manage/item_categories.php:209
-#: ../inventory/manage/items.php:380
+#: ../inventory/manage/items.php:378
+#: ../inventory/manage/items.php.orig:371
msgid "Item Assembly Costs Account:"
msgstr ""
-#: ../admin/gl_setup.php:194
+#: ../admin/gl_setup.php:226
+#: ../admin/gl_setup.php.orig:222
msgid "Manufacturing Defaults"
msgstr ""
-#: ../admin/gl_setup.php:196
+#: ../admin/gl_setup.php:228
+#: ../admin/gl_setup.php.orig:224
msgid "Work Order Required By After:"
msgstr ""
#: ../admin/inst_chart.php:50
#: ../admin/inst_lang.php:36
-#: ../admin/inst_module.php:190
+#: ../admin/inst_module.php:105
#: ../admin/inst_theme.php:74
-#: ../admin/inst_upgrade.php:189
+#: ../admin/inst_upgrade.php:155
msgid "Installed"
msgstr ""
#: ../admin/inst_chart.php:50
#: ../admin/inst_lang.php:36
-#: ../admin/inst_module.php:190
+#: ../admin/inst_module.php:105
#: ../admin/inst_theme.php:74
-#: ../inventory/inquiry/stock_status.php:70
+#: ../inventory/inquiry/stock_status.php:71
+#: ../inventory/inquiry/stock_status.php.orig:77
#: ../reporting/rep303.php:102
msgid "Available"
msgstr ""
#: ../admin/inst_chart.php:69
#: ../admin/inst_chart.php:71
#: ../admin/inst_lang.php:88
-#: ../admin/inst_module.php:213
+#: ../admin/inst_module.php:128
+#: ../admin/inst_module.php:129
#: ../admin/inst_theme.php:92
+#: ../includes/sysnames.inc:193
msgid "Unknown"
msgstr ""
#: ../admin/inst_chart.php:74
#: ../admin/inst_lang.php:103
-#: ../admin/inst_module.php:220
+#: ../admin/inst_module.php:133
+#: ../admin/inst_module.php:138
#: ../admin/inst_theme.php:96
-#: ../admin/inst_upgrade.php:171
+#: ../admin/inst_upgrade.php:137
msgid "Install"
msgstr ""
#: ../admin/inst_chart.php:75
-#: ../admin/inst_module.php:221
+#: ../admin/inst_module.php:139
#: ../admin/inst_theme.php:97
msgid "Upload and install latest extension package"
msgstr ""
#: ../admin/inst_chart.php:82
-#: ../admin/inst_module.php:228
+#: ../admin/inst_module.php:146
#: ../admin/inst_theme.php:104
#, php-format
msgid ""
msgstr ""
#: ../admin/inst_lang.php:35
-#: ../admin/inst_module.php:314
#: ../admin/printers.php:84
#: ../admin/shipping_companies.php:91
#: ../dimensions/dimension_entry.php:271
#: ../dimensions/view/view_dimension.php:54
#: ../inventory/manage/item_categories.php:98
#: ../manufacturing/manage/work_centres.php:101
-#: ../purchasing/includes/ui/invoice_ui.inc:245
-#: ../purchasing/includes/ui/invoice_ui.inc:247
-#: ../purchasing/includes/ui/invoice_ui.inc:249
+#: ../purchasing/includes/ui/invoice_ui.inc:265
+#: ../purchasing/includes/ui/invoice_ui.inc:267
+#: ../purchasing/includes/ui/invoice_ui.inc:269
#: ../reporting/rep501.php:85
-#: ../reporting/rep709.php:107
-#: ../sales/manage/customer_branches.php:295
+#: ../reporting/rep709.php:109
+#: ../reporting/rep709.php:110
+#: ../sales/manage/customer_branches.php:296
#: ../sales/manage/sales_people.php:99
-#: ../taxes/item_tax_types.php:112
+#: ../taxes/item_tax_types.php:117
msgid "Name"
msgstr ""
msgid "Install/Activate extensions"
msgstr ""
-#: ../admin/inst_module.php:34
-msgid "Extension name cannot be empty."
-msgstr ""
-
-#: ../admin/inst_module.php:39
-msgid "Extension name have to be unique."
-msgstr ""
-
-#: ../admin/inst_module.php:45
-msgid "Extension title cannot be empty."
-msgstr ""
-
-#: ../admin/inst_module.php:49
-msgid "Extension folder name cannot be empty."
-msgstr ""
-
-#: ../admin/inst_module.php:53
-msgid "You have to select extension file to upload"
-msgstr ""
-
-#: ../admin/inst_module.php:72
-msgid "Module installation support is not implemented."
-msgstr ""
-
-#: ../admin/inst_module.php:164
+#: ../admin/inst_module.php:78
msgid "Selected extension has been successfully deleted"
msgstr ""
-#: ../admin/inst_module.php:189
-#: ../admin/inst_module.php:252
+#: ../admin/inst_module.php:104
+#: ../admin/inst_module.php:169
msgid "Extension"
msgstr ""
-#: ../admin/inst_module.php:189
-#: ../admin/inst_module.php:252
+#: ../admin/inst_module.php:104
+#: ../admin/inst_module.php:169
msgid "Modules provided"
msgstr ""
-#: ../admin/inst_module.php:189
-#: ../admin/inst_module.php:252
+#: ../admin/inst_module.php:104
+#: ../admin/inst_module.php:169
msgid "Options provided"
msgstr ""
-#: ../admin/inst_module.php:217
-msgid "Edit third-party extension parameters."
-msgstr ""
-
-#: ../admin/inst_module.php:239
-msgid "Add third-party extension"
+#: ../admin/inst_module.php:133
+msgid "Install third-party extension."
msgstr ""
-#: ../admin/inst_module.php:252
-#: ../includes/ui/ui_lists.inc:648
-#: ../includes/ui/ui_lists.inc:2118
-#: ../reporting/includes/excel_report.inc:225
+#: ../admin/inst_module.php:169
+#: ../includes/ui/ui_lists.inc:675
+#: ../includes/ui/ui_lists.inc:2156
+#: ../includes/ui/ui_lists.inc.orig:675
+#: ../includes/ui/ui_lists.inc.orig:2154
+#: ../reporting/includes/excel_report.inc:232
#: ../reporting/includes/pdf_report.inc:264
msgid "Active"
msgstr ""
-#: ../admin/inst_module.php:315
-msgid "Subfolder (in modules directory)"
-msgstr ""
-
-#: ../admin/inst_module.php:317
-msgid "Menu Tab"
-msgstr ""
-
-#: ../admin/inst_module.php:318
-msgid "Menu Link Text"
-msgstr ""
-
-#: ../admin/inst_module.php:320
-msgid "Default status"
-msgstr ""
-
-#: ../admin/inst_module.php:322
-msgid "Extension File"
-msgstr ""
-
-#: ../admin/inst_module.php:323
-msgid "Access Levels File"
-msgstr ""
-
-#: ../admin/inst_module.php:324
-msgid "SQL File"
-msgstr ""
-
-#: ../admin/inst_module.php:327
-msgid "Select your extension PHP files from your local harddisk."
-msgstr ""
-
-#: ../admin/inst_module.php:337
-msgid "Extension data has been updated."
-msgstr ""
-
-#: ../admin/inst_module.php:339
-msgid "Extension has been installed."
+#: ../admin/inst_module.php:232
+msgid "Status change for some extensions failed."
msgstr ""
-#: ../admin/inst_module.php:362
+#: ../admin/inst_module.php:235
msgid "Current active extensions set has been saved."
msgstr ""
-#: ../admin/inst_module.php:387
+#: ../admin/inst_module.php:257
msgid "Extensions:"
msgstr ""
msgid "Software Upgrade"
msgstr ""
-#: ../admin/inst_upgrade.php:105
+#: ../admin/inst_upgrade.php:72
#, php-format
msgid "Database upgrade for company '%s' (%s:%s*) started..."
msgstr ""
-#: ../admin/inst_upgrade.php:113
+#: ../admin/inst_upgrade.php:80
msgid "Database upgrade finished."
msgstr ""
-#: ../admin/inst_upgrade.php:117
+#: ../admin/inst_upgrade.php:84
msgid ""
"Upgrade cannot be done because database has been already partially upgraded. "
"Please downgrade database to clean previous version or try forced upgrade."
msgstr ""
-#: ../admin/inst_upgrade.php:135
+#: ../admin/inst_upgrade.php:102
msgid "Cannot connect to database for company"
msgstr ""
-#: ../admin/inst_upgrade.php:147
+#: ../admin/inst_upgrade.php:114
#, php-format
msgid "Database upgrade to version %s failed for company '%s'."
msgstr ""
-#: ../admin/inst_upgrade.php:150
+#: ../admin/inst_upgrade.php:117
msgid "You should restore company database from latest backup file"
msgstr ""
-#: ../admin/inst_upgrade.php:162
+#: ../admin/inst_upgrade.php:129
msgid "All companies data has been successfully updated"
msgstr ""
-#: ../admin/inst_upgrade.php:171
+#: ../admin/inst_upgrade.php:137
msgid "Sql file"
msgstr ""
-#: ../admin/inst_upgrade.php:172
+#: ../admin/inst_upgrade.php:138
msgid "Force upgrade"
msgstr ""
-#: ../admin/inst_upgrade.php:195
+#: ../admin/inst_upgrade.php:161
#, php-format
msgid "Partially installed (%s)"
msgstr ""
-#: ../admin/inst_upgrade.php:204
+#: ../admin/inst_upgrade.php:170
msgid ""
"Database upgrades marked as partially installed cannot be installed "
"automatically.\n"
"upgrade."
msgstr ""
-#: ../admin/inst_upgrade.php:208
+#: ../admin/inst_upgrade.php:174
msgid "Upgrade system"
msgstr ""
-#: ../admin/inst_upgrade.php:208
+#: ../admin/inst_upgrade.php:174
msgid "Save database and perform upgrade"
msgstr ""
#: ../admin/payment_terms.php:16
-#: ../reporting/includes/doctext.inc:56
-#: ../sales/view/view_invoice.php:74
-#: ../sales/view/view_sales_order.php:77
+#: ../reporting/includes/doctext.inc:41
+#: ../sales/view/view_invoice.php:76
+#: ../sales/view/view_sales_order.php:82
+#: ../sales/view/view_sales_order.php:90
+#: ../sales/view/view_sales_order.php.orig:78
msgid "Payment Terms"
msgstr ""
#: ../dimensions/inquiry/search_dimensions.php:75
#: ../dimensions/inquiry/search_dimensions.php:130
#: ../dimensions/view/view_dimension.php:54
-#: ../gl/bank_account_reconcile.php:233
-#: ../gl/inquiry/bank_inquiry.php:67
-#: ../gl/inquiry/gl_account_inquiry.php:125
-#: ../gl/inquiry/journal_inquiry.php:122
+#: ../gl/bank_account_reconcile.php:231
+#: ../gl/inquiry/bank_inquiry.php:70
+#: ../gl/inquiry/gl_account_inquiry.php:126
+#: ../gl/inquiry/journal_inquiry.php:129
#: ../gl/inquiry/tax_inquiry.php:82
-#: ../gl/manage/bank_accounts.php:102
+#: ../gl/manage/bank_accounts.php:109
#: ../gl/manage/gl_quick_entries.php:186
#: ../gl/view/accrual_trans.php:52
-#: ../gl/includes/ui/gl_bank_ui.inc:80
-#: ../includes/ui/ui_view.inc:480
-#: ../inventory/inquiry/stock_movements.php:76
+#: ../gl/includes/ui/gl_bank_ui.inc:92
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:83
+#: ../includes/ui/ui_view.inc:488
+#: ../includes/ui/ui_view.inc.orig:488
+#: ../inventory/inquiry/stock_movements.php:77
+#: ../inventory/inquiry/stock_movements.php.orig:79
#: ../inventory/manage/item_categories.php:98
#: ../manufacturing/search_work_orders.php:161
+#: ../manufacturing/view/wo_costs_view.php:46
#: ../manufacturing/includes/manufacturing_ui.inc:236
#: ../manufacturing/includes/manufacturing_ui.inc:276
#: ../manufacturing/includes/manufacturing_ui.inc:280
#: ../manufacturing/includes/manufacturing_ui.inc:331
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:125
-#: ../purchasing/inquiry/supplier_inquiry.php:162
-#: ../reporting/rep102.php:124
-#: ../reporting/rep202.php:127
+#: ../purchasing/inquiry/supplier_inquiry.php:173
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:170
+#: ../reporting/rep102.php:132
+#: ../reporting/rep202.php:137
#: ../reporting/rep501.php:85
#: ../reporting/rep601.php:76
+#: ../reporting/rep602.php:80
#: ../reporting/rep702.php:58
-#: ../reporting/rep704.php:78
-#: ../reporting/rep704.php:81
-#: ../reporting/rep704.php:84
-#: ../reporting/rep709.php:103
+#: ../reporting/rep704.php:79
+#: ../reporting/rep704.php:82
+#: ../reporting/rep704.php:85
+#: ../reporting/rep709.php:105
#: ../reporting/rep710.php:76
#: ../reporting/rep710.php:84
-#: ../reporting/reports_main.php:239
-#: ../reporting/reports_main.php:386
-#: ../reporting/includes/doctext.inc:42
-#: ../reporting/includes/doctext.inc:52
-#: ../sales/inquiry/customer_allocation_inquiry.php:141
-#: ../sales/inquiry/customer_inquiry.php:212
+#: ../reporting/reports_main.php:252
+#: ../reporting/reports_main.php:399
+#: ../reporting/includes/doctext.inc:162
+#: ../reporting/includes/doctext.inc:203
+#: ../reporting/includes/doctext.inc:222
+#: ../sales/inquiry/customer_allocation_inquiry.php:144
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:144
+#: ../sales/inquiry/customer_inquiry.php:200
+#: ../sales/inquiry/customer_inquiry.php.orig:224
msgid "Type"
msgstr ""
msgstr ""
#: ../admin/payment_terms.php:140
+#: ../admin/void_transaction.php:125
msgid "N/A"
msgstr ""
msgstr ""
#: ../admin/security_roles.php:180
-#: ../gl/manage/gl_accounts.php:195
-#: ../inventory/manage/items.php:253
-#: ../purchasing/manage/suppliers.php:281
-#: ../sales/manage/customers.php:282
+#: ../gl/manage/gl_accounts.php:197
+#: ../inventory/manage/items.php:440
+#: ../inventory/manage/items.php.orig:433
+#: ../purchasing/manage/suppliers.php:291
+#: ../purchasing/manage/suppliers.php.orig:294
+#: ../sales/manage/customers.php:324
+#: ../sales/manage/sav.customers.php:324
msgid "Show inactive:"
msgstr ""
msgstr ""
#: ../admin/security_roles.php:249
-#: ../admin/void_transaction.php:208
+#: ../admin/void_transaction.php:229
#: ../gl/manage/gl_quick_entries.php:61
-#: ../gl/includes/ui/gl_bank_ui.inc:248
-#: ../gl/includes/ui/gl_journal_ui.inc:223
+#: ../gl/includes/ui/gl_bank_ui.inc:277
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:251
+#: ../gl/includes/ui/gl_journal_ui.inc:259
#: ../includes/ui/simple_crud_class.inc:58
#: ../includes/ui/simple_crud_class.inc:231
-#: ../includes/ui/ui_controls.inc:561
-#: ../includes/ui/ui_input.inc:206
+#: ../includes/ui/ui_controls.inc:594
+#: ../includes/ui/ui_input.inc:210
#: ../inventory/includes/item_adjustments_ui.inc:159
#: ../inventory/includes/stock_transfers_ui.inc:139
-#: ../inventory/manage/items.php:425
-#: ../manufacturing/includes/work_order_issue_ui.inc:129
-#: ../purchasing/includes/ui/po_ui.inc:436
+#: ../inventory/manage/items.php:423
+#: ../inventory/manage/items.php.orig:416
+#: ../manufacturing/includes/work_order_issue_ui.inc:133
+#: ../purchasing/includes/ui/po_ui.inc:459
#: ../sales/includes/ui/sales_credit_ui.inc:295
-#: ../sales/includes/ui/sales_order_ui.inc:566
+#: ../sales/includes/ui/sales_order_ui.inc:557
+#: ../sales/includes/ui/sales_order_ui.inc.orig:557
msgid "Cancel"
msgstr ""
#: ../admin/security_roles.php:249
-#: ../inventory/manage/items.php:425
+#: ../inventory/manage/items.php:423
+#: ../inventory/manage/items.php.orig:416
msgid "Cancel Edition"
msgstr ""
#: ../admin/shipping_companies.php:15
-#: ../reporting/includes/doctext.inc:32
-#: ../sales/customer_credit_invoice.php:265
-#: ../sales/customer_delivery.php:366
-#: ../sales/customer_invoice.php:403
+#: ../sales/customer_credit_invoice.php:256
+#: ../sales/customer_delivery.php:376
+#: ../sales/customer_invoice.php:486
#: ../sales/view/view_credit.php:74
#: ../sales/view/view_dispatch.php:92
-#: ../sales/view/view_invoice.php:91
+#: ../sales/view/view_invoice.php:92
msgid "Shipping Company"
msgstr ""
#: ../admin/shipping_companies.php:91
#: ../inventory/manage/locations.php:146
-#: ../reporting/includes/doctext.inc:75
msgid "Address"
msgstr ""
#: ../admin/shipping_companies.php:134
-#: ../gl/manage/gl_account_types.php:182
-#: ../gl/includes/ui/gl_bank_ui.inc:55
-#: ../inventory/manage/items.php:308
+#: ../gl/manage/gl_account_types.php:188
+#: ../gl/includes/ui/gl_bank_ui.inc:56
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:58
+#: ../inventory/manage/items.php:306
+#: ../inventory/manage/items.php.orig:299
#: ../manufacturing/manage/work_centres.php:137
msgid "Name:"
msgstr ""
#: ../admin/shipping_companies.php:136
-#: ../purchasing/manage/suppliers.php:104
-#: ../sales/manage/customer_branches.php:260
+#: ../purchasing/manage/suppliers.php.orig:113
+#: ../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:106
-#: ../sales/manage/customer_branches.php:262
+#: ../purchasing/manage/suppliers.php:136
+#: ../purchasing/manage/suppliers.php.orig:115
+#: ../sales/manage/customer_branches.php:263
+#: ../sales/manage/customers.php:253
+#: ../sales/manage/sav.customers.php:253
msgid "Secondary Phone Number:"
msgstr ""
msgstr ""
#: ../admin/tags.php:40
-#: ../reporting/reports_main.php:260
-#: ../reporting/reports_main.php:268
-#: ../reporting/reports_main.php:279
-#: ../reporting/reports_main.php:307
-#: ../reporting/reports_main.php:314
-#: ../reporting/reports_main.php:324
-#: ../reporting/reports_main.php:349
-#: ../reporting/reports_main.php:355
-#: ../reporting/reports_main.php:364
+#: ../reporting/reports_main.php:273
+#: ../reporting/reports_main.php:281
+#: ../reporting/reports_main.php:292
+#: ../reporting/reports_main.php:320
+#: ../reporting/reports_main.php:327
+#: ../reporting/reports_main.php:337
+#: ../reporting/reports_main.php:362
+#: ../reporting/reports_main.php:368
+#: ../reporting/reports_main.php:377
msgid "Account Tags"
msgstr ""
#: ../includes/ui/contacts_view.inc:41
#: ../inventory/manage/locations.php:146
#: ../reporting/rep106.php:86
-#: ../reporting/includes/header2.inc:86
+#: ../reporting/includes/header2.inc:98
#: ../sales/manage/sales_people.php:99
msgid "Phone"
msgstr ""
#: ../admin/users.php:115
-#: ../sales/manage/customer_branches.php:301
-#: ../sales/view/view_sales_order.php:82
+#: ../sales/manage/customer_branches.php:302
+#: ../sales/view/view_sales_order.php:96
+#: ../sales/view/view_sales_order.php.orig:83
msgid "E-mail"
msgstr ""
#: ../admin/view_print_transaction.php:43
#: ../admin/view_print_transaction.php:45
#: ../admin/view_print_transaction.php:129
-#: ../includes/ui/ui_controls.inc:172
-#: ../purchasing/inquiry/po_search_completed.php:108
+#: ../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:197
+#: ../sales/inquiry/customer_inquiry.php:185
+#: ../sales/inquiry/customer_inquiry.php.orig:209
#: ../sales/inquiry/sales_deliveries_view.php:160
-#: ../sales/inquiry/sales_orders_view.php:116
+#: ../sales/inquiry/sales_deliveries_view.php.orig:160
+#: ../sales/inquiry/sales_orders_view.php:125
+#: ../sales/inquiry/sales_orders_view.php.orig:116
msgid "Print"
msgstr ""
msgstr ""
#: ../admin/view_print_transaction.php:79
+#: ../admin/void_transaction.php:166
msgid "from #:"
msgstr ""
#: ../admin/view_print_transaction.php:81
+#: ../admin/void_transaction.php:168
msgid "to #:"
msgstr ""
#: ../admin/view_print_transaction.php:83
+#: ../admin/void_transaction.php:170
#: ../dimensions/inquiry/search_dimensions.php:88
#: ../gl/inquiry/journal_inquiry.php:53
#: ../manufacturing/search_work_orders.php:78
-#: ../purchasing/includes/ui/invoice_ui.inc:447
+#: ../purchasing/includes/ui/invoice_ui.inc:474
#: ../purchasing/inquiry/po_search_completed.php:74
+#: ../purchasing/inquiry/po_search_completed.php.orig:75
#: ../purchasing/inquiry/po_search.php:76
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:57
-#: ../purchasing/inquiry/supplier_inquiry.php:54
+#: ../purchasing/inquiry/supplier_inquiry.php:55
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:55
#: ../sales/inquiry/customer_allocation_inquiry.php:51
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:51
#: ../sales/inquiry/customer_inquiry.php:54
+#: ../sales/inquiry/customer_inquiry.php.orig:55
#: ../sales/inquiry/sales_deliveries_view.php:116
-#: ../sales/inquiry/sales_orders_view.php:244
+#: ../sales/inquiry/sales_deliveries_view.php.orig:116
+#: ../sales/inquiry/sales_orders_view.php:269
+#: ../sales/inquiry/sales_orders_view.php.orig:246
msgid "Search"
msgstr ""
msgstr ""
#: ../admin/view_print_transaction.php:127
-#: ../admin/void_transaction.php:161
+#: ../admin/void_transaction.php:182
#: ../dimensions/inquiry/search_dimensions.php:128
#: ../dimensions/view/view_dimension.php:54
-#: ../gl/bank_account_reconcile.php:235
-#: ../gl/inquiry/bank_inquiry.php:67
-#: ../gl/inquiry/journal_inquiry.php:124
+#: ../gl/bank_account_reconcile.php:233
+#: ../gl/inquiry/bank_inquiry.php:70
+#: ../gl/inquiry/journal_inquiry.php:131
#: ../gl/view/bank_transfer_view.php:86
#: ../gl/view/gl_deposit_view.php:75
#: ../gl/view/gl_payment_view.php:73
#: ../gl/view/gl_trans_view.php:35
#: ../includes/ui/contacts_view.inc:41
-#: ../inventory/inquiry/stock_movements.php:76
+#: ../inventory/inquiry/stock_movements.php:77
+#: ../inventory/inquiry/stock_movements.php.orig:79
#: ../inventory/view/view_adjustment.php:44
#: ../inventory/view/view_transfer.php:44
#: ../manufacturing/search_work_orders.php:160
#: ../manufacturing/includes/manufacturing_ui.inc:331
#: ../purchasing/includes/ui/grn_ui.inc:36
#: ../purchasing/includes/ui/grn_ui.inc:53
-#: ../purchasing/includes/ui/po_ui.inc:314
+#: ../purchasing/includes/ui/po_ui.inc:321
#: ../purchasing/view/view_po.php:115
#: ../purchasing/view/view_supp_credit.php:43
-#: ../purchasing/view/view_supp_invoice.php:46
-#: ../purchasing/view/view_supp_payment.php:70
-#: ../purchasing/inquiry/po_search_completed.php:117
+#: ../purchasing/view/view_supp_invoice.php:47
+#: ../purchasing/view/view_supp_payment.php:73
+#: ../purchasing/inquiry/po_search_completed.php:121
+#: ../purchasing/inquiry/po_search_completed.php.orig:120
#: ../purchasing/inquiry/po_search.php:131
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:127
-#: ../purchasing/inquiry/supplier_inquiry.php:164
+#: ../purchasing/inquiry/supplier_inquiry.php:175
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:172
#: ../purchasing/allocations/supplier_allocation_main.php:96
#: ../reporting/rep501.php:85
#: ../reporting/rep601.php:76
+#: ../reporting/rep602.php:80
#: ../reporting/rep702.php:51
-#: ../reporting/includes/doctext.inc:45
-#: ../sales/customer_credit_invoice.php:256
-#: ../sales/customer_credit_invoice.php:258
-#: ../sales/customer_delivery.php:346
-#: ../sales/customer_delivery.php:348
-#: ../sales/customer_invoice.php:382
-#: ../sales/customer_invoice.php:384
+#: ../reporting/includes/doctext.inc:221
+#: ../sales/customer_credit_invoice.php:247
+#: ../sales/customer_credit_invoice.php:249
+#: ../sales/customer_delivery.php:356
+#: ../sales/customer_delivery.php:358
+#: ../sales/customer_invoice.php:458
+#: ../sales/customer_invoice.php:460
#: ../sales/allocations/customer_allocation_main.php:95
#: ../sales/view/view_dispatch.php:85
-#: ../sales/view/view_invoice.php:84
+#: ../sales/view/view_invoice.php:85
#: ../sales/view/view_receipt.php:50
-#: ../sales/view/view_sales_order.php:80
-#: ../sales/inquiry/customer_allocation_inquiry.php:143
-#: ../sales/inquiry/customer_inquiry.php:215
+#: ../sales/view/view_sales_order.php:94
+#: ../sales/view/view_sales_order.php.orig:81
+#: ../sales/inquiry/customer_allocation_inquiry.php:146
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:146
+#: ../sales/inquiry/customer_inquiry.php:203
+#: ../sales/inquiry/customer_inquiry.php.orig:227
#: ../sales/inquiry/sales_deliveries_view.php:184
+#: ../sales/inquiry/sales_deliveries_view.php.orig:184
#: ../sales/includes/ui/sales_credit_ui.inc:85
#: ../sales/includes/ui/sales_credit_ui.inc:87
-#: ../sales/includes/ui/sales_order_ui.inc:374
+#: ../sales/includes/ui/sales_order_ui.inc:373
+#: ../sales/includes/ui/sales_order_ui.inc.orig:373
msgid "Reference"
msgstr ""
#: ../admin/view_print_transaction.php:128
-#: ../admin/void_transaction.php:162
+#: ../admin/void_transaction.php:183
#: ../dimensions/inquiry/search_dimensions.php:131
#: ../dimensions/view/view_dimension.php:54
-#: ../gl/accruals.php:87
-#: ../gl/accruals.php:191
-#: ../gl/bank_account_reconcile.php:236
-#: ../gl/inquiry/bank_inquiry.php:67
-#: ../gl/inquiry/gl_account_inquiry.php:125
-#: ../gl/inquiry/journal_inquiry.php:121
+#: ../gl/accruals.php:94
+#: ../gl/accruals.php:199
+#: ../gl/bank_account_reconcile.php:234
+#: ../gl/inquiry/bank_inquiry.php:70
+#: ../gl/inquiry/gl_account_inquiry.php:126
+#: ../gl/inquiry/journal_inquiry.php:128
#: ../gl/view/accrual_trans.php:52
#: ../gl/view/bank_transfer_view.php:83
#: ../gl/view/gl_deposit_view.php:68
#: ../gl/view/gl_payment_view.php:66
#: ../gl/view/gl_trans_view.php:36
-#: ../includes/ui/allocation_cart.inc:263
-#: ../includes/ui/ui_view.inc:480
-#: ../inventory/inquiry/stock_movements.php:76
+#: ../includes/ui/allocation_cart.inc:264
+#: ../includes/ui/ui_view.inc:488
+#: ../includes/ui/ui_view.inc.orig:488
+#: ../inventory/inquiry/stock_movements.php:77
+#: ../inventory/inquiry/stock_movements.php.orig:79
#: ../inventory/view/view_adjustment.php:45
#: ../inventory/view/view_transfer.php:47
#: ../manufacturing/search_work_orders.php:166
-#: ../manufacturing/work_order_entry.php:417
-#: ../manufacturing/work_order_entry.php:423
+#: ../manufacturing/work_order_entry.php:419
+#: ../manufacturing/work_order_entry.php:425
+#: ../manufacturing/view/wo_costs_view.php:46
#: ../manufacturing/view/wo_production_view.php:45
#: ../manufacturing/includes/manufacturing_ui.inc:157
#: ../manufacturing/includes/manufacturing_ui.inc:200
#: ../manufacturing/includes/manufacturing_ui.inc:277
#: ../manufacturing/includes/manufacturing_ui.inc:281
#: ../manufacturing/includes/manufacturing_ui.inc:332
-#: ../purchasing/includes/ui/invoice_ui.inc:103
-#: ../purchasing/includes/ui/po_ui.inc:328
+#: ../purchasing/includes/ui/invoice_ui.inc:114
+#: ../purchasing/includes/ui/po_ui.inc:335
#: ../purchasing/view/view_po.php:140
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:130
-#: ../purchasing/inquiry/supplier_inquiry.php:167
+#: ../purchasing/inquiry/supplier_inquiry.php:178
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:175
#: ../purchasing/allocations/supplier_allocation_main.php:97
#: ../reporting/rep101.php:130
+#: ../reporting/rep107.php:192
#: ../reporting/rep201.php:118
#: ../reporting/rep501.php:85
#: ../reporting/rep601.php:76
-#: ../reporting/rep704.php:78
-#: ../reporting/rep704.php:81
-#: ../reporting/rep704.php:84
-#: ../reporting/rep709.php:107
+#: ../reporting/rep602.php:80
+#: ../reporting/rep704.php:79
+#: ../reporting/rep704.php:82
+#: ../reporting/rep704.php:85
+#: ../reporting/rep709.php:109
#: ../reporting/rep710.php:75
-#: ../reporting/includes/doctext.inc:15
-#: ../reporting/includes/doctext.inc:108
-#: ../reporting/includes/doctext.inc:116
-#: ../sales/customer_delivery.php:376
-#: ../sales/customer_invoice.php:413
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
+#: ../reporting/includes/doctext.inc:246
+#: ../reporting/includes/header2.inc:135
+#: ../sales/customer_delivery.php:386
+#: ../sales/customer_invoice.php:501
#: ../sales/allocations/customer_allocation_main.php:96
#: ../sales/view/view_credit.php:69
-#: ../sales/view/view_sales_order.php:95
-#: ../sales/view/view_sales_order.php:128
-#: ../sales/view/view_sales_order.php:160
-#: ../sales/inquiry/customer_allocation_inquiry.php:145
-#: ../sales/inquiry/customer_inquiry.php:216
-#: ../themes/exclusive/renderer.php:273
-#: ../themes/exclusive/renderer.php:367
+#: ../sales/view/view_sales_order.php:109
+#: ../sales/view/view_sales_order.php:142
+#: ../sales/view/view_sales_order.php:179
+#: ../sales/view/view_sales_order.php.orig:96
+#: ../sales/view/view_sales_order.php.orig:129
+#: ../sales/view/view_sales_order.php.orig:161
+#: ../sales/inquiry/customer_allocation_inquiry.php:148
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:148
+#: ../sales/inquiry/customer_inquiry.php:204
+#: ../sales/inquiry/customer_inquiry.php.orig:228
msgid "Date"
msgstr ""
#: ../admin/view_print_transaction.php:130
-#: ../admin/void_transaction.php:163
+#: ../admin/void_transaction.php:184
#: ../includes/ui/ui_view.inc:51
+#: ../includes/ui/ui_view.inc.orig:51
msgid "GL"
msgstr ""
msgid "Void a Transaction"
msgstr ""
-#: ../admin/void_transaction.php:119
-#: ../admin/void_transaction.php:164
-#: ../includes/ui/ui_input.inc:136
-#: ../includes/ui/ui_input.inc:277
+#: ../admin/void_transaction.php:126
+#: ../admin/void_transaction.php:185
+#: ../includes/ui/ui_input.inc:137
+#: ../includes/ui/ui_input.inc:281
#: ../includes/ui/ui_lists.inc:20
+#: ../includes/ui/ui_lists.inc.orig:20
msgid "Select"
msgstr ""
-#: ../admin/void_transaction.php:147
+#: ../admin/void_transaction.php:157
msgid "Transaction Type:"
msgstr ""
-#: ../admin/void_transaction.php:183
+#: ../admin/void_transaction.php:204
msgid "Transaction #:"
msgstr ""
-#: ../admin/void_transaction.php:185
+#: ../admin/void_transaction.php:206
msgid "Voiding Date:"
msgstr ""
-#: ../admin/void_transaction.php:187
+#: ../admin/void_transaction.php:208
#: ../dimensions/dimension_entry.php:283
-#: ../gl/bank_transfer.php:91
+#: ../gl/bank_transfer.php:93
#: ../gl/inquiry/journal_inquiry.php:56
-#: ../gl/manage/revaluate_currencies.php:103
+#: ../gl/manage/revaluate_currencies.php:106
#: ../includes/ui/ui_view.inc:308
+#: ../includes/ui/ui_view.inc.orig:308
#: ../manufacturing/work_order_add_finished.php:210
-#: ../manufacturing/work_order_entry.php:449
+#: ../manufacturing/work_order_costs.php:146
+#: ../manufacturing/work_order_entry.php:451
#: ../manufacturing/work_order_release.php:100
-#: ../purchasing/includes/ui/invoice_ui.inc:161
-#: ../purchasing/po_entry_items.php:501
-#: ../purchasing/supplier_payment.php:298
-#: ../sales/customer_payments.php:291
+#: ../purchasing/includes/ui/invoice_ui.inc:180
+#: ../purchasing/includes/ui/po_ui.inc:492
+#: ../purchasing/po_entry_items.php:558
+#: ../purchasing/supplier_payment.php:313
+#: ../sales/customer_invoice.php:678
+#: ../sales/customer_payments.php:410
msgid "Memo:"
msgstr ""
-#: ../admin/void_transaction.php:192
-#: ../admin/void_transaction.php:201
+#: ../admin/void_transaction.php:213
+#: ../admin/void_transaction.php:222
msgid "Void Transaction"
msgstr ""
-#: ../admin/void_transaction.php:197
-#: ../admin/void_transaction.php:276
+#: ../admin/void_transaction.php:218
+#: ../admin/void_transaction.php:297
msgid "The entered transaction does not exist or cannot be voided."
msgstr ""
-#: ../admin/void_transaction.php:205
+#: ../admin/void_transaction.php:226
msgid ""
"Are you sure you want to void this transaction ? This action cannot be "
"undone."
msgstr ""
-#: ../admin/void_transaction.php:207
-#: ../includes/ui/ui_controls.inc:560
+#: ../admin/void_transaction.php:228
+#: ../includes/ui/ui_controls.inc:593
msgid "Proceed"
msgstr ""
-#: ../admin/void_transaction.php:221
+#: ../admin/void_transaction.php:242
msgid "The selected transaction was closed for edition and cannot be voided."
msgstr ""
-#: ../admin/void_transaction.php:227
+#: ../admin/void_transaction.php:248
#: ../gl/accruals.php:32
-#: ../gl/bank_transfer.php:108
-#: ../gl/gl_journal.php:154
+#: ../gl/bank_transfer.php:110
+#: ../gl/gl_journal.php:158
+#: ../gl/manage/close_period.php:34
+#: ../gl/manage/close_period.php.orig:34
#: ../gl/manage/exchange_rates.php:33
-#: ../gl/manage/revaluate_currencies.php:50
+#: ../gl/manage/revaluate_currencies.php:53
#: ../manufacturing/work_order_add_finished.php:98
-#: ../manufacturing/work_order_costs.php:83
-#: ../purchasing/po_receive_items.php:170
+#: ../manufacturing/work_order_costs.php:80
+#: ../purchasing/po_receive_items.php:174
#: ../purchasing/supplier_payment.php:179
-#: ../sales/customer_credit_invoice.php:89
-#: ../sales/sales_order_entry.php:333
+#: ../sales/customer_credit_invoice.php:91
+#: ../sales/sales_order_entry.php:345
+#: ../sales/manage/recurrent_invoices.php:41
+#: ../sales/manage/recurrent_invoices.php:46
+#: ../sales/manage/recurrent_invoices.php:51
msgid "The entered date is invalid."
msgstr ""
-#: ../admin/void_transaction.php:233
-#: ../gl/accruals.php:38
-#: ../gl/bank_transfer.php:114
-#: ../gl/gl_bank.php:247
-#: ../gl/gl_journal.php:160
-#: ../gl/manage/revaluate_currencies.php:56
-#: ../inventory/adjustments.php:114
-#: ../inventory/transfers.php:111
-#: ../manufacturing/work_order_add_finished.php:104
-#: ../manufacturing/work_order_costs.php:89
-#: ../manufacturing/work_order_entry.php:159
-#: ../manufacturing/work_order_issue.php:85
-#: ../purchasing/supplier_credit.php:176
-#: ../purchasing/supplier_invoice.php:174
-#: ../purchasing/supplier_payment.php:185
-#: ../sales/create_recurrent_invoices.php:92
-#: ../sales/credit_note_entry.php:159
-#: ../sales/customer_credit_invoice.php:93
-#: ../sales/customer_payments.php:100
+#: ../admin/void_transaction.php:254
msgid "The entered date is not in fiscal year."
msgstr ""
-#: ../admin/void_transaction.php:240
+#: ../admin/void_transaction.php:261
msgid "The transaction number is expected to be numeric and greater than zero."
msgstr ""
-#: ../admin/void_transaction.php:257
+#: ../admin/void_transaction.php:278
msgid "The selected transaction has already been voided."
msgstr ""
-#: ../admin/void_transaction.php:270
+#: ../admin/void_transaction.php:291
msgid "Selected transaction has been voided."
msgstr ""
-#: ../admin/db/fiscalyears_db.inc:121
+#: ../admin/db/fiscalyears_db.inc:136
msgid ""
"The Retained Earnings Account or the Profit and Loss Year Account has not "
"been set in System and General GL Setup"
msgstr ""
-#: ../admin/db/fiscalyears_db.inc:145
-#: ../admin/db/fiscalyears_db.inc:147
+#: ../admin/db/fiscalyears_db.inc:141
+msgid ""
+"The Retained Earnings Account should be a Balance Account or the Profit and "
+"Loss Year Account should be an Expense Account (preferred the last one in "
+"the Expense Class)"
+msgstr ""
+
+#: ../admin/db/fiscalyears_db.inc:166
+#: ../admin/db/fiscalyears_db.inc:168
msgid "Closing Year"
msgstr ""
-#: ../admin/db/fiscalyears_db.inc:193
+#: ../admin/db/fiscalyears_db.inc:214
#: ../reporting/rep101.php:175
#: ../reporting/rep201.php:167
#: ../reporting/rep706.php:181
msgid "Open Balance"
msgstr ""
-#: ../admin/db/maintenance_db.inc:150
+#: ../admin/db/maintenance_db.inc:152
+#: ../admin/db/maintenance_db.inc.orig:150
#, php-format
msgid "Cannot open the extension setup file '%s' for writing."
msgstr ""
-#: ../admin/db/maintenance_db.inc:158
+#: ../admin/db/maintenance_db.inc:160
+#: ../admin/db/maintenance_db.inc.orig:158
#, php-format
msgid "Cannot write to the extensions setup file '%s'."
msgstr ""
-#: ../admin/db/maintenance_db.inc:176
+#: ../admin/db/maintenance_db.inc:178
+#: ../admin/db/maintenance_db.inc.orig:176
msgid "Cannot update system extensions list."
msgstr ""
-#: ../admin/db/maintenance_db.inc:194
+#: ../admin/db/maintenance_db.inc:196
+#: ../admin/db/maintenance_db.inc.orig:194
#, php-format
msgid "Cannot update extensions list for company '%s'."
msgstr ""
-#: ../admin/db/maintenance_db.inc:231
+#: ../admin/db/maintenance_db.inc:233
+#: ../admin/db/maintenance_db.inc.orig:231
msgid "Cannot open the languages file - "
msgstr ""
-#: ../admin/db/maintenance_db.inc:238
+#: ../admin/db/maintenance_db.inc:240
+#: ../admin/db/maintenance_db.inc.orig:238
msgid "Cannot write to the language file - "
msgstr ""
-#: ../admin/db/maintenance_db.inc:248
+#: ../admin/db/maintenance_db.inc:250
+#: ../admin/db/maintenance_db.inc.orig:248
msgid "The language files folder "
msgstr ""
-#: ../admin/db/maintenance_db.inc:374
+#: ../admin/db/maintenance_db.inc:389
+#: ../admin/db/maintenance_db.inc.orig:386
#, php-format
msgid "SQL script execution failed in line %d: %s"
msgstr ""
-#: ../admin/db/users_db.inc:196
+#: ../admin/db/users_db.inc:210
msgid "user online"
msgstr ""
-#: ../admin/db/users_db.inc:196
+#: ../admin/db/users_db.inc:210
msgid "users online"
msgstr ""
-#: ../admin/db/voiding_db.inc:107
-#: ../sales/includes/db/sales_invoice_db.inc:211
+#: ../admin/db/voiding_db.inc:114
+#: ../sales/includes/db/sales_invoice_db.inc:249
msgid "Voided."
msgstr ""
msgstr ""
#: ../applications/customers.php:42
-msgid "Customer &Credit Notes"
+msgid "Invoice &Prepaid Orders"
msgstr ""
#: ../applications/customers.php:44
+msgid "Customer &Credit Notes"
+msgstr ""
+
+#: ../applications/customers.php:46
msgid "&Allocate Customer Payments or Credit Notes"
msgstr ""
-#: ../applications/customers.php:47
+#: ../applications/customers.php:49
#: ../applications/dimensions.php:27
#: ../applications/generalledger.php:34
#: ../applications/inventory.php:24
msgid "Inquiries and Reports"
msgstr ""
-#: ../applications/customers.php:48
+#: ../applications/customers.php:50
msgid "Sales Quotation I&nquiry"
msgstr ""
-#: ../applications/customers.php:50
+#: ../applications/customers.php:52
msgid "Sales Order &Inquiry"
msgstr ""
-#: ../applications/customers.php:52
+#: ../applications/customers.php:54
msgid "Customer Transaction &Inquiry"
msgstr ""
-#: ../applications/customers.php:55
+#: ../applications/customers.php:57
msgid "Customer Allocation &Inquiry"
msgstr ""
-#: ../applications/customers.php:58
+#: ../applications/customers.php:60
msgid "Customer and Sales &Reports"
msgstr ""
-#: ../applications/customers.php:61
+#: ../applications/customers.php:63
#: ../applications/dimensions.php:34
#: ../applications/generalledger.php:55
#: ../applications/inventory.php:32
msgid "Maintenance"
msgstr ""
-#: ../applications/customers.php:62
+#: ../applications/customers.php:64
msgid "Add and Manage &Customers"
msgstr ""
-#: ../applications/customers.php:64
+#: ../applications/customers.php:66
msgid "Customer &Branches"
msgstr ""
-#: ../applications/customers.php:66
+#: ../applications/customers.php:68
msgid "Sales &Groups"
msgstr ""
-#: ../applications/customers.php:68
+#: ../applications/customers.php:70
msgid "Recurrent &Invoices"
msgstr ""
-#: ../applications/customers.php:70
+#: ../applications/customers.php:72
msgid "Sales T&ypes"
msgstr ""
-#: ../applications/customers.php:72
+#: ../applications/customers.php:74
msgid "Sales &Persons"
msgstr ""
-#: ../applications/customers.php:74
+#: ../applications/customers.php:76
msgid "Sales &Areas"
msgstr ""
-#: ../applications/customers.php:76
+#: ../applications/customers.php:78
msgid "Credit &Status Setup"
msgstr ""
msgstr ""
#: ../applications/generalledger.php:44
-#: ../reporting/reports_main.php:284
-#: ../reporting/reports_main.php:329
-#: ../reporting/reports_main.php:369
+#: ../reporting/reports_main.php:297
+#: ../reporting/reports_main.php:342
+#: ../reporting/reports_main.php:382
msgid "Trial &Balance"
msgstr ""
msgid "GL Account &Classes"
msgstr ""
-#: ../applications/generalledger.php:75
+#: ../applications/generalledger.php:74
+msgid "&Closing GL Transactions"
+msgstr ""
+
+#: ../applications/generalledger.php:76
msgid "&Revaluation of Currency Accounts"
msgstr ""
msgstr ""
#: ../applications/manufacturing.php:19
+#: ../sales/sales_order_entry.php:113
msgid "Work &Order Entry"
msgstr ""
msgstr ""
#: ../dimensions/dimension_entry.php:123
-#: ../gl/bank_transfer.php:146
-#: ../gl/gl_bank.php:235
-#: ../gl/gl_journal.php:174
-#: ../gl/manage/revaluate_currencies.php:69
-#: ../inventory/adjustments.php:101
+#: ../gl/bank_transfer.php:171
+#: ../gl/gl_bank.php:257
+#: ../gl/gl_journal.php:178
+#: ../gl/manage/revaluate_currencies.php:72
+#: ../inventory/adjustments.php:103
#: ../inventory/transfers.php:99
#: ../manufacturing/work_order_add_finished.php:84
-#: ../manufacturing/work_order_entry.php:138
-#: ../manufacturing/work_order_issue.php:98
-#: ../purchasing/po_entry_items.php:353
-#: ../purchasing/po_receive_items.php:184
-#: ../purchasing/supplier_credit.php:156
-#: ../purchasing/supplier_invoice.php:154
-#: ../purchasing/supplier_payment.php:198
-#: ../sales/credit_note_entry.php:149
-#: ../sales/customer_credit_invoice.php:106
-#: ../sales/customer_delivery.php:181
-#: ../sales/customer_invoice.php:285
-#: ../sales/customer_payments.php:112
-#: ../sales/sales_order_entry.php:402
+#: ../manufacturing/work_order_entry.php:139
+#: ../manufacturing/work_order_issue.php:97
+#: ../purchasing/po_entry_items.php:365
+#: ../purchasing/po_receive_items.php:193
+#: ../purchasing/supplier_credit.php:173
+#: ../purchasing/supplier_invoice.php:178
+#: ../purchasing/supplier_payment.php:208
+#: ../sales/credit_note_entry.php:151
+#: ../sales/customer_credit_invoice.php:108
+#: ../sales/customer_delivery.php:180
+#: ../sales/customer_invoice.php:338
+#: ../sales/customer_payments.php:158
+#: ../sales/customer_payments.php:165
+#: ../sales/customer_payments.php:246
+#: ../sales/sales_order_entry.php:420
msgid "The entered reference is already in use."
msgstr ""
msgstr ""
#: ../dimensions/dimension_entry.php:138
-#: ../manufacturing/work_order_entry.php:153
-#: ../manufacturing/work_order_entry.php:233
-#: ../purchasing/po_entry_items.php:232
+#: ../manufacturing/work_order_entry.php:154
+#: ../manufacturing/work_order_entry.php:234
+#: ../purchasing/po_entry_items.php:238
msgid "The date entered is in an invalid format."
msgstr ""
msgstr ""
#: ../dimensions/dimension_entry.php:277
-#: ../reporting/reports_main.php:31
-#: ../reporting/reports_main.php:64
-#: ../reporting/reports_main.php:72
-#: ../reporting/reports_main.php:123
-#: ../reporting/reports_main.php:186
-#: ../reporting/reports_main.php:194
-#: ../reporting/reports_main.php:226
-#: ../reporting/reports_main.php:237
-#: ../reporting/reports_main.php:248
-#: ../reporting/reports_main.php:264
-#: ../reporting/reports_main.php:274
-#: ../reporting/reports_main.php:285
-#: ../reporting/reports_main.php:297
-#: ../reporting/reports_main.php:311
-#: ../reporting/reports_main.php:320
-#: ../reporting/reports_main.php:330
-#: ../reporting/reports_main.php:341
-#: ../reporting/reports_main.php:353
-#: ../reporting/reports_main.php:361
-#: ../reporting/reports_main.php:370
-#: ../reporting/reports_main.php:378
-#: ../reporting/reports_main.php:384
+#: ../reporting/reports_main.php:34
+#: ../reporting/reports_main.php:60
+#: ../reporting/reports_main.php:74
+#: ../reporting/reports_main.php:82
+#: ../reporting/reports_main.php:134
+#: ../reporting/reports_main.php:199
+#: ../reporting/reports_main.php:207
+#: ../reporting/reports_main.php:239
+#: ../reporting/reports_main.php:250
+#: ../reporting/reports_main.php:261
+#: ../reporting/reports_main.php:277
+#: ../reporting/reports_main.php:287
+#: ../reporting/reports_main.php:298
+#: ../reporting/reports_main.php:310
+#: ../reporting/reports_main.php:324
+#: ../reporting/reports_main.php:333
+#: ../reporting/reports_main.php:343
+#: ../reporting/reports_main.php:354
+#: ../reporting/reports_main.php:366
+#: ../reporting/reports_main.php:374
+#: ../reporting/reports_main.php:383
+#: ../reporting/reports_main.php:391
+#: ../reporting/reports_main.php:397
msgid "Start Date"
msgstr ""
#: ../dimensions/dimension_entry.php:279
-#: ../manufacturing/work_order_entry.php:418
+#: ../manufacturing/work_order_entry.php:420
msgid "Date Required By"
msgstr ""
#: ../dimensions/dimension_entry.php:302
#: ../includes/ui/simple_crud_class.inc:225
-#: ../purchasing/includes/ui/invoice_ui.inc:186
-#: ../purchasing/includes/ui/invoice_ui.inc:386
-#: ../purchasing/includes/ui/invoice_ui.inc:388
+#: ../purchasing/includes/ui/invoice_ui.inc:206
+#: ../purchasing/includes/ui/invoice_ui.inc:412
+#: ../purchasing/includes/ui/invoice_ui.inc:414
msgid "Add"
msgstr ""
msgstr ""
#: ../dimensions/includes/dimensions_ui.inc:31
-#: ../gl/accruals.php:87
-#: ../gl/inquiry/gl_account_inquiry.php:128
-#: ../gl/inquiry/gl_trial_balance.php:72
-#: ../gl/manage/gl_quick_entries.php:240
+#: ../gl/accruals.php:94
+#: ../gl/inquiry/gl_account_inquiry.php:129
+#: ../gl/inquiry/gl_trial_balance.php:170
+#: ../gl/manage/gl_quick_entries.php:241
#: ../gl/manage/gl_quick_entries.php:333
-#: ../includes/sysnames.inc:138
-#: ../purchasing/includes/ui/invoice_ui.inc:245
-#: ../purchasing/includes/ui/invoice_ui.inc:247
-#: ../purchasing/includes/ui/invoice_ui.inc:249
-#: ../reporting/rep701.php:104
+#: ../includes/sysnames.inc:165
+#: ../purchasing/includes/ui/invoice_ui.inc:265
+#: ../purchasing/includes/ui/invoice_ui.inc:267
+#: ../purchasing/includes/ui/invoice_ui.inc:269
+#: ../reporting/rep701.php:109
#: ../reporting/rep705.php:234
#: ../reporting/rep706.php:181
#: ../reporting/rep707.php:206
-#: ../reporting/rep708.php:79
+#: ../reporting/rep708.php:179
msgid "Account"
msgstr ""
#: ../dimensions/includes/dimensions_ui.inc:31
-#: ../gl/accruals.php:95
-#: ../gl/bank_account_reconcile.php:237
-#: ../gl/inquiry/bank_inquiry.php:68
-#: ../gl/inquiry/gl_account_inquiry.php:140
-#: ../gl/inquiry/gl_account_inquiry.php:142
-#: ../gl/inquiry/gl_trial_balance.php:78
-#: ../gl/inquiry/gl_trial_balance.php:80
-#: ../gl/inquiry/gl_trial_balance.php:82
+#: ../gl/accruals.php:102
+#: ../gl/bank_account_reconcile.php:235
+#: ../gl/inquiry/bank_inquiry.php:71
+#: ../gl/inquiry/gl_account_inquiry.php:141
+#: ../gl/inquiry/gl_account_inquiry.php:143
+#: ../gl/inquiry/gl_trial_balance.php:176
+#: ../gl/inquiry/gl_trial_balance.php:178
+#: ../gl/inquiry/gl_trial_balance.php:180
#: ../gl/view/accrual_trans.php:60
-#: ../gl/view/gl_trans_view.php:64
-#: ../gl/view/gl_trans_view.php:67
-#: ../gl/view/gl_trans_view.php:70
-#: ../gl/includes/ui/gl_journal_ui.inc:84
+#: ../gl/view/gl_trans_view.php:69
+#: ../gl/view/gl_trans_view.php:72
+#: ../gl/view/gl_trans_view.php:75
#: ../gl/includes/ui/gl_journal_ui.inc:87
#: ../gl/includes/ui/gl_journal_ui.inc:90
+#: ../gl/includes/ui/gl_journal_ui.inc:93
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:133
-#: ../purchasing/inquiry/supplier_inquiry.php:170
+#: ../purchasing/inquiry/supplier_inquiry.php:181
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:178
#: ../reporting/rep601.php:77
+#: ../reporting/rep602.php:81
#: ../reporting/rep702.php:52
-#: ../reporting/rep704.php:79
-#: ../reporting/rep704.php:82
-#: ../reporting/rep704.php:85
-#: ../reporting/rep708.php:79
-#: ../reporting/rep708.php:80
-#: ../sales/inquiry/customer_allocation_inquiry.php:149
-#: ../sales/inquiry/customer_inquiry.php:221
+#: ../reporting/rep704.php:80
+#: ../reporting/rep704.php:83
+#: ../reporting/rep704.php:86
+#: ../reporting/rep708.php:179
+#: ../reporting/rep708.php:180
+#: ../sales/inquiry/customer_allocation_inquiry.php:152
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:152
+#: ../sales/inquiry/customer_inquiry.php:209
+#: ../sales/inquiry/customer_inquiry.php.orig:233
msgid "Debit"
msgstr ""
#: ../dimensions/includes/dimensions_ui.inc:31
-#: ../gl/accruals.php:95
-#: ../gl/bank_account_reconcile.php:238
-#: ../gl/inquiry/bank_inquiry.php:68
-#: ../gl/inquiry/gl_account_inquiry.php:140
-#: ../gl/inquiry/gl_account_inquiry.php:142
-#: ../gl/inquiry/gl_trial_balance.php:79
-#: ../gl/inquiry/gl_trial_balance.php:81
-#: ../gl/inquiry/gl_trial_balance.php:83
+#: ../gl/accruals.php:102
+#: ../gl/bank_account_reconcile.php:236
+#: ../gl/inquiry/bank_inquiry.php:71
+#: ../gl/inquiry/gl_account_inquiry.php:141
+#: ../gl/inquiry/gl_account_inquiry.php:143
+#: ../gl/inquiry/gl_trial_balance.php:177
+#: ../gl/inquiry/gl_trial_balance.php:179
+#: ../gl/inquiry/gl_trial_balance.php:181
#: ../gl/view/accrual_trans.php:60
-#: ../gl/view/gl_trans_view.php:64
-#: ../gl/view/gl_trans_view.php:67
-#: ../gl/view/gl_trans_view.php:70
-#: ../gl/includes/ui/gl_journal_ui.inc:84
+#: ../gl/view/gl_trans_view.php:69
+#: ../gl/view/gl_trans_view.php:72
+#: ../gl/view/gl_trans_view.php:75
#: ../gl/includes/ui/gl_journal_ui.inc:87
#: ../gl/includes/ui/gl_journal_ui.inc:90
-#: ../includes/sysnames.inc:59
+#: ../gl/includes/ui/gl_journal_ui.inc:93
+#: ../includes/sysnames.inc:85
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:134
-#: ../purchasing/inquiry/supplier_inquiry.php:171
+#: ../purchasing/inquiry/supplier_inquiry.php:182
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:179
#: ../reporting/rep601.php:77
+#: ../reporting/rep602.php:81
#: ../reporting/rep702.php:52
-#: ../reporting/rep704.php:79
-#: ../reporting/rep704.php:82
-#: ../reporting/rep704.php:85
-#: ../reporting/rep708.php:79
-#: ../reporting/rep708.php:80
-#: ../sales/inquiry/customer_allocation_inquiry.php:150
-#: ../sales/inquiry/customer_inquiry.php:222
+#: ../reporting/rep704.php:80
+#: ../reporting/rep704.php:83
+#: ../reporting/rep704.php:86
+#: ../reporting/rep708.php:179
+#: ../reporting/rep708.php:180
+#: ../sales/inquiry/customer_allocation_inquiry.php:153
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:153
+#: ../sales/inquiry/customer_inquiry.php:210
+#: ../sales/inquiry/customer_inquiry.php.orig:234
msgid "Credit"
msgstr ""
#: ../dimensions/includes/dimensions_ui.inc:45
#: ../dimensions/inquiry/search_dimensions.php:134
-#: ../gl/inquiry/bank_inquiry.php:68
-#: ../gl/inquiry/gl_account_inquiry.php:140
-#: ../gl/inquiry/gl_trial_balance.php:76
+#: ../gl/inquiry/bank_inquiry.php:71
+#: ../gl/inquiry/gl_account_inquiry.php:141
+#: ../gl/inquiry/gl_trial_balance.php:174
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:136
#: ../reporting/rep203.php:92
#: ../reporting/rep204.php:82
#: ../reporting/rep601.php:77
-#: ../reporting/rep701.php:104
-#: ../reporting/rep704.php:79
-#: ../reporting/rep704.php:82
-#: ../reporting/rep704.php:85
-#: ../reporting/rep708.php:71
-#: ../sales/inquiry/customer_allocation_inquiry.php:152
+#: ../reporting/rep602.php:81
+#: ../reporting/rep701.php:109
+#: ../reporting/rep704.php:80
+#: ../reporting/rep704.php:83
+#: ../reporting/rep704.php:86
+#: ../reporting/rep708.php:172
+#: ../sales/inquiry/customer_allocation_inquiry.php:155
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:155
msgid "Balance"
msgstr ""
msgstr ""
#: ../dimensions/inquiry/search_dimensions.php:73
-#: ../gl/bank_transfer.php:89
+#: ../gl/bank_transfer.php:91
#: ../gl/inquiry/journal_inquiry.php:45
-#: ../gl/manage/revaluate_currencies.php:102
-#: ../gl/includes/ui/gl_bank_ui.inc:101
+#: ../gl/manage/revaluate_currencies.php:105
+#: ../gl/includes/ui/gl_bank_ui.inc:26
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:104
#: ../gl/includes/ui/gl_journal_ui.inc:30
#: ../includes/ui/contacts_view.inc:94
#: ../inventory/includes/item_adjustments_ui.inc:35
#: ../inventory/includes/stock_transfers_ui.inc:40
#: ../manufacturing/search_work_orders.php:67
#: ../manufacturing/work_order_add_finished.php:198
-#: ../manufacturing/work_order_entry.php:376
-#: ../manufacturing/work_order_entry.php:383
-#: ../manufacturing/includes/work_order_issue_ui.inc:152
-#: ../purchasing/includes/ui/invoice_ui.inc:92
-#: ../purchasing/includes/ui/po_ui.inc:159
-#: ../purchasing/includes/ui/po_ui.inc:164
-#: ../purchasing/supplier_payment.php:271
-#: ../sales/customer_payments.php:258
+#: ../manufacturing/work_order_costs.php:134
+#: ../manufacturing/work_order_entry.php:378
+#: ../manufacturing/work_order_entry.php:385
+#: ../manufacturing/includes/work_order_issue_ui.inc:156
+#: ../purchasing/includes/ui/invoice_ui.inc:104
+#: ../purchasing/includes/ui/po_ui.inc:166
+#: ../purchasing/includes/ui/po_ui.inc:171
+#: ../purchasing/supplier_payment.php:286
+#: ../sales/customer_payments.php:379
msgid "Reference:"
msgstr ""
#: ../dimensions/inquiry/search_dimensions.php:75
-#: ../includes/ui/allocation_cart.inc:284
-#: ../includes/ui/ui_lists.inc:1885
+#: ../includes/ui/allocation_cart.inc:286
+#: ../includes/ui/ui_lists.inc:1923
+#: ../includes/ui/ui_lists.inc.orig:1921
#: ../reporting/rep101.php:112
-#: ../reporting/rep102.php:88
+#: ../reporting/rep102.php:94
#: ../reporting/rep104.php:95
#: ../reporting/rep104.php:99
#: ../reporting/rep105.php:93
#: ../reporting/rep105.php:97
#: ../reporting/rep201.php:100
-#: ../reporting/rep202.php:90
+#: ../reporting/rep202.php:98
#: ../reporting/rep203.php:72
#: ../reporting/rep204.php:75
-#: ../reporting/rep301.php:86
-#: ../reporting/rep301.php:93
+#: ../reporting/rep301.php:90
+#: ../reporting/rep301.php:97
#: ../reporting/rep302.php:103
#: ../reporting/rep302.php:110
#: ../reporting/rep303.php:84
#: ../reporting/rep303.php:91
#: ../reporting/rep304.php:96
-#: ../reporting/rep304.php:103
-#: ../reporting/rep304.php:108
+#: ../reporting/rep304.php:101
+#: ../reporting/rep304.php:106
#: ../reporting/rep702.php:59
#: ../reporting/rep710.php:84
#: ../reporting/rep710.php:85
msgstr ""
#: ../dimensions/inquiry/search_dimensions.php:76
-#: ../gl/inquiry/bank_inquiry.php:46
-#: ../gl/inquiry/gl_trial_balance.php:45
+#: ../gl/inquiry/bank_inquiry.php:49
+#: ../gl/inquiry/gl_trial_balance.php:49
#: ../gl/inquiry/journal_inquiry.php:48
#: ../gl/inquiry/profit_loss.php:163
-#: ../gl/includes/ui/gl_bank_ui.inc:23
-#: ../gl/includes/ui/gl_bank_ui.inc:50
+#: ../gl/includes/ui/gl_bank_ui.inc:51
+#: ../gl/includes/ui/gl_bank_ui.inc:117
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:23
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:53
#: ../inventory/inquiry/stock_movements.php:58
+#: ../inventory/inquiry/stock_movements.php.orig:60
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:50
-#: ../purchasing/inquiry/supplier_inquiry.php:49
+#: ../purchasing/inquiry/supplier_inquiry.php:50
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:50
#: ../sales/inquiry/customer_inquiry.php:46
+#: ../sales/inquiry/customer_inquiry.php.orig:47
msgid "From:"
msgstr ""
#: ../dimensions/inquiry/search_dimensions.php:77
-#: ../gl/inquiry/bank_inquiry.php:47
-#: ../gl/inquiry/gl_trial_balance.php:46
+#: ../gl/inquiry/bank_inquiry.php:50
+#: ../gl/inquiry/gl_trial_balance.php:50
#: ../gl/inquiry/journal_inquiry.php:49
#: ../gl/inquiry/profit_loss.php:164
-#: ../gl/includes/ui/gl_bank_ui.inc:23
+#: ../gl/includes/ui/gl_bank_ui.inc:117
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:23
#: ../inventory/inquiry/stock_movements.php:59
+#: ../inventory/inquiry/stock_movements.php.orig:61
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:51
-#: ../purchasing/inquiry/supplier_inquiry.php:50
+#: ../purchasing/inquiry/supplier_inquiry.php:51
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:51
#: ../sales/inquiry/customer_inquiry.php:47
+#: ../sales/inquiry/customer_inquiry.php.orig:48
msgid "To:"
msgstr ""
#: ../dimensions/inquiry/search_dimensions.php:132
#: ../dimensions/view/view_dimension.php:54
-#: ../includes/ui/allocation_cart.inc:263
-#: ../purchasing/includes/ui/invoice_ui.inc:112
+#: ../includes/ui/allocation_cart.inc:264
+#: ../purchasing/includes/ui/invoice_ui.inc:123
#: ../purchasing/view/view_supp_credit.php:48
-#: ../purchasing/view/view_supp_invoice.php:51
+#: ../purchasing/view/view_supp_invoice.php:52
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:131
-#: ../purchasing/inquiry/supplier_inquiry.php:168
+#: ../purchasing/inquiry/supplier_inquiry.php:179
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:176
#: ../reporting/rep101.php:130
#: ../reporting/rep201.php:118
#: ../reporting/rep203.php:91
#: ../reporting/rep501.php:85
-#: ../reporting/includes/doctext.inc:38
-#: ../reporting/includes/doctext.inc:108
-#: ../sales/customer_invoice.php:420
+#: ../reporting/includes/doctext.inc:112
+#: ../reporting/includes/doctext.inc:144
+#: ../reporting/includes/doctext.inc:165
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:188
+#: ../reporting/includes/doctext.inc:206
+#: ../reporting/includes/doctext.inc:208
+#: ../sales/customer_invoice.php:508
#: ../sales/view/view_dispatch.php:97
#: ../sales/view/view_invoice.php:96
-#: ../sales/inquiry/customer_allocation_inquiry.php:146
-#: ../sales/inquiry/customer_inquiry.php:217
-#: ../sales/includes/ui/sales_order_ui.inc:602
-#: ../themes/exclusive/renderer.php:273
-#: ../themes/exclusive/renderer.php:367
+#: ../sales/inquiry/customer_allocation_inquiry.php:149
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:149
+#: ../sales/inquiry/customer_inquiry.php:205
+#: ../sales/inquiry/customer_inquiry.php.orig:229
+#: ../sales/includes/ui/sales_order_ui.inc:596
+#: ../sales/includes/ui/sales_order_ui.inc.orig:596
msgid "Due Date"
msgstr ""
msgstr ""
#: ../dimensions/view/view_dimension.php:84
-#: ../gl/inquiry/gl_account_inquiry.php:70
+#: ../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:229
+#: ../sales/inquiry/sales_deliveries_view.php.orig:104
+#: ../sales/inquiry/sales_orders_view.php:251
+#: ../sales/inquiry/sales_orders_view.php.orig:228
msgid "from:"
msgstr ""
#: ../dimensions/view/view_dimension.php:85
-#: ../gl/inquiry/gl_account_inquiry.php:71
+#: ../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:230
+#: ../sales/inquiry/sales_deliveries_view.php.orig:105
+#: ../sales/inquiry/sales_orders_view.php:252
+#: ../sales/inquiry/sales_orders_view.php.orig:229
msgid "to:"
msgstr ""
#: ../dimensions/view/view_dimension.php:86
-#: ../gl/inquiry/balance_sheet.php:132
-#: ../gl/inquiry/bank_inquiry.php:49
-#: ../gl/inquiry/gl_account_inquiry.php:84
-#: ../gl/inquiry/gl_trial_balance.php:54
+#: ../gl/inquiry/balance_sheet.php:131
+#: ../gl/inquiry/bank_inquiry.php:52
+#: ../gl/inquiry/gl_account_inquiry.php:85
+#: ../gl/inquiry/gl_trial_balance.php:58
#: ../gl/inquiry/profit_loss.php:178
#: ../gl/inquiry/tax_inquiry.php:63
msgid "Show"
msgstr ""
#: ../gl/accruals.php:20
-#: ../includes/access_levels.inc:243
+#: ../includes/access_levels.inc:245
msgid "Revenue / Cost Accruals"
msgstr ""
+#: ../gl/accruals.php:38
+#: ../gl/bank_transfer.php:116
+#: ../gl/gl_bank.php:269
+#: ../gl/gl_journal.php:164
+#: ../gl/manage/revaluate_currencies.php:59
+#: ../inventory/adjustments.php:116
+#: ../inventory/transfers.php:111
+#: ../manufacturing/work_order_add_finished.php:104
+#: ../manufacturing/work_order_costs.php:86
+#: ../manufacturing/work_order_entry.php:160
+#: ../manufacturing/work_order_issue.php:84
+#: ../purchasing/po_entry_items.php:342
+#: ../purchasing/po_receive_items.php:179
+#: ../purchasing/supplier_credit.php:193
+#: ../purchasing/supplier_invoice.php:198
+#: ../purchasing/supplier_payment.php:185
+#: ../sales/create_recurrent_invoices.php:108
+#: ../sales/credit_note_entry.php:161
+#: ../sales/customer_credit_invoice.php:95
+#: ../sales/customer_delivery.php:161
+#: ../sales/customer_invoice.php:318
+#: ../sales/customer_payments.php:145
+#: ../sales/sales_order_entry.php:350
+msgid ""
+"The entered date is out of fiscal year or is closed for further data entry."
+msgstr ""
+
#: ../gl/accruals.php:44
msgid "The amount can not be 0."
msgstr ""
msgid "The periods must be greater than 0."
msgstr ""
-#: ../gl/accruals.php:64
+#: ../gl/accruals.php:71
msgid ""
-"Some of the period dates are outside the fiscal year. Create a new fiscal "
-"year first!"
+"Some of the period dates are outside the fiscal year or are closed for "
+"further data entry. Create a new fiscal year first!"
msgstr ""
-#: ../gl/accruals.php:89
-#: ../gl/accruals.php:91
-#: ../gl/accruals.php:199
-#: ../gl/accruals.php:201
+#: ../gl/accruals.php:86
+#, php-format
+msgid "Accruals for %s"
+msgstr ""
+
+#: ../gl/accruals.php:96
+#: ../gl/accruals.php:98
+#: ../gl/accruals.php:207
+#: ../gl/accruals.php:209
#: ../gl/gl_budget.php:71
#: ../gl/gl_budget.php:72
#: ../gl/gl_budget.php:76
-#: ../gl/inquiry/balance_sheet.php:129
-#: ../gl/inquiry/balance_sheet.php:131
-#: ../gl/inquiry/gl_account_inquiry.php:78
-#: ../gl/inquiry/gl_account_inquiry.php:80
-#: ../gl/inquiry/gl_account_inquiry.php:133
-#: ../gl/inquiry/gl_account_inquiry.php:135
-#: ../gl/inquiry/gl_trial_balance.php:48
-#: ../gl/inquiry/gl_trial_balance.php:50
+#: ../gl/inquiry/balance_sheet.php:128
+#: ../gl/inquiry/balance_sheet.php:130
+#: ../gl/inquiry/gl_account_inquiry.php:79
+#: ../gl/inquiry/gl_account_inquiry.php:81
+#: ../gl/inquiry/gl_account_inquiry.php:134
+#: ../gl/inquiry/gl_account_inquiry.php:136
+#: ../gl/inquiry/gl_trial_balance.php:52
+#: ../gl/inquiry/gl_trial_balance.php:54
#: ../gl/inquiry/profit_loss.php:174
#: ../gl/inquiry/profit_loss.php:176
#: ../gl/manage/gl_quick_entries.php:261
#: ../gl/view/gl_deposit_view.php:102
#: ../gl/view/gl_payment_view.php:98
#: ../gl/view/gl_payment_view.php:101
-#: ../gl/view/gl_trans_view.php:63
-#: ../gl/view/gl_trans_view.php:66
-#: ../gl/includes/ui/gl_bank_ui.inc:121
-#: ../gl/includes/ui/gl_bank_ui.inc:122
-#: ../gl/includes/ui/gl_bank_ui.inc:124
-#: ../gl/includes/ui/gl_journal_ui.inc:83
-#: ../gl/includes/ui/gl_journal_ui.inc:84
+#: ../gl/view/gl_trans_view.php:68
+#: ../gl/view/gl_trans_view.php:71
+#: ../gl/includes/ui/gl_bank_ui.inc:150
+#: ../gl/includes/ui/gl_bank_ui.inc:151
+#: ../gl/includes/ui/gl_bank_ui.inc:153
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:124
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:125
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:127
#: ../gl/includes/ui/gl_journal_ui.inc:86
+#: ../gl/includes/ui/gl_journal_ui.inc:87
+#: ../gl/includes/ui/gl_journal_ui.inc:89
#: ../includes/sysnames.inc:43
-#: ../includes/sysnames.inc:139
+#: ../includes/sysnames.inc:166
#: ../inventory/manage/item_categories.php:216
#: ../inventory/manage/item_categories.php:218
+#: ../inventory/manage/items.php:350
#: ../inventory/manage/items.php:352
-#: ../inventory/manage/items.php:354
-#: ../purchasing/includes/ui/invoice_ui.inc:245
-#: ../purchasing/includes/ui/invoice_ui.inc:247
-#: ../purchasing/manage/suppliers.php:135
-#: ../purchasing/manage/suppliers.php:136
-#: ../purchasing/manage/suppliers.php:138
+#: ../inventory/manage/items.php.orig:343
+#: ../inventory/manage/items.php.orig:345
+#: ../purchasing/includes/ui/invoice_ui.inc:265
+#: ../purchasing/includes/ui/invoice_ui.inc:267
+#: ../purchasing/manage/suppliers.php:145
+#: ../purchasing/manage/suppliers.php:146
+#: ../purchasing/manage/suppliers.php:148
+#: ../purchasing/manage/suppliers.php.orig:148
+#: ../purchasing/manage/suppliers.php.orig:149
+#: ../purchasing/manage/suppliers.php.orig:151
#: ../reporting/rep501.php:90
-#: ../reporting/rep704.php:78
-#: ../reporting/rep704.php:81
-#: ../reporting/rep704.php:92
-#: ../reporting/rep704.php:94
-#: ../reporting/rep704.php:102
+#: ../reporting/rep704.php:79
+#: ../reporting/rep704.php:82
+#: ../reporting/rep704.php:93
+#: ../reporting/rep704.php:95
+#: ../reporting/rep704.php:103
#: ../reporting/rep705.php:245
#: ../reporting/rep705.php:247
#: ../reporting/rep705.php:258
#: ../reporting/rep707.php:214
#: ../reporting/rep707.php:216
#: ../reporting/rep707.php:224
-#: ../reporting/rep708.php:88
-#: ../reporting/rep708.php:90
-#: ../reporting/rep708.php:97
-#: ../reporting/reports_main.php:252
-#: ../reporting/reports_main.php:253
-#: ../reporting/reports_main.php:258
-#: ../reporting/reports_main.php:259
+#: ../reporting/rep708.php:188
+#: ../reporting/rep708.php:190
+#: ../reporting/rep708.php:197
+#: ../reporting/reports_main.php:265
#: ../reporting/reports_main.php:266
-#: ../reporting/reports_main.php:267
-#: ../reporting/reports_main.php:277
-#: ../reporting/reports_main.php:278
-#: ../reporting/reports_main.php:289
+#: ../reporting/reports_main.php:271
+#: ../reporting/reports_main.php:272
+#: ../reporting/reports_main.php:279
+#: ../reporting/reports_main.php:280
#: ../reporting/reports_main.php:290
-#: ../reporting/reports_main.php:301
-#: ../reporting/reports_main.php:306
-#: ../reporting/reports_main.php:313
-#: ../reporting/reports_main.php:323
-#: ../reporting/reports_main.php:334
-#: ../sales/customer_delivery.php:393
-#: ../sales/customer_delivery.php:401
-#: ../sales/customer_invoice.php:395
-#: ../sales/customer_invoice.php:422
-#: ../sales/manage/customers.php:234
-#: ../sales/manage/customers.php:236
+#: ../reporting/reports_main.php:291
+#: ../reporting/reports_main.php:302
+#: ../reporting/reports_main.php:303
+#: ../reporting/reports_main.php:314
+#: ../reporting/reports_main.php:319
+#: ../reporting/reports_main.php:326
+#: ../reporting/reports_main.php:336
+#: ../reporting/reports_main.php:347
+#: ../sales/customer_delivery.php:403
+#: ../sales/customer_delivery.php:411
+#: ../sales/customer_invoice.php:473
+#: ../sales/customer_invoice.php:516
+#: ../sales/manage/customers.php:269
+#: ../sales/manage/customers.php:271
+#: ../sales/manage/sav.customers.php:269
+#: ../sales/manage/sav.customers.php:271
#: ../sales/includes/ui/sales_credit_ui.inc:132
#: ../sales/includes/ui/sales_credit_ui.inc:137
-#: ../sales/includes/ui/sales_order_ui.inc:454
-#: ../sales/includes/ui/sales_order_ui.inc:459
-#: ../themes/exclusive/renderer.php:472
-#: ../themes/exclusive/renderer.php:490
+#: ../sales/includes/ui/sales_order_ui.inc:451
+#: ../sales/includes/ui/sales_order_ui.inc:456
+#: ../sales/includes/ui/sales_order_ui.inc.orig:451
+#: ../sales/includes/ui/sales_order_ui.inc.orig:456
msgid "Dimension"
msgstr ""
-#: ../gl/accruals.php:95
-#: ../gl/accruals.php:209
-#: ../gl/inquiry/gl_account_inquiry.php:140
-#: ../gl/inquiry/gl_account_inquiry.php:142
-#: ../gl/inquiry/journal_inquiry.php:126
+#: ../gl/accruals.php:102
+#: ../gl/accruals.php:217
+#: ../gl/inquiry/gl_account_inquiry.php:141
+#: ../gl/inquiry/gl_account_inquiry.php:143
+#: ../gl/inquiry/journal_inquiry.php:133
#: ../gl/view/accrual_trans.php:60
#: ../gl/view/gl_deposit_view.php:100
#: ../gl/view/gl_deposit_view.php:103
#: ../gl/view/gl_payment_view.php:99
#: ../gl/view/gl_payment_view.php:102
#: ../gl/view/gl_payment_view.php:105
-#: ../gl/view/gl_trans_view.php:64
-#: ../gl/view/gl_trans_view.php:67
-#: ../gl/view/gl_trans_view.php:70
-#: ../gl/includes/ui/gl_bank_ui.inc:122
-#: ../gl/includes/ui/gl_bank_ui.inc:125
-#: ../gl/includes/ui/gl_bank_ui.inc:128
-#: ../gl/includes/ui/gl_bank_ui.inc:268
-#: ../gl/includes/ui/gl_journal_ui.inc:84
+#: ../gl/view/gl_trans_view.php:69
+#: ../gl/view/gl_trans_view.php:72
+#: ../gl/view/gl_trans_view.php:75
+#: ../gl/includes/ui/gl_bank_ui.inc:151
+#: ../gl/includes/ui/gl_bank_ui.inc:154
+#: ../gl/includes/ui/gl_bank_ui.inc:157
+#: ../gl/includes/ui/gl_bank_ui.inc:297
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:125
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:128
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:131
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:271
#: ../gl/includes/ui/gl_journal_ui.inc:87
#: ../gl/includes/ui/gl_journal_ui.inc:90
-#: ../gl/includes/ui/gl_journal_ui.inc:240
+#: ../gl/includes/ui/gl_journal_ui.inc:93
+#: ../gl/includes/ui/gl_journal_ui.inc:276
#: ../inventory/includes/item_adjustments_ui.inc:181
#: ../inventory/includes/stock_transfers_ui.inc:161
-#: ../manufacturing/includes/work_order_issue_ui.inc:165
-#: ../purchasing/includes/ui/invoice_ui.inc:245
-#: ../purchasing/includes/ui/invoice_ui.inc:247
-#: ../purchasing/includes/ui/invoice_ui.inc:249
-#: ../sales/customer_credit_invoice.php:375
-#: ../sales/customer_delivery.php:517
-#: ../sales/customer_invoice.php:551
+#: ../manufacturing/view/wo_costs_view.php:46
+#: ../manufacturing/includes/work_order_issue_ui.inc:169
+#: ../purchasing/includes/ui/invoice_ui.inc:265
+#: ../purchasing/includes/ui/invoice_ui.inc:267
+#: ../purchasing/includes/ui/invoice_ui.inc:269
+#: ../sales/customer_credit_invoice.php:366
+#: ../sales/customer_delivery.php:527
#: ../sales/includes/ui/sales_credit_ui.inc:339
msgid "Memo"
msgstr ""
-#: ../gl/accruals.php:158
+#: ../gl/accruals.php:166
msgid "Revenue / Cost Accruals have been processed."
msgstr ""
-#: ../gl/accruals.php:164
+#: ../gl/accruals.php:172
msgid "Showing GL Transactions."
msgstr ""
-#: ../gl/accruals.php:176
+#: ../gl/accruals.php:184
msgid "Weekly"
msgstr ""
-#: ../gl/accruals.php:177
+#: ../gl/accruals.php:185
msgid "Bi-weekly"
msgstr ""
-#: ../gl/accruals.php:178
-#: ../gl/manage/gl_quick_entries.php:239
+#: ../gl/accruals.php:186
+#: ../gl/manage/gl_quick_entries.php:240
#: ../gl/includes/ui/gl_journal_ui.inc:57
-#: ../sales/create_recurrent_invoices.php:98
-#: ../sales/manage/recurrent_invoices.php:85
+#: ../sales/create_recurrent_invoices.php:115
+#: ../sales/manage/recurrent_invoices.php:102
msgid "Monthly"
msgstr ""
-#: ../gl/accruals.php:179
+#: ../gl/accruals.php:187
msgid "Quarterly"
msgstr ""
-#: ../gl/accruals.php:191
+#: ../gl/accruals.php:199
msgid "First date of Accruals"
msgstr ""
-#: ../gl/accruals.php:193
+#: ../gl/accruals.php:201
msgid "Accrued Balance Account"
msgstr ""
-#: ../gl/accruals.php:196
+#: ../gl/accruals.php:204
msgid "Revenue / Cost Account"
msgstr ""
-#: ../gl/accruals.php:204
+#: ../gl/accruals.php:212
#: ../gl/gl_budget.php:91
#: ../gl/gl_budget.php:93
-#: ../gl/inquiry/journal_inquiry.php:125
+#: ../gl/inquiry/journal_inquiry.php:132
#: ../gl/inquiry/tax_inquiry.php:82
#: ../gl/manage/gl_quick_entries.php:261
#: ../gl/manage/gl_quick_entries.php:263
#: ../gl/view/gl_payment_view.php:99
#: ../gl/view/gl_payment_view.php:102
#: ../gl/view/gl_payment_view.php:105
-#: ../gl/includes/ui/gl_bank_ui.inc:122
-#: ../gl/includes/ui/gl_bank_ui.inc:125
-#: ../gl/includes/ui/gl_bank_ui.inc:128
-#: ../includes/sysnames.inc:106
-#: ../includes/ui/allocation_cart.inc:263
-#: ../includes/ui/ui_lists.inc:1152
+#: ../gl/includes/ui/gl_bank_ui.inc:151
+#: ../gl/includes/ui/gl_bank_ui.inc:154
+#: ../gl/includes/ui/gl_bank_ui.inc:157
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:125
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:128
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:131
+#: ../includes/sysnames.inc:133
+#: ../includes/ui/allocation_cart.inc:264
+#: ../includes/ui/ui_lists.inc:1182
+#: ../includes/ui/ui_lists.inc.orig:1182
+#: ../manufacturing/view/wo_costs_view.php:46
#: ../manufacturing/includes/manufacturing_ui.inc:236
-#: ../purchasing/includes/ui/invoice_ui.inc:245
-#: ../purchasing/includes/ui/invoice_ui.inc:247
-#: ../purchasing/includes/ui/invoice_ui.inc:249
+#: ../purchasing/includes/ui/invoice_ui.inc:265
+#: ../purchasing/includes/ui/invoice_ui.inc:267
+#: ../purchasing/includes/ui/invoice_ui.inc:269
#: ../purchasing/view/view_supp_payment.php:60
-#: ../purchasing/view/view_supp_payment.php:69
-#: ../reporting/rep102.php:228
-#: ../reporting/rep202.php:234
+#: ../purchasing/view/view_supp_payment.php:72
+#: ../reporting/rep102.php:241
+#: ../reporting/rep107.php:194
+#: ../reporting/rep107.php:251
+#: ../reporting/rep109.php:192
+#: ../reporting/rep110.php:195
+#: ../reporting/rep111.php:177
+#: ../reporting/rep113.php:181
+#: ../reporting/rep202.php:249
+#: ../reporting/rep209.php:200
#: ../reporting/rep706.php:303
#: ../reporting/rep707.php:321
#: ../reporting/rep710.php:76
-#: ../reporting/includes/doctext.inc:150
#: ../sales/view/view_receipt.php:44
-#: ../themes/exclusive/renderer.php:220
-#: ../themes/exclusive/renderer.php:239
-#: ../themes/exclusive/renderer.php:317
-#: ../themes/exclusive/renderer.php:336
-#: ../themes/exclusive/renderer.php:417
-#: ../themes/exclusive/renderer.php:437
-#: ../themes/exclusive/renderer.php:472
-#: ../themes/exclusive/renderer.php:491
-#: ../themes/exclusive/renderer.php:554
msgid "Amount"
msgstr ""
-#: ../gl/accruals.php:204
+#: ../gl/accruals.php:212
msgid "Search Amount"
msgstr ""
-#: ../gl/accruals.php:206
+#: ../gl/accruals.php:214
msgid "Frequency"
msgstr ""
-#: ../gl/accruals.php:208
+#: ../gl/accruals.php:216
msgid "Periods"
msgstr ""
-#: ../gl/accruals.php:212
+#: ../gl/accruals.php:220
msgid "Show GL Rows"
msgstr ""
-#: ../gl/accruals.php:213
+#: ../gl/accruals.php:221
msgid "Process Accruals"
msgstr ""
-#: ../gl/accruals.php:214
+#: ../gl/accruals.php:222
msgid "Are you sure you want to post accruals?"
msgstr ""
#: ../gl/bank_account_reconcile.php:35
#: ../gl/bank_transfer.php:30
-#: ../gl/gl_bank.php:48
+#: ../gl/gl_bank.php:49
#: ../gl/inquiry/bank_inquiry.php:30
#: ../purchasing/supplier_payment.php:42
#: ../sales/customer_payments.php:39
msgid "Reconcile this transaction"
msgstr ""
-#: ../gl/bank_account_reconcile.php:166
-#: ../gl/inquiry/bank_inquiry.php:44
-#: ../gl/inquiry/gl_account_inquiry.php:69
+#: ../gl/bank_account_reconcile.php:164
+#: ../gl/inquiry/bank_inquiry.php:47
+#: ../gl/inquiry/gl_account_inquiry.php:70
msgid "Account:"
msgstr ""
-#: ../gl/bank_account_reconcile.php:168
+#: ../gl/bank_account_reconcile.php:166
msgid "Bank Statement:"
msgstr ""
-#: ../gl/bank_account_reconcile.php:169
+#: ../gl/bank_account_reconcile.php:167
+#: ../inventory/purchasing_data.php.orig:235
msgid "New"
msgstr ""
-#: ../gl/bank_account_reconcile.php:198
+#: ../gl/bank_account_reconcile.php:196
msgid "Reconcile Date"
msgstr ""
-#: ../gl/bank_account_reconcile.php:198
+#: ../gl/bank_account_reconcile.php:196
msgid "Beginning<br>Balance"
msgstr ""
-#: ../gl/bank_account_reconcile.php:199
+#: ../gl/bank_account_reconcile.php:197
msgid "Ending<br>Balance"
msgstr ""
-#: ../gl/bank_account_reconcile.php:199
+#: ../gl/bank_account_reconcile.php:197
msgid "Account<br>Total"
msgstr ""
-#: ../gl/bank_account_reconcile.php:199
+#: ../gl/bank_account_reconcile.php:197
msgid "Reconciled<br>Amount"
msgstr ""
-#: ../gl/bank_account_reconcile.php:199
+#: ../gl/bank_account_reconcile.php:197
+#: ../reporting/rep602.php:205
msgid "Difference"
msgstr ""
-#: ../gl/bank_account_reconcile.php:203
+#: ../gl/bank_account_reconcile.php:201
msgid "Date of bank statement to reconcile"
msgstr ""
-#: ../gl/bank_account_reconcile.php:239
-#: ../gl/inquiry/bank_inquiry.php:68
-#: ../gl/inquiry/gl_account_inquiry.php:140
-#: ../gl/inquiry/gl_account_inquiry.php:142
+#: ../gl/bank_account_reconcile.php:237
+#: ../gl/inquiry/bank_inquiry.php:71
+#: ../gl/inquiry/gl_account_inquiry.php:141
+#: ../gl/inquiry/gl_account_inquiry.php:143
#: ../gl/view/accrual_trans.php:60
-#: ../gl/view/gl_trans_view.php:36
#: ../reporting/rep601.php:76
-#: ../reporting/rep704.php:79
-#: ../reporting/rep704.php:81
-#: ../reporting/rep704.php:84
+#: ../reporting/rep602.php:80
+#: ../reporting/rep704.php:80
+#: ../reporting/rep704.php:82
+#: ../reporting/rep704.php:85
msgid "Person/Item"
msgstr ""
-#: ../gl/bank_account_reconcile.php:249
+#: ../gl/bank_account_reconcile.php:247
msgid "Reconcile"
msgstr ""
msgstr ""
#: ../gl/bank_transfer.php:39
-#: ../gl/manage/revaluate_currencies.php:34
+#: ../gl/manage/revaluate_currencies.php:35
msgid "Transfer has been entered"
msgstr ""
#: ../gl/bank_transfer.php:41
-#: ../gl/manage/revaluate_currencies.php:36
+#: ../gl/manage/revaluate_currencies.php:37
msgid "&View the GL Journal Entries for this Transfer"
msgstr ""
msgid "From Account:"
msgstr ""
-#: ../gl/bank_transfer.php:68
+#: ../gl/bank_transfer.php:70
msgid "To Account:"
msgstr ""
-#: ../gl/bank_transfer.php:70
+#: ../gl/bank_transfer.php:72
msgid "Transfer Date:"
msgstr ""
-#: ../gl/bank_transfer.php:76
-#: ../gl/bank_transfer.php:83
-#: ../sales/customer_payments.php:289
+#: ../gl/bank_transfer.php:78
+#: ../gl/bank_transfer.php:85
+#: ../sales/customer_payments.php:408
msgid "Amount:"
msgstr ""
-#: ../gl/bank_transfer.php:77
-#: ../gl/bank_transfer.php:84
-#: ../purchasing/supplier_payment.php:284
-#: ../sales/customer_payments.php:274
+#: ../gl/bank_transfer.php:79
+#: ../gl/bank_transfer.php:86
+#: ../purchasing/supplier_payment.php:299
+#: ../sales/customer_payments.php:393
msgid "Bank Charge:"
msgstr ""
-#: ../gl/bank_transfer.php:95
+#: ../gl/bank_transfer.php:97
msgid "Enter Transfer"
msgstr ""
-#: ../gl/bank_transfer.php:121
-#: ../gl/bank_transfer.php:128
+#: ../gl/bank_transfer.php:123
+#: ../gl/bank_transfer.php:153
#: ../purchasing/supplier_payment.php:130
#: ../purchasing/supplier_payment.php:136
msgid "The entered amount is invalid or less than zero."
msgstr ""
-#: ../gl/bank_transfer.php:133
+#: ../gl/bank_transfer.php:128
+#: ../gl/gl_bank.php:227
+msgid "The total bank amount cannot be 0."
+msgstr ""
+
+#: ../gl/bank_transfer.php:139
+#, php-format
+msgid "The total bank amount exceeds allowed limit (%s) for source account."
+msgstr ""
+
+#: ../gl/bank_transfer.php:145
+#: ../gl/gl_bank.php:244
+#, php-format
+msgid ""
+"The bank transaction would result in exceed of authorized overdraft limit "
+"for transaction: %s #%s on %s."
+msgstr ""
+
+#: ../gl/bank_transfer.php:158
#: ../purchasing/supplier_payment.php:144
-#: ../sales/customer_payments.php:131
+#: ../sales/customer_payments.php:184
msgid ""
"The Bank Charge Account has not been set in System and General GL Setup."
msgstr ""
-#: ../gl/bank_transfer.php:139
-#: ../gl/gl_bank.php:229
-#: ../gl/gl_journal.php:166
-#: ../gl/manage/revaluate_currencies.php:62
-#: ../inventory/adjustments.php:94
+#: ../gl/bank_transfer.php:164
+#: ../gl/gl_bank.php:251
+#: ../gl/gl_journal.php:170
+#: ../gl/manage/revaluate_currencies.php:65
+#: ../inventory/adjustments.php:96
#: ../inventory/transfers.php:93
#: ../manufacturing/work_order_add_finished.php:77
-#: ../manufacturing/work_order_entry.php:131
-#: ../manufacturing/work_order_issue.php:91
-#: ../purchasing/po_receive_items.php:177
-#: ../purchasing/supplier_payment.php:191
-#: ../sales/credit_note_entry.php:145
-#: ../sales/customer_credit_invoice.php:100
-#: ../sales/customer_delivery.php:175
-#: ../sales/customer_invoice.php:279
-#: ../sales/customer_payments.php:106
-#: ../sales/sales_order_entry.php:396
+#: ../manufacturing/work_order_entry.php:132
+#: ../manufacturing/work_order_issue.php:90
+#: ../purchasing/po_receive_items.php:186
+#: ../purchasing/supplier_payment.php:201
+#: ../sales/credit_note_entry.php:147
+#: ../sales/customer_credit_invoice.php:102
+#: ../sales/customer_delivery.php:174
+#: ../sales/customer_invoice.php:332
+#: ../sales/customer_payments.php:151
+#: ../sales/sales_order_entry.php:414
msgid "You must enter a reference."
msgstr ""
-#: ../gl/bank_transfer.php:153
+#: ../gl/bank_transfer.php:178
msgid "The source and destination bank accouts cannot be the same."
msgstr ""
-#: ../gl/gl_bank.php:33
+#: ../gl/gl_bank.php:34
msgid "Bank Account Payment Entry"
msgstr ""
-#: ../gl/gl_bank.php:36
+#: ../gl/gl_bank.php:37
msgid "Bank Account Deposit Entry"
msgstr ""
-#: ../gl/gl_bank.php:39
+#: ../gl/gl_bank.php:40
msgid "Modify Bank Account Entry"
msgstr ""
-#: ../gl/gl_bank.php:42
+#: ../gl/gl_bank.php:43
msgid "Modify Bank Deposit Entry"
msgstr ""
-#: ../gl/gl_bank.php:74
-#: ../gl/gl_bank.php:90
+#: ../gl/gl_bank.php:73
+#, php-format
+msgid "Payment %d has been entered"
+msgstr ""
+
+#: ../gl/gl_bank.php:75
+#: ../gl/gl_bank.php:93
msgid "&View the GL Postings for this Payment"
msgstr ""
-#: ../gl/gl_bank.php:76
-#: ../gl/gl_bank.php:92
+#: ../gl/gl_bank.php:77
+#: ../gl/gl_bank.php:95
msgid "Enter Another &Payment"
msgstr ""
-#: ../gl/gl_bank.php:78
-#: ../gl/gl_bank.php:94
+#: ../gl/gl_bank.php:79
+#: ../gl/gl_bank.php:97
msgid "Enter A &Deposit"
msgstr ""
-#: ../gl/gl_bank.php:106
+#: ../gl/gl_bank.php:81
+#: ../gl/gl_journal.php:62
+#: ../inventory/adjustments.php:50
+#: ../manufacturing/work_order_entry.php:68
+#: ../purchasing/po_entry_items.php:112
+#: ../purchasing/po_entry_items.php:136
+#: ../purchasing/supplier_credit.php:84
+#: ../purchasing/supplier_invoice.php:74
+#: ../sales/credit_note_entry.php:77
+#: ../sales/customer_credit_invoice.php:62
+#: ../sales/customer_invoice.php:68
+#: ../sales/sales_order_entry.php:227
+msgid "Add an Attachment"
+msgstr ""
+
+#: ../gl/gl_bank.php:107
+#, php-format
+msgid "Deposit %d has been entered"
+msgstr ""
+
+#: ../gl/gl_bank.php:109
msgid "View the GL Postings for this Deposit"
msgstr ""
-#: ../gl/gl_bank.php:108
+#: ../gl/gl_bank.php:111
msgid "Enter Another Deposit"
msgstr ""
-#: ../gl/gl_bank.php:110
+#: ../gl/gl_bank.php:113
msgid "Enter A Payment"
msgstr ""
-#: ../gl/gl_bank.php:121
+#: ../gl/gl_bank.php:122
+#, php-format
+msgid "Deposit %d has been modified"
+msgstr ""
+
+#: ../gl/gl_bank.php:124
msgid "&View the GL Postings for this Deposit"
msgstr ""
-#: ../gl/gl_bank.php:123
+#: ../gl/gl_bank.php:126
msgid "Enter Another &Deposit"
msgstr ""
-#: ../gl/gl_bank.php:125
+#: ../gl/gl_bank.php:128
msgid "Enter A &Payment"
msgstr ""
-#: ../gl/gl_bank.php:216
+#: ../gl/gl_bank.php:221
msgid "You must enter at least one payment line."
msgstr ""
-#: ../gl/gl_bank.php:222
-msgid "The total bank amount cannot be 0."
+#: ../gl/gl_bank.php:238
+#: ../purchasing/supplier_payment.php:194
+#, php-format
+msgid "The total bank amount exceeds allowed limit (%s)."
msgstr ""
-#: ../gl/gl_bank.php:241
+#: ../gl/gl_bank.php:263
msgid "The entered date for the payment is invalid."
msgstr ""
-#: ../gl/gl_bank.php:253
+#: ../gl/gl_bank.php:275
msgid "You have to select customer and customer branch."
msgstr ""
-#: ../gl/gl_bank.php:257
+#: ../gl/gl_bank.php:279
msgid "You have to select supplier."
msgstr ""
-#: ../gl/gl_bank.php:303
+#: ../gl/gl_bank.php:325
msgid "The amount entered is not a valid number or is less than zero."
msgstr ""
-#: ../gl/gl_bank.php:375
+#: ../gl/gl_bank.php:397
msgid "Payment Items"
msgstr ""
-#: ../gl/gl_bank.php:375
+#: ../gl/gl_bank.php:397
msgid "Deposit Items"
msgstr ""
-#: ../gl/gl_bank.php:383
+#: ../gl/gl_bank.php:405
msgid "Process Payment"
msgstr ""
-#: ../gl/gl_bank.php:383
+#: ../gl/gl_bank.php:405
msgid "Process Deposit"
msgstr ""
msgstr ""
#: ../gl/gl_budget.php:64
-#: ../gl/manage/gl_accounts.php:227
-#: ../gl/manage/gl_accounts.php:237
+#: ../gl/manage/gl_accounts.php:229
+#: ../gl/manage/gl_accounts.php:239
msgid "Account Code:"
msgstr ""
#: ../gl/gl_budget.php:91
#: ../gl/gl_budget.php:93
#: ../gl/inquiry/profit_loss.php:231
-#: ../gl/manage/gl_quick_entries.php:239
+#: ../gl/manage/gl_quick_entries.php:240
#: ../reporting/rep101.php:136
#: ../reporting/rep105.php:116
#: ../reporting/rep106.php:90
+#: ../reporting/rep114.php:88
#: ../reporting/rep201.php:124
-#: ../reporting/rep304.php:121
-#: ../reporting/rep305.php:77
+#: ../reporting/rep304.php:119
+#: ../reporting/rep305.php:100
#: ../reporting/rep601.php:82
+#: ../reporting/rep602.php:86
#: ../reporting/rep702.php:57
-#: ../reporting/rep704.php:90
-#: ../reporting/rep704.php:100
-#: ../reporting/rep704.php:108
+#: ../reporting/rep704.php:91
+#: ../reporting/rep704.php:101
+#: ../reporting/rep704.php:109
#: ../reporting/rep706.php:181
#: ../reporting/rep706.php:189
#: ../reporting/rep706.php:199
#: ../reporting/rep707.php:213
#: ../reporting/rep707.php:223
#: ../reporting/rep707.php:231
-#: ../reporting/rep708.php:87
-#: ../reporting/rep708.php:96
-#: ../reporting/rep708.php:103
-#: ../reporting/rep709.php:102
+#: ../reporting/rep708.php:187
+#: ../reporting/rep708.php:196
+#: ../reporting/rep708.php:203
+#: ../reporting/rep709.php:104
#: ../reporting/rep710.php:83
msgid "Period"
msgstr ""
msgstr ""
#: ../gl/gl_budget.php:127
-#: ../gl/inquiry/balance_sheet.php:99
-#: ../gl/inquiry/balance_sheet.php:206
-#: ../gl/inquiry/balance_sheet.php:237
-#: ../gl/inquiry/gl_trial_balance.php:144
+#: ../gl/inquiry/balance_sheet.php:98
+#: ../gl/inquiry/balance_sheet.php:205
+#: ../gl/inquiry/balance_sheet.php:236
+#: ../gl/inquiry/gl_trial_balance.php:209
#: ../gl/inquiry/profit_loss.php:115
#: ../gl/inquiry/profit_loss.php:283
#: ../gl/view/gl_deposit_view.php:132
#: ../gl/view/gl_payment_view.php:131
-#: ../gl/view/gl_trans_view.php:104
-#: ../gl/includes/ui/gl_bank_ui.inc:171
-#: ../gl/includes/ui/gl_journal_ui.inc:141
+#: ../gl/view/gl_trans_view.php:115
+#: ../gl/includes/ui/gl_bank_ui.inc:200
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:174
+#: ../gl/includes/ui/gl_journal_ui.inc:153
#: ../inventory/includes/item_adjustments_ui.inc:63
#: ../inventory/includes/item_adjustments_ui.inc:102
#: ../manufacturing/includes/manufacturing_ui.inc:178
-#: ../purchasing/includes/ui/invoice_ui.inc:309
-#: ../purchasing/includes/ui/invoice_ui.inc:468
-#: ../purchasing/includes/ui/invoice_ui.inc:538
-#: ../purchasing/po_receive_items.php:59
+#: ../purchasing/includes/ui/invoice_ui.inc:329
+#: ../purchasing/includes/ui/invoice_ui.inc:495
+#: ../purchasing/includes/ui/invoice_ui.inc:566
+#: ../purchasing/po_receive_items.php:63
#: ../purchasing/view/view_po.php:140
#: ../purchasing/allocations/supplier_allocation_main.php:100
#: ../reporting/rep101.php:237
#: ../reporting/rep106.php:82
-#: ../reporting/rep106.php:120
-#: ../reporting/rep106.php:168
+#: ../reporting/rep106.php:115
+#: ../reporting/rep106.php:158
+#: ../reporting/rep114.php:156
#: ../reporting/rep201.php:221
#: ../reporting/rep203.php:92
#: ../reporting/rep203.php:167
#: ../reporting/rep204.php:109
#: ../reporting/rep204.php:137
-#: ../reporting/rep301.php:125
-#: ../reporting/rep301.php:162
-#: ../reporting/rep304.php:144
-#: ../reporting/rep304.php:186
-#: ../reporting/rep305.php:72
-#: ../reporting/rep305.php:96
-#: ../reporting/rep305.php:127
+#: ../reporting/rep301.php:130
+#: ../reporting/rep301.php:167
+#: ../reporting/rep304.php:142
+#: ../reporting/rep304.php:184
+#: ../reporting/rep305.php:95
+#: ../reporting/rep305.php:119
+#: ../reporting/rep305.php:176
#: ../reporting/rep702.php:138
#: ../reporting/rep705.php:152
#: ../reporting/rep705.php:309
#: ../reporting/rep706.php:284
#: ../reporting/rep707.php:115
#: ../reporting/rep707.php:291
-#: ../reporting/rep708.php:181
-#: ../reporting/includes/doctext.inc:103
-#: ../reporting/includes/doctext.inc:111
-#: ../sales/customer_credit_invoice.php:292
-#: ../sales/customer_delivery.php:431
-#: ../sales/customer_invoice.php:443
+#: ../reporting/rep708.php:235
+#: ../reporting/includes/doctext.inc:30
+#: ../reporting/includes/doctext.inc:192
+#: ../sales/customer_credit_invoice.php:283
+#: ../sales/customer_delivery.php:441
+#: ../sales/customer_invoice.php:540
+#: ../sales/customer_invoice.php:543
#: ../sales/allocations/customer_allocation_main.php:99
#: ../sales/view/view_credit.php:91
#: ../sales/view/view_dispatch.php:113
-#: ../sales/view/view_invoice.php:114
-#: ../sales/view/view_sales_order.php:95
-#: ../sales/view/view_sales_order.php:128
-#: ../sales/view/view_sales_order.php:160
-#: ../sales/view/view_sales_order.php:201
+#: ../sales/view/view_invoice.php:116
+#: ../sales/view/view_sales_order.php:109
+#: ../sales/view/view_sales_order.php:142
+#: ../sales/view/view_sales_order.php:179
+#: ../sales/view/view_sales_order.php:220
+#: ../sales/view/view_sales_order.php.orig:96
+#: ../sales/view/view_sales_order.php.orig:129
+#: ../sales/view/view_sales_order.php.orig:161
+#: ../sales/view/view_sales_order.php.orig:202
#: ../sales/includes/ui/sales_credit_ui.inc:168
-#: ../sales/includes/ui/sales_order_ui.inc:143
-#: ../themes/exclusive/renderer.php:274
-#: ../themes/exclusive/renderer.php:367
+#: ../sales/includes/ui/sales_order_ui.inc:142
+#: ../sales/includes/ui/sales_order_ui.inc.orig:142
msgid "Total"
msgstr ""
#: ../gl/gl_journal.php:36
#: ../includes/sysnames.inc:22
-#: ../includes/sysnames.inc:123
+#: ../includes/sysnames.inc:150
msgid "Journal Entry"
msgstr ""
-#: ../gl/gl_journal.php:54
+#: ../gl/gl_journal.php:55
msgid "Journal entry has been entered"
msgstr ""
-#: ../gl/gl_journal.php:56
-#: ../gl/gl_journal.php:69
+#: ../gl/gl_journal.php:57
+#: ../gl/gl_journal.php:72
msgid "&View this Journal Entry"
msgstr ""
-#: ../gl/gl_journal.php:59
+#: ../gl/gl_journal.php:60
msgid "Enter &New Journal Entry"
msgstr ""
-#: ../gl/gl_journal.php:67
+#: ../gl/gl_journal.php:70
msgid "Journal entry has been updated"
msgstr ""
-#: ../gl/gl_journal.php:71
+#: ../gl/gl_journal.php:74
msgid "Return to Journal &Inquiry"
msgstr ""
-#: ../gl/gl_journal.php:84
+#: ../gl/gl_journal.php:87
msgid ""
"You can edit directly only journal entries created via Journal Entry page."
msgstr ""
-#: ../gl/gl_journal.php:85
+#: ../gl/gl_journal.php:88
msgid "Entry &New Journal Entry"
msgstr ""
-#: ../gl/gl_journal.php:141
+#: ../gl/gl_journal.php:145
msgid "You must enter at least one journal line."
msgstr ""
-#: ../gl/gl_journal.php:147
+#: ../gl/gl_journal.php:151
+#: ../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:209
-#: ../gl/gl_journal.php:216
+#: ../gl/gl_journal.php:213
+#: ../gl/gl_journal.php:220
msgid "Dimension is closed."
msgstr ""
-#: ../gl/gl_journal.php:223
+#: ../gl/gl_journal.php:227
msgid "You must enter either a debit amount or a credit amount."
msgstr ""
-#: ../gl/gl_journal.php:230
+#: ../gl/gl_journal.php:234
msgid "The debit amount entered is not a valid number or is less than zero."
msgstr ""
-#: ../gl/gl_journal.php:235
+#: ../gl/gl_journal.php:239
msgid "The credit amount entered is not a valid number or is less than zero."
msgstr ""
-#: ../gl/gl_journal.php:241
-#: ../includes/ui/ui_view.inc:646
-#: ../purchasing/supplier_credit.php:119
-#: ../purchasing/supplier_invoice.php:119
+#: ../gl/gl_journal.php:245
+#: ../includes/ui/ui_view.inc:673
+#: ../includes/ui/ui_view.inc.orig:672
+#: ../purchasing/supplier_credit.php:136
+#: ../purchasing/supplier_invoice.php:143
msgid "Cannot post to GL account used by more than one tax type."
msgstr ""
-#: ../gl/gl_journal.php:248
+#: ../gl/gl_journal.php:252
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:327
+#: ../gl/gl_journal.php:331
msgid "Rows"
msgstr ""
-#: ../gl/gl_journal.php:333
+#: ../gl/gl_journal.php:337
msgid "Process Journal Entry"
msgstr ""
-#: ../gl/gl_journal.php:334
+#: ../gl/gl_journal.php:338
msgid "Process journal entry only if debits equal to credits"
msgstr ""
msgid "Balance Sheet Drilldown"
msgstr ""
-#: ../gl/inquiry/balance_sheet.php:127
+#: ../gl/inquiry/balance_sheet.php:126
msgid "As at:"
msgstr ""
-#: ../gl/inquiry/balance_sheet.php:229
+#: ../gl/inquiry/balance_sheet.php:228
#: ../gl/inquiry/profit_loss.php:294
#: ../reporting/rep705.php:319
#: ../reporting/rep706.php:272
#: ../reporting/rep706.php:297
#: ../reporting/rep707.php:303
#: ../reporting/rep707.php:309
-#: ../themes/exclusive/renderer.php:544
msgid "Calculated Return"
msgstr ""
-#: ../gl/inquiry/balance_sheet.php:237
-#: ../includes/sysnames.inc:94
+#: ../gl/inquiry/balance_sheet.php:236
+#: ../includes/sysnames.inc:121
#: ../reporting/rep706.php:284
msgid "Liabilities"
msgstr ""
-#: ../gl/inquiry/balance_sheet.php:237
+#: ../gl/inquiry/balance_sheet.php:236
#: ../reporting/rep706.php:284
msgid " and "
msgstr ""
-#: ../gl/inquiry/balance_sheet.php:237
+#: ../gl/inquiry/balance_sheet.php:236
#: ../reporting/rep706.php:284
msgid "Equities"
msgstr ""
msgid "Bank Statement"
msgstr ""
-#: ../gl/inquiry/bank_inquiry.php:75
-#: ../gl/inquiry/gl_account_inquiry.php:161
+#: ../gl/inquiry/bank_inquiry.php:78
+#: ../gl/inquiry/gl_account_inquiry.php:162
#: ../reporting/rep601.php:99
-#: ../reporting/rep704.php:137
+#: ../reporting/rep602.php:103
+#: ../reporting/rep704.php:138
msgid "Opening Balance"
msgstr ""
-#: ../gl/inquiry/bank_inquiry.php:120
-#: ../gl/inquiry/gl_account_inquiry.php:210
-#: ../gl/inquiry/gl_trial_balance.php:154
+#: ../gl/inquiry/bank_inquiry.php:123
+#: ../gl/inquiry/gl_account_inquiry.php:211
+#: ../gl/inquiry/gl_trial_balance.php:219
#: ../reporting/rep601.php:150
-#: ../reporting/rep704.php:185
-#: ../reporting/rep708.php:190
+#: ../reporting/rep602.php:157
+#: ../reporting/rep704.php:186
+#: ../reporting/rep708.php:244
msgid "Ending Balance"
msgstr ""
-#: ../gl/inquiry/gl_account_inquiry.php:30
+#: ../gl/inquiry/gl_account_inquiry.php:31
msgid "General Ledger Inquiry"
msgstr ""
-#: ../gl/inquiry/gl_account_inquiry.php:69
+#: ../gl/inquiry/gl_account_inquiry.php:70
msgid "All Accounts"
msgstr ""
-#: ../gl/inquiry/gl_account_inquiry.php:82
+#: ../gl/inquiry/gl_account_inquiry.php:83
msgid "Amount min:"
msgstr ""
-#: ../gl/inquiry/gl_account_inquiry.php:83
+#: ../gl/inquiry/gl_account_inquiry.php:84
msgid "Amount max:"
msgstr ""
-#: ../gl/inquiry/gl_account_inquiry.php:219
+#: ../gl/inquiry/gl_account_inquiry.php:220
msgid ""
"No general ledger transactions have been created for the specified criteria."
msgstr ""
-#: ../gl/inquiry/gl_trial_balance.php:27
-#: ../reporting/rep708.php:106
+#: ../gl/inquiry/gl_trial_balance.php:28
+#: ../reporting/rep708.php:206
msgid "Trial Balance"
msgstr ""
-#: ../gl/inquiry/gl_trial_balance.php:51
+#: ../gl/inquiry/gl_trial_balance.php:55
msgid "No zero values"
msgstr ""
-#: ../gl/inquiry/gl_trial_balance.php:52
-#: ../reporting/reports_main.php:288
-#: ../reporting/reports_main.php:333
-#: ../reporting/reports_main.php:373
+#: ../gl/inquiry/gl_trial_balance.php:56
+#: ../reporting/reports_main.php:301
+#: ../reporting/reports_main.php:346
+#: ../reporting/reports_main.php:386
msgid "Only balances"
msgstr ""
-#: ../gl/inquiry/gl_trial_balance.php:73
-#: ../gl/manage/bank_accounts.php:102
-#: ../gl/view/gl_trans_view.php:63
-#: ../gl/view/gl_trans_view.php:66
-#: ../gl/view/gl_trans_view.php:69
-#: ../reporting/rep701.php:104
+#: ../gl/inquiry/gl_trial_balance.php:88
+#: ../gl/inquiry/gl_trial_balance.php:140
+#: ../reporting/rep706.php:302
+#: ../reporting/rep707.php:320
+#: ../reporting/rep708.php:51
+#: ../reporting/rep708.php:117
+#: ../sales/create_recurrent_invoices.php:115
+#: ../sales/manage/recurrent_invoices.php:102
+msgid "Group"
+msgstr ""
+
+#: ../gl/inquiry/gl_trial_balance.php:158
+msgid "The from date cannot be bigger than the fiscal year end."
+msgstr ""
+
+#: ../gl/inquiry/gl_trial_balance.php:171
+#: ../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:109
#: ../reporting/rep702.php:51
#: ../reporting/rep705.php:234
#: ../reporting/rep706.php:181
#: ../reporting/rep707.php:206
-#: ../reporting/rep708.php:79
+#: ../reporting/rep708.php:179
msgid "Account Name"
msgstr ""
-#: ../gl/inquiry/gl_trial_balance.php:74
-#: ../reporting/rep708.php:71
+#: ../gl/inquiry/gl_trial_balance.php:172
+#: ../reporting/rep708.php:172
msgid "Brought Forward"
msgstr ""
-#: ../gl/inquiry/gl_trial_balance.php:75
-#: ../reporting/rep708.php:71
+#: ../gl/inquiry/gl_trial_balance.php:173
+#: ../reporting/rep708.php:172
msgid "This Period"
msgstr ""
+#: ../gl/inquiry/gl_trial_balance.php:192
+msgid "Class"
+msgstr ""
+
+#: ../gl/inquiry/gl_trial_balance.php:227
+#: ../reporting/rep708.php:265
+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 ""
msgid "Enter memo fragment or leave empty"
msgstr ""
-#: ../gl/inquiry/journal_inquiry.php:123
+#: ../gl/inquiry/journal_inquiry.php:130
msgid "Trans #"
msgstr ""
-#: ../gl/inquiry/journal_inquiry.php:127
+#: ../gl/inquiry/journal_inquiry.php:134
#: ../reporting/rep710.php:75
#: ../reporting/rep710.php:85
-#: ../reporting/reports_main.php:387
+#: ../reporting/reports_main.php:400
msgid "User"
msgstr ""
#: ../gl/inquiry/profit_loss.php:168
#: ../reporting/rep707.php:206
-#: ../reporting/includes/reports_classes.inc:238
+#: ../reporting/includes/reports_classes.inc:234
msgid "Accumulated"
msgstr ""
#: ../gl/inquiry/profit_loss.php:168
#: ../reporting/rep707.php:251
-#: ../reporting/includes/reports_classes.inc:238
+#: ../reporting/includes/reports_classes.inc:234
msgid "Period Y-1"
msgstr ""
#: ../gl/inquiry/profit_loss.php:168
#: ../reporting/rep707.php:242
-#: ../reporting/includes/reports_classes.inc:238
+#: ../reporting/includes/reports_classes.inc:234
msgid "Budget"
msgstr ""
#: ../gl/inquiry/profit_loss.php:169
-#: ../reporting/reports_main.php:276
-#: ../reporting/reports_main.php:322
-#: ../reporting/reports_main.php:363
+#: ../reporting/reports_main.php:289
+#: ../reporting/reports_main.php:335
+#: ../reporting/reports_main.php:376
msgid "Compare to"
msgstr ""
msgstr ""
#: ../gl/inquiry/tax_inquiry.php:82
-#: ../reporting/rep709.php:168
+#: ../reporting/rep709.php:172
msgid "Outputs"
msgstr ""
#: ../gl/inquiry/tax_inquiry.php:82
-#: ../reporting/rep709.php:168
+#: ../reporting/rep709.php:172
msgid "Inputs"
msgstr ""
msgstr ""
#: ../gl/inquiry/tax_inquiry.php:100
-#: ../reporting/rep709.php:168
+#: ../reporting/rep709.php:172
msgid "Output Tax"
msgstr ""
msgstr ""
#: ../gl/inquiry/tax_inquiry.php:106
-#: ../reporting/rep709.php:168
+#: ../reporting/rep709.php:172
msgid "Input Tax"
msgstr ""
msgstr ""
#: ../gl/inquiry/tax_inquiry.php:119
-#: ../reporting/rep709.php:199
+#: ../reporting/rep709.php:203
msgid "Total payable or refund"
msgstr ""
#: ../gl/manage/bank_accounts.php:16
-#: ../reporting/reports_main.php:225
+#: ../reporting/reports_main.php:238
msgid "Bank Accounts"
msgstr ""
msgid "The bank account name cannot be empty."
msgstr ""
-#: ../gl/manage/bank_accounts.php:47
+#: ../gl/manage/bank_accounts.php:39
+msgid "The GL account selected is already in use. Select another GL account."
+msgstr ""
+
+#: ../gl/manage/bank_accounts.php:52
msgid "Bank account has been updated"
msgstr ""
-#: ../gl/manage/bank_accounts.php:56
+#: ../gl/manage/bank_accounts.php:61
msgid "New bank account has been added"
msgstr ""
-#: ../gl/manage/bank_accounts.php:72
+#: ../gl/manage/bank_accounts.php:76
msgid ""
"Cannot delete this bank account because transactions have been created using "
"this account."
msgstr ""
-#: ../gl/manage/bank_accounts.php:78
+#: ../gl/manage/bank_accounts.php:82
msgid ""
"Cannot delete this bank account because POS definitions have been created "
"using this account."
msgstr ""
-#: ../gl/manage/bank_accounts.php:83
+#: ../gl/manage/bank_accounts.php:87
msgid "Selected bank account has been deleted"
msgstr ""
-#: ../gl/manage/bank_accounts.php:102
+#: ../gl/manage/bank_accounts.php:109
#: ../gl/view/bank_transfer_view.php:69
#: ../gl/view/bank_transfer_view.php:78
#: ../gl/view/gl_deposit_view.php:66
#: ../gl/view/gl_payment_view.php:64
#: ../inventory/prices.php:133
-#: ../inventory/purchasing_data.php:127
+#: ../inventory/purchasing_data.php:129
#: ../purchasing/view/view_supp_credit.php:49
-#: ../purchasing/view/view_supp_invoice.php:53
-#: ../purchasing/inquiry/po_search_completed.php:122
+#: ../purchasing/view/view_supp_invoice.php:54
+#: ../purchasing/inquiry/po_search_completed.php:126
+#: ../purchasing/inquiry/po_search_completed.php.orig:125
#: ../purchasing/inquiry/po_search.php:136
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:132
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:142
-#: ../purchasing/inquiry/supplier_inquiry.php:72
-#: ../purchasing/inquiry/supplier_inquiry.php:169
+#: ../purchasing/inquiry/supplier_inquiry.php:73
#: ../purchasing/inquiry/supplier_inquiry.php:180
+#: ../purchasing/inquiry/supplier_inquiry.php:192
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:73
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:177
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:189
#: ../purchasing/allocations/supplier_allocation_main.php:99
#: ../purchasing/allocations/supplier_allocation_main.php:107
#: ../reporting/rep101.php:138
-#: ../reporting/rep102.php:123
-#: ../reporting/rep102.php:128
+#: ../reporting/rep102.php:131
+#: ../reporting/rep102.php:137
#: ../reporting/rep104.php:114
#: ../reporting/rep201.php:126
-#: ../reporting/rep202.php:126
+#: ../reporting/rep202.php:136
#: ../reporting/rep203.php:99
-#: ../sales/customer_credit_invoice.php:248
-#: ../sales/customer_delivery.php:338
-#: ../sales/customer_invoice.php:392
+#: ../sales/customer_credit_invoice.php:239
+#: ../sales/customer_delivery.php:348
+#: ../sales/customer_invoice.php:468
#: ../sales/allocations/customer_allocation_main.php:98
#: ../sales/allocations/customer_allocation_main.php:106
#: ../sales/view/view_credit.php:70
#: ../sales/view/view_dispatch.php:86
-#: ../sales/view/view_invoice.php:85
-#: ../sales/inquiry/customer_allocation_inquiry.php:148
-#: ../sales/inquiry/customer_allocation_inquiry.php:158
+#: ../sales/view/view_invoice.php:86
+#: ../sales/inquiry/customer_allocation_inquiry.php:151
+#: ../sales/inquiry/customer_allocation_inquiry.php:161
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:151
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:161
#: ../sales/inquiry/customer_inquiry.php:76
-#: ../sales/inquiry/customer_inquiry.php:220
-#: ../sales/inquiry/customer_inquiry.php:233
+#: ../sales/inquiry/customer_inquiry.php:208
+#: ../sales/inquiry/customer_inquiry.php:221
+#: ../sales/inquiry/customer_inquiry.php.orig:77
+#: ../sales/inquiry/customer_inquiry.php.orig:232
+#: ../sales/inquiry/customer_inquiry.php.orig:245
#: ../sales/inquiry/sales_deliveries_view.php:189
-#: ../sales/inquiry/sales_orders_view.php:268
-#: ../sales/inquiry/sales_orders_view.php:282
-#: ../themes/exclusive/renderer.php:273
-#: ../themes/exclusive/renderer.php:367
+#: ../sales/inquiry/sales_deliveries_view.php.orig:189
+#: ../sales/inquiry/sales_orders_view.php:294
+#: ../sales/inquiry/sales_orders_view.php:308
+#: ../sales/inquiry/sales_orders_view.php.orig:271
+#: ../sales/inquiry/sales_orders_view.php.orig:285
msgid "Currency"
msgstr ""
-#: ../gl/manage/bank_accounts.php:102
+#: ../gl/manage/bank_accounts.php:109
msgid "GL Account"
msgstr ""
-#: ../gl/manage/bank_accounts.php:103
-#: ../reporting/includes/doctext.inc:77
+#: ../gl/manage/bank_accounts.php:110
+#: ../reporting/includes/doctext.inc:260
msgid "Bank"
msgstr ""
-#: ../gl/manage/bank_accounts.php:103
-#: ../includes/ui/ui_view.inc:480
+#: ../gl/manage/bank_accounts.php:110
+#: ../includes/ui/ui_view.inc:488
+#: ../includes/ui/ui_view.inc.orig:488
msgid "Number"
msgstr ""
-#: ../gl/manage/bank_accounts.php:103
+#: ../gl/manage/bank_accounts.php:110
msgid "Bank Address"
msgstr ""
-#: ../gl/manage/bank_accounts.php:103
+#: ../gl/manage/bank_accounts.php:110
msgid "Dflt"
msgstr ""
-#: ../gl/manage/bank_accounts.php:159
+#: ../gl/manage/bank_accounts.php:167
msgid "Bank Account Name:"
msgstr ""
-#: ../gl/manage/bank_accounts.php:163
-#: ../gl/manage/bank_accounts.php:167
+#: ../gl/manage/bank_accounts.php:171
+#: ../gl/manage/bank_accounts.php:175
msgid "Account Type:"
msgstr ""
-#: ../gl/manage/bank_accounts.php:171
-#: ../gl/manage/bank_accounts.php:175
+#: ../gl/manage/bank_accounts.php:179
+#: ../gl/manage/bank_accounts.php:183
msgid "Bank Account Currency:"
msgstr ""
-#: ../gl/manage/bank_accounts.php:178
+#: ../gl/manage/bank_accounts.php:186
msgid "Default currency account:"
msgstr ""
-#: ../gl/manage/bank_accounts.php:181
-#: ../gl/manage/bank_accounts.php:183
+#: ../gl/manage/bank_accounts.php:189
+#: ../gl/manage/bank_accounts.php:191
msgid "Bank Account GL Code:"
msgstr ""
-#: ../gl/manage/bank_accounts.php:185
+#: ../gl/manage/bank_accounts.php:194
msgid "Bank Name:"
msgstr ""
-#: ../gl/manage/bank_accounts.php:186
+#: ../gl/manage/bank_accounts.php:195
+#: ../sales/manage/customer_branches.php:255
msgid "Bank Account Number:"
msgstr ""
-#: ../gl/manage/bank_accounts.php:187
+#: ../gl/manage/bank_accounts.php:196
msgid "Bank Address:"
msgstr ""
+#: ../gl/manage/close_period.php:25
+#: ../gl/manage/close_period.php.orig:25
+msgid "Closing GL Transactions"
+msgstr ""
+
+#: ../gl/manage/close_period.php:40
+#: ../gl/manage/close_period.php.orig:40
+msgid "Selected date is not in fiscal year or the year is closed."
+msgstr ""
+
+#: ../gl/manage/close_period.php:47
+#: ../gl/manage/close_period.php.orig:47
+msgid "The entered date is earlier than date already selected as closing date."
+msgstr ""
+
+#: ../gl/manage/close_period.php:51
+#: ../gl/manage/close_period.php.orig:51
+msgid "You are not allowed to reopen already closed transactions."
+msgstr ""
+
+#: ../gl/manage/close_period.php:69
+#: ../gl/manage/close_period.php.orig:69
+#, php-format
+msgid ""
+"All transactions resulting in GL accounts changes up to %s has been closed "
+"for further edition."
+msgstr ""
+
+#: ../gl/manage/close_period.php:88
+#: ../gl/manage/close_period.php.orig:88
+msgid ""
+"Using this feature you can prevent entering new transactions <br>\n"
+"\tand disable edition of already entered transactions up to specified date."
+"<br>\n"
+"\tOnly transactions which can generate GL postings are subject to the "
+"constraint."
+msgstr ""
+
+#: ../gl/manage/close_period.php:101
+#: ../gl/manage/close_period.php.orig:101
+msgid "End date of closing period:"
+msgstr ""
+
+#: ../gl/manage/close_period.php:104
+#: ../gl/manage/close_period.php.orig:104
+msgid "Close Transactions"
+msgstr ""
+
#: ../gl/manage/currencies.php:16
#: ../includes/access_levels.inc:223
msgid "Currencies"
msgid "New currency has been added"
msgstr ""
-#: ../gl/manage/currencies.php:94
+#: ../gl/manage/currencies.php:92
msgid ""
"Cannot delete this currency, because customer accounts have been created "
"referring to this currency."
msgstr ""
-#: ../gl/manage/currencies.php:100
+#: ../gl/manage/currencies.php:98
msgid ""
"Cannot delete this currency, because supplier accounts have been created "
"referring to this currency."
msgstr ""
-#: ../gl/manage/currencies.php:106
+#: ../gl/manage/currencies.php:104
msgid ""
"Cannot delete this currency, because the company preferences uses this "
"currency."
msgstr ""
-#: ../gl/manage/currencies.php:113
+#: ../gl/manage/currencies.php:111
msgid ""
"Cannot delete this currency, because thre are bank accounts that use this "
"currency."
msgstr ""
-#: ../gl/manage/currencies.php:128
+#: ../gl/manage/currencies.php:126
msgid "Selected currency has been deleted"
msgstr ""
-#: ../gl/manage/currencies.php:141
+#: ../gl/manage/currencies.php:139
msgid "Abbreviation"
msgstr ""
-#: ../gl/manage/currencies.php:141
+#: ../gl/manage/currencies.php:139
msgid "Symbol"
msgstr ""
-#: ../gl/manage/currencies.php:141
+#: ../gl/manage/currencies.php:139
msgid "Currency Name"
msgstr ""
-#: ../gl/manage/currencies.php:142
+#: ../gl/manage/currencies.php:140
msgid "Hundredths name"
msgstr ""
-#: ../gl/manage/currencies.php:142
+#: ../gl/manage/currencies.php:140
msgid "Country"
msgstr ""
-#: ../gl/manage/currencies.php:142
+#: ../gl/manage/currencies.php:140
msgid "Auto update"
msgstr ""
-#: ../gl/manage/currencies.php:177
+#: ../gl/manage/currencies.php:175
msgid "The marked currency is the home currency which cannot be deleted."
msgstr ""
-#: ../gl/manage/currencies.php:203
-#: ../gl/manage/currencies.php:208
+#: ../gl/manage/currencies.php:201
+#: ../gl/manage/currencies.php:206
msgid "Currency Abbreviation:"
msgstr ""
-#: ../gl/manage/currencies.php:211
+#: ../gl/manage/currencies.php:209
msgid "Currency Symbol:"
msgstr ""
-#: ../gl/manage/currencies.php:212
+#: ../gl/manage/currencies.php:210
msgid "Currency Name:"
msgstr ""
-#: ../gl/manage/currencies.php:213
+#: ../gl/manage/currencies.php:211
msgid "Hundredths Name:"
msgstr ""
-#: ../gl/manage/currencies.php:214
+#: ../gl/manage/currencies.php:212
msgid "Country:"
msgstr ""
-#: ../gl/manage/currencies.php:215
+#: ../gl/manage/currencies.php:213
msgid "Automatic exchange rate update:"
msgstr ""
#: ../gl/manage/exchange_rates.php:141
#: ../includes/ui/ui_view.inc:288
#: ../includes/ui/ui_view.inc:290
+#: ../includes/ui/ui_view.inc.orig:288
+#: ../includes/ui/ui_view.inc.orig:290
msgid "Exchange Rate:"
msgstr ""
msgstr ""
#: ../gl/manage/gl_account_classes.php:110
-#: ../gl/manage/gl_account_types.php:122
+#: ../gl/manage/gl_account_types.php:128
msgid "Class Type"
msgstr ""
msgstr ""
#: ../gl/manage/gl_account_classes.php:171
-#: ../gl/manage/gl_account_types.php:186
+#: ../gl/manage/gl_account_types.php:192
msgid "Class Type:"
msgstr ""
#: ../gl/manage/gl_accounts.php:16
-#: ../reporting/rep701.php:110
+#: ../reporting/rep701.php:115
msgid "Chart of Accounts"
msgstr ""
msgid "The account code must be numeric."
msgstr ""
-#: ../gl/manage/gl_accounts.php:86
+#: ../gl/manage/gl_accounts.php:81
+msgid "The account belongs to a bank account and cannot be inactivated."
+msgstr ""
+
+#: ../gl/manage/gl_accounts.php:90
msgid "Account data has been updated."
msgstr ""
-#: ../gl/manage/gl_accounts.php:95
+#: ../gl/manage/gl_accounts.php:99
msgid "New account has been added."
msgstr ""
-#: ../gl/manage/gl_accounts.php:113
+#: ../gl/manage/gl_accounts.php:116
msgid ""
"Cannot delete this account because transactions have been created using this "
"account."
msgstr ""
-#: ../gl/manage/gl_accounts.php:119
+#: ../gl/manage/gl_accounts.php:122
msgid ""
"Cannot delete this account because it is used as one of the company default "
"GL accounts."
msgstr ""
-#: ../gl/manage/gl_accounts.php:125
+#: ../gl/manage/gl_accounts.php:128
msgid "Cannot delete this account because it is used by a bank account."
msgstr ""
-#: ../gl/manage/gl_accounts.php:131
+#: ../gl/manage/gl_accounts.php:134
msgid ""
"Cannot delete this account because it is used by one or more Item Categories."
msgstr ""
-#: ../gl/manage/gl_accounts.php:137
+#: ../gl/manage/gl_accounts.php:140
msgid "Cannot delete this account because it is used by one or more Items."
msgstr ""
-#: ../gl/manage/gl_accounts.php:143
+#: ../gl/manage/gl_accounts.php:146
msgid "Cannot delete this account because it is used by one or more Taxes."
msgstr ""
-#: ../gl/manage/gl_accounts.php:149
+#: ../gl/manage/gl_accounts.php:152
msgid ""
"Cannot delete this account because it is used by one or more Customer "
"Branches."
msgstr ""
-#: ../gl/manage/gl_accounts.php:155
+#: ../gl/manage/gl_accounts.php:157
msgid "Cannot delete this account because it is used by one or more suppliers."
msgstr ""
-#: ../gl/manage/gl_accounts.php:161
+#: ../gl/manage/gl_accounts.php:163
msgid ""
"Cannot delete this account because it is used by one or more Quick Entry "
"Lines."
msgstr ""
-#: ../gl/manage/gl_accounts.php:179
+#: ../gl/manage/gl_accounts.php:181
msgid "Selected account has been deleted"
msgstr ""
-#: ../gl/manage/gl_accounts.php:194
+#: ../gl/manage/gl_accounts.php:196
msgid "New account"
msgstr ""
-#: ../gl/manage/gl_accounts.php:240
+#: ../gl/manage/gl_accounts.php:242
msgid "Account Code 2:"
msgstr ""
-#: ../gl/manage/gl_accounts.php:242
+#: ../gl/manage/gl_accounts.php:244
msgid "Account Name:"
msgstr ""
-#: ../gl/manage/gl_accounts.php:244
+#: ../gl/manage/gl_accounts.php:246
msgid "Account Group:"
msgstr ""
-#: ../gl/manage/gl_accounts.php:246
+#: ../gl/manage/gl_accounts.php:248
msgid "Account Tags:"
msgstr ""
-#: ../gl/manage/gl_accounts.php:248
+#: ../gl/manage/gl_accounts.php:250
msgid "Account status:"
msgstr ""
-#: ../gl/manage/gl_accounts.php:253
+#: ../gl/manage/gl_accounts.php:255
msgid "Add Account"
msgstr ""
-#: ../gl/manage/gl_accounts.php:257
+#: ../gl/manage/gl_accounts.php:259
msgid "Update Account"
msgstr ""
-#: ../gl/manage/gl_accounts.php:258
+#: ../gl/manage/gl_accounts.php:260
msgid "Delete account"
msgstr ""
msgid "The account group name cannot be empty."
msgstr ""
-#: ../gl/manage/gl_account_types.php:43
+#: ../gl/manage/gl_account_types.php:42
+msgid "This account group id is already in use."
+msgstr ""
+
+#: ../gl/manage/gl_account_types.php:50
msgid "You cannot set an account group to be a subgroup of itself."
msgstr ""
-#: ../gl/manage/gl_account_types.php:61
+#: ../gl/manage/gl_account_types.php:68
msgid "Selected account type has been updated"
msgstr ""
-#: ../gl/manage/gl_account_types.php:66
+#: ../gl/manage/gl_account_types.php:73
msgid "New account type has been added"
msgstr ""
-#: ../gl/manage/gl_account_types.php:83
+#: ../gl/manage/gl_account_types.php:89
msgid ""
"Cannot delete this account group because GL accounts have been created "
"referring to it."
msgstr ""
-#: ../gl/manage/gl_account_types.php:89
+#: ../gl/manage/gl_account_types.php:95
msgid ""
"Cannot delete this account group because GL account groups have been created "
"referring to it."
msgstr ""
-#: ../gl/manage/gl_account_types.php:105
+#: ../gl/manage/gl_account_types.php:111
msgid "Selected account group has been deleted"
msgstr ""
-#: ../gl/manage/gl_account_types.php:122
+#: ../gl/manage/gl_account_types.php:128
msgid "Group ID"
msgstr ""
-#: ../gl/manage/gl_account_types.php:122
+#: ../gl/manage/gl_account_types.php:128
#: ../sales/manage/sales_groups.php:85
msgid "Group Name"
msgstr ""
-#: ../gl/manage/gl_account_types.php:122
+#: ../gl/manage/gl_account_types.php:128
msgid "Subgroup Of"
msgstr ""
-#: ../gl/manage/gl_account_types.php:181
+#: ../gl/manage/gl_account_types.php:187
msgid "ID:"
msgstr ""
-#: ../gl/manage/gl_account_types.php:184
+#: ../gl/manage/gl_account_types.php:190
msgid "Subgroup Of:"
msgstr ""
#: ../gl/manage/gl_quick_entries.php:58
#: ../includes/ui/simple_crud_class.inc:221
-#: ../includes/ui/ui_input.inc:201
+#: ../includes/ui/ui_input.inc:205
msgid "Add new"
msgstr ""
msgstr ""
#: ../gl/manage/gl_quick_entries.php:171
-#: ../gl/manage/gl_quick_entries.php:244
-#: ../gl/manage/gl_quick_entries.php:245
msgid "Base Amount"
msgstr ""
-#: ../gl/manage/gl_quick_entries.php:225
+#: ../gl/manage/gl_quick_entries.php:226
msgid "Entry Type"
msgstr ""
-#: ../gl/manage/gl_quick_entries.php:229
+#: ../gl/manage/gl_quick_entries.php:230
msgid "Balance Based"
msgstr ""
-#: ../gl/manage/gl_quick_entries.php:239
+#: ../gl/manage/gl_quick_entries.php:240
#: ../gl/includes/ui/gl_journal_ui.inc:57
msgid "Yearly"
msgstr ""
msgstr ""
#: ../gl/manage/gl_quick_entries.php:329
-#: ../sales/customer_delivery.php:431
-#: ../sales/customer_invoice.php:443
+#: ../sales/customer_delivery.php:441
+#: ../sales/customer_invoice.php:540
+#: ../sales/customer_invoice.php:543
msgid "Tax Type"
msgstr ""
msgid "Revaluation of Currency Accounts"
msgstr ""
-#: ../gl/manage/revaluate_currencies.php:31
+#: ../gl/manage/revaluate_currencies.php:32
msgid "No Revaluation was needed"
msgstr ""
-#: ../gl/manage/revaluate_currencies.php:101
+#: ../gl/manage/revaluate_currencies.php:40
+#, php-format
+msgid "%d Journal Entries for AR/AP accounts have been added"
+msgstr ""
+
+#: ../gl/manage/revaluate_currencies.php:104
msgid "Date for Revaluation:"
msgstr ""
-#: ../gl/manage/revaluate_currencies.php:106
+#: ../gl/manage/revaluate_currencies.php:109
msgid "Revaluate Currencies"
msgstr ""
msgstr ""
#: ../gl/view/gl_deposit_view.php:71
-#: ../gl/includes/db/gl_db_banking.inc:104
-#: ../reporting/reports_main.php:78
-#: ../reporting/reports_main.php:85
-#: ../reporting/reports_main.php:97
-#: ../reporting/reports_main.php:104
-#: ../reporting/reports_main.php:110
-#: ../reporting/reports_main.php:116
-#: ../reporting/reports_main.php:151
-#: ../reporting/reports_main.php:157
-#: ../reporting/reports_main.php:206
+#: ../gl/includes/db/gl_db_banking.inc:211
+#: ../reporting/reports_main.php:88
+#: ../reporting/reports_main.php:95
+#: ../reporting/reports_main.php:102
+#: ../reporting/reports_main.php:114
+#: ../reporting/reports_main.php:121
+#: ../reporting/reports_main.php:127
+#: ../reporting/reports_main.php:163
+#: ../reporting/reports_main.php:169
+#: ../reporting/reports_main.php:219
msgid "From"
msgstr ""
#: ../gl/view/gl_payment_view.php:98
#: ../gl/view/gl_payment_view.php:101
#: ../gl/view/gl_payment_view.php:104
-#: ../gl/view/gl_trans_view.php:63
-#: ../gl/view/gl_trans_view.php:66
-#: ../gl/view/gl_trans_view.php:69
-#: ../gl/includes/ui/gl_bank_ui.inc:121
-#: ../gl/includes/ui/gl_bank_ui.inc:124
-#: ../gl/includes/ui/gl_bank_ui.inc:127
-#: ../gl/includes/ui/gl_journal_ui.inc:83
+#: ../gl/view/gl_trans_view.php:68
+#: ../gl/view/gl_trans_view.php:71
+#: ../gl/view/gl_trans_view.php:74
+#: ../gl/includes/ui/gl_bank_ui.inc:150
+#: ../gl/includes/ui/gl_bank_ui.inc:153
+#: ../gl/includes/ui/gl_bank_ui.inc:156
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:124
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:127
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:130
#: ../gl/includes/ui/gl_journal_ui.inc:86
#: ../gl/includes/ui/gl_journal_ui.inc:89
-#: ../reporting/rep701.php:104
+#: ../gl/includes/ui/gl_journal_ui.inc:92
+#: ../reporting/rep701.php:109
msgid "Account Code"
msgstr ""
#: ../gl/view/gl_payment_view.php:98
#: ../gl/view/gl_payment_view.php:101
#: ../gl/view/gl_payment_view.php:104
-#: ../gl/includes/ui/gl_bank_ui.inc:121
-#: ../gl/includes/ui/gl_bank_ui.inc:124
-#: ../gl/includes/ui/gl_bank_ui.inc:127
-#: ../gl/includes/ui/gl_journal_ui.inc:83
+#: ../gl/includes/ui/gl_bank_ui.inc:150
+#: ../gl/includes/ui/gl_bank_ui.inc:153
+#: ../gl/includes/ui/gl_bank_ui.inc:156
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:124
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:127
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:130
#: ../gl/includes/ui/gl_journal_ui.inc:86
#: ../gl/includes/ui/gl_journal_ui.inc:89
+#: ../gl/includes/ui/gl_journal_ui.inc:92
msgid "Account Description"
msgstr ""
msgstr ""
#: ../gl/view/gl_payment_view.php:70
-#: ../purchasing/view/view_supp_payment.php:61
+#: ../purchasing/view/view_supp_payment.php:64
+#: ../purchasing/view/view_supp_payment.php:78
#: ../sales/view/view_receipt.php:48
msgid "Payment Type"
msgstr ""
#: ../gl/view/gl_payment_view.php:79
-#: ../purchasing/view/view_supp_payment.php:76
+#: ../purchasing/view/view_supp_payment.php:85
msgid "This payment has been voided."
msgstr ""
msgid "General Ledger Transaction Details"
msgstr ""
-#: ../gl/view/gl_trans_view.php:54
+#: ../gl/view/gl_trans_view.php:39
+#: ../gl/includes/ui/gl_journal_ui.inc:97
+msgid "Counterparty"
+msgstr ""
+
+#: ../gl/view/gl_trans_view.php:59
msgid "No general ledger transactions have been created for"
msgstr ""
-#: ../gl/view/gl_trans_view.php:54
+#: ../gl/view/gl_trans_view.php:59
msgid "number"
msgstr ""
-#: ../gl/view/gl_trans_view.php:118
+#: ../gl/view/gl_trans_view.php:129
msgid "This transaction has been voided."
msgstr ""
#: ../gl/includes/db/gl_db_banking.inc:44
#: ../gl/includes/db/gl_db_banking.inc:47
+#: ../gl/includes/db/gl_db_banking.inc:59
+#: ../gl/includes/db/gl_db_banking.inc:62
msgid "Exchange Variance"
msgstr ""
-#: ../gl/includes/db/gl_db_banking.inc:104
-#: ../reporting/reports_main.php:79
-#: ../reporting/reports_main.php:86
-#: ../reporting/reports_main.php:98
-#: ../reporting/reports_main.php:105
-#: ../reporting/reports_main.php:111
-#: ../reporting/reports_main.php:117
-#: ../reporting/reports_main.php:152
-#: ../reporting/reports_main.php:158
-#: ../reporting/reports_main.php:207
+#: ../gl/includes/db/gl_db_banking.inc:211
+#: ../reporting/reports_main.php:89
+#: ../reporting/reports_main.php:96
+#: ../reporting/reports_main.php:103
+#: ../reporting/reports_main.php:115
+#: ../reporting/reports_main.php:122
+#: ../reporting/reports_main.php:128
+#: ../reporting/reports_main.php:164
+#: ../reporting/reports_main.php:170
+#: ../reporting/reports_main.php:220
msgid "To"
msgstr ""
-#: ../gl/includes/ui/gl_bank_ui.inc:25
+#: ../gl/includes/db/gl_db_banking.inc:427
+#: ../purchasing/includes/db/invoice_db.inc:136
+msgid "Document reentered."
+msgstr ""
+
+#: ../gl/includes/db/gl_db_rates.inc:130
+#, php-format
+msgid ""
+"Cannot retrieve currency rate from %s page. Please set the rate manually."
+msgstr ""
+
+#: ../gl/includes/ui/gl_bank_ui.inc:24
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:28
#: ../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_costs.php:144
+#: ../manufacturing/work_order_costs.php:133
#: ../purchasing/allocations/supplier_allocate.php:54
#: ../sales/allocations/customer_allocate.php:53
#: ../sales/includes/ui/sales_credit_ui.inc:121
msgid "Date:"
msgstr ""
-#: ../gl/includes/ui/gl_bank_ui.inc:50
+#: ../gl/includes/ui/gl_bank_ui.inc:51
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:53
msgid "Pay To:"
msgstr ""
-#: ../gl/includes/ui/gl_bank_ui.inc:55
+#: ../gl/includes/ui/gl_bank_ui.inc:56
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:58
msgid "To the Order of:"
msgstr ""
-#: ../gl/includes/ui/gl_bank_ui.inc:62
-#: ../inventory/purchasing_data.php:182
-#: ../inventory/purchasing_data.php:186
-#: ../purchasing/includes/ui/invoice_ui.inc:73
+#: ../gl/includes/ui/gl_bank_ui.inc:63
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:65
+#: ../inventory/purchasing_data.php:184
+#: ../inventory/purchasing_data.php:188
+#: ../inventory/purchasing_data.php.orig:112
#: ../purchasing/includes/ui/invoice_ui.inc:80
-#: ../purchasing/includes/ui/po_ui.inc:120
+#: ../purchasing/includes/ui/invoice_ui.inc:88
+#: ../purchasing/includes/ui/invoice_ui.inc:90
#: ../purchasing/includes/ui/po_ui.inc:125
+#: ../purchasing/includes/ui/po_ui.inc:130
msgid "Supplier:"
msgstr ""
-#: ../gl/includes/ui/gl_bank_ui.inc:65
-#: ../sales/manage/recurrent_invoices.php:151
+#: ../gl/includes/ui/gl_bank_ui.inc:66
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:68
+#: ../sales/manage/recurrent_invoices.php:169
#: ../sales/includes/ui/sales_credit_ui.inc:29
-#: ../sales/includes/ui/sales_order_ui.inc:279
+#: ../sales/includes/ui/sales_order_ui.inc:278
+#: ../sales/includes/ui/sales_order_ui.inc.orig:278
msgid "Customer:"
msgstr ""
-#: ../gl/includes/ui/gl_bank_ui.inc:69
-#: ../sales/customer_payments.php:239
-#: ../sales/manage/recurrent_invoices.php:154
+#: ../gl/includes/ui/gl_bank_ui.inc:70
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:72
+#: ../sales/customer_payments.php:360
+#: ../sales/manage/recurrent_invoices.php:172
#: ../sales/includes/ui/sales_credit_ui.inc:37
-#: ../sales/includes/ui/sales_order_ui.inc:286
+#: ../sales/includes/ui/sales_order_ui.inc:285
+#: ../sales/includes/ui/sales_order_ui.inc.orig:285
msgid "Branch:"
msgstr ""
+#: ../gl/includes/ui/gl_bank_ui.inc:84
#: ../gl/includes/ui/gl_bank_ui.inc:87
+#: ../sales/customer_payments.php:369
+msgid "This customer account is on hold."
+msgstr ""
+
+#: ../gl/includes/ui/gl_bank_ui.inc:99
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:90
#: ../gl/includes/ui/gl_journal_ui.inc:58
#: ../gl/includes/ui/gl_journal_ui.inc:62
-#: ../purchasing/includes/ui/invoice_ui.inc:231
+#: ../purchasing/includes/ui/invoice_ui.inc:251
msgid "Go"
msgstr ""
-#: ../gl/includes/ui/gl_bank_ui.inc:156
+#: ../gl/includes/ui/gl_bank_ui.inc:185
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:159
#: ../includes/ui/simple_crud_class.inc:52
#: ../inventory/includes/item_adjustments_ui.inc:88
#: ../inventory/includes/stock_transfers_ui.inc:80
#: ../manufacturing/includes/work_order_issue_ui.inc:59
-#: ../purchasing/includes/ui/invoice_ui.inc:514
-#: ../purchasing/includes/ui/po_ui.inc:267
+#: ../purchasing/includes/ui/invoice_ui.inc:542
+#: ../purchasing/includes/ui/po_ui.inc:274
#: ../sales/includes/ui/sales_credit_ui.inc:198
-#: ../sales/includes/ui/sales_order_ui.inc:204
+#: ../sales/includes/ui/sales_order_ui.inc:203
+#: ../sales/includes/ui/sales_order_ui.inc.orig:203
msgid "Edit document line"
msgstr ""
-#: ../gl/includes/ui/gl_bank_ui.inc:158
+#: ../gl/includes/ui/gl_bank_ui.inc:187
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:161
#: ../includes/ui/simple_crud_class.inc:54
#: ../inventory/includes/item_adjustments_ui.inc:90
#: ../inventory/includes/stock_transfers_ui.inc:82
#: ../manufacturing/includes/work_order_issue_ui.inc:61
-#: ../purchasing/includes/ui/invoice_ui.inc:285
-#: ../purchasing/includes/ui/po_ui.inc:269
+#: ../purchasing/includes/ui/invoice_ui.inc:305
+#: ../purchasing/includes/ui/po_ui.inc:276
#: ../sales/includes/ui/sales_credit_ui.inc:200
-#: ../sales/includes/ui/sales_order_ui.inc:206
+#: ../sales/includes/ui/sales_order_ui.inc:205
+#: ../sales/includes/ui/sales_order_ui.inc.orig:205
msgid "Remove line from document"
msgstr ""
-#: ../gl/includes/ui/gl_bank_ui.inc:247
-#: ../gl/includes/ui/gl_journal_ui.inc:222
+#: ../gl/includes/ui/gl_bank_ui.inc:276
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:250
+#: ../gl/includes/ui/gl_journal_ui.inc:258
#: ../includes/ui/simple_crud_class.inc:56
#: ../inventory/includes/item_adjustments_ui.inc:158
#: ../inventory/includes/stock_transfers_ui.inc:138
-#: ../manufacturing/includes/work_order_issue_ui.inc:128
-#: ../purchasing/includes/ui/po_ui.inc:435
+#: ../manufacturing/includes/work_order_issue_ui.inc:132
+#: ../purchasing/includes/ui/po_ui.inc:458
#: ../sales/includes/ui/sales_credit_ui.inc:294
-#: ../sales/includes/ui/sales_order_ui.inc:565
+#: ../sales/includes/ui/sales_order_ui.inc:556
+#: ../sales/includes/ui/sales_order_ui.inc.orig:556
msgid "Confirm changes"
msgstr ""
-#: ../gl/includes/ui/gl_bank_ui.inc:249
-#: ../gl/includes/ui/gl_journal_ui.inc:224
+#: ../gl/includes/ui/gl_bank_ui.inc:278
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:252
+#: ../gl/includes/ui/gl_journal_ui.inc:260
#: ../includes/ui/simple_crud_class.inc:58
#: ../inventory/includes/item_adjustments_ui.inc:160
#: ../inventory/includes/stock_transfers_ui.inc:140
-#: ../manufacturing/includes/work_order_issue_ui.inc:130
-#: ../purchasing/includes/ui/po_ui.inc:437
+#: ../manufacturing/includes/work_order_issue_ui.inc:134
+#: ../purchasing/includes/ui/po_ui.inc:460
#: ../sales/includes/ui/sales_credit_ui.inc:296
-#: ../sales/includes/ui/sales_order_ui.inc:567
+#: ../sales/includes/ui/sales_order_ui.inc:558
+#: ../sales/includes/ui/sales_order_ui.inc.orig:558
msgid "Cancel changes"
msgstr ""
-#: ../gl/includes/ui/gl_bank_ui.inc:254
-#: ../gl/includes/ui/gl_journal_ui.inc:228
+#: ../gl/includes/ui/gl_bank_ui.inc:283
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:257
+#: ../gl/includes/ui/gl_journal_ui.inc:264
#: ../inventory/includes/item_adjustments_ui.inc:166
#: ../inventory/includes/stock_transfers_ui.inc:146
-#: ../manufacturing/includes/work_order_issue_ui.inc:136
-#: ../purchasing/includes/ui/po_ui.inc:443
+#: ../manufacturing/includes/work_order_issue_ui.inc:140
+#: ../purchasing/includes/ui/po_ui.inc:466
#: ../sales/includes/ui/sales_credit_ui.inc:302
-#: ../sales/includes/ui/sales_order_ui.inc:573
+#: ../sales/includes/ui/sales_order_ui.inc:564
+#: ../sales/includes/ui/sales_order_ui.inc.orig:564
msgid "Add Item"
msgstr ""
-#: ../gl/includes/ui/gl_bank_ui.inc:255
+#: ../gl/includes/ui/gl_bank_ui.inc:284
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:258
#: ../inventory/includes/item_adjustments_ui.inc:167
#: ../inventory/includes/stock_transfers_ui.inc:147
-#: ../manufacturing/includes/work_order_issue_ui.inc:137
-#: ../purchasing/includes/ui/po_ui.inc:444
+#: ../manufacturing/includes/work_order_issue_ui.inc:141
+#: ../purchasing/includes/ui/po_ui.inc:467
#: ../sales/includes/ui/sales_credit_ui.inc:303
-#: ../sales/includes/ui/sales_order_ui.inc:574
+#: ../sales/includes/ui/sales_order_ui.inc:565
+#: ../sales/includes/ui/sales_order_ui.inc.orig:565
msgid "Add new item to document"
msgstr ""
msgstr ""
#: ../gl/includes/ui/gl_journal_ui.inc:46
-#: ../includes/sysnames.inc:72
+#: ../includes/sysnames.inc:98
msgid "Quick Entry"
msgstr ""
msgid "balance from account"
msgstr ""
-#: ../gl/includes/ui/gl_journal_ui.inc:123
+#: ../gl/includes/ui/gl_journal_ui.inc:135
msgid "Edit journal line"
msgstr ""
-#: ../gl/includes/ui/gl_journal_ui.inc:125
+#: ../gl/includes/ui/gl_journal_ui.inc:137
msgid "Remove line from journal"
msgstr ""
-#: ../gl/includes/ui/gl_journal_ui.inc:229
+#: ../gl/includes/ui/gl_journal_ui.inc:200
+#: ../gl/includes/ui/gl_journal_ui.inc:232
+msgid "[Select account]"
+msgstr ""
+
+#: ../gl/includes/ui/gl_journal_ui.inc:265
msgid "Add new line to journal"
msgstr ""
msgstr ""
#: ../includes/access_levels.inc:69
-msgid "Manufacturing transations"
+msgid "Manufacturing transactions"
msgstr ""
#: ../includes/access_levels.inc:70
msgstr ""
#: ../includes/access_levels.inc:72
-#: ../inventory/manage/items.php:350
-#: ../reporting/reports_main.php:210
+#: ../inventory/manage/items.php:348
+#: ../inventory/manage/items.php.orig:341
+#: ../reporting/reports_main.php:223
msgid "Dimensions"
msgstr ""
msgstr ""
#: ../includes/access_levels.inc:230
-msgid "Allow entry on non closed Fiscal years"
+msgid "Closing GL transactions"
+msgstr ""
+
+#: ../includes/access_levels.inc:231
+msgid "Reopening GL transactions"
msgstr ""
#: ../includes/access_levels.inc:232
+msgid "Allow entry on non closed Fiscal years"
+msgstr ""
+
+#: ../includes/access_levels.inc:234
msgid "Bank transactions view"
msgstr ""
-#: ../includes/access_levels.inc:233
+#: ../includes/access_levels.inc:235
msgid "GL postings view"
msgstr ""
-#: ../includes/access_levels.inc:234
+#: ../includes/access_levels.inc:236
msgid "Exchange rate table changes"
msgstr ""
-#: ../includes/access_levels.inc:235
+#: ../includes/access_levels.inc:237
msgid "Bank payments"
msgstr ""
-#: ../includes/access_levels.inc:236
+#: ../includes/access_levels.inc:238
msgid "Bank deposits"
msgstr ""
-#: ../includes/access_levels.inc:237
+#: ../includes/access_levels.inc:239
msgid "Bank account transfers"
msgstr ""
-#: ../includes/access_levels.inc:238
+#: ../includes/access_levels.inc:240
msgid "Bank reconciliation"
msgstr ""
-#: ../includes/access_levels.inc:239
+#: ../includes/access_levels.inc:241
msgid "Manual journal entries"
msgstr ""
-#: ../includes/access_levels.inc:240
+#: ../includes/access_levels.inc:242
msgid "Journal entries to bank related accounts"
msgstr ""
-#: ../includes/access_levels.inc:241
+#: ../includes/access_levels.inc:243
msgid "Budget edition"
msgstr ""
-#: ../includes/access_levels.inc:242
+#: ../includes/access_levels.inc:244
msgid "Item standard costs"
msgstr ""
-#: ../includes/access_levels.inc:245
+#: ../includes/access_levels.inc:247
msgid "GL analytical reports and inquiries"
msgstr ""
-#: ../includes/access_levels.inc:246
+#: ../includes/access_levels.inc:248
msgid "Tax reports and inquiries"
msgstr ""
-#: ../includes/access_levels.inc:247
+#: ../includes/access_levels.inc:249
msgid "Bank reports and inquiries"
msgstr ""
-#: ../includes/access_levels.inc:248
+#: ../includes/access_levels.inc:250
msgid "GL reports and inquiries"
msgstr ""
"rate manually on Exchange Rates page."
msgstr ""
-#: ../includes/current_user.inc:79
+#: ../includes/current_user.inc:88
msgid ""
"Before software upgrade you have to include old $security_groups and "
"$security_headings arrays from old config.php file to the new one."
msgstr ""
-#: ../includes/current_user.inc:80
-#: ../includes/ui/ui_controls.inc:174
-#: ../includes/ui/ui_view.inc:842
+#: ../includes/current_user.inc:89
+#: ../includes/ui/ui_controls.inc:197
+#: ../includes/ui/ui_view.inc:844
+#: ../includes/ui/ui_view.inc.orig:843
msgid "Back"
msgstr ""
-#: ../includes/current_user.inc:90
+#: ../includes/current_user.inc:99
msgid "System is available for site admin only until full database upgrade"
msgstr ""
-#: ../includes/current_user.inc:428
+#: ../includes/current_user.inc:462
msgid "Requesting data..."
msgstr ""
-#: ../includes/errors.inc:71
-msgid "in file"
+#: ../includes/data_checks.inc:495
+#, php-format
+msgid "%s #%s is closed for further edition."
msgstr ""
-#: ../includes/errors.inc:71
+#: ../includes/errors.inc:123
+msgid "in file"
+msgstr ""
+
+#: ../includes/errors.inc:123
msgid "at line "
msgstr ""
-#: ../includes/errors.inc:118
+#: ../includes/errors.inc:177
msgid "Debug mode database warning:"
msgstr ""
-#: ../includes/errors.inc:120
+#: ../includes/errors.inc:179
msgid "DATABASE ERROR :"
msgstr ""
-#: ../includes/errors.inc:151
+#: ../includes/errors.inc:210
msgid ""
"The entered information is a duplicate. Please go back and enter different "
"values."
msgstr ""
-#: ../includes/main.inc:42
+#: ../includes/main.inc:44
msgid "This page is usable only with javascript enabled browsers."
msgstr ""
-#: ../includes/packages.inc:304
+#: ../includes/packages.inc:190
+#, php-format
+msgid "No key field '%s' in file '%s'"
+msgstr ""
+
+#: ../includes/packages.inc:295
+#: ../includes/packages.inc:329
+#, php-format
+msgid "Cannot delete outdated '%s' file."
+msgstr ""
+
+#: ../includes/packages.inc:299
msgid "Release file in repository is invalid, or public key is outdated."
msgstr ""
-#: ../includes/packages.inc:320
+#: ../includes/packages.inc:316
msgid "Repository version does not match application version."
msgstr ""
-#: ../includes/packages.inc:334
+#: ../includes/packages.inc:333
#, php-format
msgid ""
"Security alert: broken index file in repository '%s'. Please inform "
"repository administrator about this issue."
msgstr ""
-#: ../includes/packages.inc:367
+#: ../includes/packages.inc:366
#, php-format
msgid ""
"Security alert: broken package '%s' in repository. Please inform repository "
"administrator about this issue."
msgstr ""
-#: ../includes/packages.inc:599
-#: ../includes/packages.inc:650
+#: ../includes/packages.inc:621
+#: ../includes/packages.inc:672
#, php-format
msgid "Package '%s' not found."
msgstr ""
-#: ../includes/session.inc:39
+#: ../includes/session.inc:133
msgid "Incorrect Password"
msgstr ""
-#: ../includes/session.inc:40
+#: ../includes/session.inc:134
msgid "The user and password combination is not valid for the system."
msgstr ""
-#: ../includes/session.inc:42
+#: ../includes/session.inc:136
msgid ""
"If you are not an authorized user, please contact your system administrator "
"to obtain an account to enable you to use the system."
msgstr ""
-#: ../includes/session.inc:43
+#: ../includes/session.inc:137
msgid "Try again"
msgstr ""
-#: ../includes/session.inc:62
+#: ../includes/session.inc:156
msgid "Security settings have not been defined for your user account."
msgstr ""
-#: ../includes/session.inc:63
+#: ../includes/session.inc:157
msgid "Please contact your system administrator."
msgstr ""
-#: ../includes/session.inc:64
+#: ../includes/session.inc:158
msgid ""
"Please remove $security_groups and $security_headings arrays from config.php "
"file!"
msgstr ""
-#: ../includes/session.inc:66
+#: ../includes/session.inc:160
msgid ""
"Access to application has been blocked until database upgrade is completed "
"by system administrator."
msgstr ""
-#: ../includes/session.inc:80
+#: ../includes/session.inc:174
msgid ""
"The security settings on your account do not permit you to access this "
"function"
msgstr ""
-#: ../includes/session.inc:89
+#: ../includes/session.inc:183
msgid ""
"System is blocked after source upgrade until database is updated on System/"
"Software Upgrade page"
msgstr ""
#: ../includes/sysnames.inc:23
-#: ../includes/sysnames.inc:122
+#: ../includes/sysnames.inc:149
msgid "Bank Payment"
msgstr ""
#: ../includes/sysnames.inc:24
-#: ../includes/sysnames.inc:121
+#: ../includes/sysnames.inc:148
msgid "Bank Deposit"
msgstr ""
msgstr ""
#: ../includes/sysnames.inc:32
-#: ../purchasing/includes/ui/po_ui.inc:323
+#: ../purchasing/includes/ui/po_ui.inc:330
#: ../purchasing/view/view_po.php:30
msgid "Purchase Order"
msgstr ""
msgstr ""
#: ../includes/sysnames.inc:34
-#: ../purchasing/supplier_credit.php:28
+#: ../purchasing/supplier_credit.php:58
msgid "Supplier Credit Note"
msgstr ""
msgstr ""
#: ../includes/sysnames.inc:37
-#: ../includes/sysnames.inc:69
+#: ../includes/sysnames.inc:95
msgid "Work Order"
msgstr ""
msgstr ""
#: ../includes/sysnames.inc:40
-#: ../sales/inquiry/sales_orders_view.php:134
-#: ../sales/inquiry/sales_orders_view.php:156
+#: ../sales/inquiry/sales_orders_view.php:151
+#: ../sales/inquiry/sales_orders_view.php:173
+#: ../sales/inquiry/sales_orders_view.php.orig:138
+#: ../sales/inquiry/sales_orders_view.php.orig:160
msgid "Sales Order"
msgstr ""
#: ../includes/sysnames.inc:41
-#: ../sales/sales_order_entry.php:590
+#: ../sales/sales_order_entry.php:625
msgid "Sales Quotation"
msgstr ""
msgid "Cost Update"
msgstr ""
+#: ../includes/sysnames.inc:47
+msgid "GJ"
+msgstr ""
+
+#: ../includes/sysnames.inc:48
+msgid "BP"
+msgstr ""
+
+#: ../includes/sysnames.inc:49
+msgid "BD"
+msgstr ""
+
#: ../includes/sysnames.inc:50
-msgid "Savings Account"
+msgid "BT"
msgstr ""
#: ../includes/sysnames.inc:51
-msgid "Chequing Account"
+msgid "SI"
msgstr ""
#: ../includes/sysnames.inc:52
-#: ../manufacturing/work_order_costs.php:153
-msgid "Credit Account"
+msgid "CN"
msgstr ""
#: ../includes/sysnames.inc:53
-msgid "Cash Account"
+msgid "CP"
+msgstr ""
+
+#: ../includes/sysnames.inc:54
+#: ../sales/customer_invoice.php:545
+msgid "DN"
+msgstr ""
+
+#: ../includes/sysnames.inc:55
+msgid "IT"
+msgstr ""
+
+#: ../includes/sysnames.inc:56
+msgid "IA"
msgstr ""
#: ../includes/sysnames.inc:57
-msgid "Transfer"
+msgid "PO"
msgstr ""
#: ../includes/sysnames.inc:58
-msgid "Cheque"
+msgid "PI"
+msgstr ""
+
+#: ../includes/sysnames.inc:59
+msgid "PC"
msgstr ""
#: ../includes/sysnames.inc:60
-#: ../includes/sysnames.inc:154
+msgid "SP"
+msgstr ""
+
+#: ../includes/sysnames.inc:61
+#: ../reporting/rep204.php:82
+#: ../reporting/rep305.php:95
+msgid "GRN"
+msgstr ""
+
+#: ../includes/sysnames.inc:62
+msgid "WO"
+msgstr ""
+
+#: ../includes/sysnames.inc:63
+msgid "WI"
+msgstr ""
+
+#: ../includes/sysnames.inc:64
+msgid "WP"
+msgstr ""
+
+#: ../includes/sysnames.inc:65
+msgid "SO"
+msgstr ""
+
+#: ../includes/sysnames.inc:66
+msgid "SQ"
+msgstr ""
+
+#: ../includes/sysnames.inc:67
+msgid "CU"
+msgstr ""
+
+#: ../includes/sysnames.inc:68
+msgid "Dim"
+msgstr ""
+
+#: ../includes/sysnames.inc:76
+msgid "Savings Account"
+msgstr ""
+
+#: ../includes/sysnames.inc:77
+msgid "Chequing Account"
+msgstr ""
+
+#: ../includes/sysnames.inc:78
+#: ../manufacturing/work_order_costs.php:145
+msgid "Credit Account"
+msgstr ""
+
+#: ../includes/sysnames.inc:79
+msgid "Cash Account"
+msgstr ""
+
+#: ../includes/sysnames.inc:83
+msgid "Transfer"
+msgstr ""
+
+#: ../includes/sysnames.inc:84
+msgid "Cheque"
+msgstr ""
+
+#: ../includes/sysnames.inc:86
+#: ../includes/sysnames.inc:181
msgid "Cash"
msgstr ""
-#: ../includes/sysnames.inc:70
+#: ../includes/sysnames.inc:96
+#: ../includes/sysnames.inc:195
#: ../reporting/rep101.php:137
-#: ../reporting/rep102.php:115
-#: ../reporting/rep102.php:122
+#: ../reporting/rep102.php:123
+#: ../reporting/rep102.php:130
#: ../reporting/rep105.php:107
#: ../reporting/rep106.php:81
-#: ../reporting/rep304.php:114
-#: ../reporting/rep304.php:124
-#: ../reporting/reports_main.php:29
-#: ../reporting/reports_main.php:33
-#: ../reporting/reports_main.php:40
-#: ../reporting/reports_main.php:91
-#: ../reporting/reports_main.php:190
-#: ../sales/create_recurrent_invoices.php:98
-#: ../sales/customer_credit_invoice.php:246
-#: ../sales/customer_delivery.php:336
-#: ../sales/customer_invoice.php:367
+#: ../reporting/rep114.php:93
+#: ../reporting/rep304.php:112
+#: ../reporting/rep304.php:122
+#: ../reporting/reports_main.php:32
+#: ../reporting/reports_main.php:36
+#: ../reporting/reports_main.php:43
+#: ../reporting/reports_main.php:108
+#: ../reporting/reports_main.php:203
+#: ../sales/create_recurrent_invoices.php:115
+#: ../sales/customer_credit_invoice.php:237
+#: ../sales/customer_delivery.php:346
+#: ../sales/customer_invoice.php:444
#: ../sales/allocations/customer_allocation_main.php:97
#: ../sales/allocations/customer_allocation_main.php:105
-#: ../sales/manage/recurrent_invoices.php:85
+#: ../sales/manage/recurrent_invoices.php:102
#: ../sales/view/view_credit.php:47
-#: ../sales/inquiry/customer_allocation_inquiry.php:147
-#: ../sales/inquiry/customer_allocation_inquiry.php:157
-#: ../sales/inquiry/customer_inquiry.php:218
-#: ../sales/inquiry/customer_inquiry.php:232
+#: ../sales/inquiry/customer_allocation_inquiry.php:150
+#: ../sales/inquiry/customer_allocation_inquiry.php:160
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:150
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:160
+#: ../sales/inquiry/customer_inquiry.php:206
+#: ../sales/inquiry/customer_inquiry.php:220
+#: ../sales/inquiry/customer_inquiry.php.orig:230
+#: ../sales/inquiry/customer_inquiry.php.orig:244
#: ../sales/inquiry/sales_deliveries_view.php:180
-#: ../sales/inquiry/sales_orders_view.php:260
-#: ../sales/inquiry/sales_orders_view.php:274
-#: ../themes/exclusive/renderer.php:220
-#: ../themes/exclusive/renderer.php:238
-#: ../themes/exclusive/renderer.php:273
+#: ../sales/inquiry/sales_deliveries_view.php.orig:180
+#: ../sales/inquiry/sales_orders_view.php:286
+#: ../sales/inquiry/sales_orders_view.php:300
+#: ../sales/inquiry/sales_orders_view.php.orig:263
+#: ../sales/inquiry/sales_orders_view.php.orig:277
msgid "Customer"
msgstr ""
-#: ../includes/sysnames.inc:71
-#: ../includes/sysnames.inc:146
-#: ../inventory/purchasing_data.php:127
+#: ../includes/sysnames.inc:97
+#: ../includes/sysnames.inc:173
+#: ../includes/sysnames.inc:196
+#: ../inventory/purchasing_data.php:129
#: ../purchasing/includes/ui/grn_ui.inc:20
-#: ../purchasing/includes/ui/po_ui.inc:316
+#: ../purchasing/includes/ui/po_ui.inc:323
#: ../purchasing/view/view_supp_credit.php:42
-#: ../purchasing/view/view_supp_invoice.php:45
-#: ../purchasing/inquiry/po_search_completed.php:118
+#: ../purchasing/view/view_supp_invoice.php:46
+#: ../purchasing/inquiry/po_search_completed.php:122
+#: ../purchasing/inquiry/po_search_completed.php.orig:121
#: ../purchasing/inquiry/po_search.php:132
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:128
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:141
-#: ../purchasing/inquiry/supplier_inquiry.php:165
-#: ../purchasing/inquiry/supplier_inquiry.php:179
+#: ../purchasing/inquiry/supplier_inquiry.php:176
+#: ../purchasing/inquiry/supplier_inquiry.php:191
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:173
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:188
#: ../purchasing/allocations/supplier_allocation_main.php:98
#: ../purchasing/allocations/supplier_allocation_main.php:106
#: ../reporting/rep201.php:125
-#: ../reporting/rep202.php:118
-#: ../reporting/rep202.php:125
+#: ../reporting/rep202.php:128
+#: ../reporting/rep202.php:135
#: ../reporting/rep203.php:98
#: ../reporting/rep204.php:88
-#: ../reporting/reports_main.php:121
-#: ../reporting/reports_main.php:125
#: ../reporting/reports_main.php:132
-#: ../reporting/reports_main.php:141
-#: ../reporting/reports_main.php:147
-#: ../themes/exclusive/renderer.php:317
-#: ../themes/exclusive/renderer.php:335
-#: ../themes/exclusive/renderer.php:367
+#: ../reporting/reports_main.php:136
+#: ../reporting/reports_main.php:143
+#: ../reporting/reports_main.php:153
+#: ../reporting/reports_main.php:159
msgid "Supplier"
msgstr ""
-#: ../includes/sysnames.inc:79
+#: ../includes/sysnames.inc:105
msgid "Assemble"
msgstr ""
-#: ../includes/sysnames.inc:80
+#: ../includes/sysnames.inc:106
msgid "Unassemble"
msgstr ""
-#: ../includes/sysnames.inc:81
+#: ../includes/sysnames.inc:107
msgid "Advanced Manufacture"
msgstr ""
-#: ../includes/sysnames.inc:85
+#: ../includes/sysnames.inc:111
msgid "Labour Cost"
msgstr ""
-#: ../includes/sysnames.inc:86
+#: ../includes/sysnames.inc:112
msgid "Overhead Cost"
msgstr ""
-#: ../includes/sysnames.inc:93
+#: ../includes/sysnames.inc:113
+msgid "Materials"
+msgstr ""
+
+#: ../includes/sysnames.inc:120
msgid "Assets"
msgstr ""
-#: ../includes/sysnames.inc:95
+#: ../includes/sysnames.inc:122
msgid "Equity"
msgstr ""
-#: ../includes/sysnames.inc:96
+#: ../includes/sysnames.inc:123
msgid "Income"
msgstr ""
-#: ../includes/sysnames.inc:97
+#: ../includes/sysnames.inc:124
msgid "Cost of Goods Sold"
msgstr ""
-#: ../includes/sysnames.inc:98
+#: ../includes/sysnames.inc:125
msgid "Expense"
msgstr ""
-#: ../includes/sysnames.inc:105
-#: ../themes/exclusive/renderer.php:274
-#: ../themes/exclusive/renderer.php:368
+#: ../includes/sysnames.inc:132
msgid "Remainder"
msgstr ""
-#: ../includes/sysnames.inc:107
+#: ../includes/sysnames.inc:134
msgid "Amount, increase base"
msgstr ""
-#: ../includes/sysnames.inc:108
+#: ../includes/sysnames.inc:135
msgid "Amount, reduce base"
msgstr ""
-#: ../includes/sysnames.inc:109
+#: ../includes/sysnames.inc:136
msgid "% amount of base"
msgstr ""
-#: ../includes/sysnames.inc:110
+#: ../includes/sysnames.inc:137
msgid "% amount of base, increase base"
msgstr ""
-#: ../includes/sysnames.inc:111
+#: ../includes/sysnames.inc:138
msgid "% amount of base, reduce base"
msgstr ""
-#: ../includes/sysnames.inc:112
+#: ../includes/sysnames.inc:139
msgid "Taxes added"
msgstr ""
-#: ../includes/sysnames.inc:113
+#: ../includes/sysnames.inc:140
msgid "Taxes added, increase base"
msgstr ""
-#: ../includes/sysnames.inc:114
+#: ../includes/sysnames.inc:141
msgid "Taxes added, reduce base"
msgstr ""
-#: ../includes/sysnames.inc:115
+#: ../includes/sysnames.inc:142
msgid "Taxes included"
msgstr ""
-#: ../includes/sysnames.inc:116
+#: ../includes/sysnames.inc:143
msgid "Taxes included, increase base"
msgstr ""
-#: ../includes/sysnames.inc:117
+#: ../includes/sysnames.inc:144
msgid "Taxes included, reduce base"
msgstr ""
-#: ../includes/sysnames.inc:124
+#: ../includes/sysnames.inc:151
msgid "Supplier Invoice/Credit"
msgstr ""
-#: ../includes/sysnames.inc:130
+#: ../includes/sysnames.inc:157
#: ../manufacturing/search_work_orders.php:165
#: ../manufacturing/includes/manufacturing_ui.inc:278
msgid "Manufactured"
msgstr ""
-#: ../includes/sysnames.inc:131
+#: ../includes/sysnames.inc:158
msgid "Purchased"
msgstr ""
-#: ../includes/sysnames.inc:132
+#: ../includes/sysnames.inc:159
msgid "Service"
msgstr ""
-#: ../includes/sysnames.inc:145
+#: ../includes/sysnames.inc:172
msgid "Customer branch"
msgstr ""
-#: ../includes/sysnames.inc:147
+#: ../includes/sysnames.inc:174
msgid "Shipper"
msgstr ""
-#: ../includes/sysnames.inc:148
+#: ../includes/sysnames.inc:175
msgid "Company internal"
msgstr ""
-#: ../includes/sysnames.inc:153
+#: ../includes/sysnames.inc:180
msgid "Prepayment"
msgstr ""
-#: ../includes/sysnames.inc:155
+#: ../includes/sysnames.inc:182
msgid "After No. of Days"
msgstr ""
-#: ../includes/sysnames.inc:156
+#: ../includes/sysnames.inc:183
msgid "Day In Following Month"
msgstr ""
+#: ../includes/sysnames.inc:187
+msgid "Sum per line taxes"
+msgstr ""
+
+#: ../includes/sysnames.inc:188
+msgid "Taxes from totals"
+msgstr ""
+
#: ../includes/system_tests.inc:15
#: ../includes/ui/ui_view.inc:210
+#: ../includes/ui/ui_view.inc.orig:210
#: ../reporting/rep705.php:250
#: ../reporting/rep705.php:261
#: ../reporting/rep705.php:270
#: ../includes/system_tests.inc:411
#: ../includes/ui/view_package.php:37
#: ../reporting/rep204.php:83
-#: ../reporting/rep301.php:99
+#: ../reporting/rep301.php:103
msgid "Value"
msgstr ""
#: ../includes/system_tests.inc:411
-#: ../reporting/reports_main.php:36
-#: ../reporting/reports_main.php:45
-#: ../reporting/reports_main.php:53
-#: ../reporting/reports_main.php:61
-#: ../reporting/reports_main.php:69
-#: ../reporting/reports_main.php:75
-#: ../reporting/reports_main.php:83
-#: ../reporting/reports_main.php:89
-#: ../reporting/reports_main.php:95
-#: ../reporting/reports_main.php:102
-#: ../reporting/reports_main.php:108
-#: ../reporting/reports_main.php:114
+#: ../reporting/reports_main.php:39
+#: ../reporting/reports_main.php:49
+#: ../reporting/reports_main.php:57
+#: ../reporting/reports_main.php:63
+#: ../reporting/reports_main.php:71
+#: ../reporting/reports_main.php:79
+#: ../reporting/reports_main.php:85
+#: ../reporting/reports_main.php:93
+#: ../reporting/reports_main.php:100
+#: ../reporting/reports_main.php:106
+#: ../reporting/reports_main.php:112
#: ../reporting/reports_main.php:119
-#: ../reporting/reports_main.php:128
-#: ../reporting/reports_main.php:137
-#: ../reporting/reports_main.php:144
-#: ../reporting/reports_main.php:148
-#: ../reporting/reports_main.php:155
-#: ../reporting/reports_main.php:161
-#: ../reporting/reports_main.php:169
-#: ../reporting/reports_main.php:174
-#: ../reporting/reports_main.php:183
-#: ../reporting/reports_main.php:191
+#: ../reporting/reports_main.php:125
+#: ../reporting/reports_main.php:130
+#: ../reporting/reports_main.php:139
+#: ../reporting/reports_main.php:149
+#: ../reporting/reports_main.php:156
+#: ../reporting/reports_main.php:160
+#: ../reporting/reports_main.php:167
+#: ../reporting/reports_main.php:173
+#: ../reporting/reports_main.php:182
+#: ../reporting/reports_main.php:187
#: ../reporting/reports_main.php:196
-#: ../reporting/reports_main.php:203
+#: ../reporting/reports_main.php:204
#: ../reporting/reports_main.php:209
-#: ../reporting/reports_main.php:217
-#: ../reporting/reports_main.php:228
-#: ../reporting/reports_main.php:234
-#: ../reporting/reports_main.php:240
-#: ../reporting/reports_main.php:254
-#: ../reporting/reports_main.php:261
-#: ../reporting/reports_main.php:271
-#: ../reporting/reports_main.php:282
-#: ../reporting/reports_main.php:291
-#: ../reporting/reports_main.php:302
-#: ../reporting/reports_main.php:308
-#: ../reporting/reports_main.php:317
-#: ../reporting/reports_main.php:327
-#: ../reporting/reports_main.php:335
-#: ../reporting/reports_main.php:345
-#: ../reporting/reports_main.php:350
+#: ../reporting/reports_main.php:216
+#: ../reporting/reports_main.php:222
+#: ../reporting/reports_main.php:230
+#: ../reporting/reports_main.php:241
+#: ../reporting/reports_main.php:247
+#: ../reporting/reports_main.php:253
+#: ../reporting/reports_main.php:267
+#: ../reporting/reports_main.php:274
+#: ../reporting/reports_main.php:284
+#: ../reporting/reports_main.php:295
+#: ../reporting/reports_main.php:304
+#: ../reporting/reports_main.php:315
+#: ../reporting/reports_main.php:321
+#: ../reporting/reports_main.php:330
+#: ../reporting/reports_main.php:340
+#: ../reporting/reports_main.php:348
#: ../reporting/reports_main.php:358
-#: ../reporting/reports_main.php:367
-#: ../reporting/reports_main.php:374
-#: ../reporting/reports_main.php:381
-#: ../reporting/reports_main.php:388
-#: ../reporting/includes/excel_report.inc:288
-#: ../reporting/includes/excel_report.inc:421
+#: ../reporting/reports_main.php:363
+#: ../reporting/reports_main.php:371
+#: ../reporting/reports_main.php:380
+#: ../reporting/reports_main.php:387
+#: ../reporting/reports_main.php:394
+#: ../reporting/reports_main.php:401
+#: ../reporting/includes/excel_report.inc:295
+#: ../reporting/includes/excel_report.inc:428
#: ../reporting/includes/pdf_report.inc:346
-#: ../reporting/includes/pdf_report.inc:617
-#: ../sales/view/view_sales_order.php:84
+#: ../reporting/includes/pdf_report.inc:618
+#: ../sales/view/view_sales_order.php:98
+#: ../sales/view/view_sales_order.php.orig:85
msgid "Comments"
msgstr ""
msgid "Ok"
msgstr ""
-#: ../includes/db/audit_trail_db.inc:93
+#: ../includes/db/audit_trail_db.inc:99
msgid ""
"Some transactions journal GL postings were not indexed due to lack of audit "
"trail record."
msgstr ""
-#: ../includes/db/inventory_db.inc:227
-#, php-format
-msgid "Cost was %s changed to %s for item '%s'"
-msgstr ""
-
-#: ../includes/db/inventory_db.inc:285
+#: ../includes/db/inventory_db.inc:252
msgid "Cost was "
msgstr ""
-#: ../includes/db/inventory_db.inc:285
+#: ../includes/db/inventory_db.inc:252
msgid " changed to "
msgstr ""
-#: ../includes/db/inventory_db.inc:285
+#: ../includes/db/inventory_db.inc:252
msgid " for item "
msgstr ""
-#: ../includes/ui/allocation_cart.inc:263
+#: ../includes/db/inventory_db.inc:292
+msgid "Zero/negative inventory handling"
+msgstr ""
+
+#: ../includes/ui/allocation_cart.inc:264
#: ../purchasing/allocations/supplier_allocation_main.php:94
#: ../sales/allocations/customer_allocation_main.php:93
msgid "Transaction Type"
msgstr ""
-#: ../includes/ui/allocation_cart.inc:263
-#: ../reporting/rep704.php:78
-#: ../reporting/rep704.php:81
-#: ../reporting/rep704.php:84
-#: ../reporting/rep709.php:107
+#: ../includes/ui/allocation_cart.inc:264
+#: ../reporting/rep704.php:79
+#: ../reporting/rep704.php:82
+#: ../reporting/rep704.php:85
+#: ../reporting/rep709.php:109
#: ../sales/view/view_credit.php:68
-#: ../sales/view/view_sales_order.php:95
-#: ../sales/view/view_sales_order.php:128
-#: ../sales/view/view_sales_order.php:160
-#: ../sales/inquiry/sales_orders_view.php:228
-#: ../sales/inquiry/sales_orders_view.php:259
-#: ../sales/inquiry/sales_orders_view.php:273
+#: ../sales/view/view_sales_order.php:109
+#: ../sales/view/view_sales_order.php:142
+#: ../sales/view/view_sales_order.php:179
+#: ../sales/view/view_sales_order.php.orig:96
+#: ../sales/view/view_sales_order.php.orig:129
+#: ../sales/view/view_sales_order.php.orig:161
+#: ../sales/inquiry/sales_orders_view.php:248
+#: ../sales/inquiry/sales_orders_view.php:285
+#: ../sales/inquiry/sales_orders_view.php:299
+#: ../sales/inquiry/sales_orders_view.php.orig:225
+#: ../sales/inquiry/sales_orders_view.php.orig:262
+#: ../sales/inquiry/sales_orders_view.php.orig:276
msgid "Ref"
msgstr ""
-#: ../includes/ui/allocation_cart.inc:264
+#: ../includes/ui/allocation_cart.inc:265
msgid "Other Allocations"
msgstr ""
-#: ../includes/ui/allocation_cart.inc:264
-#: ../includes/ui/ui_view.inc:481
-#: ../reporting/includes/doctext.inc:108
+#: ../includes/ui/allocation_cart.inc:265
+#: ../includes/ui/ui_view.inc:489
+#: ../includes/ui/ui_view.inc.orig:489
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
msgid "This Allocation"
msgstr ""
-#: ../includes/ui/allocation_cart.inc:264
-#: ../includes/ui/allocation_cart.inc:311
-#: ../includes/ui/ui_view.inc:481
+#: ../includes/ui/allocation_cart.inc:265
+#: ../includes/ui/allocation_cart.inc:314
+#: ../includes/ui/ui_view.inc:489
+#: ../includes/ui/ui_view.inc.orig:489
#: ../purchasing/allocations/supplier_allocation_main.php:101
-#: ../reporting/includes/doctext.inc:108
-#: ../reporting/includes/doctext.inc:166
+#: ../reporting/rep112.php:141
+#: ../reporting/rep210.php:154
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
#: ../sales/allocations/customer_allocation_main.php:100
msgid "Left to Allocate"
msgstr ""
-#: ../includes/ui/allocation_cart.inc:294
-#: ../reporting/includes/doctext.inc:165
+#: ../includes/ui/allocation_cart.inc:297
+#: ../reporting/rep112.php:138
+#: ../reporting/rep210.php:151
msgid "Total Allocated"
msgstr ""
-#: ../includes/ui/allocation_cart.inc:331
+#: ../includes/ui/allocation_cart.inc:334
msgid "The entry for one or more amounts is invalid or negative."
msgstr ""
-#: ../includes/ui/allocation_cart.inc:340
+#: ../includes/ui/allocation_cart.inc:343
msgid "At least one transaction is overallocated."
msgstr ""
-#: ../includes/ui/allocation_cart.inc:358
+#: ../includes/ui/allocation_cart.inc:361
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:223
-#: ../reporting/includes/header2.inc:92
+#: ../reporting/includes/header2.inc:104
#: ../sales/manage/sales_people.php:99
msgid "Fax"
msgstr ""
msgstr ""
#: ../includes/ui/contacts_view.inc:102
+#: ../sales/manage/customers.php:252
+#: ../sales/manage/sav.customers.php:252
msgid "Phone:"
msgstr ""
#: ../includes/ui/contacts_view.inc:105
#: ../inventory/manage/locations.php:207
-#: ../purchasing/manage/suppliers.php:108
-#: ../sales/manage/customer_branches.php:264
+#: ../purchasing/manage/suppliers.php:139
+#: ../purchasing/manage/suppliers.php.orig:117
+#: ../sales/manage/customer_branches.php:265
+#: ../sales/manage/customers.php:255
#: ../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:109
-#: ../sales/manage/customer_branches.php:265
+#: ../purchasing/manage/suppliers.php:140
+#: ../purchasing/manage/suppliers.php.orig:118
+#: ../sales/manage/customer_branches.php:266
msgid "Document Language:"
msgstr ""
#: ../includes/ui/contacts_view.inc:110
-#: ../sales/manage/customer_branches.php:265
+#: ../sales/manage/customer_branches.php:266
msgid "Customer default"
msgstr ""
msgstr ""
#: ../includes/ui/db_pager_view.inc:166
-#: ../includes/ui/ui_input.inc:892
+#: ../includes/ui/ui_input.inc:899
msgid "Show also Inactive"
msgstr ""
msgstr ""
#: ../includes/ui/simple_crud_class.inc:227
-#: ../includes/ui/ui_input.inc:203
+#: ../includes/ui/ui_input.inc:207
msgid "Submit changes"
msgstr ""
#: ../includes/ui/simple_crud_class.inc:229
-#: ../includes/ui/ui_input.inc:204
+#: ../includes/ui/ui_input.inc:208
msgid "Clone"
msgstr ""
#: ../includes/ui/simple_crud_class.inc:229
-#: ../includes/ui/ui_input.inc:205
+#: ../includes/ui/ui_input.inc:209
msgid "Edit new record with current data"
msgstr ""
#: ../includes/ui/simple_crud_class.inc:231
-#: ../includes/ui/ui_input.inc:206
+#: ../includes/ui/ui_input.inc:210
msgid "Cancel edition"
msgstr ""
-#: ../includes/ui/ui_controls.inc:123
+#: ../includes/ui/ui_controls.inc:79
+msgid "Request from outside of this page is forbidden."
+msgstr ""
+
+#: ../includes/ui/ui_controls.inc:80
+msgid "CSRF attack detected from: "
+msgstr ""
+
+#: ../includes/ui/ui_controls.inc:146
msgid "You should automatically be forwarded."
msgstr ""
-#: ../includes/ui/ui_controls.inc:124
+#: ../includes/ui/ui_controls.inc:147
msgid "If this does not happen"
msgstr ""
-#: ../includes/ui/ui_controls.inc:124
+#: ../includes/ui/ui_controls.inc:147
msgid "click here"
msgstr ""
-#: ../includes/ui/ui_controls.inc:124
+#: ../includes/ui/ui_controls.inc:147
msgid "to continue"
msgstr ""
-#: ../includes/ui/ui_controls.inc:171
+#: ../includes/ui/ui_controls.inc:194
msgid "View Attachment"
msgstr ""
-#: ../includes/ui/ui_controls.inc:174
+#: ../includes/ui/ui_controls.inc:197
msgid "Close"
msgstr ""
-#: ../includes/ui/ui_controls.inc:425
-#: ../sales/manage/customers.php:16
+#: ../includes/ui/ui_controls.inc:457
+#: ../sales/manage/customers.php:23
+#: ../sales/manage/sav.customers.php:23
msgid "Customers"
msgstr ""
-#: ../includes/ui/ui_controls.inc:427
+#: ../includes/ui/ui_controls.inc:459
msgid "Branches"
msgstr ""
-#: ../includes/ui/ui_controls.inc:429
-#: ../purchasing/manage/suppliers.php:16
+#: ../includes/ui/ui_controls.inc:461
+#: ../purchasing/manage/suppliers.php:22
+#: ../purchasing/manage/suppliers.php.orig:23
msgid "Suppliers"
msgstr ""
-#: ../includes/ui/ui_controls.inc:431
+#: ../includes/ui/ui_controls.inc:463
#: ../inventory/transfers.php:230
-#: ../inventory/manage/items.php:16
+#: ../inventory/manage/items.php:22
+#: ../inventory/manage/items.php.orig:21
msgid "Items"
msgstr ""
-#: ../includes/ui/ui_controls.inc:575
+#: ../includes/ui/ui_controls.inc:608
msgid "Entered data has not been saved yet.\\nDo you want to abandon changes?"
msgstr ""
-#: ../includes/ui/ui_input.inc:621
-#: ../reporting/includes/reports_classes.inc:219
+#: ../includes/ui/ui_input.inc:628
+#: ../reporting/includes/reports_classes.inc:216
msgid "Click Here to Pick up the date"
msgstr ""
-#: ../includes/ui/ui_input.inc:904
-#: ../includes/ui/ui_lists.inc:2118
-#: ../reporting/rep301.php:147
+#: ../includes/ui/ui_input.inc:911
+#: ../includes/ui/ui_lists.inc:2156
+#: ../includes/ui/ui_lists.inc.orig:2154
+#: ../reporting/rep301.php:152
#: ../reporting/rep302.php:166
#: ../reporting/rep303.php:170
-#: ../reporting/rep304.php:168
-#: ../reporting/rep304.php:172
-#: ../reporting/rep305.php:111
-#: ../sales/manage/customer_branches.php:303
+#: ../reporting/rep304.php:166
+#: ../reporting/rep304.php:170
+#: ../sales/manage/customer_branches.php:304
msgid "Inactive"
msgstr ""
-#: ../includes/ui/ui_input.inc:914
-#: ../includes/ui/ui_input.inc:926
+#: ../includes/ui/ui_input.inc:921
+#: ../includes/ui/ui_input.inc:933
msgid "Current Credit:"
msgstr ""
-#: ../includes/ui/ui_lists.inc:17
+#: ../includes/ui/ui_input.inc:967
+msgid "Bank Balance:"
+msgstr ""
+
+#: ../includes/ui/ui_lists.inc:17
+#: ../includes/ui/ui_lists.inc.orig:17
msgid "Set filter"
msgstr ""
#: ../includes/ui/ui_lists.inc:100
+#: ../includes/ui/ui_lists.inc.orig:100
msgid "Press Space tab for search pattern entry"
msgstr ""
#: ../includes/ui/ui_lists.inc:104
+#: ../includes/ui/ui_lists.inc.orig:104
msgid "Enter code fragment to search or * for all"
msgstr ""
#: ../includes/ui/ui_lists.inc:105
+#: ../includes/ui/ui_lists.inc.orig:105
msgid "Enter description fragment to search or * for all"
msgstr ""
-#: ../includes/ui/ui_lists.inc:438
-#: ../includes/ui/ui_lists.inc:1356
+#: ../includes/ui/ui_lists.inc:453
+#: ../includes/ui/ui_lists.inc:1386
+#: ../includes/ui/ui_lists.inc.orig:453
+#: ../includes/ui/ui_lists.inc.orig:1386
msgid "All Suppliers"
msgstr ""
-#: ../includes/ui/ui_lists.inc:442
+#: ../includes/ui/ui_lists.inc:457
+#: ../includes/ui/ui_lists.inc.orig:457
msgid "Press Space tab to filter by name fragment"
msgstr ""
-#: ../includes/ui/ui_lists.inc:443
+#: ../includes/ui/ui_lists.inc:458
+#: ../includes/ui/ui_lists.inc.orig:458
msgid "Select supplier"
msgstr ""
-#: ../includes/ui/ui_lists.inc:487
+#: ../includes/ui/ui_lists.inc:505
+#: ../includes/ui/ui_lists.inc.orig:505
msgid "All Customers"
msgstr ""
-#: ../includes/ui/ui_lists.inc:491
+#: ../includes/ui/ui_lists.inc:509
+#: ../includes/ui/ui_lists.inc.orig:509
msgid "Press Space tab to filter by name fragment; F2 - entry new customer"
msgstr ""
-#: ../includes/ui/ui_lists.inc:492
+#: ../includes/ui/ui_lists.inc:510
+#: ../includes/ui/ui_lists.inc.orig:510
msgid "Select customer"
msgstr ""
-#: ../includes/ui/ui_lists.inc:535
+#: ../includes/ui/ui_lists.inc:557
+#: ../includes/ui/ui_lists.inc.orig:557
msgid "All branches"
msgstr ""
-#: ../includes/ui/ui_lists.inc:538
+#: ../includes/ui/ui_lists.inc:560
+#: ../includes/ui/ui_lists.inc.orig:560
msgid "Select customer branch"
msgstr ""
-#: ../includes/ui/ui_lists.inc:573
+#: ../includes/ui/ui_lists.inc:600
+#: ../includes/ui/ui_lists.inc.orig:600
msgid "All Locations"
msgstr ""
-#: ../includes/ui/ui_lists.inc:725
-#: ../includes/ui/ui_lists.inc:790
+#: ../includes/ui/ui_lists.inc:752
+#: ../includes/ui/ui_lists.inc:820
+#: ../includes/ui/ui_lists.inc.orig:752
+#: ../includes/ui/ui_lists.inc.orig:820
msgid "All Items"
msgstr ""
-#: ../includes/ui/ui_lists.inc:1263
+#: ../includes/ui/ui_lists.inc:1293
+#: ../includes/ui/ui_lists.inc.orig:1293
msgid "All Sales Types"
msgstr ""
-#: ../includes/ui/ui_lists.inc:1592
+#: ../includes/ui/ui_lists.inc:1628
+#: ../includes/ui/ui_lists.inc.orig:1626
msgid "Use Item Sales Accounts"
msgstr ""
-#: ../includes/ui/ui_lists.inc:1902
-#: ../includes/ui/ui_lists.inc:1919
-#: ../includes/ui/ui_lists.inc:1936
+#: ../includes/ui/ui_lists.inc:1940
+#: ../includes/ui/ui_lists.inc:1957
+#: ../includes/ui/ui_lists.inc:1974
+#: ../includes/ui/ui_lists.inc.orig:1938
+#: ../includes/ui/ui_lists.inc.orig:1955
+#: ../includes/ui/ui_lists.inc.orig:1972
msgid "All Types"
msgstr ""
-#: ../includes/ui/ui_lists.inc:1903
-#: ../sales/view/view_sales_order.php:126
+#: ../includes/ui/ui_lists.inc:1941
+#: ../includes/ui/ui_lists.inc.orig:1939
+#: ../sales/view/view_sales_order.php:140
+#: ../sales/view/view_sales_order.php.orig:127
msgid "Sales Invoices"
msgstr ""
-#: ../includes/ui/ui_lists.inc:1904
-#: ../includes/ui/ui_lists.inc:1921
-#: ../includes/ui/ui_lists.inc:1939
+#: ../includes/ui/ui_lists.inc:1942
+#: ../includes/ui/ui_lists.inc:1959
+#: ../includes/ui/ui_lists.inc:1977
+#: ../includes/ui/ui_lists.inc.orig:1940
+#: ../includes/ui/ui_lists.inc.orig:1957
+#: ../includes/ui/ui_lists.inc.orig:1975
msgid "Overdue Invoices"
msgstr ""
-#: ../includes/ui/ui_lists.inc:1905
-#: ../includes/ui/ui_lists.inc:1922
-#: ../includes/ui/ui_lists.inc:1940
+#: ../includes/ui/ui_lists.inc:1943
+#: ../includes/ui/ui_lists.inc:1960
+#: ../includes/ui/ui_lists.inc:1978
+#: ../includes/ui/ui_lists.inc.orig:1941
+#: ../includes/ui/ui_lists.inc.orig:1958
+#: ../includes/ui/ui_lists.inc.orig:1976
+#: ../includes/ui/ui_view.inc:550
+#: ../includes/ui/ui_view.inc:554
+#: ../includes/ui/ui_view.inc.orig:484
msgid "Payments"
msgstr ""
-#: ../includes/ui/ui_lists.inc:1906
-#: ../includes/ui/ui_lists.inc:1923
-#: ../includes/ui/ui_lists.inc:1941
-#: ../sales/view/view_sales_order.php:157
+#: ../includes/ui/ui_lists.inc:1944
+#: ../includes/ui/ui_lists.inc:1961
+#: ../includes/ui/ui_lists.inc:1979
+#: ../includes/ui/ui_lists.inc.orig:1942
+#: ../includes/ui/ui_lists.inc.orig:1959
+#: ../includes/ui/ui_lists.inc.orig:1977
+#: ../sales/view/view_sales_order.php:176
+#: ../sales/view/view_sales_order.php.orig:158
msgid "Credit Notes"
msgstr ""
-#: ../includes/ui/ui_lists.inc:1907
-#: ../sales/view/view_sales_order.php:92
+#: ../includes/ui/ui_lists.inc:1945
+#: ../includes/ui/ui_lists.inc.orig:1943
+#: ../sales/view/view_sales_order.php:106
+#: ../sales/view/view_sales_order.php.orig:93
msgid "Delivery Notes"
msgstr ""
-#: ../includes/ui/ui_lists.inc:1920
-#: ../includes/ui/ui_lists.inc:1938
+#: ../includes/ui/ui_lists.inc:1958
+#: ../includes/ui/ui_lists.inc:1976
+#: ../includes/ui/ui_lists.inc.orig:1956
+#: ../includes/ui/ui_lists.inc.orig:1974
msgid "Invoices"
msgstr ""
-#: ../includes/ui/ui_lists.inc:1924
-#: ../includes/ui/ui_lists.inc:1942
+#: ../includes/ui/ui_lists.inc:1962
+#: ../includes/ui/ui_lists.inc:1980
+#: ../includes/ui/ui_lists.inc.orig:1960
+#: ../includes/ui/ui_lists.inc.orig:1978
msgid "Overdue Credit Notes"
msgstr ""
-#: ../includes/ui/ui_lists.inc:1937
+#: ../includes/ui/ui_lists.inc:1975
+#: ../includes/ui/ui_lists.inc.orig:1973
msgid "GRNs"
msgstr ""
-#: ../includes/ui/ui_lists.inc:1955
+#: ../includes/ui/ui_lists.inc:1993
+#: ../includes/ui/ui_lists.inc.orig:1991
msgid "Automatically put balance on back order"
msgstr ""
-#: ../includes/ui/ui_lists.inc:1956
+#: ../includes/ui/ui_lists.inc:1994
+#: ../includes/ui/ui_lists.inc.orig:1992
msgid "Cancel any quantites not delivered"
msgstr ""
-#: ../includes/ui/ui_lists.inc:1973
+#: ../includes/ui/ui_lists.inc:2011
+#: ../includes/ui/ui_lists.inc.orig:2009
msgid "Items Returned to Inventory Location"
msgstr ""
-#: ../includes/ui/ui_lists.inc:1974
+#: ../includes/ui/ui_lists.inc:2012
+#: ../includes/ui/ui_lists.inc.orig:2010
msgid "Items Written Off"
msgstr ""
-#: ../includes/ui/ui_lists.inc:2144
+#: ../includes/ui/ui_lists.inc:2182
+#: ../includes/ui/ui_lists.inc.orig:2180
msgid "New role"
msgstr ""
-#: ../includes/ui/ui_lists.inc:2202
+#: ../includes/ui/ui_lists.inc:2240
+#: ../includes/ui/ui_lists.inc.orig:2238
msgid "No tags defined."
msgstr ""
-#: ../includes/ui/ui_lists.inc:2202
+#: ../includes/ui/ui_lists.inc:2240
+#: ../includes/ui/ui_lists.inc.orig:2238
msgid "No active tags defined."
msgstr ""
-#: ../includes/ui/ui_lists.inc:2240
+#: ../includes/ui/ui_lists.inc:2278
+#: ../includes/ui/ui_lists.inc.orig:2276
#, php-format
msgid "Activated for '%s'"
msgstr ""
-#: ../includes/ui/ui_lists.inc:2243
+#: ../includes/ui/ui_lists.inc:2281
+#: ../includes/ui/ui_lists.inc.orig:2279
msgid "Available and/or installed"
msgstr ""
-#: ../includes/ui/ui_lists.inc:2313
+#: ../includes/ui/ui_lists.inc:2351
+#: ../includes/ui/ui_lists.inc.orig:2349
msgid "Standard new company American COA (4 digit)"
msgstr ""
-#: ../includes/ui/ui_lists.inc:2315
+#: ../includes/ui/ui_lists.inc:2353
+#: ../includes/ui/ui_lists.inc.orig:2351
msgid "Standard American COA (4 digit) with demo data"
msgstr ""
+#: ../includes/ui/ui_lists.inc:2374
+#: ../includes/ui/ui_lists.inc.orig:2372
+msgid "No payment Link"
+msgstr ""
+
#: ../includes/ui/ui_msgs.inc:63
msgid "in units of : "
msgstr ""
#: ../includes/ui/ui_view.inc:306
+#: ../includes/ui/ui_view.inc.orig:306
msgid "Date Voided:"
msgstr ""
-#: ../includes/ui/ui_view.inc:404
-#: ../reporting/rep107.php:188
-#: ../reporting/rep109.php:182
-#: ../reporting/rep110.php:184
-#: ../reporting/rep209.php:188
+#: ../includes/ui/ui_view.inc:407
+#: ../includes/ui/ui_view.inc.orig:407
+#: ../reporting/rep107.php:242
+#: ../reporting/rep109.php:183
+#: ../reporting/rep110.php:186
+#: ../reporting/rep111.php:168
+#: ../reporting/rep113.php:172
+#: ../reporting/rep209.php:191
msgid "Total Tax Excluded"
msgstr ""
-#: ../includes/ui/ui_view.inc:410
-#: ../includes/ui/ui_view.inc:426
-#: ../includes/ui/ui_view.inc:444
-#: ../reporting/includes/doctext.inc:149
+#: ../includes/ui/ui_view.inc:413
+#: ../includes/ui/ui_view.inc:432
+#: ../includes/ui/ui_view.inc:451
+#: ../includes/ui/ui_view.inc.orig:413
+#: ../includes/ui/ui_view.inc.orig:432
+#: ../includes/ui/ui_view.inc.orig:451
+#: ../reporting/rep107.php:251
+#: ../reporting/rep109.php:192
+#: ../reporting/rep110.php:195
+#: ../reporting/rep111.php:177
+#: ../reporting/rep113.php:181
+#: ../reporting/rep209.php:200
msgid "Included"
msgstr ""
-#: ../includes/ui/ui_view.inc:476
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:99
-msgid "Allocations"
-msgstr ""
-
-#: ../includes/ui/ui_view.inc:480
-#: ../reporting/includes/doctext.inc:108
+#: ../includes/ui/ui_view.inc:488
+#: ../includes/ui/ui_view.inc.orig:488
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
msgid "Total Amount"
msgstr ""
-#: ../includes/ui/ui_view.inc:504
+#: ../includes/ui/ui_view.inc:511
+#: ../includes/ui/ui_view.inc.orig:512
msgid "Total Allocated:"
msgstr ""
-#: ../includes/ui/ui_view.inc:508
+#: ../includes/ui/ui_view.inc:517
+#: ../includes/ui/ui_view.inc.orig:516
msgid "Left to Allocate:"
msgstr ""
-#: ../includes/ui/ui_view.inc:544
+#: ../includes/ui/ui_view.inc:533
+#: ../includes/ui/ui_view.inc:537
+#: ../includes/ui/ui_view.inc.orig:484
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:99
+msgid "Allocations"
+msgstr ""
+
+#: ../includes/ui/ui_view.inc:550
+#: ../includes/ui/ui_view.inc:554
+msgid "Pre-Payments"
+msgstr ""
+
+#: ../includes/ui/ui_view.inc:570
+#: ../includes/ui/ui_view.inc.orig:569
msgid "No Quick Entries are defined."
msgstr ""
-#: ../includes/ui/ui_view.inc:572
+#: ../includes/ui/ui_view.inc:598
+#: ../includes/ui/ui_view.inc.orig:597
msgid "No Quick Entry lines are defined."
msgstr ""
-#: ../includes/ui/ui_view.inc:753
-#: ../purchasing/includes/ui/invoice_ui.inc:446
+#: ../includes/ui/ui_view.inc:780
+#: ../includes/ui/ui_view.inc.orig:779
+#: ../purchasing/includes/ui/invoice_ui.inc:473
msgid "and"
msgstr ""
-#: ../includes/ui/ui_view.inc:839
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
msgid "January"
msgstr ""
-#: ../includes/ui/ui_view.inc:839
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
msgid "February"
msgstr ""
-#: ../includes/ui/ui_view.inc:839
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
msgid "March"
msgstr ""
-#: ../includes/ui/ui_view.inc:839
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
msgid "April"
msgstr ""
-#: ../includes/ui/ui_view.inc:839
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
msgid "May"
msgstr ""
-#: ../includes/ui/ui_view.inc:839
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
msgid "June"
msgstr ""
-#: ../includes/ui/ui_view.inc:839
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
msgid "July"
msgstr ""
-#: ../includes/ui/ui_view.inc:839
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
msgid "August"
msgstr ""
-#: ../includes/ui/ui_view.inc:839
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
msgid "September"
msgstr ""
-#: ../includes/ui/ui_view.inc:839
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
msgid "October"
msgstr ""
-#: ../includes/ui/ui_view.inc:839
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
msgid "November"
msgstr ""
-#: ../includes/ui/ui_view.inc:839
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
msgid "December"
msgstr ""
-#: ../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:841
msgid "Su"
msgstr ""
-#: ../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:841
msgid "Mo"
msgstr ""
-#: ../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:841
msgid "Tu"
msgstr ""
-#: ../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:841
msgid "We"
msgstr ""
-#: ../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:841
msgid "Th"
msgstr ""
-#: ../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:841
msgid "Fr"
msgstr ""
-#: ../includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:841
msgid "Sa"
msgstr ""
-#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:843
+#: ../includes/ui/ui_view.inc.orig:842
msgid "W"
msgstr ""
msgid "Enter &Another Adjustment"
msgstr ""
-#: ../inventory/adjustments.php:88
+#: ../inventory/adjustments.php:90
#: ../inventory/transfers.php:87
-#: ../sales/sales_order_entry.php:343
+#: ../sales/sales_order_entry.php:355
msgid "You must enter at least one non empty item line."
msgstr ""
-#: ../inventory/adjustments.php:108
+#: ../inventory/adjustments.php:110
#: ../inventory/transfers.php:105
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 :"
msgstr ""
-#: ../inventory/adjustments.php:152
+#: ../inventory/adjustments.php:154
#: ../manufacturing/work_order_issue.php:141
msgid "The quantity entered is negative or invalid."
msgstr ""
-#: ../inventory/adjustments.php:159
+#: ../inventory/adjustments.php:161
#: ../manufacturing/work_order_issue.php:148
msgid "The entered standard cost is negative or invalid."
msgstr ""
-#: ../inventory/adjustments.php:228
+#: ../inventory/adjustments.php:230
msgid "Adjustment Items"
msgstr ""
-#: ../inventory/adjustments.php:234
+#: ../inventory/adjustments.php:236
msgid "Process Adjustment"
msgstr ""
#: ../inventory/purchasing_data.php:101
#: ../inventory/reorder_level.php:43
#: ../inventory/inquiry/stock_movements.php:49
+#: ../inventory/inquiry/stock_movements.php.orig:51
#: ../inventory/inquiry/stock_status.php:41
+#: ../inventory/inquiry/stock_status.php.orig:47
#: ../inventory/manage/item_codes.php:105
-#: ../manufacturing/work_order_entry.php:394
-#: ../manufacturing/work_order_entry.php:399
+#: ../manufacturing/work_order_entry.php:396
+#: ../manufacturing/work_order_entry.php:401
#: ../purchasing/inquiry/po_search.php:74
#: ../sales/inquiry/sales_deliveries_view.php:114
-#: ../sales/inquiry/sales_orders_view.php:239
+#: ../sales/inquiry/sales_deliveries_view.php.orig:114
+#: ../sales/inquiry/sales_orders_view.php:263
+#: ../sales/inquiry/sales_orders_view.php.orig:240
msgid "Item:"
msgstr ""
-#: ../inventory/cost_update.php:111
+#: ../inventory/cost_update.php:102
msgid "Standard Material Cost Per Unit"
msgstr ""
-#: ../inventory/cost_update.php:114
+#: ../inventory/cost_update.php:105
msgid "Standard Labour Cost Per Unit"
msgstr ""
-#: ../inventory/cost_update.php:115
+#: ../inventory/cost_update.php:106
msgid "Standard Overhead Cost Per Unit"
msgstr ""
msgstr ""
#: ../inventory/prices.php:27
-#: ../inventory/inquiry/stock_movements.php:30
-#: ../inventory/inquiry/stock_status.php:34
+#: ../inventory/inquiry/stock_movements.php:29
+#: ../inventory/inquiry/stock_movements.php.orig:31
+#: ../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
#: ../inventory/prices.php:133
#: ../reporting/rep104.php:116
-#: ../sales/customer_delivery.php:353
-#: ../sales/customer_invoice.php:390
+#: ../sales/customer_delivery.php:363
+#: ../sales/customer_invoice.php:466
#: ../sales/view/view_credit.php:73
#: ../sales/view/view_dispatch.php:93
-#: ../sales/view/view_invoice.php:92
+#: ../sales/view/view_invoice.php:93
#: ../sales/includes/ui/sales_credit_ui.inc:102
msgid "Sales Type"
msgstr ""
#: ../inventory/prices.php:133
-#: ../inventory/purchasing_data.php:127
-#: ../purchasing/includes/ui/invoice_ui.inc:478
-#: ../purchasing/po_receive_items.php:59
+#: ../inventory/purchasing_data.php:129
+#: ../inventory/purchasing_data.php.orig:224
+#: ../purchasing/includes/ui/invoice_ui.inc:505
+#: ../purchasing/po_receive_items.php:63
#: ../purchasing/view/view_grn.php:41
#: ../purchasing/view/view_po.php:45
#: ../reporting/rep104.php:109
-#: ../reporting/includes/doctext.inc:103
-#: ../reporting/includes/doctext.inc:111
-#: ../sales/customer_credit_invoice.php:292
-#: ../sales/customer_delivery.php:431
-#: ../sales/customer_invoice.php:443
+#: ../reporting/includes/doctext.inc:30
+#: ../reporting/includes/doctext.inc:192
+#: ../sales/customer_credit_invoice.php:283
+#: ../sales/customer_delivery.php:441
+#: ../sales/customer_invoice.php:540
+#: ../sales/customer_invoice.php:543
#: ../sales/view/view_credit.php:91
#: ../sales/view/view_dispatch.php:113
-#: ../sales/view/view_invoice.php:114
-#: ../sales/view/view_sales_order.php:201
+#: ../sales/view/view_invoice.php:116
+#: ../sales/view/view_sales_order.php:220
+#: ../sales/view/view_sales_order.php.orig:202
#: ../sales/includes/ui/sales_credit_ui.inc:168
msgid "Price"
msgstr ""
msgstr ""
#: ../inventory/prices.php:174
+#: ../inventory/purchasing_data.php.orig:189
msgid "Currency:"
msgstr ""
msgstr ""
#: ../inventory/prices.php:184
-#: ../inventory/purchasing_data.php:189
+#: ../inventory/purchasing_data.php:191
+#: ../inventory/purchasing_data.php.orig:193
msgid "Price:"
msgstr ""
msgstr ""
#: ../inventory/purchasing_data.php:16
+#: ../inventory/purchasing_data.php.orig:17
msgid "Supplier Purchasing Data"
msgstr ""
#: ../inventory/purchasing_data.php:23
-#: ../purchasing/po_entry_items.php:64
+#: ../inventory/purchasing_data.php.orig:24
+#: ../purchasing/po_entry_items.php:67
msgid "There are no purchasable inventory items defined in the system."
msgstr ""
#: ../inventory/purchasing_data.php:24
-#: ../purchasing/po_entry_items.php:62
-#: ../purchasing/supplier_credit.php:32
-#: ../purchasing/supplier_invoice.php:32
+#: ../inventory/purchasing_data.php.orig:25
+#: ../purchasing/po_entry_items.php:65
+#: ../purchasing/supplier_credit.php:31
+#: ../purchasing/supplier_invoice.php:30
#: ../purchasing/supplier_payment.php:40
msgid "There are no suppliers defined in the system."
msgstr ""
#: ../inventory/purchasing_data.php:38
+#: ../inventory/purchasing_data.php.orig:39
#: ../inventory/manage/item_codes.php:35
msgid "There is no item selected."
msgstr ""
#: ../inventory/purchasing_data.php:44
+#: ../inventory/purchasing_data.php.orig:45
msgid "The price entered was not numeric."
msgstr ""
#: ../inventory/purchasing_data.php:50
+#: ../inventory/purchasing_data.php.orig:51
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 "
msgstr ""
#: ../inventory/purchasing_data.php:60
+#: ../inventory/purchasing_data.php.orig:61
msgid "This supplier purchasing data has been added."
msgstr ""
#: ../inventory/purchasing_data.php:66
+#: ../inventory/purchasing_data.php.orig:67
msgid "Supplier purchasing data has been updated."
msgstr ""
#: ../inventory/purchasing_data.php:77
+#: ../inventory/purchasing_data.php.orig:88
msgid "The purchasing data item has been sucessfully deleted."
msgstr ""
-#: ../inventory/purchasing_data.php:112
+#: ../inventory/purchasing_data.php:114
msgid "Entered item is not defined. Please re-enter."
msgstr ""
-#: ../inventory/purchasing_data.php:121
+#: ../inventory/purchasing_data.php:123
msgid "There is no purchasing data set up for the part selected"
msgstr ""
-#: ../inventory/purchasing_data.php:128
+#: ../inventory/purchasing_data.php:130
+#: ../inventory/purchasing_data.php.orig:222
msgid "Supplier's Unit"
msgstr ""
-#: ../inventory/purchasing_data.php:128
+#: ../inventory/purchasing_data.php:130
+#: ../inventory/purchasing_data.php.orig:223
msgid "Conversion Factor"
msgstr ""
-#: ../inventory/purchasing_data.php:128
+#: ../inventory/purchasing_data.php:130
msgid "Supplier's Description"
msgstr ""
-#: ../inventory/purchasing_data.php:190
+#: ../inventory/purchasing_data.php:192
+#: ../inventory/purchasing_data.php.orig:194
msgid "Suppliers Unit of Measure:"
msgstr ""
-#: ../inventory/purchasing_data.php:196
+#: ../inventory/purchasing_data.php:198
+#: ../inventory/purchasing_data.php.orig:200
msgid "Conversion Factor (to our UOM):"
msgstr ""
-#: ../inventory/purchasing_data.php:198
+#: ../inventory/purchasing_data.php:200
+#: ../inventory/purchasing_data.php.orig:202
msgid "Supplier's Code or Description:"
msgstr ""
+#: ../inventory/purchasing_data.php.orig:116
+msgid "Show all:"
+msgstr ""
+
+#: ../inventory/purchasing_data.php.orig:185
+msgid "Stock item:"
+msgstr ""
+
+#: ../inventory/purchasing_data.php.orig:219
+msgid "Supplier Code/Description"
+msgstr ""
+
+#: ../inventory/purchasing_data.php.orig:220
+#: ../inventory/includes/item_adjustments_ui.inc:62
+#: ../inventory/includes/stock_transfers_ui.inc:60
+#: ../manufacturing/includes/work_order_issue_ui.inc:33
+#: ../purchasing/includes/ui/po_ui.inc:243
+#: ../purchasing/po_receive_items.php:62
+#: ../purchasing/view/view_grn.php:40
+#: ../purchasing/view/view_po.php:45
+#: ../reporting/includes/doctext.inc:29
+#: ../reporting/includes/doctext.inc:191
+#: ../reporting/includes/doctext.inc:228
+#: ../sales/customer_credit_invoice.php:282
+#: ../sales/customer_delivery.php:439
+#: ../sales/customer_invoice.php:539
+#: ../sales/customer_invoice.php:542
+#: ../sales/view/view_credit.php:90
+#: ../sales/view/view_dispatch.php:112
+#: ../sales/view/view_invoice.php:115
+#: ../sales/view/view_sales_order.php:219
+#: ../sales/view/view_sales_order.php.orig:201
+#: ../sales/includes/ui/sales_credit_ui.inc:167
+#: ../sales/includes/ui/sales_order_ui.inc:140
+#: ../sales/includes/ui/sales_order_ui.inc.orig:140
+msgid "Item Code"
+msgstr ""
+
+#: ../inventory/purchasing_data.php.orig:221
+#: ../inventory/includes/item_adjustments_ui.inc:62
+#: ../inventory/includes/stock_transfers_ui.inc:60
+#: ../manufacturing/includes/work_order_issue_ui.inc:33
+#: ../purchasing/includes/ui/po_ui.inc:243
+#: ../purchasing/view/view_grn.php:40
+#: ../purchasing/view/view_po.php:45
+#: ../reporting/includes/doctext.inc:29
+#: ../reporting/includes/doctext.inc:191
+#: ../reporting/includes/doctext.inc:228
+#: ../sales/customer_credit_invoice.php:282
+#: ../sales/customer_delivery.php:439
+#: ../sales/customer_invoice.php:539
+#: ../sales/customer_invoice.php:542
+#: ../sales/view/view_credit.php:90
+#: ../sales/view/view_dispatch.php:112
+#: ../sales/view/view_invoice.php:115
+#: ../sales/view/view_sales_order.php:219
+#: ../sales/view/view_sales_order.php.orig:201
+#: ../sales/includes/ui/sales_credit_ui.inc:167
+#: ../sales/includes/ui/sales_order_ui.inc:140
+#: ../sales/includes/ui/sales_order_ui.inc.orig:140
+msgid "Item Description"
+msgstr ""
+
#: ../inventory/reorder_level.php:16
msgid "Reorder Levels"
msgstr ""
msgstr ""
#: ../inventory/reorder_level.php:57
-#: ../inventory/inquiry/stock_status.php:65
-#: ../inventory/inquiry/stock_status.php:69
+#: ../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:119
-#: ../purchasing/inquiry/po_search_completed.php:129
+#: ../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
#: ../reporting/rep105.php:118
-#: ../reporting/rep301.php:105
+#: ../reporting/rep301.php:110
#: ../reporting/rep302.php:130
#: ../reporting/rep303.php:122
-#: ../reporting/rep304.php:123
-#: ../reporting/reports_main.php:167
-#: ../reporting/reports_main.php:173
-#: ../reporting/reports_main.php:178
-#: ../reporting/reports_main.php:189
+#: ../reporting/rep304.php:121
+#: ../reporting/reports_main.php:180
+#: ../reporting/reports_main.php:186
+#: ../reporting/reports_main.php:191
+#: ../reporting/reports_main.php:202
#: ../sales/manage/sales_points.php:84
msgid "Location"
msgstr ""
#: ../inventory/reorder_level.php:57
-#: ../inventory/inquiry/stock_movements.php:77
-#: ../inventory/inquiry/stock_status.php:69
-#: ../sales/sales_order_entry.php:480
-#: ../sales/includes/ui/sales_order_ui.inc:176
+#: ../inventory/inquiry/stock_movements.php:78
+#: ../inventory/inquiry/stock_movements.php.orig:80
+#: ../inventory/inquiry/stock_status.php:70
+#: ../inventory/inquiry/stock_status.php.orig:76
+#: ../purchasing/supplier_credit.php:220
+#: ../sales/sales_order_entry.php:503
+#: ../sales/includes/ui/sales_order_ui.inc:175
+#: ../sales/includes/ui/sales_order_ui.inc.orig:175
msgid "Quantity On Hand"
msgstr ""
#: ../inventory/reorder_level.php:57
-#: ../inventory/inquiry/stock_status.php:69
-#: ../sales/includes/db/sales_order_db.inc:108
-#: ../sales/includes/db/sales_order_db.inc:261
+#: ../inventory/inquiry/stock_status.php:70
+#: ../inventory/inquiry/stock_status.php.orig:76
+#: ../sales/includes/db/sales_order_db.inc:112
+#: ../sales/includes/db/sales_order_db.inc:275
msgid "Re-Order Level"
msgstr ""
#: ../inventory/includes/stock_transfers_ui.inc:20
#: ../manufacturing/includes/work_order_issue_ui.inc:20
#: ../sales/includes/ui/sales_order_ui.inc:60
+#: ../sales/includes/ui/sales_order_ui.inc.orig:60
msgid "For Part :"
msgstr ""
#: ../inventory/includes/item_adjustments_ui.inc:34
-#: ../manufacturing/work_order_entry.php:209
+#: ../manufacturing/work_order_entry.php:210
#: ../purchasing/inquiry/po_search.php:67
#: ../sales/inquiry/sales_deliveries_view.php:107
-#: ../sales/inquiry/sales_orders_view.php:232
+#: ../sales/inquiry/sales_deliveries_view.php.orig:107
+#: ../sales/inquiry/sales_orders_view.php:254
+#: ../sales/inquiry/sales_orders_view.php.orig:231
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:236
-#: ../purchasing/po_receive_items.php:58
-#: ../purchasing/view/view_grn.php:40
-#: ../purchasing/view/view_po.php:45
-#: ../reporting/includes/doctext.inc:102
-#: ../reporting/includes/doctext.inc:105
-#: ../reporting/includes/doctext.inc:110
-#: ../sales/customer_credit_invoice.php:291
-#: ../sales/customer_delivery.php:429
-#: ../sales/customer_invoice.php:442
-#: ../sales/view/view_credit.php:90
-#: ../sales/view/view_dispatch.php:112
-#: ../sales/view/view_invoice.php:113
-#: ../sales/view/view_sales_order.php:200
-#: ../sales/includes/ui/sales_credit_ui.inc:167
-#: ../sales/includes/ui/sales_order_ui.inc:141
-msgid "Item Code"
-msgstr ""
-
-#: ../inventory/includes/item_adjustments_ui.inc:62
-#: ../inventory/includes/stock_transfers_ui.inc:60
-#: ../manufacturing/includes/work_order_issue_ui.inc:33
-#: ../purchasing/includes/ui/po_ui.inc:236
-#: ../purchasing/view/view_grn.php:40
-#: ../purchasing/view/view_po.php:45
-#: ../reporting/includes/doctext.inc:102
-#: ../reporting/includes/doctext.inc:105
-#: ../reporting/includes/doctext.inc:110
-#: ../sales/customer_credit_invoice.php:291
-#: ../sales/customer_delivery.php:429
-#: ../sales/customer_invoice.php:442
-#: ../sales/view/view_credit.php:90
-#: ../sales/view/view_dispatch.php:112
-#: ../sales/view/view_invoice.php:113
-#: ../sales/view/view_sales_order.php:200
-#: ../sales/includes/ui/sales_credit_ui.inc:167
-#: ../sales/includes/ui/sales_order_ui.inc:141
-msgid "Item Description"
-msgstr ""
-
-#: ../inventory/includes/item_adjustments_ui.inc:62
-#: ../inventory/includes/stock_transfers_ui.inc:60
-#: ../inventory/manage/item_codes.php:122
+#: ../inventory/manage/item_codes.php:124
#: ../inventory/manage/sales_kits.php:40
#: ../inventory/view/view_adjustment.php:56
#: ../inventory/view/view_transfer.php:56
#: ../manufacturing/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:478
-#: ../purchasing/includes/ui/po_ui.inc:236
+#: ../purchasing/includes/ui/invoice_ui.inc:505
+#: ../purchasing/includes/ui/po_ui.inc:243
#: ../purchasing/view/view_grn.php:40
#: ../purchasing/view/view_po.php:45
-#: ../reporting/rep301.php:99
+#: ../reporting/rep301.php:103
#: ../reporting/rep303.php:109
#: ../reporting/rep303.php:115
#: ../reporting/rep401.php:69
-#: ../reporting/includes/doctext.inc:47
-#: ../reporting/includes/doctext.inc:103
-#: ../reporting/includes/doctext.inc:110
+#: ../reporting/includes/doctext.inc:29
+#: ../reporting/includes/doctext.inc:192
+#: ../reporting/includes/doctext.inc:225
+#: ../sales/customer_invoice.php:539
#: ../sales/view/view_credit.php:90
#: ../sales/view/view_dispatch.php:112
-#: ../sales/view/view_invoice.php:113
-#: ../sales/view/view_sales_order.php:200
+#: ../sales/view/view_invoice.php:115
+#: ../sales/view/view_sales_order.php:219
+#: ../sales/view/view_sales_order.php.orig:201
#: ../sales/includes/ui/sales_credit_ui.inc:167
-#: ../sales/includes/ui/sales_order_ui.inc:141
-#: ../themes/exclusive/renderer.php:417
+#: ../sales/includes/ui/sales_order_ui.inc:140
+#: ../sales/includes/ui/sales_order_ui.inc.orig:140
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:237
+#: ../purchasing/includes/ui/po_ui.inc:244
#: ../purchasing/view/view_grn.php:41
#: ../purchasing/view/view_po.php:45
-#: ../reporting/includes/doctext.inc:103
-#: ../reporting/includes/doctext.inc:111
+#: ../reporting/includes/doctext.inc:30
+#: ../reporting/includes/doctext.inc:192
#: ../sales/view/view_credit.php:91
#: ../sales/view/view_dispatch.php:113
-#: ../sales/view/view_invoice.php:114
-#: ../sales/view/view_sales_order.php:200
+#: ../sales/view/view_invoice.php:116
+#: ../sales/view/view_sales_order.php:219
+#: ../sales/view/view_sales_order.php.orig:201
#: ../sales/includes/ui/sales_credit_ui.inc:167
-#: ../sales/includes/ui/sales_order_ui.inc:143
+#: ../sales/includes/ui/sales_order_ui.inc:142
+#: ../sales/includes/ui/sales_order_ui.inc.orig:142
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:99
+#: ../reporting/rep301.php:103
msgid "Unit Cost"
msgstr ""
#: ../inventory/includes/stock_transfers_ui.inc:35
#: ../inventory/inquiry/stock_movements.php:56
-#: ../manufacturing/includes/work_order_issue_ui.inc:160
+#: ../inventory/inquiry/stock_movements.php.orig:58
+#: ../manufacturing/includes/work_order_issue_ui.inc:164
msgid "From Location:"
msgstr ""
"\t\t\t\tusing this item as component"
msgstr ""
-#: ../inventory/inquiry/stock_movements.php:27
+#: ../inventory/inquiry/stock_movements.php:26
+#: ../inventory/inquiry/stock_movements.php.orig:27
msgid "Inventory Item Movement"
msgstr ""
#: ../inventory/inquiry/stock_movements.php:61
+#: ../inventory/inquiry/stock_movements.php.orig:63
msgid "Show Movements"
msgstr ""
#: ../inventory/inquiry/stock_movements.php:61
-#: ../purchasing/includes/ui/invoice_ui.inc:447
+#: ../inventory/inquiry/stock_movements.php.orig:63
+#: ../purchasing/includes/ui/invoice_ui.inc:474
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:57
-#: ../purchasing/inquiry/supplier_inquiry.php:54
+#: ../purchasing/inquiry/supplier_inquiry.php:55
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:55
#: ../sales/inquiry/customer_allocation_inquiry.php:51
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:51
#: ../sales/inquiry/customer_inquiry.php:54
+#: ../sales/inquiry/customer_inquiry.php.orig:55
msgid "Refresh Inquiry"
msgstr ""
-#: ../inventory/inquiry/stock_movements.php:76
+#: ../inventory/inquiry/stock_movements.php:77
+#: ../inventory/inquiry/stock_movements.php.orig:79
msgid "Detail"
msgstr ""
-#: ../inventory/inquiry/stock_movements.php:77
+#: ../inventory/inquiry/stock_movements.php:78
+#: ../inventory/inquiry/stock_movements.php.orig:80
msgid "Quantity In"
msgstr ""
-#: ../inventory/inquiry/stock_movements.php:77
+#: ../inventory/inquiry/stock_movements.php:78
+#: ../inventory/inquiry/stock_movements.php.orig:80
msgid "Quantity Out"
msgstr ""
-#: ../inventory/inquiry/stock_movements.php:92
+#: ../inventory/inquiry/stock_movements.php:93
+#: ../inventory/inquiry/stock_movements.php.orig:95
msgid "Quantity on hand before"
msgstr ""
-#: ../inventory/inquiry/stock_movements.php:180
+#: ../inventory/inquiry/stock_movements.php:181
+#: ../inventory/inquiry/stock_movements.php.orig:183
msgid "Quantity on hand after"
msgstr ""
-#: ../inventory/inquiry/stock_status.php:18
-#: ../inventory/inquiry/stock_status.php:20
+#: ../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:55
+#: ../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."
msgstr ""
-#: ../inventory/inquiry/stock_status.php:65
-#: ../inventory/inquiry/stock_status.php:70
+#: ../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:109
#: ../reporting/rep303.php:115
msgid "Demand"
msgstr ""
-#: ../inventory/inquiry/stock_status.php:70
+#: ../inventory/inquiry/stock_status.php:71
+#: ../inventory/inquiry/stock_status.php.orig:77
#: ../reporting/rep303.php:109
#: ../reporting/rep303.php:115
msgid "On Order"
msgstr ""
#: ../inventory/manage/item_categories.php:98
-#: ../inventory/manage/item_codes.php:122
+#: ../inventory/manage/item_codes.php:124
#: ../inventory/manage/sales_kits.php:40
#: ../inventory/view/view_adjustment.php:57
#: ../inventory/view/view_transfer.php:56
#: ../manufacturing/view/wo_issue_view.php:77
#: ../manufacturing/manage/bom_edit.php:71
-#: ../purchasing/po_receive_items.php:58
-#: ../sales/customer_credit_invoice.php:291
-#: ../sales/customer_delivery.php:430
-#: ../sales/customer_invoice.php:442
+#: ../purchasing/po_receive_items.php:62
+#: ../sales/customer_credit_invoice.php:282
+#: ../sales/customer_delivery.php:440
+#: ../sales/customer_invoice.php:539
+#: ../sales/customer_invoice.php:542
msgid "Units"
msgstr ""
msgstr ""
#: ../inventory/manage/item_categories.php:184
-#: ../inventory/manage/items.php:335
+#: ../inventory/manage/items.php:333
+#: ../inventory/manage/items.php.orig:326
msgid "Item Tax Type:"
msgstr ""
#: ../inventory/manage/item_categories.php:186
-#: ../inventory/manage/items.php:337
+#: ../inventory/manage/items.php:335
+#: ../inventory/manage/items.php.orig:328
msgid "Item Type:"
msgstr ""
#: ../inventory/manage/item_categories.php:188
-#: ../inventory/manage/items.php:339
+#: ../inventory/manage/items.php:337
+#: ../inventory/manage/items.php.orig:330
msgid "Units of Measure:"
msgstr ""
#: ../inventory/manage/item_categories.php:190
-#: ../inventory/manage/items.php:343
+#: ../inventory/manage/items.php:341
+#: ../inventory/manage/items.php.orig:334
msgid "Exclude from sales:"
msgstr ""
msgstr ""
#: ../inventory/manage/item_codes.php:23
-#: ../sales/sales_order_entry.php:635
+#: ../sales/sales_order_entry.php:670
msgid "There are no inventory items defined in the system."
msgstr ""
msgstr ""
#: ../inventory/manage/item_codes.php:55
-#: ../inventory/manage/items.php:150
+#: ../inventory/manage/items.php:163
+#: ../inventory/manage/items.php.orig:156
#: ../inventory/manage/sales_kits.php:88
msgid "This item code is already assigned to stock item or sale kit."
msgstr ""
msgid "Item code has been sucessfully deleted."
msgstr ""
-#: ../inventory/manage/item_codes.php:122
+#: ../inventory/manage/item_codes.php:124
msgid "EAN/UPC Code"
msgstr ""
-#: ../inventory/manage/item_codes.php:123
+#: ../inventory/manage/item_codes.php:125
#: ../reporting/rep104.php:115
#: ../reporting/rep105.php:117
-#: ../reporting/rep301.php:99
-#: ../reporting/rep301.php:104
+#: ../reporting/rep301.php:103
+#: ../reporting/rep301.php:109
#: ../reporting/rep302.php:122
#: ../reporting/rep302.php:129
#: ../reporting/rep303.php:121
-#: ../reporting/rep304.php:114
-#: ../reporting/rep304.php:122
+#: ../reporting/rep304.php:112
+#: ../reporting/rep304.php:120
msgid "Category"
msgstr ""
-#: ../inventory/manage/item_codes.php:176
+#: ../inventory/manage/item_codes.php:178
msgid "UPC/EAN code:"
msgstr ""
-#: ../inventory/manage/item_codes.php:177
+#: ../inventory/manage/item_codes.php:179
#: ../inventory/manage/sales_kits.php:245
#: ../manufacturing/work_order_add_finished.php:206
-#: ../manufacturing/work_order_entry.php:422
+#: ../manufacturing/work_order_entry.php:424
#: ../manufacturing/manage/bom_edit.php:228
msgid "Quantity:"
msgstr ""
-#: ../inventory/manage/item_codes.php:178
-#: ../inventory/manage/items.php:310
+#: ../inventory/manage/item_codes.php:180
+#: ../inventory/manage/items.php:308
+#: ../inventory/manage/items.php.orig:301
#: ../inventory/manage/movement_types.php:129
#: ../inventory/manage/sales_kits.php:206
#: ../inventory/manage/sales_kits.php:232
#: ../manufacturing/manage/work_centres.php:138
#: ../sales/manage/credit_status.php:145
-#: ../sales/manage/recurrent_invoices.php:147
-#: ../taxes/item_tax_types.php:168
-#: ../taxes/tax_groups.php:204
+#: ../sales/manage/recurrent_invoices.php:165
+#: ../taxes/item_tax_types.php:173
+#: ../taxes/tax_groups.php:162
+#: ../taxes/tax_groups.php.orig:164
+#: ../taxes/tax_groups.php.sav:164
#: ../taxes/tax_types.php:158
msgid "Description:"
msgstr ""
-#: ../inventory/manage/item_codes.php:179
-#: ../inventory/manage/items.php:312
+#: ../inventory/manage/item_codes.php:181
+#: ../inventory/manage/items.php:310
+#: ../inventory/manage/items.php.orig:303
#: ../inventory/manage/sales_kits.php:207
#: ../inventory/manage/sales_kits.php:233
msgid "Category:"
msgstr ""
-#: ../inventory/manage/items.php:69
-msgid "Only jpg files are supported - a file extension of .jpg is expected"
+#: ../inventory/manage/items.php:82
+#: ../inventory/manage/items.php.orig:80
+msgid ""
+"Only graphics files are supported - a file extension of .jpg, .png or .gif "
+"is expected"
msgstr ""
-#: ../inventory/manage/items.php:100
+#: ../inventory/manage/items.php:113
+#: ../inventory/manage/items.php.orig:106
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:102
+#: ../inventory/manage/items.php:115
+#: ../inventory/manage/items.php.orig:108
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:129
+#: ../inventory/manage/items.php:142
+#: ../inventory/manage/items.php.orig:135
msgid "The item name must be entered."
msgstr ""
-#: ../inventory/manage/items.php:135
+#: ../inventory/manage/items.php:148
+#: ../inventory/manage/items.php.orig:141
msgid "The item code cannot be empty"
msgstr ""
-#: ../inventory/manage/items.php:143
+#: ../inventory/manage/items.php:156
+#: ../inventory/manage/items.php.orig:149
msgid ""
"The item code cannot contain any of the following characters - & + OR a "
"space OR quotes"
msgstr ""
-#: ../inventory/manage/items.php:179
+#: ../inventory/manage/items.php:192
+#: ../inventory/manage/items.php.orig:185
msgid "Item has been updated."
msgstr ""
-#: ../inventory/manage/items.php:192
+#: ../inventory/manage/items.php:205
+#: ../inventory/manage/items.php.orig:198
msgid "A new item has been added."
msgstr ""
-#: ../inventory/manage/items.php:234
+#: ../inventory/manage/items.php:248
+#: ../inventory/manage/items.php.orig:241
msgid "Selected item has been deleted."
msgstr ""
-#: ../inventory/manage/items.php:250
-msgid "Select an item:"
-msgstr ""
-
-#: ../inventory/manage/items.php:251
-msgid "New item"
-msgstr ""
-
-#: ../inventory/manage/items.php:268
+#: ../inventory/manage/items.php:265
+#: ../inventory/manage/items.php.orig:258
#: ../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:465
-#: ../purchasing/includes/ui/invoice_ui.inc:477
+#: ../purchasing/includes/ui/invoice_ui.inc:492
+#: ../purchasing/includes/ui/invoice_ui.inc:504
#: ../reporting/rep204.php:82
-#: ../themes/exclusive/renderer.php:417
-#: ../themes/exclusive/renderer.php:436
msgid "Item"
msgstr ""
-#: ../inventory/manage/items.php:273
-#: ../inventory/manage/items.php:303
+#: ../inventory/manage/items.php:270
+#: ../inventory/manage/items.php:301
+#: ../inventory/manage/items.php.orig:263
+#: ../inventory/manage/items.php.orig:294
msgid "Item Code:"
msgstr ""
-#: ../inventory/manage/items.php:341
+#: ../inventory/manage/items.php:339
+#: ../inventory/manage/items.php.orig:332
msgid "Editable description:"
msgstr ""
-#: ../inventory/manage/items.php:361
+#: ../inventory/manage/items.php:359
+#: ../inventory/manage/items.php.orig:352
#: ../sales/manage/customer_branches.php:249
msgid "GL Accounts"
msgstr ""
-#: ../inventory/manage/items.php:384
+#: ../inventory/manage/items.php:382
+#: ../inventory/manage/items.php.orig:375
msgid "Other"
msgstr ""
-#: ../inventory/manage/items.php:387
+#: ../inventory/manage/items.php:385
+#: ../inventory/manage/items.php.orig:378
msgid "Image File (.jpg)"
msgstr ""
-#: ../inventory/manage/items.php:402
+#: ../inventory/manage/items.php:400
+#: ../inventory/manage/items.php.orig:393
msgid "No image"
msgstr ""
-#: ../inventory/manage/items.php:407
+#: ../inventory/manage/items.php:405
+#: ../inventory/manage/items.php.orig:398
msgid "Delete Image:"
msgstr ""
-#: ../inventory/manage/items.php:409
+#: ../inventory/manage/items.php:407
+#: ../inventory/manage/items.php.orig:400
msgid "Item status:"
msgstr ""
-#: ../inventory/manage/items.php:415
+#: ../inventory/manage/items.php:413
+#: ../inventory/manage/items.php.orig:406
msgid "Insert New Item"
msgstr ""
-#: ../inventory/manage/items.php:419
+#: ../inventory/manage/items.php:417
+#: ../inventory/manage/items.php.orig:410
msgid "Update Item"
msgstr ""
-#: ../inventory/manage/items.php:422
+#: ../inventory/manage/items.php:420
+#: ../inventory/manage/items.php.orig:413
msgid "Select this items and return to document entry."
msgstr ""
-#: ../inventory/manage/items.php:423
+#: ../inventory/manage/items.php:421
+#: ../inventory/manage/items.php.orig:414
msgid "Clone This Item"
msgstr ""
-#: ../inventory/manage/items.php:424
+#: ../inventory/manage/items.php:422
+#: ../inventory/manage/items.php.orig:415
msgid "Delete This Item"
msgstr ""
+#: ../inventory/manage/items.php:437
+#: ../inventory/manage/items.php.orig:430
+msgid "Select an item:"
+msgstr ""
+
+#: ../inventory/manage/items.php:438
+#: ../inventory/manage/items.php.orig:431
+msgid "New item"
+msgstr ""
+
+#: ../inventory/manage/items.php:461
+#: ../inventory/manage/items.php.orig:454
+#: ../purchasing/manage/suppliers.php:308
+#: ../purchasing/manage/suppliers.php.orig:311
+#: ../sales/manage/customer_branches.php:324
+#: ../sales/manage/customers.php:342
+#: ../sales/manage/sav.customers.php:342
+msgid "&General settings"
+msgstr ""
+
+#: ../inventory/manage/items.php:462
+#: ../inventory/manage/items.php.orig:455
+#: ../purchasing/manage/suppliers.php:310
+#: ../purchasing/manage/suppliers.php.orig:313
+#: ../sales/manage/customers.php:344
+#: ../sales/manage/sav.customers.php:344
+msgid "&Transactions"
+msgstr ""
+
+#: ../inventory/manage/items.php:463
+#: ../inventory/manage/items.php.orig:456
+msgid "&Status"
+msgstr ""
+
#: ../inventory/manage/item_units.php:16
msgid "Units of Measure"
msgstr ""
#: ../manufacturing/view/wo_issue_view.php:44
#: ../manufacturing/includes/manufacturing_ui.inc:29
#: ../manufacturing/includes/manufacturing_ui.inc:83
-#: ../reporting/includes/doctext.inc:106
+#: ../reporting/includes/doctext.inc:229
msgid "From Location"
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:244
+#: ../sales/inquiry/sales_deliveries_view.php.orig:116
+#: ../sales/inquiry/sales_orders_view.php:269
+#: ../sales/inquiry/sales_orders_view.php.orig:246
msgid "Select documents"
msgstr ""
#: ../manufacturing/search_work_orders.php:167
#: ../manufacturing/includes/manufacturing_ui.inc:277
#: ../manufacturing/includes/manufacturing_ui.inc:281
-#: ../reporting/includes/doctext.inc:44
-#: ../sales/inquiry/sales_orders_view.php:264
+#: ../reporting/includes/doctext.inc:227
+#: ../sales/inquiry/sales_orders_view.php:290
+#: ../sales/inquiry/sales_orders_view.php.orig:267
msgid "Required By"
msgstr ""
#: ../manufacturing/work_order_add_finished.php:46
#: ../manufacturing/work_order_costs.php:45
#: ../manufacturing/work_order_entry.php:56
-#: ../manufacturing/work_order_issue.php:38
+#: ../manufacturing/work_order_issue.php:40
#: ../manufacturing/work_order_release.php:72
msgid "View this Work Order"
msgstr ""
#: ../manufacturing/work_order_add_finished.php:48
-#: ../manufacturing/work_order_costs.php:47
#: ../manufacturing/work_order_entry.php:65
-#: ../manufacturing/work_order_issue.php:40
+#: ../manufacturing/work_order_issue.php:42
msgid "View the GL Journal Entries for this Work Order"
msgstr ""
msgstr ""
#: ../manufacturing/work_order_add_finished.php:52
-#: ../manufacturing/work_order_costs.php:51
-#: ../manufacturing/work_order_issue.php:42
+#: ../manufacturing/work_order_costs.php:49
+#: ../manufacturing/work_order_issue.php:44
msgid "Select another &Work Order to Process"
msgstr ""
#: ../manufacturing/work_order_add_finished.php:65
-#: ../manufacturing/work_order_costs.php:64
-#: ../manufacturing/work_order_entry.php:340
+#: ../manufacturing/work_order_costs.php:62
+#: ../manufacturing/work_order_entry.php:341
#: ../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."
msgid "The additional cost has been entered."
msgstr ""
-#: ../manufacturing/work_order_costs.php:49
+#: ../manufacturing/work_order_costs.php:47
msgid "Enter another additional cost."
msgstr ""
-#: ../manufacturing/work_order_costs.php:76
+#: ../manufacturing/work_order_costs.php:73
msgid "The amount entered is not a valid number or less then zero."
msgstr ""
-#: ../manufacturing/work_order_costs.php:95
+#: ../manufacturing/work_order_costs.php:92
msgid ""
"The additional cost date cannot be before the release date of the work order."
msgstr ""
-#: ../manufacturing/work_order_costs.php:151
+#: ../manufacturing/work_order_costs.php:143
msgid "Additional Costs:"
msgstr ""
-#: ../manufacturing/work_order_costs.php:152
+#: ../manufacturing/work_order_costs.php:144
msgid "Debit Account"
msgstr ""
-#: ../manufacturing/work_order_costs.php:159
+#: ../manufacturing/work_order_costs.php:151
msgid "Process Additional Cost"
msgstr ""
msgid "Email this Work Order"
msgstr ""
-#: ../manufacturing/work_order_entry.php:79
+#: ../manufacturing/work_order_entry.php:80
msgid "The work order been updated."
msgstr ""
-#: ../manufacturing/work_order_entry.php:89
+#: ../manufacturing/work_order_entry.php:90
msgid "Work order has been deleted."
msgstr ""
-#: ../manufacturing/work_order_entry.php:99
+#: ../manufacturing/work_order_entry.php:100
msgid ""
"This work order has been closed. There can be no more issues against it."
msgstr ""
-#: ../manufacturing/work_order_entry.php:109
+#: ../manufacturing/work_order_entry.php:110
msgid "Enter a new work order"
msgstr ""
-#: ../manufacturing/work_order_entry.php:110
+#: ../manufacturing/work_order_entry.php:111
msgid "Select an existing work order"
msgstr ""
-#: ../manufacturing/work_order_entry.php:146
+#: ../manufacturing/work_order_entry.php:147
msgid "The quantity entered is invalid or less than zero."
msgstr ""
-#: ../manufacturing/work_order_entry.php:168
+#: ../manufacturing/work_order_entry.php:169
msgid "The selected item to manufacture does not have a bom."
msgstr ""
-#: ../manufacturing/work_order_entry.php:177
+#: ../manufacturing/work_order_entry.php:178
msgid "The labour cost entered is invalid or less than zero."
msgstr ""
-#: ../manufacturing/work_order_entry.php:185
+#: ../manufacturing/work_order_entry.php:186
msgid "The cost entered is invalid or less than zero."
msgstr ""
-#: ../manufacturing/work_order_entry.php:208
+#: ../manufacturing/work_order_entry.php:209
msgid ""
"The work order cannot be processed because there is an insufficient quantity "
"for component:"
msgstr ""
-#: ../manufacturing/work_order_entry.php:222
+#: ../manufacturing/work_order_entry.php:223
msgid ""
"The selected item cannot be unassembled because there is insufficient stock."
msgstr ""
-#: ../manufacturing/work_order_entry.php:248
+#: ../manufacturing/work_order_entry.php:249
msgid ""
"The quantity cannot be changed to be less than the quantity already "
"manufactured for this order."
msgstr ""
-#: ../manufacturing/work_order_entry.php:297
+#: ../manufacturing/work_order_entry.php:298
msgid ""
"This work order cannot be deleted because it has already been processed."
msgstr ""
-#: ../manufacturing/work_order_entry.php:348
+#: ../manufacturing/work_order_entry.php:349
msgid "This work order is closed and cannot be edited."
msgstr ""
-#: ../manufacturing/work_order_entry.php:395
-#: ../manufacturing/work_order_entry.php:403
+#: ../manufacturing/work_order_entry.php:397
+#: ../manufacturing/work_order_entry.php:405
msgid "Destination Location:"
msgstr ""
-#: ../manufacturing/work_order_entry.php:414
+#: ../manufacturing/work_order_entry.php:416
msgid "Quantity Required:"
msgstr ""
-#: ../manufacturing/work_order_entry.php:416
+#: ../manufacturing/work_order_entry.php:418
msgid "Quantity Manufactured:"
msgstr ""
-#: ../manufacturing/work_order_entry.php:435
+#: ../manufacturing/work_order_entry.php:437
msgid "Credit Labour Account"
msgstr ""
-#: ../manufacturing/work_order_entry.php:442
+#: ../manufacturing/work_order_entry.php:444
msgid "Credit Overhead Account"
msgstr ""
-#: ../manufacturing/work_order_entry.php:447
+#: ../manufacturing/work_order_entry.php:449
msgid "Released On:"
msgstr ""
-#: ../manufacturing/work_order_entry.php:457
+#: ../manufacturing/work_order_entry.php:459
msgid "Save changes to work order"
msgstr ""
-#: ../manufacturing/work_order_entry.php:460
+#: ../manufacturing/work_order_entry.php:462
msgid "Close This Work Order"
msgstr ""
-#: ../manufacturing/work_order_entry.php:462
+#: ../manufacturing/work_order_entry.php:464
msgid "Delete This Work Order"
msgstr ""
-#: ../manufacturing/work_order_entry.php:468
+#: ../manufacturing/work_order_entry.php:470
msgid "Add Workorder"
msgstr ""
-#: ../manufacturing/work_order_issue.php:29
+#: ../manufacturing/work_order_issue.php:31
msgid "Issue Items to Work Order"
msgstr ""
-#: ../manufacturing/work_order_issue.php:36
+#: ../manufacturing/work_order_issue.php:38
msgid "The work order issue has been entered."
msgstr ""
-#: ../manufacturing/work_order_issue.php:79
+#: ../manufacturing/work_order_issue.php:78
msgid "The entered date for the issue is invalid."
msgstr ""
msgid "Release Work Order"
msgstr ""
+#: ../manufacturing/view/wo_costs_view.php:20
+msgid "View Work Order Costs"
+msgstr ""
+
+#: ../manufacturing/view/wo_costs_view.php:62
+#, php-format
+msgid "Production Costs for Work Order # %d"
+msgstr ""
+
#: ../manufacturing/view/wo_issue_view.php:19
msgid "View Work Order Issue"
msgstr ""
msgstr ""
#: ../manufacturing/view/work_order_view.php:56
-#: ../reporting/rep409.php:93
+#: ../reporting/rep409.php:91
msgid "Work Order Requirements"
msgstr ""
#: ../manufacturing/manage/bom_edit.php:71
#: ../manufacturing/includes/manufacturing_ui.inc:28
#: ../manufacturing/includes/manufacturing_ui.inc:83
-#: ../reporting/includes/doctext.inc:106
+#: ../reporting/includes/doctext.inc:229
msgid "Work Centre"
msgstr ""
msgstr ""
#: ../manufacturing/includes/manufacturing_ui.inc:84
-#: ../reporting/includes/doctext.inc:106
+#: ../reporting/includes/doctext.inc:229
msgid "Unit Quantity"
msgstr ""
#: ../manufacturing/includes/manufacturing_ui.inc:84
-#: ../reporting/includes/doctext.inc:106
+#: ../reporting/includes/doctext.inc:229
msgid "Total Quantity"
msgstr ""
#: ../manufacturing/includes/manufacturing_ui.inc:84
-#: ../reporting/includes/doctext.inc:106
+#: ../reporting/includes/doctext.inc:229
msgid "Units Issued"
msgstr ""
#: ../manufacturing/includes/manufacturing_ui.inc:276
#: ../manufacturing/includes/manufacturing_ui.inc:280
#: ../manufacturing/includes/manufacturing_ui.inc:331
-#: ../reporting/includes/doctext.inc:43
+#: ../reporting/includes/doctext.inc:223
msgid "Manufactured Item"
msgstr ""
#: ../manufacturing/includes/manufacturing_ui.inc:277
#: ../manufacturing/includes/manufacturing_ui.inc:281
#: ../manufacturing/includes/manufacturing_ui.inc:332
-#: ../reporting/includes/doctext.inc:46
+#: ../reporting/includes/doctext.inc:224
msgid "Into Location"
msgstr ""
msgid "This work order is closed."
msgstr ""
-#: ../manufacturing/includes/work_order_issue_ui.inc:158
+#: ../manufacturing/includes/work_order_issue_ui.inc:162
msgid "Return Items to Location"
msgstr ""
-#: ../manufacturing/includes/work_order_issue_ui.inc:158
+#: ../manufacturing/includes/work_order_issue_ui.inc:162
msgid "Issue Items to Work order"
msgstr ""
-#: ../manufacturing/includes/work_order_issue_ui.inc:161
+#: ../manufacturing/includes/work_order_issue_ui.inc:165
msgid "To Work Centre:"
msgstr ""
-#: ../manufacturing/includes/work_order_issue_ui.inc:163
+#: ../manufacturing/includes/work_order_issue_ui.inc:167
msgid "Issue Date:"
msgstr ""
-#: ../manufacturing/includes/db/work_order_issues_db.inc:72
+#: ../manufacturing/includes/db/work_order_issues_db.inc:81
msgid "Issue of"
msgstr ""
-#: ../manufacturing/includes/db/work_order_issues_db.inc:80
+#: ../manufacturing/includes/db/work_order_issues_db.inc:90
msgid "Issue to"
msgstr ""
-#: ../manufacturing/includes/db/work_order_produce_items_db.inc:65
+#: ../manufacturing/includes/db/work_order_issues_db.inc:208
+msgid "Reversed the issue of"
+msgstr ""
+
+#: ../manufacturing/includes/db/work_order_issues_db.inc:220
+msgid "Reversed the issue to"
+msgstr ""
+
+#: ../manufacturing/includes/db/work_order_produce_items_db.inc:73
msgid "Production."
msgstr ""
-#: ../manufacturing/includes/db/work_orders_db.inc:179
-#: ../purchasing/includes/db/po_db.inc:115
-#: ../sales/includes/db/cust_trans_db.inc:109
-#: ../sales/includes/db/sales_order_db.inc:247
+#: ../manufacturing/includes/db/work_order_produce_items_db.inc:157
+msgid "Reversed the production "
+msgstr ""
+
+#: ../manufacturing/includes/db/work_orders_db.inc:79
+#: ../purchasing/includes/db/po_db.inc:123
+#: ../sales/includes/db/cust_trans_db.inc:114
+#: ../sales/includes/db/sales_order_db.inc:261
msgid "Updated."
msgstr ""
-#: ../manufacturing/includes/db/work_orders_db.inc:200
+#: ../manufacturing/includes/db/work_orders_db.inc:100
msgid "Canceled."
msgstr ""
-#: ../manufacturing/includes/db/work_orders_db.inc:276
+#: ../manufacturing/includes/db/work_orders_db.inc:176
msgid "Released."
msgstr ""
msgid "Quick production."
msgstr ""
-#: ../manufacturing/includes/db/work_orders_quick_db.inc:188
+#: ../manufacturing/includes/db/work_orders_quick_db.inc:169
msgid "Produced"
msgstr ""
+#: ../purchasing/includes/db/invoice_db.inc:298
+msgid "Supplier invoice adjustment for zero inventory of "
+msgstr ""
+
+#: ../purchasing/includes/db/invoice_db.inc:298
+#: ../reporting/rep106.php:81
+#: ../sales/inquiry/sales_deliveries_view.php:166
+#: ../sales/inquiry/sales_deliveries_view.php.orig:166
+#: ../sales/inquiry/sales_orders_view.php:159
+#: ../sales/inquiry/sales_orders_view.php.orig:146
+msgid "Invoice"
+msgstr ""
+
+#: ../purchasing/includes/db/invoice_db.inc:716
+#: ../purchasing/includes/db/invoice_db.inc:718
+msgid "GRN Removal"
+msgstr ""
+
#: ../purchasing/includes/ui/grn_ui.inc:23
-#: ../purchasing/includes/ui/po_ui.inc:319
-#: ../sales/view/view_sales_order.php:73
+#: ../purchasing/includes/ui/po_ui.inc:326
+#: ../sales/view/view_sales_order.php:74
+#: ../sales/view/view_sales_order.php.orig:74
msgid "Order Currency"
msgstr ""
msgstr ""
#: ../purchasing/includes/ui/grn_ui.inc:28
-#: ../sales/view/view_sales_order.php:66
+#: ../sales/view/view_sales_order.php:67
+#: ../sales/view/view_sales_order.php.orig:67
msgid "Ordered On"
msgstr ""
#: ../purchasing/includes/ui/grn_ui.inc:40
#: ../purchasing/includes/ui/grn_ui.inc:54
-#: ../purchasing/includes/ui/po_ui.inc:334
-#: ../purchasing/includes/ui/po_ui.inc:339
+#: ../purchasing/includes/ui/po_ui.inc:341
+#: ../purchasing/includes/ui/po_ui.inc:346
msgid "Deliver Into Location"
msgstr ""
#: ../purchasing/includes/ui/grn_ui.inc:49
#: ../purchasing/includes/ui/grn_ui.inc:55
-#: ../purchasing/includes/ui/po_ui.inc:344
+#: ../purchasing/includes/ui/po_ui.inc:351
#: ../purchasing/view/view_supp_credit.php:44
-#: ../purchasing/view/view_supp_invoice.php:47
-#: ../purchasing/inquiry/po_search_completed.php:120
+#: ../purchasing/view/view_supp_invoice.php:48
+#: ../purchasing/inquiry/po_search_completed.php:124
+#: ../purchasing/inquiry/po_search_completed.php.orig:123
#: ../purchasing/inquiry/po_search.php:134
-#: ../purchasing/inquiry/supplier_inquiry.php:166
+#: ../purchasing/inquiry/supplier_inquiry.php:177
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:174
msgid "Supplier's Reference"
msgstr ""
#: ../purchasing/includes/ui/grn_ui.inc:62
-#: ../purchasing/includes/ui/po_ui.inc:348
-#: ../sales/view/view_sales_order.php:78
+#: ../purchasing/includes/ui/po_ui.inc:355
+#: ../sales/view/view_sales_order.php:92
+#: ../sales/view/view_sales_order.php.orig:79
msgid "Delivery Address"
msgstr ""
#: ../purchasing/includes/ui/grn_ui.inc:65
-#: ../purchasing/includes/ui/po_ui.inc:352
+#: ../purchasing/includes/ui/po_ui.inc:367
msgid "Order Comments"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:96
-#: ../purchasing/includes/ui/invoice_ui.inc:99
+#: ../purchasing/includes/ui/invoice_ui.inc:108
+msgid "Source Invoices:"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:110
msgid "Supplier's Ref.:"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:114
+#: ../purchasing/includes/ui/invoice_ui.inc:125
msgid "Terms:"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:126
-#: ../purchasing/manage/suppliers.php:92
-#: ../purchasing/manage/suppliers.php:97
+#: ../purchasing/includes/ui/invoice_ui.inc:137
+#: ../purchasing/manage/suppliers.php:100
+#: ../purchasing/manage/suppliers.php:105
+#: ../purchasing/manage/suppliers.php.orig:101
+#: ../purchasing/manage/suppliers.php.orig:106
msgid "Supplier's Currency:"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:130
-#: ../purchasing/manage/suppliers.php:99
+#: ../purchasing/includes/ui/invoice_ui.inc:141
+#: ../purchasing/manage/suppliers.php:107
+#: ../purchasing/manage/suppliers.php.orig:108
#: ../sales/manage/customer_branches.php:247
-#: ../sales/includes/ui/sales_order_ui.inc:473
+#: ../sales/manage/customers.php:292
+#: ../sales/manage/sav.customers.php:292
msgid "Tax Group:"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:145
+#: ../purchasing/includes/ui/invoice_ui.inc:159
msgid "Sub-total:"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:153
+#: ../purchasing/includes/ui/invoice_ui.inc:167
msgid "Invoice Total:"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:156
-#: ../sales/customer_credit_invoice.php:341
+#: ../purchasing/includes/ui/invoice_ui.inc:170
+#: ../sales/customer_credit_invoice.php:332
#: ../sales/includes/ui/sales_credit_ui.inc:233
msgid "Credit Note Total"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:187
+#: ../purchasing/includes/ui/invoice_ui.inc:175
+#: ../purchasing/includes/ui/po_ui.inc:487
+#: ../purchasing/po_entry_items.php:554
+msgid "Tax algorithm:"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:207
msgid "Add GL Line"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:188
+#: ../purchasing/includes/ui/invoice_ui.inc:208
msgid "Reset"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:189
-#: ../purchasing/po_receive_items.php:323
+#: ../purchasing/includes/ui/invoice_ui.inc:209
+#: ../purchasing/po_receive_items.php:332
msgid "Clear all GL entry fields"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:207
+#: ../purchasing/includes/ui/invoice_ui.inc:227
msgid "GL Items for this Invoice"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:209
+#: ../purchasing/includes/ui/invoice_ui.inc:229
msgid "GL Items for this Credit Note"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:219
+#: ../purchasing/includes/ui/invoice_ui.inc:239
msgid "Quick Entry:"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:386
+#: ../purchasing/includes/ui/invoice_ui.inc:412
msgid "Add to Invoice"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:388
+#: ../purchasing/includes/ui/invoice_ui.inc:414
msgid "Add to Credit Note"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:390
-#: ../sales/customer_invoice.php:497
+#: ../purchasing/includes/ui/invoice_ui.inc:416
+#: ../sales/customer_invoice.php:601
msgid "Remove"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:390
-#: ../purchasing/includes/ui/invoice_ui.inc:425
+#: ../purchasing/includes/ui/invoice_ui.inc:416
+#: ../purchasing/includes/ui/invoice_ui.inc:451
msgid ""
"WARNING! Be careful with removal. The operation is executed immediately and "
"cannot be undone !!!"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:392
+#: ../purchasing/includes/ui/invoice_ui.inc:418
#, 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:423
+#: ../purchasing/includes/ui/invoice_ui.inc:449
msgid "Items Received Yet to be Invoiced"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:428
+#: ../purchasing/includes/ui/invoice_ui.inc:454
msgid "Delivery Item Selected For Adding To A Supplier Credit Note"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:433
+#: ../purchasing/includes/ui/invoice_ui.inc:459
msgid "Received Items Charged on this Invoice"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:435
+#: ../purchasing/includes/ui/invoice_ui.inc:461
msgid "Received Items Credited on this Note"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:445
+#: ../purchasing/includes/ui/invoice_ui.inc:471
msgid "Received between"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:456
+#: ../purchasing/includes/ui/invoice_ui.inc:483
msgid "Add All Items"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:465
-#: ../purchasing/includes/ui/invoice_ui.inc:477
-#: ../sales/inquiry/sales_orders_view.php:150
+#: ../purchasing/includes/ui/invoice_ui.inc:492
+#: ../purchasing/includes/ui/invoice_ui.inc:504
+#: ../sales/inquiry/sales_orders_view.php:167
+#: ../sales/inquiry/sales_orders_view.php.orig:154
msgid "Delivery"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:465
+#: ../purchasing/includes/ui/invoice_ui.inc:492
msgid "Sequence #"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:465
+#: ../purchasing/includes/ui/invoice_ui.inc:492
msgid "P.O."
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:466
+#: ../purchasing/includes/ui/invoice_ui.inc:493
msgid "Received On"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:466
+#: ../purchasing/includes/ui/invoice_ui.inc:493
#: ../purchasing/view/view_po.php:46
msgid "Quantity Received"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:466
+#: ../purchasing/includes/ui/invoice_ui.inc:493
#: ../purchasing/view/view_grn.php:41
#: ../purchasing/view/view_po.php:46
msgid "Quantity Invoiced"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:467
+#: ../purchasing/includes/ui/invoice_ui.inc:494
msgid "Qty Yet To Invoice"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:467
-#: ../purchasing/includes/ui/po_ui.inc:238
-#: ../sales/includes/ui/sales_order_ui.inc:143
+#: ../purchasing/includes/ui/invoice_ui.inc:494
+#: ../purchasing/includes/ui/po_ui.inc:245
+#: ../sales/includes/ui/sales_order_ui.inc:142
+#: ../sales/includes/ui/sales_order_ui.inc.orig:142
msgid "Price after Tax"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:467
-#: ../purchasing/includes/ui/po_ui.inc:238
-#: ../sales/includes/ui/sales_order_ui.inc:143
+#: ../purchasing/includes/ui/invoice_ui.inc:494
+#: ../purchasing/includes/ui/po_ui.inc:245
+#: ../sales/includes/ui/sales_order_ui.inc:142
+#: ../sales/includes/ui/sales_order_ui.inc.orig:142
msgid "Price before Tax"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:473
+#: ../purchasing/includes/ui/invoice_ui.inc:500
msgid "Qty Yet To Credit"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:478
+#: ../purchasing/includes/ui/invoice_ui.inc:505
msgid "Line Value"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:545
+#: ../purchasing/includes/ui/invoice_ui.inc:573
msgid ""
"There are no outstanding items received from this supplier that have not "
"been invoiced by them."
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:548
+#: ../purchasing/includes/ui/invoice_ui.inc:576
msgid ""
"There are no received items for the selected supplier that have been "
"invoiced."
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:549
+#: ../purchasing/includes/ui/invoice_ui.inc:577
msgid "Credits can only be applied to invoiced items."
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc:149
+#: ../purchasing/includes/ui/po_ui.inc:156
msgid "Supplier Currency:"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc:178
-#: ../sales/sales_order_entry.php:659
+#: ../purchasing/includes/ui/po_ui.inc:185
+#: ../sales/sales_order_entry.php:694
msgid "Order Date:"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc:179
-#: ../sales/sales_order_entry.php:646
+#: ../purchasing/includes/ui/po_ui.inc:186
+#: ../sales/sales_order_entry.php:681
msgid "Delivery Date:"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc:179
-#: ../sales/sales_order_entry.php:640
+#: ../purchasing/includes/ui/po_ui.inc:186
+#: ../sales/sales_order_entry.php:675
msgid "Invoice Date:"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc:190
+#: ../purchasing/includes/ui/po_ui.inc:197
msgid "Due Date:"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc:192
+#: ../purchasing/includes/ui/po_ui.inc:199
msgid "Supplier's Reference:"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc:193
+#: ../purchasing/includes/ui/po_ui.inc:200
msgid "Receive Into:"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc:218
+#: ../purchasing/includes/ui/po_ui.inc:225
msgid ""
"The default stock location set up for this user is not a currently defined "
"stock location. Your system administrator needs to amend your user record."
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc:222
+#: ../purchasing/includes/ui/po_ui.inc:229
msgid "Deliver to:"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc:231
+#: ../purchasing/includes/ui/po_ui.inc:238
msgid "Order Items"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc:237
-#: ../purchasing/po_receive_items.php:58
+#: ../purchasing/includes/ui/po_ui.inc:244
+#: ../purchasing/po_receive_items.php:62
msgid "Received"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc:238
-#: ../sales/includes/ui/sales_order_ui.inc:617
+#: ../purchasing/includes/ui/po_ui.inc:245
+#: ../sales/includes/ui/sales_order_ui.inc:611
+#: ../sales/includes/ui/sales_order_ui.inc.orig:611
msgid "Required Delivery Date"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc:238
+#: ../purchasing/includes/ui/po_ui.inc:245
#: ../purchasing/view/view_grn.php:41
#: ../purchasing/view/view_po.php:46
msgid "Line Total"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc:289
-#: ../purchasing/po_receive_items.php:110
-#: ../reporting/includes/doctext.inc:147
-#: ../sales/customer_credit_invoice.php:333
-#: ../sales/customer_delivery.php:499
-#: ../sales/customer_invoice.php:538
+#: ../purchasing/includes/ui/po_ui.inc:296
+#: ../purchasing/po_receive_items.php:114
+#: ../reporting/rep107.php:217
+#: ../reporting/rep109.php:152
+#: ../reporting/rep110.php:161
+#: ../reporting/rep111.php:137
+#: ../reporting/rep113.php:147
+#: ../reporting/rep209.php:167
+#: ../sales/customer_credit_invoice.php:324
+#: ../sales/customer_delivery.php:509
+#: ../sales/customer_invoice.php:645
#: ../sales/view/view_dispatch.php:146
-#: ../sales/view/view_invoice.php:148
+#: ../sales/view/view_invoice.php:150
#: ../sales/includes/ui/sales_credit_ui.inc:217
-#: ../sales/includes/ui/sales_order_ui.inc:230
+#: ../sales/includes/ui/sales_order_ui.inc:229
+#: ../sales/includes/ui/sales_order_ui.inc.orig:229
msgid "Sub-total"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc:298
-#: ../purchasing/po_receive_items.php:118
+#: ../purchasing/includes/ui/po_ui.inc:305
+#: ../purchasing/po_receive_items.php:122
#: ../purchasing/view/view_grn.php:79
#: ../purchasing/view/view_po.php:93
-#: ../sales/customer_delivery.php:506
-#: ../sales/view/view_sales_order.php:243
-#: ../sales/includes/ui/sales_order_ui.inc:237
+#: ../sales/customer_delivery.php:516
+#: ../sales/view/view_sales_order.php:262
+#: ../sales/view/view_sales_order.php.orig:244
+#: ../sales/includes/ui/sales_order_ui.inc:236
+#: ../sales/includes/ui/sales_order_ui.inc.orig:236
msgid "Amount Total"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc:299
+#: ../purchasing/includes/ui/po_ui.inc:306
#: ../purchasing/allocations/supplier_allocate.php:64
#: ../sales/allocations/customer_allocate.php:63
-#: ../sales/includes/ui/sales_order_ui.inc:238
+#: ../sales/includes/ui/sales_order_ui.inc:237
+#: ../sales/includes/ui/sales_order_ui.inc.orig:237
msgid "Refresh"
msgstr ""
+#: ../purchasing/includes/ui/po_ui.inc:361
+#: ../sales/view/view_sales_order.php:83
+msgid "Required Pre-Payment"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:362
+msgid "Pre-Payments Allocated"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:488
+#: ../purchasing/po_entry_items.php:555
+#: ../sales/customer_invoice.php:452
+#: ../sales/includes/ui/sales_order_ui.inc:407
+#: ../sales/includes/ui/sales_order_ui.inc:409
+#: ../sales/includes/ui/sales_order_ui.inc.orig:405
+#: ../sales/includes/ui/sales_order_ui.inc.orig:409
+msgid "Payment:"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:488
+#: ../purchasing/po_entry_items.php:555
+msgid "Delayed"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:490
+#: ../sales/includes/ui/sales_order_ui.inc:622
+#: ../sales/includes/ui/sales_order_ui.inc:624
+msgid "Pre-Payment Required:"
+msgstr ""
+
#: ../purchasing/po_entry_items.php:38
msgid "Modify Purchase Order #"
msgstr ""
msgid "Direct Purchase Invoice Entry"
msgstr ""
-#: ../purchasing/po_entry_items.php:74
+#: ../purchasing/po_entry_items.php:77
msgid "Purchase Order has been entered"
msgstr ""
-#: ../purchasing/po_entry_items.php:76
+#: ../purchasing/po_entry_items.php:79
msgid "Purchase Order has been updated"
msgstr ""
-#: ../purchasing/po_entry_items.php:77
+#: ../purchasing/po_entry_items.php:80
msgid "&View this order"
msgstr ""
-#: ../purchasing/po_entry_items.php:79
-#: ../sales/sales_order_entry.php:105
-#: ../sales/sales_order_entry.php:123
+#: ../purchasing/po_entry_items.php:82
+#: ../sales/sales_order_entry.php:106
+#: ../sales/sales_order_entry.php:126
msgid "&Print This Order"
msgstr ""
-#: ../purchasing/po_entry_items.php:81
-#: ../sales/sales_order_entry.php:106
-#: ../sales/sales_order_entry.php:124
+#: ../purchasing/po_entry_items.php:84
+#: ../sales/sales_order_entry.php:107
+#: ../sales/sales_order_entry.php:127
msgid "&Email This Order"
msgstr ""
-#: ../purchasing/po_entry_items.php:83
+#: ../purchasing/po_entry_items.php:86
msgid "&Receive Items on this Purchase Order"
msgstr ""
-#: ../purchasing/po_entry_items.php:85
+#: ../purchasing/po_entry_items.php:88
msgid "Enter &Another Purchase Order"
msgstr ""
-#: ../purchasing/po_entry_items.php:87
+#: ../purchasing/po_entry_items.php:90
msgid "Select An &Outstanding Purchase Order"
msgstr ""
-#: ../purchasing/po_entry_items.php:96
+#: ../purchasing/po_entry_items.php:99
msgid "Direct GRN has been entered"
msgstr ""
-#: ../purchasing/po_entry_items.php:98
+#: ../purchasing/po_entry_items.php:101
msgid "&View this GRN"
msgstr ""
-#: ../purchasing/po_entry_items.php:104
-#: ../purchasing/po_receive_items.php:38
-msgid "Entry purchase &invoice for this receival"
+#: ../purchasing/po_entry_items.php:105
+#: ../purchasing/po_receive_items.php:40
+msgid "View the GL Journal Entries for this Delivery"
msgstr ""
-#: ../purchasing/po_entry_items.php:106
-#: ../purchasing/po_entry_items.php:130
-#: ../purchasing/supplier_credit.php:49
-#: ../purchasing/supplier_invoice.php:52
-msgid "Add an Attachment"
+#: ../purchasing/po_entry_items.php:110
+#: ../purchasing/po_receive_items.php:42
+msgid "Entry purchase &invoice for this receival"
msgstr ""
-#: ../purchasing/po_entry_items.php:109
+#: ../purchasing/po_entry_items.php:115
msgid "Enter &Another GRN"
msgstr ""
-#: ../purchasing/po_entry_items.php:118
+#: ../purchasing/po_entry_items.php:124
msgid "Direct Purchase Invoice has been entered"
msgstr ""
-#: ../purchasing/po_entry_items.php:120
+#: ../purchasing/po_entry_items.php:126
msgid "&View this Invoice"
msgstr ""
-#: ../purchasing/po_entry_items.php:125
-#: ../purchasing/supplier_invoice.php:46
+#: ../purchasing/po_entry_items.php:131
+#: ../purchasing/supplier_invoice.php:68
msgid "View the GL Journal Entries for this Invoice"
msgstr ""
-#: ../purchasing/po_entry_items.php:127
-#: ../purchasing/supplier_invoice.php:48
+#: ../purchasing/po_entry_items.php:133
+#: ../purchasing/supplier_invoice.php:70
msgid "Entry supplier &payment for this invoice"
msgstr ""
-#: ../purchasing/po_entry_items.php:133
+#: ../purchasing/po_entry_items.php:139
msgid "Enter &Another Direct Invoice"
msgstr ""
-#: ../purchasing/po_entry_items.php:165
+#: ../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:180
+#: ../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:181
+#: ../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:196
+#: ../purchasing/po_entry_items.php:202
msgid "This purchase order has been cancelled."
msgstr ""
-#: ../purchasing/po_entry_items.php:198
+#: ../purchasing/po_entry_items.php:204
msgid "Enter a new purchase order"
msgstr ""
-#: ../purchasing/po_entry_items.php:210
-#: ../sales/sales_order_entry.php:452
+#: ../purchasing/po_entry_items.php:216
+#: ../sales/sales_order_entry.php:475
msgid "Item description cannot be empty."
msgstr ""
-#: ../purchasing/po_entry_items.php:220
+#: ../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:227
+#: ../purchasing/po_entry_items.php:233
msgid "The price entered must be numeric and not less than zero."
msgstr ""
-#: ../purchasing/po_entry_items.php:251
+#: ../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:252
+#: ../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:280
+#: ../purchasing/po_entry_items.php:286
msgid "The selected item is already on this order."
msgstr ""
-#: ../purchasing/po_entry_items.php:307
+#: ../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:323
-#: ../purchasing/supplier_invoice.php:352
+#: ../purchasing/po_entry_items.php:329
+#: ../purchasing/supplier_invoice.php:381
#: ../purchasing/supplier_payment.php:118
msgid "There is no supplier selected."
msgstr ""
-#: ../purchasing/po_entry_items.php:330
+#: ../purchasing/po_entry_items.php:336
msgid "The entered order date is invalid."
msgstr ""
-#: ../purchasing/po_entry_items.php:337
+#: ../purchasing/po_entry_items.php:349
msgid "The entered due date is invalid."
msgstr ""
-#: ../purchasing/po_entry_items.php:346
+#: ../purchasing/po_entry_items.php:358
msgid "There is no reference entered for this purchase order."
msgstr ""
-#: ../purchasing/po_entry_items.php:361
-#: ../purchasing/supplier_invoice.php:161
+#: ../purchasing/po_entry_items.php:373
+#: ../purchasing/supplier_invoice.php:185
msgid "You must enter a supplier's invoice reference."
msgstr ""
-#: ../purchasing/po_entry_items.php:367
+#: ../purchasing/po_entry_items.php:380
+#: ../purchasing/supplier_invoice.php:211
+msgid ""
+"This invoice number has already been entered. It cannot be entered again."
+msgstr ""
+
+#: ../purchasing/po_entry_items.php:386
msgid "There is no delivery address specified."
msgstr ""
-#: ../purchasing/po_entry_items.php:373
+#: ../purchasing/po_entry_items.php:392
msgid "There is no location specified to move any items into."
msgstr ""
-#: ../purchasing/po_entry_items.php:380
+#: ../purchasing/po_entry_items.php:399
msgid ""
"The order cannot be placed because there are no lines entered on this order."
msgstr ""
-#: ../purchasing/po_entry_items.php:506
-#: ../sales/sales_order_entry.php:663
+#: ../purchasing/po_entry_items.php:404
+msgid "Required prepayment is greater than total invoice value."
+msgstr ""
+
+#: ../purchasing/po_entry_items.php:492
+msgid "Payment for:"
+msgstr ""
+
+#: ../purchasing/po_entry_items.php:563
+#: ../sales/sales_order_entry.php:698
msgid "Place Order"
msgstr ""
-#: ../purchasing/po_entry_items.php:507
+#: ../purchasing/po_entry_items.php:564
msgid "Update Order"
msgstr ""
-#: ../purchasing/po_entry_items.php:508
-#: ../sales/sales_order_entry.php:662
+#: ../purchasing/po_entry_items.php:565
+#: ../sales/sales_order_entry.php:697
msgid "Cancel Order"
msgstr ""
-#: ../purchasing/po_entry_items.php:510
+#: ../purchasing/po_entry_items.php:567
msgid "Process GRN"
msgstr ""
-#: ../purchasing/po_entry_items.php:511
+#: ../purchasing/po_entry_items.php:568
msgid "Update GRN"
msgstr ""
-#: ../purchasing/po_entry_items.php:512
+#: ../purchasing/po_entry_items.php:569
msgid "Cancel GRN"
msgstr ""
-#: ../purchasing/po_entry_items.php:515
-#: ../sales/customer_invoice.php:557
+#: ../purchasing/po_entry_items.php:572
+#: ../sales/customer_invoice.php:684
msgid "Process Invoice"
msgstr ""
-#: ../purchasing/po_entry_items.php:516
+#: ../purchasing/po_entry_items.php:573
msgid "Update Invoice"
msgstr ""
-#: ../purchasing/po_entry_items.php:517
-#: ../sales/sales_order_entry.php:643
+#: ../purchasing/po_entry_items.php:574
+#: ../sales/sales_order_entry.php:678
msgid "Cancel Invoice"
msgstr ""
msgid "&View this Delivery"
msgstr ""
-#: ../purchasing/po_receive_items.php:40
+#: ../purchasing/po_receive_items.php:44
msgid "Select a different &purchase order for receiving items against"
msgstr ""
-#: ../purchasing/po_receive_items.php:49
+#: ../purchasing/po_receive_items.php:53
msgid ""
"This page can only be opened if a purchase order has been selected. Please "
"select a purchase order first."
msgstr ""
-#: ../purchasing/po_receive_items.php:58
+#: ../purchasing/po_receive_items.php:62
#: ../reporting/rep105.php:112
-#: ../sales/customer_delivery.php:430
+#: ../sales/customer_delivery.php:440
msgid "Ordered"
msgstr ""
-#: ../purchasing/po_receive_items.php:59
+#: ../purchasing/po_receive_items.php:63
#: ../reporting/rep101.php:131
#: ../reporting/rep105.php:113
-#: ../reporting/rep105.php:167
+#: ../reporting/rep105.php:162
#: ../reporting/rep201.php:119
-#: ../reporting/includes/doctext.inc:117
+#: ../reporting/includes/doctext.inc:247
msgid "Outstanding"
msgstr ""
-#: ../purchasing/po_receive_items.php:59
-#: ../sales/customer_delivery.php:431
+#: ../purchasing/po_receive_items.php:63
+#: ../sales/customer_delivery.php:441
msgid "This Delivery"
msgstr ""
-#: ../purchasing/po_receive_items.php:164
-#: ../purchasing/po_receive_items.php:213
+#: ../purchasing/po_receive_items.php:168
+#: ../purchasing/po_receive_items.php:222
msgid ""
"There is nothing to process. Please enter valid quantities greater than zero."
msgstr ""
-#: ../purchasing/po_receive_items.php:218
+#: ../purchasing/po_receive_items.php:227
msgid ""
"Entered quantities cannot be greater than the quantity entered on the "
"purchase order including the allowed over-receive percentage"
msgstr ""
-#: ../purchasing/po_receive_items.php:220
+#: ../purchasing/po_receive_items.php:229
msgid ""
"Modify the ordered items on the purchase order if you wish to increase the "
"quantities."
msgstr ""
-#: ../purchasing/po_receive_items.php:238
+#: ../purchasing/po_receive_items.php:247
msgid ""
"This order has been changed or invoiced since this delivery was started to "
"be actioned. Processing halted. To enter a delivery against this purchase "
"by the other user."
msgstr ""
-#: ../purchasing/po_receive_items.php:241
+#: ../purchasing/po_receive_items.php:250
msgid "Select a different purchase order for receiving goods against"
msgstr ""
-#: ../purchasing/po_receive_items.php:244
+#: ../purchasing/po_receive_items.php:253
msgid "Re-Read the updated purchase order for receiving goods against"
msgstr ""
-#: ../purchasing/po_receive_items.php:318
+#: ../purchasing/po_receive_items.php:327
msgid "Items to Receive"
msgstr ""
-#: ../purchasing/po_receive_items.php:323
+#: ../purchasing/po_receive_items.php:332
msgid "Process Receive Items"
msgstr ""
-#: ../purchasing/supplier_credit.php:43
+#: ../purchasing/supplier_credit.php:63
+#, php-format
+msgid "Modifying Supplier Credit # %d"
+msgstr ""
+
+#: ../purchasing/supplier_credit.php:78
msgid "Supplier credit note has been processed."
msgstr ""
-#: ../purchasing/supplier_credit.php:44
+#: ../purchasing/supplier_credit.php:79
msgid "View this Credit Note"
msgstr ""
-#: ../purchasing/supplier_credit.php:46
+#: ../purchasing/supplier_credit.php:81
msgid "View the GL Journal Entries for this Credit Note"
msgstr ""
-#: ../purchasing/supplier_credit.php:48
+#: ../purchasing/supplier_credit.php:83
msgid "Enter Another Credit Note"
msgstr ""
-#: ../purchasing/supplier_credit.php:102
-#: ../purchasing/supplier_invoice.php:102
+#: ../purchasing/supplier_credit.php:119
+#: ../purchasing/supplier_invoice.php:126
msgid ""
"The account code entered is not a valid code, this line cannot be added to "
"the transaction."
msgstr ""
-#: ../purchasing/supplier_credit.php:112
-#: ../purchasing/supplier_invoice.php:112
+#: ../purchasing/supplier_credit.php:129
+#: ../purchasing/supplier_invoice.php:136
msgid ""
"The amount entered is not numeric. This line cannot be added to the "
"transaction."
msgstr ""
-#: ../purchasing/supplier_credit.php:142
+#: ../purchasing/supplier_credit.php:159
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:149
+#: ../purchasing/supplier_credit.php:166
msgid "You must enter an credit note reference."
msgstr ""
-#: ../purchasing/supplier_credit.php:163
+#: ../purchasing/supplier_credit.php:180
msgid "You must enter a supplier's credit note reference."
msgstr ""
-#: ../purchasing/supplier_credit.php:170
+#: ../purchasing/supplier_credit.php:187
msgid ""
"The credit note as entered cannot be processed because the date entered is "
"not valid."
msgstr ""
-#: ../purchasing/supplier_credit.php:182
-#: ../purchasing/supplier_invoice.php:180
+#: ../purchasing/supplier_credit.php:199
+#: ../purchasing/supplier_invoice.php:204
msgid ""
"The invoice as entered cannot be processed because the due date is in an "
"incorrect format."
msgstr ""
-#: ../purchasing/supplier_credit.php:189
+#: ../purchasing/supplier_credit.php:206
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:227
+#: ../purchasing/supplier_credit.php:218
+msgid ""
+"The return cannot be processed because there is an insufficient quantity for "
+"item:"
+msgstr ""
+
+#: ../purchasing/supplier_credit.php:262
msgid "The quantity to credit must be numeric and greater than zero."
msgstr ""
-#: ../purchasing/supplier_credit.php:234
+#: ../purchasing/supplier_credit.php:269
msgid "The price is either not numeric or negative."
msgstr ""
-#: ../purchasing/supplier_credit.php:336
+#: ../purchasing/supplier_credit.php:371
msgid "Enter Credit Note"
msgstr ""
-#: ../purchasing/supplier_invoice.php:28
+#: ../purchasing/supplier_invoice.php:46
msgid "Enter Supplier Invoice"
msgstr ""
-#: ../purchasing/supplier_invoice.php:43
+#: ../purchasing/supplier_invoice.php:51
+#, php-format
+msgid "Modifying Purchase Invoice # %d"
+msgstr ""
+
+#: ../purchasing/supplier_invoice.php:65
msgid "Supplier invoice has been processed."
msgstr ""
-#: ../purchasing/supplier_invoice.php:44
+#: ../purchasing/supplier_invoice.php:66
msgid "View this Invoice"
msgstr ""
-#: ../purchasing/supplier_invoice.php:50
+#: ../purchasing/supplier_invoice.php:72
msgid "Enter Another Invoice"
msgstr ""
-#: ../purchasing/supplier_invoice.php:141
+#: ../purchasing/supplier_invoice.php:165
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:147
+#: ../purchasing/supplier_invoice.php:171
msgid "You must enter an invoice reference."
msgstr ""
-#: ../purchasing/supplier_invoice.php:168
+#: ../purchasing/supplier_invoice.php:192
msgid ""
"The invoice as entered cannot be processed because the invoice date is in an "
"incorrect format."
msgstr ""
-#: ../purchasing/supplier_invoice.php:187
-msgid ""
-"This invoice number has already been entered. It cannot be entered again."
-msgstr ""
-
-#: ../purchasing/supplier_invoice.php:224
+#: ../purchasing/supplier_invoice.php:253
msgid "The quantity to invoice must be numeric and greater than zero."
msgstr ""
-#: ../purchasing/supplier_invoice.php:231
+#: ../purchasing/supplier_invoice.php:260
msgid "The price is not numeric."
msgstr ""
-#: ../purchasing/supplier_invoice.php:244
+#: ../purchasing/supplier_invoice.php:273
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:245
-#: ../purchasing/supplier_invoice.php:258
+#: ../purchasing/supplier_invoice.php:274
+#: ../purchasing/supplier_invoice.php:287
msgid "The over-charge percentage allowance is :"
msgstr ""
-#: ../purchasing/supplier_invoice.php:257
+#: ../purchasing/supplier_invoice.php:286
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:334
+#: ../purchasing/supplier_invoice.php:363
#, php-format
msgid "All yet non-invoiced items on delivery line # %d has been removed."
msgstr ""
-#: ../purchasing/supplier_invoice.php:376
+#: ../purchasing/supplier_invoice.php:405
msgid "Enter Invoice"
msgstr ""
msgid "Supplier Payment Entry"
msgstr ""
-#: ../purchasing/supplier_payment.php:89
+#: ../purchasing/supplier_payment.php:90
msgid "Invalid purchase invoice number."
msgstr ""
msgstr ""
#: ../purchasing/supplier_payment.php:152
-#: ../sales/customer_payments.php:139
+#: ../sales/customer_payments.php:192
msgid "The exchange rate must be numeric and greater than zero."
msgstr ""
"positive values."
msgstr ""
-#: ../purchasing/supplier_payment.php:263
+#: ../purchasing/supplier_payment.php:273
msgid "Payment To:"
msgstr ""
-#: ../purchasing/supplier_payment.php:267
+#: ../purchasing/supplier_payment.php:280
msgid "From Bank Account:"
msgstr ""
-#: ../purchasing/supplier_payment.php:273
+#: ../purchasing/supplier_payment.php:288
#: ../purchasing/view/view_supp_payment.php:55
msgid "Date Paid"
msgstr ""
-#: ../purchasing/supplier_payment.php:296
-#: ../sales/customer_payments.php:287
+#: ../purchasing/supplier_payment.php:311
+#: ../sales/customer_payments.php:406
msgid "Amount of Discount:"
msgstr ""
-#: ../purchasing/supplier_payment.php:297
+#: ../purchasing/supplier_payment.php:312
msgid "Amount of Payment:"
msgstr ""
-#: ../purchasing/supplier_payment.php:303
+#: ../purchasing/supplier_payment.php:318
msgid "The amount and discount are in the bank account's currency."
msgstr ""
-#: ../purchasing/supplier_payment.php:306
+#: ../purchasing/supplier_payment.php:321
msgid "Enter Payment"
msgstr ""
#: ../purchasing/view/view_grn.php:37
#: ../purchasing/view/view_po.php:41
-#: ../sales/view/view_sales_order.php:197
+#: ../sales/view/view_sales_order.php:216
+#: ../sales/view/view_sales_order.php.orig:198
msgid "Line Details"
msgstr ""
#: ../purchasing/view/view_grn.php:40
-#: ../reporting/includes/doctext.inc:36
-#: ../reporting/includes/doctext.inc:103
+#: ../reporting/includes/doctext.inc:77
+#: ../reporting/includes/doctext.inc:192
+#: ../reporting/includes/doctext.inc:244
#: ../sales/inquiry/sales_deliveries_view.php:186
+#: ../sales/inquiry/sales_deliveries_view.php.orig:186
msgid "Delivery Date"
msgstr ""
#: ../purchasing/view/view_grn.php:70
#: ../purchasing/view/view_po.php:84
#: ../purchasing/view/view_supp_credit.php:60
-#: ../purchasing/view/view_supp_invoice.php:65
+#: ../purchasing/view/view_supp_invoice.php:66
#: ../sales/view/view_credit.php:136
-#: ../sales/view/view_sales_order.php:233
+#: ../sales/view/view_sales_order.php:252
+#: ../sales/view/view_sales_order.php.orig:234
msgid "Sub Total"
msgstr ""
#: ../purchasing/view/view_po.php:100
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:147
-#: ../purchasing/inquiry/supplier_inquiry.php:187
-#: ../sales/inquiry/customer_allocation_inquiry.php:162
-#: ../sales/inquiry/customer_inquiry.php:239
+#: ../purchasing/inquiry/supplier_inquiry.php:197
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:196
+#: ../sales/inquiry/customer_allocation_inquiry.php:165
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:165
+#: ../sales/inquiry/customer_inquiry.php:227
+#: ../sales/inquiry/customer_inquiry.php.orig:251
#: ../sales/inquiry/sales_deliveries_view.php:206
-#: ../sales/inquiry/sales_orders_view.php:312
+#: ../sales/inquiry/sales_deliveries_view.php.orig:206
+#: ../sales/inquiry/sales_orders_view.php:344
+#: ../sales/inquiry/sales_orders_view.php.orig:317
msgid "Marked items are overdue."
msgstr ""
#: ../purchasing/view/view_po.php:113
-#: ../sales/view/view_invoice.php:97
-#: ../sales/view/view_sales_order.php:50
+#: ../sales/view/view_invoice.php:98
+#: ../sales/view/view_sales_order.php:51
+#: ../sales/view/view_sales_order.php.orig:51
msgid "Deliveries"
msgstr ""
msgstr ""
#: ../purchasing/view/view_po.php:138
-#: ../sales/view/view_sales_order.php:52
+#: ../sales/view/view_sales_order.php:53
+#: ../sales/view/view_sales_order.php.orig:53
msgid "Invoices/Credits"
msgstr ""
msgstr ""
#: ../purchasing/view/view_supp_credit.php:47
-#: ../purchasing/view/view_supp_invoice.php:50
-#: ../sales/customer_credit_invoice.php:279
-#: ../sales/view/view_invoice.php:95
+#: ../purchasing/view/view_supp_invoice.php:51
+#: ../reporting/includes/doctext.inc:141
+#: ../sales/customer_credit_invoice.php:270
+#: ../sales/view/view_invoice.php:100
msgid "Invoice Date"
msgstr ""
msgid "This credit note has been voided."
msgstr ""
-#: ../purchasing/view/view_supp_invoice.php:23
+#: ../purchasing/view/view_supp_invoice.php:24
msgid "View Supplier Invoice"
msgstr ""
-#: ../purchasing/view/view_supp_invoice.php:40
+#: ../purchasing/view/view_supp_invoice.php:41
msgid "SUPPLIER INVOICE"
msgstr ""
-#: ../purchasing/view/view_supp_invoice.php:72
-#: ../reporting/includes/doctext.inc:151
-#: ../sales/view/view_invoice.php:164
+#: ../purchasing/view/view_supp_invoice.php:73
+#: ../reporting/rep107.php:266
+#: ../reporting/rep107.php:272
+#: ../sales/view/view_invoice.php:166
msgid "TOTAL INVOICE"
msgstr ""
-#: ../purchasing/view/view_supp_invoice.php:76
-#: ../sales/view/view_invoice.php:168
+#: ../purchasing/view/view_supp_invoice.php:77
+#: ../sales/view/view_invoice.php:170
msgid "This invoice has been voided."
msgstr ""
msgid "Payment Currency"
msgstr ""
-#: ../purchasing/view/view_supp_payment.php:66
+#: ../purchasing/view/view_supp_payment.php:62
+#: ../sales/customer_delivery.php:441
+#: ../sales/customer_invoice.php:540
+#: ../sales/customer_invoice.php:543
+#: ../sales/view/view_receipt.php:45
+#: ../sales/view/view_sales_order.php:220
+#: ../sales/view/view_sales_order.php.orig:202
+msgid "Discount"
+msgstr ""
+
+#: ../purchasing/view/view_supp_payment.php:69
msgid "Supplier's Currency"
msgstr ""
-#: ../purchasing/manage/suppliers.php:21
+#: ../purchasing/manage/suppliers.php:27
+#: ../purchasing/manage/suppliers.php.orig:28
#: ../sales/manage/customer_branches.php:33
msgid ""
"There are no tax groups defined in the system. At least one tax group is "
"required before proceeding."
msgstr ""
-#: ../purchasing/manage/suppliers.php:83
+#: ../purchasing/manage/suppliers.php:91
+#: ../purchasing/manage/suppliers.php.orig:92
msgid "Basic Data"
msgstr ""
-#: ../purchasing/manage/suppliers.php:85
+#: ../purchasing/manage/suppliers.php:93
+#: ../purchasing/manage/suppliers.php.orig:94
msgid "Supplier Name:"
msgstr ""
-#: ../purchasing/manage/suppliers.php:86
+#: ../purchasing/manage/suppliers.php:94
+#: ../purchasing/manage/suppliers.php.orig:95
msgid "Supplier Short Name:"
msgstr ""
-#: ../purchasing/manage/suppliers.php:89
+#: ../purchasing/manage/suppliers.php:97
+#: ../purchasing/manage/suppliers.php.orig:98
msgid "Website:"
msgstr ""
-#: ../purchasing/manage/suppliers.php:100
+#: ../purchasing/manage/suppliers.php:108
+#: ../purchasing/manage/suppliers.php.orig:109
msgid "Our Customer No:"
msgstr ""
-#: ../purchasing/manage/suppliers.php:103
-msgid "Contact Data"
-msgstr ""
-
-#: ../purchasing/manage/suppliers.php:109
-msgid "System default"
-msgstr ""
-
-#: ../purchasing/manage/suppliers.php:111
+#: ../purchasing/manage/suppliers.php:110
+#: ../purchasing/manage/suppliers.php.orig:120
msgid "Purchasing"
msgstr ""
-#: ../purchasing/manage/suppliers.php:112
+#: ../purchasing/manage/suppliers.php:111
+#: ../purchasing/manage/suppliers.php.orig:121
msgid "Bank Name/Account:"
msgstr ""
-#: ../purchasing/manage/suppliers.php:113
-#: ../sales/manage/customers.php:228
+#: ../purchasing/manage/suppliers.php:112
+#: ../purchasing/manage/suppliers.php.orig:122
+#: ../sales/manage/customers.php:263
+#: ../sales/manage/sav.customers.php:263
msgid "Credit Limit:"
msgstr ""
-#: ../purchasing/manage/suppliers.php:114
-#: ../sales/manage/customers.php:230
+#: ../purchasing/manage/suppliers.php:113
+#: ../purchasing/manage/suppliers.php.orig:123
+#: ../sales/manage/customers.php:265
+#: ../sales/manage/sav.customers.php:265
msgid "Payment Terms:"
msgstr ""
-#: ../purchasing/manage/suppliers.php:120
-#: ../purchasing/manage/suppliers.php:123
+#: ../purchasing/manage/suppliers.php:119
+#: ../purchasing/manage/suppliers.php:122
+#: ../purchasing/manage/suppliers.php.orig:129
+#: ../purchasing/manage/suppliers.php.orig:132
msgid "Prices contain tax included:"
msgstr ""
-#: ../purchasing/manage/suppliers.php:125
-#: ../reporting/rep704.php:91
-#: ../reporting/rep704.php:101
-#: ../reporting/rep704.php:109
+#: ../purchasing/manage/suppliers.php:124
+#: ../purchasing/manage/suppliers.php.orig:134
+msgid "Tax Calculation Algorithm:"
+msgstr ""
+
+#: ../purchasing/manage/suppliers.php:128
+#: ../purchasing/manage/suppliers.php.orig:138
+#: ../reporting/rep704.php:92
+#: ../reporting/rep704.php:102
+#: ../reporting/rep704.php:110
msgid "Accounts"
msgstr ""
-#: ../purchasing/manage/suppliers.php:126
+#: ../purchasing/manage/suppliers.php:129
+#: ../purchasing/manage/suppliers.php.orig:139
msgid "Accounts Payable Account:"
msgstr ""
-#: ../purchasing/manage/suppliers.php:127
+#: ../purchasing/manage/suppliers.php:130
+#: ../purchasing/manage/suppliers.php.orig:140
msgid "Purchase Account:"
msgstr ""
-#: ../purchasing/manage/suppliers.php:128
+#: ../purchasing/manage/suppliers.php:131
+#: ../purchasing/manage/suppliers.php.orig:141
msgid "Use Item Inventory/COGS Account"
msgstr ""
-#: ../purchasing/manage/suppliers.php:146
-#: ../sales/manage/customer_branches.php:267
-msgid "Addresses"
+#: ../purchasing/manage/suppliers.php:134
+#: ../purchasing/manage/suppliers.php:137
+#: ../purchasing/manage/suppliers.php.orig:112
+msgid "Contact Data"
+msgstr ""
+
+#: ../purchasing/manage/suppliers.php:140
+#: ../purchasing/manage/suppliers.php.orig:118
+msgid "System default"
msgstr ""
-#: ../purchasing/manage/suppliers.php:147
+#: ../purchasing/manage/suppliers.php:157
+#: ../purchasing/manage/suppliers.php.orig:159
#: ../sales/manage/customer_branches.php:268
+msgid "Addresses"
+msgstr ""
+
+#: ../purchasing/manage/suppliers.php:158
+#: ../purchasing/manage/suppliers.php.orig:160
+#: ../sales/manage/customer_branches.php:269
msgid "Mailing Address:"
msgstr ""
-#: ../purchasing/manage/suppliers.php:148
+#: ../purchasing/manage/suppliers.php:159
+#: ../purchasing/manage/suppliers.php.orig:161
msgid "Physical Address:"
msgstr ""
-#: ../purchasing/manage/suppliers.php:150
+#: ../purchasing/manage/suppliers.php:161
+#: ../purchasing/manage/suppliers.php.orig:163
msgid "General"
msgstr ""
-#: ../purchasing/manage/suppliers.php:151
-#: ../sales/manage/customer_branches.php:270
-#: ../sales/manage/customers.php:251
+#: ../purchasing/manage/suppliers.php:162
+#: ../purchasing/manage/suppliers.php.orig:164
+#: ../sales/manage/customer_branches.php:271
+#: ../sales/manage/customers.php:286
+#: ../sales/manage/sav.customers.php:286
msgid "General Notes:"
msgstr ""
-#: ../purchasing/manage/suppliers.php:153
+#: ../purchasing/manage/suppliers.php:164
+#: ../purchasing/manage/suppliers.php.orig:166
msgid "Supplier status:"
msgstr ""
-#: ../purchasing/manage/suppliers.php:160
+#: ../purchasing/manage/suppliers.php:170
+#: ../purchasing/manage/suppliers.php.orig:173
msgid "Update Supplier"
msgstr ""
-#: ../purchasing/manage/suppliers.php:161
+#: ../purchasing/manage/suppliers.php:171
+#: ../purchasing/manage/suppliers.php.orig:174
msgid "Update supplier data"
msgstr ""
-#: ../purchasing/manage/suppliers.php:162
+#: ../purchasing/manage/suppliers.php:172
+#: ../purchasing/manage/suppliers.php.orig:175
msgid "Select this supplier and return to document entry."
msgstr ""
-#: ../purchasing/manage/suppliers.php:163
+#: ../purchasing/manage/suppliers.php:173
+#: ../purchasing/manage/suppliers.php.orig:176
msgid "Delete Supplier"
msgstr ""
-#: ../purchasing/manage/suppliers.php:164
+#: ../purchasing/manage/suppliers.php:174
+#: ../purchasing/manage/suppliers.php.orig:177
msgid "Delete supplier data if have been never used"
msgstr ""
-#: ../purchasing/manage/suppliers.php:168
+#: ../purchasing/manage/suppliers.php:178
+#: ../purchasing/manage/suppliers.php.orig:181
msgid "Add New Supplier Details"
msgstr ""
-#: ../purchasing/manage/suppliers.php:187
+#: ../purchasing/manage/suppliers.php:197
+#: ../purchasing/manage/suppliers.php.orig:200
msgid "The supplier name must be entered."
msgstr ""
-#: ../purchasing/manage/suppliers.php:194
+#: ../purchasing/manage/suppliers.php:204
+#: ../purchasing/manage/suppliers.php.orig:207
msgid "The supplier short name must be entered."
msgstr ""
-#: ../purchasing/manage/suppliers.php:214
+#: ../purchasing/manage/suppliers.php:224
+#: ../purchasing/manage/suppliers.php.orig:227
msgid "Supplier has been updated."
msgstr ""
-#: ../purchasing/manage/suppliers.php:232
+#: ../purchasing/manage/suppliers.php:242
+#: ../purchasing/manage/suppliers.php.orig:245
msgid "A new supplier has been added."
msgstr ""
-#: ../purchasing/manage/suppliers.php:250
+#: ../purchasing/manage/suppliers.php:260
+#: ../purchasing/manage/suppliers.php.orig:263
msgid ""
"Cannot delete this supplier because there are transactions that refer to "
"this supplier."
msgstr ""
-#: ../purchasing/manage/suppliers.php:258
+#: ../purchasing/manage/suppliers.php:268
+#: ../purchasing/manage/suppliers.php.orig:271
msgid ""
"Cannot delete the supplier record because purchase orders have been created "
"against this supplier."
msgstr ""
-#: ../purchasing/manage/suppliers.php:279
+#: ../purchasing/manage/suppliers.php:289
+#: ../purchasing/manage/suppliers.php.orig:292
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:48
msgid "Select a supplier: "
msgstr ""
-#: ../purchasing/manage/suppliers.php:280
+#: ../purchasing/manage/suppliers.php:290
+#: ../purchasing/manage/suppliers.php.orig:293
msgid "New supplier"
msgstr ""
-#: ../purchasing/manage/suppliers.php:298
-#: ../sales/manage/customer_branches.php:323
-#: ../sales/manage/customers.php:300
-msgid "&General settings"
+#: ../purchasing/manage/suppliers.php:309
+#: ../purchasing/manage/suppliers.php.orig:312
+#: ../sales/manage/customer_branches.php:325
+#: ../sales/manage/customers.php:343
+#: ../sales/manage/sav.customers.php:343
+msgid "&Contacts"
msgstr ""
-#: ../purchasing/manage/suppliers.php:299
-#: ../sales/manage/customer_branches.php:324
-#: ../sales/manage/customers.php:301
-msgid "&Contacts"
+#: ../purchasing/manage/suppliers.php:311
+#: ../purchasing/manage/suppliers.php.orig:314
+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:225
+#: ../sales/inquiry/sales_deliveries_view.php.orig:103
+#: ../sales/inquiry/sales_orders_view.php:247
+#: ../sales/inquiry/sales_orders_view.php.orig:224
msgid "#:"
msgstr ""
#: ../purchasing/inquiry/po_search_completed.php:65
+#: ../purchasing/inquiry/po_search_completed.php.orig:66
msgid "into location:"
msgstr ""
-#: ../purchasing/inquiry/po_search_completed.php:121
+#: ../purchasing/inquiry/po_search_completed.php:125
+#: ../purchasing/inquiry/po_search_completed.php.orig:124
#: ../purchasing/inquiry/po_search.php:135
-#: ../sales/inquiry/sales_orders_view.php:263
+#: ../sales/inquiry/sales_orders_view.php:289
+#: ../sales/inquiry/sales_orders_view.php.orig:266
msgid "Order Date"
msgstr ""
-#: ../purchasing/inquiry/po_search_completed.php:123
+#: ../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:266
+#: ../sales/inquiry/sales_orders_view.php:292
+#: ../sales/inquiry/sales_orders_view.php.orig:269
msgid "Order Total"
msgstr ""
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:55
#: ../sales/inquiry/customer_allocation_inquiry.php:49
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:49
msgid "show settled:"
msgstr ""
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:135
#: ../reporting/rep101.php:131
#: ../reporting/rep201.php:119
-#: ../reporting/includes/doctext.inc:117
-#: ../sales/inquiry/customer_allocation_inquiry.php:151
+#: ../reporting/includes/doctext.inc:247
+#: ../sales/inquiry/customer_allocation_inquiry.php:154
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:154
msgid "Allocated"
msgstr ""
#: ../purchasing/inquiry/supplier_inquiry.php:25
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:25
msgid "Supplier Inquiry"
msgstr ""
-#: ../purchasing/inquiry/supplier_inquiry.php:47
+#: ../purchasing/inquiry/supplier_inquiry.php:48
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:48
msgid "Select a supplier:"
msgstr ""
-#: ../purchasing/inquiry/supplier_inquiry.php:66
#: ../purchasing/inquiry/supplier_inquiry.php:67
#: ../purchasing/inquiry/supplier_inquiry.php:68
-#: ../reporting/rep102.php:110
-#: ../reporting/rep102.php:111
-#: ../reporting/rep102.php:112
-#: ../reporting/rep102.php:227
-#: ../reporting/rep202.php:112
-#: ../reporting/rep202.php:113
-#: ../reporting/rep202.php:114
-#: ../reporting/rep202.php:143
-#: ../reporting/rep202.php:144
-#: ../reporting/rep202.php:145
-#: ../reporting/rep202.php:233
-#: ../reporting/includes/doctext.inc:179
-#: ../sales/create_recurrent_invoices.php:98
-#: ../sales/manage/recurrent_invoices.php:85
+#: ../purchasing/inquiry/supplier_inquiry.php:69
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:67
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:68
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:69
+#: ../reporting/rep102.php:118
+#: ../reporting/rep102.php:119
+#: ../reporting/rep102.php:120
+#: ../reporting/rep102.php:240
+#: ../reporting/rep108.php:150
+#: ../reporting/rep108.php:151
+#: ../reporting/rep108.php:152
+#: ../reporting/rep202.php:122
+#: ../reporting/rep202.php:123
+#: ../reporting/rep202.php:124
+#: ../reporting/rep202.php:154
+#: ../reporting/rep202.php:155
+#: ../reporting/rep202.php:156
+#: ../reporting/rep202.php:248
+#: ../sales/create_recurrent_invoices.php:115
+#: ../sales/manage/recurrent_invoices.php:102
#: ../sales/inquiry/customer_inquiry.php:71
#: ../sales/inquiry/customer_inquiry.php:72
#: ../sales/inquiry/customer_inquiry.php:73
-#: ../themes/exclusive/renderer.php:274
-#: ../themes/exclusive/renderer.php:368
+#: ../sales/inquiry/customer_inquiry.php.orig:72
+#: ../sales/inquiry/customer_inquiry.php.orig:73
+#: ../sales/inquiry/customer_inquiry.php.orig:74
msgid "Days"
msgstr ""
-#: ../purchasing/inquiry/supplier_inquiry.php:68
-#: ../reporting/rep102.php:112
-#: ../reporting/rep202.php:114
-#: ../reporting/rep202.php:145
-#: ../reporting/includes/doctext.inc:180
+#: ../purchasing/inquiry/supplier_inquiry.php:69
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:69
+#: ../reporting/rep102.php:120
+#: ../reporting/rep108.php:152
+#: ../reporting/rep202.php:124
+#: ../reporting/rep202.php:156
#: ../sales/inquiry/customer_inquiry.php:73
+#: ../sales/inquiry/customer_inquiry.php.orig:74
msgid "Over"
msgstr ""
-#: ../purchasing/inquiry/supplier_inquiry.php:72
+#: ../purchasing/inquiry/supplier_inquiry.php:73
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:73
#: ../sales/inquiry/customer_inquiry.php:76
+#: ../sales/inquiry/customer_inquiry.php.orig:77
msgid "Terms"
msgstr ""
-#: ../purchasing/inquiry/supplier_inquiry.php:72
-#: ../reporting/rep102.php:115
-#: ../reporting/rep102.php:225
-#: ../reporting/rep202.php:118
-#: ../reporting/rep202.php:231
-#: ../reporting/includes/doctext.inc:175
+#: ../purchasing/inquiry/supplier_inquiry.php:73
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:73
+#: ../reporting/rep102.php:123
+#: ../reporting/rep102.php:238
+#: ../reporting/rep108.php:154
+#: ../reporting/rep202.php:128
+#: ../reporting/rep202.php:246
#: ../sales/inquiry/customer_inquiry.php:76
+#: ../sales/inquiry/customer_inquiry.php.orig:77
msgid "Current"
msgstr ""
-#: ../purchasing/inquiry/supplier_inquiry.php:73
-#: ../reporting/rep102.php:116
-#: ../reporting/rep202.php:119
-#: ../reporting/includes/doctext.inc:176
+#: ../purchasing/inquiry/supplier_inquiry.php:74
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:74
+#: ../reporting/rep102.php:124
+#: ../reporting/rep108.php:154
+#: ../reporting/rep202.php:129
#: ../sales/inquiry/customer_inquiry.php:77
+#: ../sales/inquiry/customer_inquiry.php.orig:78
msgid "Total Balance"
msgstr ""
-#: ../purchasing/inquiry/supplier_inquiry.php:127
-#: ../sales/inquiry/customer_inquiry.php:158
+#: ../purchasing/inquiry/supplier_inquiry.php:133
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:130
+#: ../sales/inquiry/customer_inquiry.php:162
+#: ../sales/inquiry/customer_inquiry.php.orig:161
msgid "Credit This"
msgstr ""
-#: ../purchasing/inquiry/supplier_inquiry.php:149
+#: ../purchasing/inquiry/supplier_inquiry.php:155
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:152
msgid "Print Remittance"
msgstr ""
msgstr ""
#: ../reporting/rep101.php:120
-#: ../reporting/rep102.php:100
-#: ../reporting/rep202.php:102
+#: ../reporting/rep102.php:106
+#: ../reporting/rep114.php:103
+#: ../reporting/rep202.php:110
#: ../reporting/rep203.php:81
msgid "Balances in Home Currency"
msgstr ""
#: ../reporting/rep101.php:130
#: ../reporting/rep201.php:118
#: ../reporting/rep203.php:91
-#: ../reporting/rep709.php:107
-#: ../reporting/includes/doctext.inc:108
-#: ../reporting/includes/doctext.inc:116
+#: ../reporting/rep709.php:109
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
+#: ../reporting/includes/doctext.inc:246
msgid "Trans Type"
msgstr ""
#: ../reporting/rep101.php:130
#: ../reporting/rep201.php:118
-#: ../reporting/includes/doctext.inc:116
+#: ../reporting/includes/doctext.inc:246
msgid "Charges"
msgstr ""
#: ../reporting/rep101.php:130
#: ../reporting/rep201.php:119
-#: ../reporting/includes/doctext.inc:117
+#: ../reporting/includes/doctext.inc:247
msgid "Credits"
msgstr ""
#: ../reporting/rep101.php:139
-#: ../reporting/rep102.php:125
+#: ../reporting/rep102.php:134
#: ../reporting/rep201.php:127
-#: ../reporting/rep202.php:128
+#: ../reporting/rep202.php:139
#: ../reporting/rep203.php:100
#: ../reporting/rep303.php:124
-#: ../reporting/reports_main.php:35
-#: ../reporting/reports_main.php:43
-#: ../reporting/reports_main.php:127
-#: ../reporting/reports_main.php:135
-#: ../reporting/reports_main.php:143
-#: ../reporting/reports_main.php:182
+#: ../reporting/reports_main.php:38
+#: ../reporting/reports_main.php:47
+#: ../reporting/reports_main.php:138
+#: ../reporting/reports_main.php:147
+#: ../reporting/reports_main.php:155
+#: ../reporting/reports_main.php:195
msgid "Suppress Zeros"
msgstr ""
msgstr ""
#: ../reporting/rep101.php:244
-#: ../reporting/rep102.php:211
-#: ../reporting/rep106.php:177
+#: ../reporting/rep102.php:224
+#: ../reporting/rep106.php:167
#: ../reporting/rep201.php:231
-#: ../reporting/rep202.php:216
+#: ../reporting/rep202.php:231
#: ../reporting/rep203.php:177
#: ../reporting/rep204.php:144
-#: ../reporting/rep301.php:171
-#: ../reporting/rep304.php:193
-#: ../reporting/rep305.php:132
+#: ../reporting/rep301.php:176
+#: ../reporting/rep304.php:191
+#: ../reporting/rep305.php:181
msgid "Grand Total"
msgstr ""
-#: ../reporting/rep102.php:94
+#: ../reporting/rep102.php:100
#: ../reporting/rep106.php:91
-#: ../reporting/rep202.php:96
-#: ../reporting/rep709.php:91
-#: ../reporting/reports_main.php:42
-#: ../reporting/reports_main.php:74
-#: ../reporting/reports_main.php:134
-#: ../reporting/reports_main.php:168
-#: ../reporting/reports_main.php:380
+#: ../reporting/rep202.php:104
+#: ../reporting/rep709.php:93
+#: ../reporting/reports_main.php:46
+#: ../reporting/reports_main.php:84
+#: ../reporting/reports_main.php:146
+#: ../reporting/reports_main.php:181
+#: ../reporting/reports_main.php:393
msgid "Summary Only"
msgstr ""
-#: ../reporting/rep102.php:96
-#: ../reporting/rep202.php:98
-#: ../reporting/rep709.php:93
+#: ../reporting/rep102.php:102
+#: ../reporting/rep202.php:106
+#: ../reporting/rep709.php:95
msgid "Detailed Report"
msgstr ""
-#: ../reporting/rep102.php:121
-#: ../reporting/rep202.php:124
+#: ../reporting/rep102.php:129
+#: ../reporting/rep202.php:134
#: ../reporting/rep203.php:97
-#: ../reporting/reports_main.php:32
-#: ../reporting/reports_main.php:39
-#: ../reporting/reports_main.php:65
-#: ../reporting/reports_main.php:73
-#: ../reporting/reports_main.php:124
-#: ../reporting/reports_main.php:131
-#: ../reporting/reports_main.php:140
-#: ../reporting/reports_main.php:187
-#: ../reporting/reports_main.php:195
-#: ../reporting/reports_main.php:227
-#: ../reporting/reports_main.php:238
-#: ../reporting/reports_main.php:249
-#: ../reporting/reports_main.php:265
-#: ../reporting/reports_main.php:275
-#: ../reporting/reports_main.php:286
-#: ../reporting/reports_main.php:298
-#: ../reporting/reports_main.php:312
-#: ../reporting/reports_main.php:321
-#: ../reporting/reports_main.php:331
-#: ../reporting/reports_main.php:342
-#: ../reporting/reports_main.php:354
-#: ../reporting/reports_main.php:362
-#: ../reporting/reports_main.php:371
-#: ../reporting/reports_main.php:379
-#: ../reporting/reports_main.php:385
+#: ../reporting/rep301.php:108
+#: ../reporting/reports_main.php:35
+#: ../reporting/reports_main.php:42
+#: ../reporting/reports_main.php:61
+#: ../reporting/reports_main.php:75
+#: ../reporting/reports_main.php:83
+#: ../reporting/reports_main.php:135
+#: ../reporting/reports_main.php:142
+#: ../reporting/reports_main.php:152
+#: ../reporting/reports_main.php:178
+#: ../reporting/reports_main.php:200
+#: ../reporting/reports_main.php:208
+#: ../reporting/reports_main.php:240
+#: ../reporting/reports_main.php:251
+#: ../reporting/reports_main.php:262
+#: ../reporting/reports_main.php:278
+#: ../reporting/reports_main.php:288
+#: ../reporting/reports_main.php:299
+#: ../reporting/reports_main.php:311
+#: ../reporting/reports_main.php:325
+#: ../reporting/reports_main.php:334
+#: ../reporting/reports_main.php:344
+#: ../reporting/reports_main.php:355
+#: ../reporting/reports_main.php:367
+#: ../reporting/reports_main.php:375
+#: ../reporting/reports_main.php:384
+#: ../reporting/reports_main.php:392
+#: ../reporting/reports_main.php:398
msgid "End Date"
msgstr ""
-#: ../reporting/rep102.php:129
+#: ../reporting/rep102.php:133
+#: ../reporting/rep202.php:138
+#: ../reporting/reports_main.php:45
+#: ../reporting/reports_main.php:110
+#: ../reporting/reports_main.php:145
+msgid "Show Also Allocated"
+msgstr ""
+
+#: ../reporting/rep102.php:138
msgid "Aged Customer Analysis"
msgstr ""
msgstr ""
#: ../reporting/rep103.php:142
-#: ../reporting/reports_main.php:48
+#: ../reporting/reports_main.php:52
msgid "Activity Since"
msgstr ""
#: ../reporting/rep103.php:143
-#: ../reporting/reports_main.php:49
+#: ../reporting/reports_main.php:53
#: ../sales/manage/sales_areas.php:16
msgid "Sales Areas"
msgstr ""
#: ../reporting/rep103.php:144
-#: ../reporting/reports_main.php:50
+#: ../reporting/reports_main.php:54
msgid "Sales Folk"
msgstr ""
msgstr ""
#: ../reporting/rep103.php:196
-#: ../sales/includes/ui/sales_order_ui.inc:416
msgid "Price List"
msgstr ""
msgstr ""
#: ../reporting/rep104.php:109
-#: ../reporting/rep301.php:99
+#: ../reporting/rep301.php:103
#: ../reporting/rep303.php:109
#: ../reporting/rep303.php:115
msgid "UOM"
msgstr ""
#: ../reporting/rep104.php:117
-#: ../reporting/reports_main.php:60
+#: ../reporting/reports_main.php:70
msgid "Show GP %"
msgstr ""
msgstr ""
#: ../reporting/rep105.php:103
-#: ../reporting/reports_main.php:68
+#: ../reporting/reports_main.php:78
msgid "Back Orders Only"
msgstr ""
#: ../reporting/rep105.php:107
#: ../reporting/rep204.php:82
-#: ../sales/inquiry/customer_allocation_inquiry.php:144
-#: ../sales/inquiry/customer_inquiry.php:214
+#: ../sales/inquiry/customer_allocation_inquiry.php:147
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:147
+#: ../sales/inquiry/customer_inquiry.php:202
+#: ../sales/inquiry/customer_inquiry.php.orig:226
msgid "Order"
msgstr ""
#: ../reporting/rep105.php:107
#: ../reporting/rep106.php:81
-#: ../reporting/includes/doctext.inc:163
-#: ../sales/create_recurrent_invoices.php:98
-#: ../sales/customer_credit_invoice.php:247
-#: ../sales/customer_delivery.php:337
-#: ../sales/customer_invoice.php:368
-#: ../sales/manage/recurrent_invoices.php:85
+#: ../reporting/rep112.php:164
+#: ../sales/create_recurrent_invoices.php:115
+#: ../sales/customer_credit_invoice.php:238
+#: ../sales/customer_delivery.php:347
+#: ../sales/customer_invoice.php:445
+#: ../sales/manage/customers.php:251
+#: ../sales/manage/customers.php:289
+#: ../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:219
+#: ../sales/inquiry/customer_inquiry.php:207
+#: ../sales/inquiry/customer_inquiry.php.orig:231
#: ../sales/inquiry/sales_deliveries_view.php:182
-#: ../sales/inquiry/sales_orders_view.php:261
-#: ../sales/inquiry/sales_orders_view.php:275
-#: ../themes/exclusive/renderer.php:273
+#: ../sales/inquiry/sales_deliveries_view.php.orig:182
+#: ../sales/inquiry/sales_orders_view.php:287
+#: ../sales/inquiry/sales_orders_view.php:301
+#: ../sales/inquiry/sales_orders_view.php.orig:264
+#: ../sales/inquiry/sales_orders_view.php.orig:278
msgid "Branch"
msgstr ""
msgstr ""
#: ../reporting/rep105.php:112
-#: ../sales/customer_delivery.php:430
-#: ../sales/customer_invoice.php:442
+#: ../sales/customer_delivery.php:440
+#: ../sales/customer_invoice.php:542
msgid "Invoiced"
msgstr ""
msgid "Order Status Listing"
msgstr ""
-#: ../reporting/rep106.php:81
-#: ../sales/inquiry/sales_deliveries_view.php:166
-#: ../sales/inquiry/sales_orders_view.php:142
-msgid "Invoice"
-msgstr ""
-
#: ../reporting/rep106.php:82
msgid "Inv Date"
msgstr ""
msgstr ""
#: ../reporting/rep106.php:86
-#: ../reporting/includes/header2.inc:98
+#: ../reporting/includes/header2.inc:110
#: ../sales/manage/sales_people.php:99
msgid "Email"
msgstr ""
msgid "Salesman Listing"
msgstr ""
-#: ../reporting/rep107.php:66
-#: ../reporting/rep107.php:100
-#: ../reporting/rep107.php:111
-#: ../reporting/includes/doctext.inc:92
+#: ../reporting/rep107.php:85
+#: ../reporting/rep107.php:105
+#: ../reporting/includes/doctext.inc:118
msgid "INVOICE"
msgstr ""
-#: ../reporting/rep107.php:105
-#: ../reporting/rep107.php:111
-#: ../reporting/includes/doctext.inc:100
-msgid "CREDIT NOTE"
+#: ../reporting/rep107.php:186
+msgid "Prepayments invoiced to this order up to day:"
+msgstr ""
+
+#: ../reporting/rep107.php:193
+msgid "Invoice reference"
+msgstr ""
+
+#: ../reporting/rep107.php:210
+msgid "Total payments:"
+msgstr ""
+
+#: ../reporting/rep107.php:220
+#: ../reporting/rep109.php:155
+#: ../reporting/rep110.php:164
+#: ../reporting/rep111.php:140
+#: ../reporting/rep113.php:150
+#: ../sales/view/view_credit.php:138
+#: ../sales/view/view_dispatch.php:155
+#: ../sales/view/view_invoice.php:159
+#: ../sales/view/view_sales_order.php:245
+#: ../sales/view/view_sales_order.php.orig:227
+#: ../sales/includes/ui/sales_credit_ui.inc:222
+msgid "Shipping"
+msgstr ""
+
+#: ../reporting/rep107.php:266
+#: ../reporting/rep109.php:207
+#: ../reporting/rep111.php:192
+msgid "TOTAL ORDER VAT INCL."
+msgstr ""
+
+#: ../reporting/rep107.php:272
+msgid "THIS INVOICE"
msgstr ""
#: ../reporting/rep108.php:84
#: ../reporting/rep108.php:115
-#: ../reporting/includes/doctext.inc:115
+#: ../reporting/includes/doctext.inc:238
msgid "STATEMENT"
msgstr ""
-#: ../reporting/rep109.php:65
-#: ../reporting/rep109.php:93
-#: ../reporting/rep109.php:99
-#: ../reporting/includes/doctext.inc:90
+#: ../reporting/rep108.php:126
+msgid "Outstanding Transactions"
+msgstr ""
+
+#: ../reporting/rep108.php:169
+msgid "Statement"
+msgstr ""
+
+#: ../reporting/rep108.php:169
+msgid "as of"
+msgstr ""
+
+#: ../reporting/rep109.php:66
+#: ../reporting/rep109.php:94
+#: ../reporting/rep109.php:100
+#: ../reporting/includes/doctext.inc:65
msgid "SALES ORDER"
msgstr ""
-#: ../reporting/rep109.php:67
-#: ../reporting/rep109.php:88
-#: ../reporting/rep109.php:99
-#: ../reporting/includes/doctext.inc:90
+#: ../reporting/rep109.php:68
+#: ../reporting/rep109.php:89
+#: ../reporting/rep109.php:100
+#: ../reporting/includes/doctext.inc:65
msgid "QUOTE"
msgstr ""
+#: ../reporting/rep109.php:161
+#: ../reporting/rep111.php:146
+msgid "TOTAL ORDER EX VAT"
+msgstr ""
+
#: ../reporting/rep110.php:68
msgid "DELIVERY"
msgstr ""
#: ../reporting/rep110.php:70
#: ../reporting/rep110.php:97
-#: ../reporting/includes/doctext.inc:88
+#: ../reporting/includes/doctext.inc:82
msgid "PACKING SLIP"
msgstr ""
#: ../reporting/rep110.php:92
#: ../reporting/rep110.php:103
-#: ../reporting/includes/doctext.inc:88
+#: ../reporting/includes/doctext.inc:82
msgid "DELIVERY NOTE"
msgstr ""
-#: ../reporting/rep111.php:60
-#: ../reporting/rep111.php:85
-#: ../reporting/includes/doctext.inc:84
+#: ../reporting/rep110.php:208
+msgid "TOTAL DELIVERY INCL. VAT"
+msgstr ""
+
+#: ../reporting/rep111.php:61
+#: ../reporting/rep111.php:86
+#: ../reporting/includes/doctext.inc:50
msgid "SALES QUOTATION"
msgstr ""
-#: ../reporting/rep112.php:92
-#: ../reporting/rep112.php:112
-#: ../reporting/includes/doctext.inc:98
+#: ../reporting/rep112.php:80
+#: ../reporting/rep112.php:101
+#: ../reporting/includes/doctext.inc:198
msgid "RECEIPT"
msgstr ""
+#: ../reporting/rep112.php:110
+#: ../reporting/rep210.php:124
+msgid "As advance / full / part / payment towards:"
+msgstr ""
+
+#: ../reporting/rep112.php:145
+msgid "TOTAL RECEIPT"
+msgstr ""
+
+#: ../reporting/rep112.php:155
+msgid "Received / Sign"
+msgstr ""
+
+#: ../reporting/rep112.php:157
+msgid "By Cash / Cheque* / Draft No."
+msgstr ""
+
+#: ../reporting/rep112.php:159
+msgid "Dated"
+msgstr ""
+
+#: ../reporting/rep112.php:162
+msgid "Drawn on Bank"
+msgstr ""
+
+#: ../reporting/rep113.php:66
+#: ../reporting/rep113.php:91
+#: ../reporting/rep113.php:96
+#: ../reporting/includes/doctext.inc:103
+msgid "CREDIT NOTE"
+msgstr ""
+
+#: ../reporting/rep113.php:194
+#: ../sales/view/view_credit.php:143
+msgid "TOTAL CREDIT"
+msgstr ""
+
+#: ../reporting/rep114.php:85
+msgid "Sales Summary Report"
+msgstr ""
+
+#: ../reporting/rep114.php:89
+#: ../reporting/reports_main.php:62
+msgid "Tax Id Only"
+msgstr ""
+
+#: ../reporting/rep114.php:93
+msgid "Tax Id"
+msgstr ""
+
+#: ../reporting/rep114.php:93
+msgid "Total ex. Tax"
+msgstr ""
+
+#: ../reporting/rep114.php:93
+#: ../reporting/rep709.php:110
+#: ../taxes/tax_groups.php:171
+#: ../taxes/tax_groups.php.orig:173
+#: ../taxes/tax_groups.php.sav:173
+msgid "Tax"
+msgstr ""
+
#: ../reporting/rep201.php:108
msgid "Balances in Home currency"
msgstr ""
msgid "Supplier Balances"
msgstr ""
-#: ../reporting/rep202.php:131
+#: ../reporting/rep202.php:142
msgid "currency"
msgstr ""
-#: ../reporting/rep202.php:132
+#: ../reporting/rep202.php:143
msgid "Aged Supplier Analysis"
msgstr ""
msgid "Payment Report"
msgstr ""
-#: ../reporting/rep204.php:82
-msgid "GRN"
-msgstr ""
-
#: ../reporting/rep204.php:82
msgid "Qty Recd"
msgstr ""
#: ../reporting/rep209.php:88
#: ../reporting/rep209.php:107
#: ../reporting/rep209.php:112
-#: ../reporting/includes/doctext.inc:86
+#: ../reporting/includes/doctext.inc:171
msgid "PURCHASE ORDER"
msgstr ""
-#: ../reporting/rep210.php:94
-#: ../reporting/rep210.php:121
-#: ../reporting/rep210.php:126
-#: ../reporting/includes/doctext.inc:96
+#: ../reporting/rep209.php:214
+msgid "TOTAL PO"
+msgstr ""
+
+#: ../reporting/rep210.php:82
+#: ../reporting/rep210.php:110
+#: ../reporting/rep210.php:115
+#: ../reporting/includes/doctext.inc:151
msgid "REMITTANCE"
msgstr ""
-#: ../reporting/rep301.php:107
+#: ../reporting/rep210.php:159
+msgid "TOTAL REMITTANCE"
+msgstr ""
+
+#: ../reporting/rep301.php:112
msgid "Inventory Valuation Report"
msgstr ""
#: ../reporting/rep303.php:109
#: ../reporting/rep303.php:115
-#: ../reporting/rep305.php:72
+#: ../reporting/rep305.php:95
msgid "Stock ID"
msgstr ""
msgid "Stock Check Sheets"
msgstr ""
-#: ../reporting/rep304.php:114
+#: ../reporting/rep304.php:112
+#: ../reporting/rep305.php:95
msgid "Qty"
msgstr ""
-#: ../reporting/rep304.php:114
+#: ../reporting/rep304.php:112
#: ../sales/manage/customer_branches.php:241
-#: ../sales/manage/customers.php:224
+#: ../sales/manage/customers.php:259
+#: ../sales/manage/sav.customers.php:259
msgid "Sales"
msgstr ""
-#: ../reporting/rep304.php:114
+#: ../reporting/rep304.php:112
msgid "Cost"
msgstr ""
-#: ../reporting/rep304.php:114
+#: ../reporting/rep304.php:112
msgid "Contribution"
msgstr ""
-#: ../reporting/rep304.php:126
+#: ../reporting/rep304.php:124
msgid "Inventory Sales Report"
msgstr ""
-#: ../reporting/rep305.php:72
+#: ../reporting/rep305.php:95
msgid "PO No"
msgstr ""
-#: ../reporting/rep305.php:72
-msgid "Qty Received"
+#: ../reporting/rep305.php:95
+msgid "Inv"
msgstr ""
-#: ../reporting/rep305.php:72
-msgid "Unit Price"
+#: ../reporting/rep305.php:95
+msgid "Inv Price"
msgstr ""
-#: ../reporting/rep305.php:72
-msgid "Actual Price"
+#: ../reporting/rep305.php:95
+msgid "PO Price"
msgstr ""
-#: ../reporting/rep305.php:79
+#: ../reporting/rep305.php:102
msgid "GRN Valuation Report"
msgstr ""
msgid "Bill of Material Listing"
msgstr ""
-#: ../reporting/rep409.php:60
-#: ../reporting/rep409.php:79
-#: ../reporting/rep409.php:84
-#: ../reporting/includes/doctext.inc:94
+#: ../reporting/rep409.php:58
+#: ../reporting/rep409.php:77
+#: ../reporting/rep409.php:82
+#: ../reporting/includes/doctext.inc:214
msgid "WORK ORDER"
msgstr ""
-#: ../reporting/rep409.php:134
+#: ../reporting/rep409.php:132
msgid "Insufficient stock"
msgstr ""
-#: ../reporting/rep409.php:147
-#: ../reporting/includes/doctext.inc:136
-msgid "Work Order No."
-msgstr ""
-
#: ../reporting/rep501.php:85
msgid "YTD"
msgstr ""
msgstr ""
#: ../reporting/rep601.php:83
-#: ../reporting/includes/doctext.inc:70
+#: ../reporting/rep602.php:87
+#: ../reporting/includes/doctext.inc:260
msgid "Bank Account"
msgstr ""
#: ../reporting/rep601.php:144
+#: ../reporting/rep602.php:151
msgid "Total Debit / Credit"
msgstr ""
#: ../reporting/rep601.php:161
+#: ../reporting/rep602.php:167
msgid "Net Change"
msgstr ""
+#: ../reporting/rep602.php:73
+msgid "Bank Statement w/Reconcile"
+msgstr ""
+
+#: ../reporting/rep602.php:81
+msgid "Reco Date"
+msgstr ""
+
+#: ../reporting/rep602.php:81
+msgid "Narration"
+msgstr ""
+
+#: ../reporting/rep602.php:195
+msgid "Bank Balance"
+msgstr ""
+
#: ../reporting/rep702.php:51
msgid "Type/Account"
msgstr ""
msgid "List of Journal Entries"
msgstr ""
-#: ../reporting/rep704.php:66
+#: ../reporting/rep704.php:67
msgid "GL Account Transactions"
msgstr ""
#: ../reporting/rep705.php:243
#: ../reporting/rep705.php:256
#: ../reporting/rep705.php:267
-#: ../reporting/reports_main.php:257
-#: ../reporting/reports_main.php:305
-#: ../reporting/reports_main.php:348
+#: ../reporting/reports_main.php:270
+#: ../reporting/reports_main.php:318
+#: ../reporting/reports_main.php:361
msgid "Year"
msgstr ""
msgid "Close Balance"
msgstr ""
-#: ../reporting/rep706.php:302
-#: ../reporting/rep707.php:320
-#: ../sales/create_recurrent_invoices.php:98
-#: ../sales/manage/recurrent_invoices.php:85
-msgid "Group"
-msgstr ""
-
#: ../reporting/rep707.php:254
msgid "Profit and Loss Statement"
msgstr ""
-#: ../reporting/rep709.php:89
+#: ../reporting/rep709.php:91
msgid "Tax Report"
msgstr ""
-#: ../reporting/rep709.php:107
+#: ../reporting/rep709.php:109
msgid "Branch Name"
msgstr ""
-#: ../reporting/rep709.php:108
+#: ../reporting/rep709.php:110
msgid "Net"
msgstr ""
-#: ../reporting/rep709.php:108
-#: ../taxes/item_tax_types.php:180
+#: ../reporting/rep709.php:110
+#: ../taxes/item_tax_types.php:185
msgid "Rate"
msgstr ""
-#: ../reporting/rep709.php:108
-#: ../taxes/tax_groups.php:214
-msgid "Tax"
-msgstr ""
-
-#: ../reporting/rep709.php:168
+#: ../reporting/rep709.php:172
msgid "Tax Rate"
msgstr ""
-#: ../reporting/rep709.php:168
+#: ../reporting/rep709.php:172
msgid "Net Tax"
msgstr ""
msgstr ""
#: ../reporting/rep710.php:87
-#: ../reporting/reports_main.php:383
+#: ../reporting/reports_main.php:396
msgid "Audit Trail"
msgstr ""
msgid "Changed"
msgstr ""
-#: ../reporting/reports_main.php:23
+#: ../reporting/reports_main.php:26
msgid "Reports and Analysis"
msgstr ""
-#: ../reporting/reports_main.php:30
+#: ../reporting/reports_main.php:33
msgid "Customer &Balances"
msgstr ""
-#: ../reporting/reports_main.php:34
-#: ../reporting/reports_main.php:41
-#: ../reporting/reports_main.php:56
-#: ../reporting/reports_main.php:80
-#: ../reporting/reports_main.php:92
-#: ../reporting/reports_main.php:99
-#: ../reporting/reports_main.php:106
-#: ../reporting/reports_main.php:112
-#: ../reporting/reports_main.php:118
-#: ../reporting/reports_main.php:126
-#: ../reporting/reports_main.php:133
-#: ../reporting/reports_main.php:142
-#: ../reporting/reports_main.php:153
-#: ../reporting/reports_main.php:159
+#: ../reporting/reports_main.php:37
+#: ../reporting/reports_main.php:44
+#: ../reporting/reports_main.php:66
+#: ../reporting/reports_main.php:90
+#: ../reporting/reports_main.php:97
+#: ../reporting/reports_main.php:109
+#: ../reporting/reports_main.php:116
+#: ../reporting/reports_main.php:123
+#: ../reporting/reports_main.php:129
+#: ../reporting/reports_main.php:137
+#: ../reporting/reports_main.php:144
+#: ../reporting/reports_main.php:154
+#: ../reporting/reports_main.php:165
+#: ../reporting/reports_main.php:171
msgid "Currency Filter"
msgstr ""
-#: ../reporting/reports_main.php:37
-#: ../reporting/reports_main.php:46
-#: ../reporting/reports_main.php:54
-#: ../reporting/reports_main.php:62
-#: ../reporting/reports_main.php:70
-#: ../reporting/reports_main.php:76
-#: ../reporting/reports_main.php:129
-#: ../reporting/reports_main.php:138
-#: ../reporting/reports_main.php:145
-#: ../reporting/reports_main.php:149
-#: ../reporting/reports_main.php:170
-#: ../reporting/reports_main.php:175
-#: ../reporting/reports_main.php:184
-#: ../reporting/reports_main.php:192
+#: ../reporting/reports_main.php:40
+#: ../reporting/reports_main.php:50
+#: ../reporting/reports_main.php:58
+#: ../reporting/reports_main.php:64
+#: ../reporting/reports_main.php:72
+#: ../reporting/reports_main.php:80
+#: ../reporting/reports_main.php:86
+#: ../reporting/reports_main.php:140
+#: ../reporting/reports_main.php:150
+#: ../reporting/reports_main.php:157
+#: ../reporting/reports_main.php:161
+#: ../reporting/reports_main.php:183
+#: ../reporting/reports_main.php:188
#: ../reporting/reports_main.php:197
-#: ../reporting/reports_main.php:204
-#: ../reporting/reports_main.php:218
-#: ../reporting/reports_main.php:229
-#: ../reporting/reports_main.php:235
-#: ../reporting/reports_main.php:241
-#: ../reporting/reports_main.php:255
-#: ../reporting/reports_main.php:262
-#: ../reporting/reports_main.php:272
-#: ../reporting/reports_main.php:283
-#: ../reporting/reports_main.php:292
-#: ../reporting/reports_main.php:303
-#: ../reporting/reports_main.php:309
-#: ../reporting/reports_main.php:318
-#: ../reporting/reports_main.php:328
-#: ../reporting/reports_main.php:336
-#: ../reporting/reports_main.php:346
-#: ../reporting/reports_main.php:351
+#: ../reporting/reports_main.php:205
+#: ../reporting/reports_main.php:210
+#: ../reporting/reports_main.php:217
+#: ../reporting/reports_main.php:231
+#: ../reporting/reports_main.php:242
+#: ../reporting/reports_main.php:248
+#: ../reporting/reports_main.php:254
+#: ../reporting/reports_main.php:268
+#: ../reporting/reports_main.php:275
+#: ../reporting/reports_main.php:285
+#: ../reporting/reports_main.php:296
+#: ../reporting/reports_main.php:305
+#: ../reporting/reports_main.php:316
+#: ../reporting/reports_main.php:322
+#: ../reporting/reports_main.php:331
+#: ../reporting/reports_main.php:341
+#: ../reporting/reports_main.php:349
#: ../reporting/reports_main.php:359
-#: ../reporting/reports_main.php:368
-#: ../reporting/reports_main.php:375
-#: ../reporting/reports_main.php:382
-#: ../reporting/reports_main.php:389
+#: ../reporting/reports_main.php:364
+#: ../reporting/reports_main.php:372
+#: ../reporting/reports_main.php:381
+#: ../reporting/reports_main.php:388
+#: ../reporting/reports_main.php:395
+#: ../reporting/reports_main.php:402
msgid "Destination"
msgstr ""
-#: ../reporting/reports_main.php:38
+#: ../reporting/reports_main.php:41
msgid "&Aged Customer Analysis"
msgstr ""
-#: ../reporting/reports_main.php:44
-#: ../reporting/reports_main.php:136
-#: ../reporting/reports_main.php:270
-#: ../reporting/reports_main.php:281
-#: ../reporting/reports_main.php:316
-#: ../reporting/reports_main.php:326
-#: ../reporting/reports_main.php:357
-#: ../reporting/reports_main.php:366
+#: ../reporting/reports_main.php:48
+#: ../reporting/reports_main.php:148
+#: ../reporting/reports_main.php:283
+#: ../reporting/reports_main.php:294
+#: ../reporting/reports_main.php:329
+#: ../reporting/reports_main.php:339
+#: ../reporting/reports_main.php:370
+#: ../reporting/reports_main.php:379
msgid "Graphics"
msgstr ""
-#: ../reporting/reports_main.php:47
+#: ../reporting/reports_main.php:51
msgid "Customer &Detail Listing"
msgstr ""
-#: ../reporting/reports_main.php:51
+#: ../reporting/reports_main.php:55
msgid "Activity Greater Than"
msgstr ""
-#: ../reporting/reports_main.php:52
+#: ../reporting/reports_main.php:56
msgid "Activity Less Than"
msgstr ""
-#: ../reporting/reports_main.php:55
+#: ../reporting/reports_main.php:59
+msgid "Sales &Summary Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:65
msgid "&Price Listing"
msgstr ""
-#: ../reporting/reports_main.php:57
-#: ../reporting/reports_main.php:66
-#: ../reporting/reports_main.php:166
-#: ../reporting/reports_main.php:172
-#: ../reporting/reports_main.php:177
-#: ../reporting/reports_main.php:188
+#: ../reporting/reports_main.php:67
+#: ../reporting/reports_main.php:76
+#: ../reporting/reports_main.php:179
+#: ../reporting/reports_main.php:185
+#: ../reporting/reports_main.php:190
+#: ../reporting/reports_main.php:201
msgid "Inventory Category"
msgstr ""
-#: ../reporting/reports_main.php:58
+#: ../reporting/reports_main.php:68
#: ../sales/manage/sales_types.php:16
msgid "Sales Types"
msgstr ""
-#: ../reporting/reports_main.php:59
-#: ../reporting/reports_main.php:179
-msgid "Show Pictures"
+#: ../reporting/reports_main.php:69
+#: ../reporting/reports_main.php:192
+msgid "Show Pictures"
msgstr ""
-#: ../reporting/reports_main.php:63
+#: ../reporting/reports_main.php:73
msgid "&Order Status Listing"
msgstr ""
-#: ../reporting/reports_main.php:67
+#: ../reporting/reports_main.php:77
msgid "Stock Location"
msgstr ""
-#: ../reporting/reports_main.php:71
+#: ../reporting/reports_main.php:81
msgid "&Salesman Listing"
msgstr ""
-#: ../reporting/reports_main.php:77
-msgid "Print &Invoices/Credit Notes"
+#: ../reporting/reports_main.php:87
+msgid "Print &Invoices"
msgstr ""
-#: ../reporting/reports_main.php:81
-#: ../reporting/reports_main.php:87
+#: ../reporting/reports_main.php:91
+#: ../reporting/reports_main.php:98
+#: ../reporting/reports_main.php:104
msgid "email Customers"
msgstr ""
-#: ../reporting/reports_main.php:82
+#: ../reporting/reports_main.php:92
+#: ../reporting/reports_main.php:99
msgid "Payment Link"
msgstr ""
-#: ../reporting/reports_main.php:84
+#: ../reporting/reports_main.php:94
+msgid "Print &Credit Notes"
+msgstr ""
+
+#: ../reporting/reports_main.php:101
msgid "Print &Deliveries"
msgstr ""
-#: ../reporting/reports_main.php:88
+#: ../reporting/reports_main.php:105
msgid "Print as Packing Slip"
msgstr ""
-#: ../reporting/reports_main.php:90
+#: ../reporting/reports_main.php:107
msgid "Print &Statements"
msgstr ""
-#: ../reporting/reports_main.php:93
-msgid "Show Outstanding Only"
-msgstr ""
-
-#: ../reporting/reports_main.php:94
-#: ../reporting/reports_main.php:100
-#: ../reporting/reports_main.php:107
-#: ../reporting/reports_main.php:113
-#: ../reporting/reports_main.php:154
-#: ../reporting/reports_main.php:160
+#: ../reporting/reports_main.php:111
+#: ../reporting/reports_main.php:117
+#: ../reporting/reports_main.php:124
+#: ../reporting/reports_main.php:166
+#: ../reporting/reports_main.php:172
msgid "Email Customers"
msgstr ""
-#: ../reporting/reports_main.php:96
+#: ../reporting/reports_main.php:113
msgid "&Print Sales Orders"
msgstr ""
-#: ../reporting/reports_main.php:101
+#: ../reporting/reports_main.php:118
msgid "Print as Quote"
msgstr ""
-#: ../reporting/reports_main.php:103
-#: ../reporting/reports_main.php:109
+#: ../reporting/reports_main.php:120
msgid "&Print Sales Quotations"
msgstr ""
-#: ../reporting/reports_main.php:115
+#: ../reporting/reports_main.php:126
msgid "Print Receipts"
msgstr ""
-#: ../reporting/reports_main.php:122
+#: ../reporting/reports_main.php:133
msgid "Supplier &Balances"
msgstr ""
-#: ../reporting/reports_main.php:130
+#: ../reporting/reports_main.php:141
msgid "&Aged Supplier Analyses"
msgstr ""
-#: ../reporting/reports_main.php:139
+#: ../reporting/reports_main.php:151
msgid "&Payment Report"
msgstr ""
-#: ../reporting/reports_main.php:146
+#: ../reporting/reports_main.php:158
msgid "Outstanding &GRNs Report"
msgstr ""
-#: ../reporting/reports_main.php:150
+#: ../reporting/reports_main.php:162
msgid "Print Purchase &Orders"
msgstr ""
-#: ../reporting/reports_main.php:156
-msgid "Print Remittances"
+#: ../reporting/reports_main.php:168
+msgid "Print Remi&ttances"
msgstr ""
-#: ../reporting/reports_main.php:165
+#: ../reporting/reports_main.php:177
msgid "Inventory &Valuation Report"
msgstr ""
-#: ../reporting/reports_main.php:171
+#: ../reporting/reports_main.php:184
msgid "Inventory &Planning Report"
msgstr ""
-#: ../reporting/reports_main.php:176
+#: ../reporting/reports_main.php:189
msgid "Stock &Check Sheets"
msgstr ""
-#: ../reporting/reports_main.php:180
+#: ../reporting/reports_main.php:193
msgid "Inventory Column"
msgstr ""
-#: ../reporting/reports_main.php:181
+#: ../reporting/reports_main.php:194
msgid "Show Shortage"
msgstr ""
-#: ../reporting/reports_main.php:185
+#: ../reporting/reports_main.php:198
msgid "Inventory &Sales Report"
msgstr ""
-#: ../reporting/reports_main.php:193
+#: ../reporting/reports_main.php:206
msgid "&GRN Valuation Report"
msgstr ""
-#: ../reporting/reports_main.php:199
+#: ../reporting/reports_main.php:212
msgid "Manufacturing"
msgstr ""
-#: ../reporting/reports_main.php:200
+#: ../reporting/reports_main.php:213
msgid "&Bill of Material Listing"
msgstr ""
-#: ../reporting/reports_main.php:201
+#: ../reporting/reports_main.php:214
msgid "From product"
msgstr ""
-#: ../reporting/reports_main.php:202
+#: ../reporting/reports_main.php:215
msgid "To product"
msgstr ""
-#: ../reporting/reports_main.php:205
+#: ../reporting/reports_main.php:218
msgid "Print &Work Orders"
msgstr ""
-#: ../reporting/reports_main.php:208
+#: ../reporting/reports_main.php:221
msgid "Email Locations"
msgstr ""
-#: ../reporting/reports_main.php:213
+#: ../reporting/reports_main.php:226
msgid "Dimension &Summary"
msgstr ""
-#: ../reporting/reports_main.php:214
+#: ../reporting/reports_main.php:227
msgid "From Dimension"
msgstr ""
-#: ../reporting/reports_main.php:215
+#: ../reporting/reports_main.php:228
msgid "To Dimension"
msgstr ""
-#: ../reporting/reports_main.php:216
+#: ../reporting/reports_main.php:229
msgid "Show Balance"
msgstr ""
-#: ../reporting/reports_main.php:223
+#: ../reporting/reports_main.php:236
msgid "Banking"
msgstr ""
-#: ../reporting/reports_main.php:224
+#: ../reporting/reports_main.php:237
msgid "Bank &Statement"
msgstr ""
-#: ../reporting/reports_main.php:231
+#: ../reporting/reports_main.php:244
msgid "General Ledger"
msgstr ""
-#: ../reporting/reports_main.php:232
+#: ../reporting/reports_main.php:245
msgid "Chart of &Accounts"
msgstr ""
-#: ../reporting/reports_main.php:233
+#: ../reporting/reports_main.php:246
msgid "Show Balances"
msgstr ""
-#: ../reporting/reports_main.php:236
+#: ../reporting/reports_main.php:249
msgid "List of &Journal Entries"
msgstr ""
-#: ../reporting/reports_main.php:247
-#: ../reporting/reports_main.php:296
-#: ../reporting/reports_main.php:340
+#: ../reporting/reports_main.php:260
+#: ../reporting/reports_main.php:309
+#: ../reporting/reports_main.php:353
msgid "GL Account &Transactions"
msgstr ""
-#: ../reporting/reports_main.php:250
-#: ../reporting/reports_main.php:299
-#: ../reporting/reports_main.php:343
+#: ../reporting/reports_main.php:263
+#: ../reporting/reports_main.php:312
+#: ../reporting/reports_main.php:356
msgid "From Account"
msgstr ""
-#: ../reporting/reports_main.php:251
-#: ../reporting/reports_main.php:300
-#: ../reporting/reports_main.php:344
+#: ../reporting/reports_main.php:264
+#: ../reporting/reports_main.php:313
+#: ../reporting/reports_main.php:357
msgid "To Account"
msgstr ""
-#: ../reporting/reports_main.php:256
-#: ../reporting/reports_main.php:304
-#: ../reporting/reports_main.php:347
+#: ../reporting/reports_main.php:269
+#: ../reporting/reports_main.php:317
+#: ../reporting/reports_main.php:360
msgid "Annual &Expense Breakdown"
msgstr ""
-#: ../reporting/reports_main.php:263
-#: ../reporting/reports_main.php:310
-#: ../reporting/reports_main.php:352
+#: ../reporting/reports_main.php:276
+#: ../reporting/reports_main.php:323
+#: ../reporting/reports_main.php:365
msgid "&Balance Sheet"
msgstr ""
-#: ../reporting/reports_main.php:269
-#: ../reporting/reports_main.php:280
-#: ../reporting/reports_main.php:315
-#: ../reporting/reports_main.php:325
-#: ../reporting/reports_main.php:356
-#: ../reporting/reports_main.php:365
+#: ../reporting/reports_main.php:282
+#: ../reporting/reports_main.php:293
+#: ../reporting/reports_main.php:328
+#: ../reporting/reports_main.php:338
+#: ../reporting/reports_main.php:369
+#: ../reporting/reports_main.php:378
msgid "Decimal values"
msgstr ""
-#: ../reporting/reports_main.php:273
-#: ../reporting/reports_main.php:319
-#: ../reporting/reports_main.php:360
+#: ../reporting/reports_main.php:286
+#: ../reporting/reports_main.php:332
+#: ../reporting/reports_main.php:373
msgid "&Profit and Loss Statement"
msgstr ""
-#: ../reporting/reports_main.php:287
-#: ../reporting/reports_main.php:332
-#: ../reporting/reports_main.php:372
+#: ../reporting/reports_main.php:300
+#: ../reporting/reports_main.php:345
+#: ../reporting/reports_main.php:385
msgid "Zero values"
msgstr ""
-#: ../reporting/reports_main.php:377
+#: ../reporting/reports_main.php:390
msgid "Ta&x Report"
msgstr ""
-#: ../reporting/includes/doctext.inc:14
-msgid "Cust no"
-msgstr ""
-
#: ../reporting/includes/doctext.inc:18
-msgid "Order To"
-msgstr ""
-
-#: ../reporting/includes/doctext.inc:20
-msgid "Deliver To"
-msgstr ""
-
-#: ../reporting/includes/doctext.inc:22
-#: ../reporting/includes/doctext.inc:29
+#: ../reporting/includes/doctext.inc:156
#: ../sales/view/view_dispatch.php:51
-#: ../sales/view/view_invoice.php:51
+#: ../sales/view/view_invoice.php:53
msgid "Charge To"
msgstr ""
-#: ../reporting/includes/doctext.inc:27
-msgid "With thanks from"
-msgstr ""
-
-#: ../reporting/includes/doctext.inc:30
+#: ../reporting/includes/doctext.inc:23
#: ../sales/view/view_dispatch.php:74
msgid "Delivered To"
msgstr ""
-#: ../reporting/includes/doctext.inc:34
-#: ../sales/view/view_sales_order.php:68
-#: ../sales/inquiry/sales_orders_view.php:278
-#: ../sales/includes/ui/sales_order_ui.inc:612
-msgid "Valid until"
+#: ../reporting/includes/doctext.inc:30
+#: ../sales/customer_credit_invoice.php:283
+#: ../sales/view/view_credit.php:91
+#: ../sales/view/view_dispatch.php:113
+#: ../sales/view/view_invoice.php:116
+#: ../sales/includes/ui/sales_credit_ui.inc:168
+#: ../sales/includes/ui/sales_order_ui.inc:142
+#: ../sales/includes/ui/sales_order_ui.inc.orig:142
+msgid "Discount %"
msgstr ""
-#: ../reporting/includes/doctext.inc:39
-msgid "Your Ref"
+#: ../reporting/includes/doctext.inc:33
+msgid "All amounts stated in"
msgstr ""
-#: ../reporting/includes/doctext.inc:54
-#: ../sales/manage/customer_branches.php:297
-msgid "Sales Person"
+#: ../reporting/includes/doctext.inc:51
+msgid "Quotation No."
msgstr ""
-#: ../reporting/includes/doctext.inc:55
-msgid "Your VAT no."
+#: ../reporting/includes/doctext.inc:56
+#: ../reporting/includes/doctext.inc:73
+#: ../reporting/includes/doctext.inc:94
+#: ../reporting/includes/doctext.inc:108
+#: ../reporting/includes/doctext.inc:131
+#: ../reporting/includes/doctext.inc:161
+#: ../reporting/includes/doctext.inc:184
+#: ../reporting/includes/doctext.inc:202
+#: ../reporting/includes/doctext.inc:240
+msgid "Customers Reference"
msgstr ""
#: ../reporting/includes/doctext.inc:57
-msgid "Customers Reference"
+#: ../reporting/includes/doctext.inc:74
+#: ../reporting/includes/doctext.inc:95
+#: ../reporting/includes/doctext.inc:109
+#: ../reporting/includes/doctext.inc:132
+#: ../reporting/includes/doctext.inc:185
+#: ../reporting/includes/doctext.inc:241
+#: ../sales/manage/customer_branches.php:298
+msgid "Sales Person"
msgstr ""
#: ../reporting/includes/doctext.inc:58
-#: ../sales/view/view_dispatch.php:87
-#: ../sales/view/view_invoice.php:86
-msgid "Our Order No"
-msgstr ""
-
-#: ../reporting/includes/doctext.inc:60
-msgid "Our VAT No."
-msgstr ""
-
-#: ../reporting/includes/doctext.inc:61
-msgid "Domicile"
+#: ../reporting/includes/doctext.inc:75
+#: ../reporting/includes/doctext.inc:96
+#: ../reporting/includes/doctext.inc:110
+#: ../reporting/includes/doctext.inc:133
+#: ../reporting/includes/doctext.inc:163
+#: ../reporting/includes/doctext.inc:186
+#: ../reporting/includes/doctext.inc:204
+#: ../reporting/includes/doctext.inc:242
+msgid "Your VAT no."
msgstr ""
-#: ../reporting/includes/doctext.inc:66
-msgid "* Subject to Realisation of the Cheque."
+#: ../reporting/includes/doctext.inc:59
+msgid "Our Quotation No"
msgstr ""
-#: ../reporting/includes/doctext.inc:68
-msgid "All amounts stated in"
+#: ../reporting/includes/doctext.inc:60
+#: ../sales/view/view_sales_order.php:69
+#: ../sales/view/view_sales_order.php.orig:69
+#: ../sales/inquiry/sales_orders_view.php:304
+#: ../sales/inquiry/sales_orders_view.php.orig:281
+#: ../sales/includes/ui/sales_order_ui.inc:606
+#: ../sales/includes/ui/sales_order_ui.inc.orig:606
+msgid "Valid until"
msgstr ""
-#: ../reporting/includes/doctext.inc:72
-msgid "Please quote Invoice no. when paying. All amounts stated in"
+#: ../reporting/includes/doctext.inc:65
+msgid "PREPAYMENT ORDER"
msgstr ""
-#: ../reporting/includes/doctext.inc:73
-msgid "Please quote Credit no. when paying. All amounts stated in"
+#: ../reporting/includes/doctext.inc:66
+msgid "Order No."
msgstr ""
#: ../reporting/includes/doctext.inc:76
-msgid "Phone/Fax/Email"
-msgstr ""
-
-#: ../reporting/includes/doctext.inc:78
-#: ../reporting/includes/doctext.inc:125
-msgid "You can pay through"
-msgstr ""
-
+#: ../reporting/includes/doctext.inc:97
#: ../reporting/includes/doctext.inc:111
-#: ../sales/customer_credit_invoice.php:292
-#: ../sales/view/view_credit.php:91
-#: ../sales/view/view_dispatch.php:113
-#: ../sales/view/view_invoice.php:114
-#: ../sales/includes/ui/sales_credit_ui.inc:168
-#: ../sales/includes/ui/sales_order_ui.inc:143
-msgid "Discount %"
-msgstr ""
-
-#: ../reporting/includes/doctext.inc:116
-msgid "DueDate"
-msgstr ""
-
-#: ../reporting/includes/doctext.inc:122
-msgid "Dear"
-msgstr ""
-
-#: ../reporting/includes/doctext.inc:123
-msgid "Attached you will find "
-msgstr ""
-
-#: ../reporting/includes/doctext.inc:124
-msgid "Kindest regards"
+#: ../reporting/includes/doctext.inc:138
+#: ../reporting/includes/doctext.inc:164
+#: ../reporting/includes/doctext.inc:187
+#: ../reporting/includes/doctext.inc:205
+#: ../reporting/includes/doctext.inc:243
+#: ../sales/view/view_dispatch.php:87
+#: ../sales/view/view_invoice.php:87
+msgid "Our Order No"
msgstr ""
-#: ../reporting/includes/doctext.inc:129
-#: ../reporting/includes/doctext.inc:138
+#: ../reporting/includes/doctext.inc:83
msgid "Delivery Note No."
msgstr ""
-#: ../reporting/includes/doctext.inc:130
-msgid "Receipt No."
+#: ../reporting/includes/doctext.inc:98
+msgid "To Be Invoiced Before"
msgstr ""
-#: ../reporting/includes/doctext.inc:131
-msgid "Remittance No."
+#: ../reporting/includes/doctext.inc:104
+msgid "Credit No."
msgstr ""
-#: ../reporting/includes/doctext.inc:132
-msgid "Purchase Order No."
+#: ../reporting/includes/doctext.inc:105
+msgid "Please quote Credit no. when paying. All amounts stated in"
msgstr ""
-#: ../reporting/includes/doctext.inc:133
-#: ../reporting/includes/doctext.inc:139
-msgid "Order No."
+#: ../reporting/includes/doctext.inc:117
+msgid "PREPAYMENT INVOICE"
msgstr ""
-#: ../reporting/includes/doctext.inc:134
-msgid "Quotation No."
+#: ../reporting/includes/doctext.inc:118
+msgid "FINAL INVOICE"
msgstr ""
-#: ../reporting/includes/doctext.inc:135
+#: ../reporting/includes/doctext.inc:119
msgid "Invoice No."
msgstr ""
-#: ../reporting/includes/doctext.inc:136
-msgid "Credit No."
+#: ../reporting/includes/doctext.inc:121
+msgid "Please quote Invoice no. when paying. All amounts stated in"
msgstr ""
-#: ../reporting/includes/doctext.inc:148
-#: ../sales/view/view_credit.php:138
-#: ../sales/view/view_dispatch.php:155
-#: ../sales/view/view_invoice.php:157
-#: ../sales/view/view_sales_order.php:226
-#: ../sales/includes/ui/sales_credit_ui.inc:222
-msgid "Shipping"
+#: ../reporting/includes/doctext.inc:137
+msgid "Date of Payment"
msgstr ""
-#: ../reporting/includes/doctext.inc:151
-#: ../sales/view/view_credit.php:143
-msgid "TOTAL CREDIT"
+#: ../reporting/includes/doctext.inc:143
+msgid "Date of Sale"
msgstr ""
#: ../reporting/includes/doctext.inc:152
-msgid "TOTAL ORDER EX VAT"
+msgid "Remittance No."
msgstr ""
#: ../reporting/includes/doctext.inc:153
-msgid "TOTAL ORDER VAT INCL."
-msgstr ""
-
-#: ../reporting/includes/doctext.inc:154
-msgid "TOTAL PO"
-msgstr ""
-
-#: ../reporting/includes/doctext.inc:155
-msgid "TOTAL DELIVERY INCL. VAT"
-msgstr ""
-
-#: ../reporting/includes/doctext.inc:159
-msgid "As advance / full / part / payment towards:"
-msgstr ""
-
-#: ../reporting/includes/doctext.inc:160
-msgid "By Cash / Cheque* / Draft No."
+#: ../reporting/includes/doctext.inc:173
+msgid "Order To"
msgstr ""
-#: ../reporting/includes/doctext.inc:161
-msgid "Dated"
+#: ../reporting/includes/doctext.inc:172
+msgid "Purchase Order No."
msgstr ""
-#: ../reporting/includes/doctext.inc:162
-msgid "Drawn on Bank"
+#: ../reporting/includes/doctext.inc:176
+msgid "Deliver To"
msgstr ""
-#: ../reporting/includes/doctext.inc:164
-msgid "Received / Sign"
+#: ../reporting/includes/doctext.inc:199
+msgid "Receipt No."
msgstr ""
-#: ../reporting/includes/doctext.inc:168
-msgid "TOTAL RECEIPT"
+#: ../reporting/includes/doctext.inc:200
+msgid "With thanks from"
msgstr ""
-#: ../reporting/includes/doctext.inc:170
-msgid "TOTAL REMITTANCE"
+#: ../reporting/includes/doctext.inc:215
+msgid "Work Order No."
msgstr ""
-#: ../reporting/includes/doctext.inc:174
-msgid "Outstanding Transactions"
+#: ../reporting/includes/doctext.inc:246
+msgid "DueDate"
msgstr ""
-#: ../reporting/includes/doctext.inc:177
-msgid "Statement"
+#: ../reporting/includes/doctext.inc:272
+#: ../reporting/includes/pdf_report.inc:1013
+msgid "You can pay through"
msgstr ""
-#: ../reporting/includes/doctext.inc:178
-msgid "as of"
+#: ../reporting/includes/doctext.inc:276
+msgid "* Subject to Realisation of the Cheque."
msgstr ""
-#: ../reporting/includes/excel_report.inc:65
+#: ../reporting/includes/excel_report.inc:67
#: ../reporting/includes/pdf_report.inc:80
msgid ""
"The security settings on your account do not permit you to print this report"
msgstr ""
-#: ../reporting/includes/excel_report.inc:255
+#: ../reporting/includes/excel_report.inc:262
#: ../reporting/includes/pdf_report.inc:316
msgid "Print Out Date"
msgstr ""
-#: ../reporting/includes/excel_report.inc:261
+#: ../reporting/includes/excel_report.inc:268
#: ../reporting/includes/pdf_report.inc:325
msgid "Fiscal Year"
msgstr ""
-#: ../reporting/includes/excel_report.inc:389
+#: ../reporting/includes/excel_report.inc:396
msgid "Report Date"
msgstr ""
-#: ../reporting/includes/excel_report.inc:406
-#: ../reporting/includes/pdf_report.inc:599
+#: ../reporting/includes/excel_report.inc:413
+#: ../reporting/includes/pdf_report.inc:600
msgid "Generated At"
msgstr ""
-#: ../reporting/includes/excel_report.inc:412
-#: ../reporting/includes/pdf_report.inc:608
+#: ../reporting/includes/excel_report.inc:419
+#: ../reporting/includes/pdf_report.inc:609
msgid "Generated By"
msgstr ""
-#: ../reporting/includes/header2.inc:150
+#: ../reporting/includes/header2.inc:122
+msgid "Our VAT No."
+msgstr ""
+
+#: ../reporting/includes/header2.inc:128
+msgid "Domicile"
+msgstr ""
+
+#: ../reporting/includes/header2.inc:143
#: ../reporting/includes/pdf_report.inc:352
-#: ../reporting/includes/pdf_report.inc:499
-#: ../reporting/includes/pdf_report.inc:627
+#: ../reporting/includes/pdf_report.inc:500
+#: ../reporting/includes/pdf_report.inc:628
msgid "Page"
msgstr ""
-#: ../reporting/includes/pdf_report.inc:582
+#: ../reporting/includes/pdf_report.inc:583
msgid "Report Period"
msgstr ""
-#: ../reporting/includes/pdf_report.inc:996
+#: ../reporting/includes/pdf_report.inc:980
msgid "You have no email contact defined for this type of document"
msgstr ""
-#: ../reporting/includes/pdf_report.inc:1038
+#: ../reporting/includes/pdf_report.inc:999
+msgid "Dear"
+msgstr ""
+
+#: ../reporting/includes/pdf_report.inc:1000
+msgid "Attached you will find "
+msgstr ""
+
+#: ../reporting/includes/pdf_report.inc:1016
+msgid "Kindest regards"
+msgstr ""
+
+#: ../reporting/includes/pdf_report.inc:1028
+msgid "There is no contact email set for this document type."
+msgstr ""
+
+#: ../reporting/includes/pdf_report.inc:1031
msgid "Sending document by email failed"
msgstr ""
-#: ../reporting/includes/pdf_report.inc:1041
+#: ../reporting/includes/pdf_report.inc:1031
+#: ../reporting/includes/pdf_report.inc:1034
+msgid "Email:"
+msgstr ""
+
+#: ../reporting/includes/pdf_report.inc:1034
msgid "has been sent by email to destination."
msgstr ""
-#: ../reporting/includes/pdf_report.inc:1071
+#: ../reporting/includes/pdf_report.inc:1064
msgid "Report has been sent to network printer "
msgstr ""
msgid "Cannot flush printing queue"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:57
+#: ../reporting/includes/reports_classes.inc:61
msgid "Report Classes:"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:70
+#: ../reporting/includes/reports_classes.inc:81
msgid "Reports For Class: "
msgstr ""
-#: ../reporting/includes/reports_classes.inc:85
+#: ../reporting/includes/reports_classes.inc:101
msgid "Display: "
msgstr ""
-#: ../reporting/includes/reports_classes.inc:115
-msgid "Invalid date format"
-msgstr ""
-
-#: ../reporting/includes/reports_classes.inc:153
+#: ../reporting/includes/reports_classes.inc:149
msgid "Unknown report parameter type:"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:178
+#: ../reporting/includes/reports_classes.inc:175
msgid "No Currency Filter"
msgstr ""
#: ../reporting/includes/reports_classes.inc:227
-msgid "No payment Link"
-msgstr ""
-
-#: ../reporting/includes/reports_classes.inc:231
msgid "PDF/Printer"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:242
+#: ../reporting/includes/reports_classes.inc:238
msgid "No Graphics"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:242
+#: ../reporting/includes/reports_classes.inc:238
msgid "Vertical bars"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:242
+#: ../reporting/includes/reports_classes.inc:238
msgid "Horizontal bars"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:243
+#: ../reporting/includes/reports_classes.inc:239
msgid "Dots"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:243
+#: ../reporting/includes/reports_classes.inc:239
msgid "Lines"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:243
+#: ../reporting/includes/reports_classes.inc:239
msgid "Pie"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:243
+#: ../reporting/includes/reports_classes.inc:239
msgid "Donut"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:247
-#: ../reporting/includes/reports_classes.inc:250
+#: ../reporting/includes/reports_classes.inc:243
+#: ../reporting/includes/reports_classes.inc:246
msgid "No Type Filter"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:260
+#: ../reporting/includes/reports_classes.inc:256
msgid "No Account Group Filter"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:275
-#: ../reporting/includes/reports_classes.inc:281
-#: ../reporting/includes/reports_classes.inc:287
+#: ../reporting/includes/reports_classes.inc:271
+#: ../reporting/includes/reports_classes.inc:277
+#: ../reporting/includes/reports_classes.inc:283
msgid "No Dimension Filter"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:293
-msgid "No Customer Filter"
-msgstr ""
-
-#: ../reporting/includes/reports_classes.inc:304
-msgid "No Supplier Filter"
-msgstr ""
-
-#: ../reporting/includes/reports_classes.inc:312
-msgid "IV"
-msgstr ""
-
-#: ../reporting/includes/reports_classes.inc:313
-#: ../reporting/includes/reports_classes.inc:356
-#: ../reporting/includes/reports_classes.inc:366
-msgid "CN"
-msgstr ""
-
-#: ../reporting/includes/reports_classes.inc:321
-#: ../sales/customer_invoice.php:446
-msgid "DN"
-msgstr ""
-
-#: ../reporting/includes/reports_classes.inc:354
-msgid "BP"
-msgstr ""
-
-#: ../reporting/includes/reports_classes.inc:355
-msgid "SP"
-msgstr ""
-
-#: ../reporting/includes/reports_classes.inc:364
-msgid "BD"
+#: ../reporting/includes/reports_classes.inc:289
+msgid "No Customer Filter"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:365
-msgid "CP"
+#: ../reporting/includes/reports_classes.inc:297
+msgid "No Supplier Filter"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:383
+#: ../reporting/includes/reports_classes.inc:379
msgid "No Location Filter"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:386
+#: ../reporting/includes/reports_classes.inc:382
msgid "No Category Filter"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:395
+#: ../reporting/includes/reports_classes.inc:391
msgid "No Sales Folk Filter"
msgstr ""
-#: ../reporting/includes/reports_classes.inc:402
+#: ../reporting/includes/reports_classes.inc:398
msgid "No Users Filter"
msgstr ""
msgid "Create and Print Recurrent Invoices"
msgstr ""
-#: ../sales/create_recurrent_invoices.php:98
-#: ../sales/manage/recurrent_invoices.php:85
+#: ../sales/create_recurrent_invoices.php:40
+#, php-format
+msgid "Recurrent Invoice covers period %s - %s."
+msgstr ""
+
+#: ../sales/create_recurrent_invoices.php:97
+#, php-format
+msgid "%s recurrent invoice(s) created, # %s - # %s."
+msgstr ""
+
+#: ../sales/create_recurrent_invoices.php:102
+#, php-format
+msgid "&Print Recurrent Invoices # %s - # %s"
+msgstr ""
+
+#: ../sales/create_recurrent_invoices.php:104
+#, php-format
+msgid "&Email Recurrent Invoices # %s - # %s"
+msgstr ""
+
+#: ../sales/create_recurrent_invoices.php:115
+#: ../sales/manage/recurrent_invoices.php:102
msgid "Template No"
msgstr ""
-#: ../sales/create_recurrent_invoices.php:98
-#: ../sales/manage/recurrent_invoices.php:85
+#: ../sales/create_recurrent_invoices.php:115
+#: ../sales/manage/recurrent_invoices.php:102
msgid "Begin"
msgstr ""
-#: ../sales/create_recurrent_invoices.php:98
-#: ../sales/manage/recurrent_invoices.php:85
+#: ../sales/create_recurrent_invoices.php:115
+#: ../sales/manage/recurrent_invoices.php:102
msgid "End"
msgstr ""
-#: ../sales/create_recurrent_invoices.php:98
-#: ../sales/manage/recurrent_invoices.php:85
+#: ../sales/create_recurrent_invoices.php:115
+#: ../sales/manage/recurrent_invoices.php:102
+#: ../sales/manage/recurrent_invoices.php:185
msgid "Last Created"
msgstr ""
-#: ../sales/create_recurrent_invoices.php:142
+#: ../sales/create_recurrent_invoices.php:156
msgid "Create Invoices"
msgstr ""
-#: ../sales/create_recurrent_invoices.php:149
+#: ../sales/create_recurrent_invoices.php:164
msgid "Marked items are due."
msgstr ""
-#: ../sales/create_recurrent_invoices.php:151
+#: ../sales/create_recurrent_invoices.php:166
msgid "No recurrent invoices are due."
msgstr ""
msgstr ""
#: ../sales/credit_note_entry.php:51
-#: ../sales/sales_order_entry.php:637
+#: ../sales/sales_order_entry.php:672
msgid ""
"There are no customers, or there are no customers with branches. Please "
"define customers and customer branches."
#: ../sales/credit_note_entry.php:73
#: ../sales/customer_credit_invoice.php:60
-#: ../sales/customer_credit_invoice.php:75
+#: ../sales/customer_credit_invoice.php:77
msgid "View the GL &Journal Entries for this Credit Note"
msgstr ""
msgid "Enter Another &Credit Note"
msgstr ""
-#: ../sales/credit_note_entry.php:155
+#: ../sales/credit_note_entry.php:157
msgid "The entered date for the credit note is invalid."
msgstr ""
-#: ../sales/credit_note_entry.php:172
+#: ../sales/credit_note_entry.php:174
msgid ""
"For credit notes created to write off the stock, a general ledger account is "
"required to be selected."
msgstr ""
-#: ../sales/credit_note_entry.php:173
+#: ../sales/credit_note_entry.php:175
msgid ""
"Please select an account to write the cost of the stock off to, then click "
"on Process again."
msgstr ""
-#: ../sales/credit_note_entry.php:193
+#: ../sales/credit_note_entry.php:195
msgid "The quantity must be greater than zero."
msgstr ""
-#: ../sales/credit_note_entry.php:198
+#: ../sales/credit_note_entry.php:200
msgid "The entered price is negative or invalid."
msgstr ""
-#: ../sales/credit_note_entry.php:203
+#: ../sales/credit_note_entry.php:205
msgid "The entered discount percent is negative, greater than 100 or invalid."
msgstr ""
-#: ../sales/credit_note_entry.php:271
+#: ../sales/credit_note_entry.php:273
msgid "Credit Note Items"
msgstr ""
-#: ../sales/credit_note_entry.php:281
-#: ../sales/customer_credit_invoice.php:393
+#: ../sales/credit_note_entry.php:283
+#: ../sales/customer_credit_invoice.php:384
msgid "Process Credit Note"
msgstr ""
msgstr ""
#: ../sales/customer_credit_invoice.php:55
-#: ../sales/customer_credit_invoice.php:70
+#: ../sales/customer_credit_invoice.php:72
msgid "&View This Credit Note"
msgstr ""
#: ../sales/customer_credit_invoice.php:57
-#: ../sales/customer_credit_invoice.php:72
+#: ../sales/customer_credit_invoice.php:74
msgid "&Print This Credit Note"
msgstr ""
#: ../sales/customer_credit_invoice.php:58
-#: ../sales/customer_credit_invoice.php:73
+#: ../sales/customer_credit_invoice.php:75
msgid "&Email This Credit Note"
msgstr ""
-#: ../sales/customer_credit_invoice.php:68
+#: ../sales/customer_credit_invoice.php:70
msgid "Credit Note has been updated"
msgstr ""
-#: ../sales/customer_credit_invoice.php:112
+#: ../sales/customer_credit_invoice.php:114
msgid "The entered shipping cost is invalid or less than zero."
msgstr ""
-#: ../sales/customer_credit_invoice.php:117
-#: ../sales/customer_credit_invoice.php:152
+#: ../sales/customer_credit_invoice.php:119
+#: ../sales/customer_credit_invoice.php:141
msgid ""
"Selected quantity cannot be less than zero nor more than quantity not "
"credited yet."
msgstr ""
-#: ../sales/customer_credit_invoice.php:150
+#: ../sales/customer_credit_invoice.php:139
msgid ""
"This page can only be opened if an invoice has been selected for crediting."
msgstr ""
-#: ../sales/customer_credit_invoice.php:260
+#: ../sales/customer_credit_invoice.php:251
msgid "Crediting Invoice"
msgstr ""
-#: ../sales/customer_credit_invoice.php:281
+#: ../sales/customer_credit_invoice.php:272
msgid "Credit Note Date"
msgstr ""
-#: ../sales/customer_credit_invoice.php:291
+#: ../sales/customer_credit_invoice.php:282
msgid "Invoiced Quantity"
msgstr ""
-#: ../sales/customer_credit_invoice.php:292
+#: ../sales/customer_credit_invoice.php:283
msgid "Credit Quantity"
msgstr ""
-#: ../sales/customer_credit_invoice.php:326
+#: ../sales/customer_credit_invoice.php:317
msgid "Credit Shipping Cost"
msgstr ""
-#: ../sales/customer_credit_invoice.php:359
+#: ../sales/customer_credit_invoice.php:350
#: ../sales/includes/ui/sales_credit_ui.inc:323
msgid "Credit Note Type"
msgstr ""
-#: ../sales/customer_credit_invoice.php:367
+#: ../sales/customer_credit_invoice.php:358
#: ../sales/includes/ui/sales_credit_ui.inc:331
msgid "Items Returned to Location"
msgstr ""
-#: ../sales/customer_credit_invoice.php:372
+#: ../sales/customer_credit_invoice.php:363
#: ../sales/includes/ui/sales_credit_ui.inc:336
msgid "Write off the cost of the items to"
msgstr ""
-#: ../sales/customer_credit_invoice.php:391
+#: ../sales/customer_credit_invoice.php:382
msgid "Update credit value for quantities entered"
msgstr ""
msgstr ""
#: ../sales/customer_delivery.php:50
-#: ../sales/sales_order_entry.php:173
+#: ../sales/sales_order_entry.php:176
#, php-format
msgid "Delivery # %d has been entered."
msgstr ""
#: ../sales/customer_delivery.php:52
-#: ../sales/sales_order_entry.php:175
+#: ../sales/sales_order_entry.php:178
msgid "&View This Delivery"
msgstr ""
#: ../sales/customer_delivery.php:54
#: ../sales/customer_delivery.php:75
-#: ../sales/sales_order_entry.php:177
+#: ../sales/sales_order_entry.php:180
msgid "&Print Delivery Note"
msgstr ""
#: ../sales/customer_delivery.php:55
#: ../sales/customer_delivery.php:76
-#: ../sales/sales_order_entry.php:178
+#: ../sales/sales_order_entry.php:181
msgid "&Email Delivery Note"
msgstr ""
#: ../sales/customer_delivery.php:56
#: ../sales/customer_delivery.php:77
-#: ../sales/sales_order_entry.php:179
+#: ../sales/sales_order_entry.php:182
msgid "P&rint as Packing Slip"
msgstr ""
#: ../sales/customer_delivery.php:57
#: ../sales/customer_delivery.php:78
-#: ../sales/sales_order_entry.php:180
+#: ../sales/sales_order_entry.php:183
msgid "E&mail as Packing Slip"
msgstr ""
#: ../sales/customer_delivery.php:59
-#: ../sales/sales_order_entry.php:183
+#: ../sales/sales_order_entry.php:186
msgid "View the GL Journal Entries for this Dispatch"
msgstr ""
msgid "Select A Different Delivery"
msgstr ""
-#: ../sales/customer_delivery.php:96
+#: ../sales/customer_delivery.php:94
+#: ../sales/customer_delivery.php:99
msgid "Select a different sales order to delivery"
msgstr ""
-#: ../sales/customer_delivery.php:97
+#: ../sales/customer_delivery.php:95
msgid "This order has no items. There is nothing to delivery."
msgstr ""
-#: ../sales/customer_delivery.php:119
+#: ../sales/customer_delivery.php:101
+msgid ""
+"This prepayment order is not yet ready for delivery due to insufficient "
+"amount received."
+msgstr ""
+
+#: ../sales/customer_delivery.php:118
msgid "Select a different delivery"
msgstr ""
-#: ../sales/customer_delivery.php:120
+#: ../sales/customer_delivery.php:119
msgid "This delivery has all items invoiced. There is nothing to modify."
msgstr ""
-#: ../sales/customer_delivery.php:130
+#: ../sales/customer_delivery.php:129
msgid ""
"This page can only be opened if an order or delivery note has been selected. "
"Please select it first."
msgstr ""
-#: ../sales/customer_delivery.php:132
+#: ../sales/customer_delivery.php:131
msgid "Select a Sales Order to Delivery"
msgstr ""
-#: ../sales/customer_delivery.php:141
+#: ../sales/customer_delivery.php:140
msgid ""
"Selected quantity cannot be less than quantity invoiced nor more than "
"quantity\tnot dispatched on sales order."
msgstr ""
-#: ../sales/customer_delivery.php:144
+#: ../sales/customer_delivery.php:143
msgid "Freight cost cannot be less than zero"
msgstr ""
-#: ../sales/customer_delivery.php:156
+#: ../sales/customer_delivery.php:155
msgid "The entered date of delivery is invalid."
msgstr ""
-#: ../sales/customer_delivery.php:162
-msgid "The entered date of delivery is not in fiscal year."
-msgstr ""
-
-#: ../sales/customer_delivery.php:168
+#: ../sales/customer_delivery.php:167
msgid "The entered dead-line for invoice is invalid."
msgstr ""
-#: ../sales/customer_delivery.php:191
-#: ../sales/customer_invoice.php:296
+#: ../sales/customer_delivery.php:190
+#: ../sales/customer_invoice.php:351
msgid "The entered shipping value is not numeric."
msgstr ""
-#: ../sales/customer_delivery.php:197
+#: ../sales/customer_delivery.php:196
msgid "There are no item quantities on this delivery note."
msgstr ""
-#: ../sales/customer_delivery.php:290
-#: ../sales/sales_order_entry.php:478
-#: ../sales/includes/ui/sales_order_ui.inc:245
+#: ../sales/customer_delivery.php:299
+#: ../sales/sales_order_entry.php:501
+#: ../sales/includes/ui/sales_order_ui.inc:244
+#: ../sales/includes/ui/sales_order_ui.inc.orig:244
msgid ""
"The delivery cannot be processed because there is an insufficient quantity "
"for item:"
msgstr ""
-#: ../sales/customer_delivery.php:351
+#: ../sales/customer_delivery.php:361
msgid "For Sales Order"
msgstr ""
-#: ../sales/customer_delivery.php:360
+#: ../sales/customer_delivery.php:370
msgid "Delivery From"
msgstr ""
-#: ../sales/customer_delivery.php:409
+#: ../sales/customer_delivery.php:419
msgid "Invoice Dead-line"
msgstr ""
-#: ../sales/customer_delivery.php:419
-#: ../sales/customer_invoice.php:432
+#: ../sales/customer_delivery.php:429
+#: ../sales/customer_invoice.php:528
#: ../sales/includes/ui/sales_order_ui.inc:82
-#: ../sales/includes/ui/sales_order_ui.inc:369
+#: ../sales/includes/ui/sales_order_ui.inc:368
+#: ../sales/includes/ui/sales_order_ui.inc.orig:82
+#: ../sales/includes/ui/sales_order_ui.inc.orig:368
msgid ""
"The selected customer account is currently on hold. Please contact the "
"credit control personnel to discuss."
msgstr ""
-#: ../sales/customer_delivery.php:424
+#: ../sales/customer_delivery.php:434
msgid "Delivery Items"
msgstr ""
-#: ../sales/customer_delivery.php:430
+#: ../sales/customer_delivery.php:440
msgid "Max. delivery"
msgstr ""
-#: ../sales/customer_delivery.php:430
-#: ../sales/customer_invoice.php:442
-#: ../sales/includes/ui/sales_order_ui.inc:142
+#: ../sales/customer_delivery.php:440
+#: ../sales/customer_invoice.php:542
+#: ../sales/includes/ui/sales_order_ui.inc:141
+#: ../sales/includes/ui/sales_order_ui.inc.orig:141
msgid "Delivered"
msgstr ""
-#: ../sales/customer_delivery.php:431
-#: ../sales/customer_invoice.php:443
-#: ../sales/view/view_receipt.php:45
-#: ../sales/view/view_sales_order.php:201
-msgid "Discount"
-msgstr ""
-
-#: ../sales/customer_delivery.php:491
-#: ../sales/customer_invoice.php:527
+#: ../sales/customer_delivery.php:501
+#: ../sales/customer_invoice.php:631
msgid "Shipping Cost"
msgstr ""
-#: ../sales/customer_delivery.php:511
-#: ../sales/includes/ui/sales_order_ui.inc:243
+#: ../sales/customer_delivery.php:521
+#: ../sales/includes/ui/sales_order_ui.inc:242
+#: ../sales/includes/ui/sales_order_ui.inc.orig:242
msgid ""
"Marked items have insufficient quantities in stock as on day of delivery."
msgstr ""
-#: ../sales/customer_delivery.php:515
+#: ../sales/customer_delivery.php:525
msgid "Action For Balance"
msgstr ""
-#: ../sales/customer_delivery.php:522
-#: ../sales/customer_invoice.php:556
+#: ../sales/customer_delivery.php:532
+#: ../sales/customer_invoice.php:683
msgid "Refresh document page"
msgstr ""
-#: ../sales/customer_delivery.php:523
+#: ../sales/customer_delivery.php:533
msgid "Process Dispatch"
msgstr ""
-#: ../sales/customer_delivery.php:524
-#: ../sales/customer_invoice.php:558
-#: ../sales/sales_order_entry.php:685
+#: ../sales/customer_delivery.php:534
+#: ../sales/customer_invoice.php:685
+#: ../sales/sales_order_entry.php:719
msgid "Check entered data and save document"
msgstr ""
-#: ../sales/customer_invoice.php:37
+#: ../sales/customer_invoice.php:38
#, php-format
msgid "Modifying Sales Invoice # %d."
msgstr ""
-#: ../sales/customer_invoice.php:40
+#: ../sales/customer_invoice.php:41
msgid "Issue an Invoice for Delivery Note"
msgstr ""
-#: ../sales/customer_invoice.php:42
+#: ../sales/customer_invoice.php:43
msgid "Issue Batch Invoice for Delivery Notes"
msgstr ""
-#: ../sales/customer_invoice.php:55
-msgid "Selected deliveries has been processed"
+#: ../sales/customer_invoice.php:45
+msgid "Prepayment or Final Invoice Entry"
msgstr ""
#: ../sales/customer_invoice.php:57
-#: ../sales/customer_invoice.php:75
-#: ../sales/sales_order_entry.php:202
-msgid "&View This Invoice"
+msgid "Selected deliveries has been processed"
msgstr ""
#: ../sales/customer_invoice.php:59
-#: ../sales/customer_invoice.php:77
+#: ../sales/customer_invoice.php:79
+#: ../sales/sales_order_entry.php:205
+msgid "&View This Invoice"
+msgstr ""
+
+#: ../sales/customer_invoice.php:61
+#: ../sales/customer_invoice.php:81
msgid "&Print This Invoice"
msgstr ""
-#: ../sales/customer_invoice.php:60
-#: ../sales/customer_invoice.php:78
+#: ../sales/customer_invoice.php:62
+#: ../sales/customer_invoice.php:82
msgid "&Email This Invoice"
msgstr ""
-#: ../sales/customer_invoice.php:62
-#: ../sales/sales_order_entry.php:215
+#: ../sales/customer_invoice.php:64
+#: ../sales/sales_order_entry.php:218
msgid "View the GL &Journal Entries for this Invoice"
msgstr ""
-#: ../sales/customer_invoice.php:64
+#: ../sales/customer_invoice.php:66
msgid "Select Another &Delivery For Invoicing"
msgstr ""
-#: ../sales/customer_invoice.php:73
+#: ../sales/customer_invoice.php:77
#, php-format
msgid "Sales Invoice # %d has been updated."
msgstr ""
-#: ../sales/customer_invoice.php:80
+#: ../sales/customer_invoice.php:84
msgid "Select Another &Invoice to Modify"
msgstr ""
-#: ../sales/customer_invoice.php:118
+#: ../sales/customer_invoice.php:123
msgid "Select a different delivery to invoice"
msgstr ""
-#: ../sales/customer_invoice.php:119
+#: ../sales/customer_invoice.php:124
msgid ""
"There are no delivered items with a quantity left to invoice. There is "
"nothing left to invoice."
msgstr ""
-#: ../sales/customer_invoice.php:134
+#: ../sales/customer_invoice.php:146
msgid ""
-"There are no delivery notes for this invoice.<br>\n"
-"\t\tMost likely this invoice was created in Front Accounting version prior "
-"to 2.0\n"
-"\t\tand therefore can not be modified."
+"All quantities on this invoice has been credited. There is nothing to modify "
+"on this invoice"
msgstr ""
-#: ../sales/customer_invoice.php:143
+#: ../sales/customer_invoice.php:152
msgid ""
-"All quantities on this invoice has been credited. There is nothing to modify "
-"on this invoice"
+"You have to set Deferred Income Account in GL Setup to entry prepayment "
+"invoices."
msgstr ""
-#: ../sales/customer_invoice.php:149
+#: ../sales/customer_invoice.php:160
+msgid ""
+"Please select correct Sales Order Prepayment to be invoiced and try again."
+msgstr ""
+
+#: ../sales/customer_invoice.php:191
msgid ""
"This page can only be opened after delivery selection. Please select "
"delivery to invoicing first."
msgstr ""
-#: ../sales/customer_invoice.php:151
+#: ../sales/customer_invoice.php:193
msgid "Select Delivery to Invoice"
msgstr ""
-#: ../sales/customer_invoice.php:156
-#: ../sales/customer_invoice.php:307
+#: ../sales/customer_invoice.php:198
+#: ../sales/customer_invoice.php:362
msgid ""
"Selected quantity cannot be less than quantity credited nor more than "
"quantity not invoiced yet."
msgstr ""
-#: ../sales/customer_invoice.php:260
+#: ../sales/customer_invoice.php:312
msgid "The entered invoice date is invalid."
msgstr ""
-#: ../sales/customer_invoice.php:266
-msgid "The entered invoice date is not in fiscal year."
-msgstr ""
-
-#: ../sales/customer_invoice.php:272
+#: ../sales/customer_invoice.php:325
msgid "The entered invoice due date is invalid."
msgstr ""
-#: ../sales/customer_invoice.php:302
+#: ../sales/customer_invoice.php:357
msgid "There are no item quantities on this invoice."
msgstr ""
-#: ../sales/customer_invoice.php:373
+#: ../sales/customer_invoice.php:367
+msgid ""
+"There is no non-invoiced payments for this order. If you want to issue final "
+"invoice, select delayed or cash payment terms."
+msgstr ""
+
+#: ../sales/customer_invoice.php:449
msgid "Payment terms:"
msgstr ""
-#: ../sales/customer_invoice.php:376
-#: ../sales/includes/ui/sales_order_ui.inc:408
-#: ../sales/includes/ui/sales_order_ui.inc:412
-msgid "Payment:"
+#: ../sales/customer_invoice.php:534
+#: ../sales/sales_order_entry.php:695
+msgid "Sales Order Items"
msgstr ""
-#: ../sales/customer_invoice.php:438
+#: ../sales/customer_invoice.php:534
msgid "Invoice Items"
msgstr ""
-#: ../sales/customer_invoice.php:443
+#: ../sales/customer_invoice.php:543
msgid "This Invoice"
msgstr ""
-#: ../sales/customer_invoice.php:451
+#: ../sales/customer_invoice.php:550
msgid "Credited"
msgstr ""
-#: ../sales/customer_invoice.php:545
+#: ../sales/customer_invoice.php:652
msgid "Invoice Total"
msgstr ""
+#: ../sales/customer_invoice.php:661
+msgid "Sales order:"
+msgstr ""
+
+#: ../sales/customer_invoice.php:673
+msgid "Payments received:"
+msgstr ""
+
+#: ../sales/customer_invoice.php:674
+msgid "Invoiced here:"
+msgstr ""
+
+#: ../sales/customer_invoice.php:675
+msgid "Left to be invoiced:"
+msgstr ""
+
#: ../sales/customer_payments.php:33
msgid "Customer Payment Entry"
msgstr ""
msgid "There are no customers defined in the system."
msgstr ""
-#: ../sales/customer_payments.php:62
+#: ../sales/customer_payments.php:68
+msgid "Invalid sales invoice number."
+msgstr ""
+
+#: ../sales/customer_payments.php:92
msgid "The customer payment has been successfully entered."
msgstr ""
-#: ../sales/customer_payments.php:64
+#: ../sales/customer_payments.php:94
+#: ../sales/customer_payments.php:109
msgid "&Print This Receipt"
msgstr ""
-#: ../sales/customer_payments.php:66
+#: ../sales/customer_payments.php:96
+#: ../sales/customer_payments.php:111
msgid "&View the GL Journal Entries for this Customer Payment"
msgstr ""
-#: ../sales/customer_payments.php:70
+#: ../sales/customer_payments.php:100
+#: ../sales/customer_payments.php:115
msgid "Enter Another &Customer Payment"
msgstr ""
-#: ../sales/customer_payments.php:83
-#: ../sales/sales_order_entry.php:320
+#: ../sales/customer_payments.php:107
+msgid "The customer payment has been successfully updated."
+msgstr ""
+
+#: ../sales/customer_payments.php:128
+#: ../sales/sales_order_entry.php:332
msgid "There is no customer selected."
msgstr ""
-#: ../sales/customer_payments.php:90
-#: ../sales/sales_order_entry.php:327
+#: ../sales/customer_payments.php:135
+#: ../sales/sales_order_entry.php:339
msgid "This customer has no branch defined."
msgstr ""
-#: ../sales/customer_payments.php:96
+#: ../sales/customer_payments.php:141
msgid "The entered date is invalid. Please enter a valid date for the payment."
msgstr ""
-#: ../sales/customer_payments.php:118
-#: ../sales/customer_payments.php:124
+#: ../sales/customer_payments.php:171
+#: ../sales/customer_payments.php:177
msgid "The entered amount is invalid or negative and cannot be processed."
msgstr ""
-#: ../sales/customer_payments.php:150
+#: ../sales/customer_payments.php:203
msgid "The entered discount is not a valid number."
msgstr ""
-#: ../sales/customer_payments.php:157
+#: ../sales/customer_payments.php:210
msgid ""
"The balance of the amount and discout is zero or negative. Please enter "
"valid amounts."
msgstr ""
-#: ../sales/customer_payments.php:234
+#: ../sales/customer_payments.php:341
+#: ../sales/customer_payments.php:343
msgid "From Customer:"
msgstr ""
-#: ../sales/customer_payments.php:249
-msgid "This customer account is on hold."
-msgstr ""
-
-#: ../sales/customer_payments.php:255
+#: ../sales/customer_payments.php:378
msgid "Into Bank Account:"
msgstr ""
-#: ../sales/customer_payments.php:262
+#: ../sales/customer_payments.php:383
msgid "Date of Deposit:"
msgstr ""
-#: ../sales/customer_payments.php:286
+#: ../sales/customer_payments.php:405
msgid "Customer prompt payment discount :"
msgstr ""
-#: ../sales/customer_payments.php:295
+#: ../sales/customer_payments.php:414
msgid "Amount and discount are in customer's currency."
msgstr ""
-#: ../sales/customer_payments.php:299
+#: ../sales/customer_payments.php:419
+msgid "Update Payment"
+msgstr ""
+
+#: ../sales/customer_payments.php:421
msgid "Add Payment"
msgstr ""
msgid "Sales Order Entry"
msgstr ""
-#: ../sales/sales_order_entry.php:101
+#: ../sales/sales_order_entry.php:102
#, php-format
msgid "Order # %d has been entered."
msgstr ""
-#: ../sales/sales_order_entry.php:103
-#: ../sales/sales_order_entry.php:121
+#: ../sales/sales_order_entry.php:104
+#: ../sales/sales_order_entry.php:124
msgid "&View This Order"
msgstr ""
-#: ../sales/sales_order_entry.php:109
+#: ../sales/sales_order_entry.php:110
msgid "Make &Delivery Against This Order"
msgstr ""
-#: ../sales/sales_order_entry.php:112
+#: ../sales/sales_order_entry.php:115
msgid "Enter a &New Order"
msgstr ""
-#: ../sales/sales_order_entry.php:119
+#: ../sales/sales_order_entry.php:122
#, php-format
msgid "Order # %d has been updated."
msgstr ""
-#: ../sales/sales_order_entry.php:127
+#: ../sales/sales_order_entry.php:130
msgid "Confirm Order Quantities and Make &Delivery"
msgstr ""
-#: ../sales/sales_order_entry.php:130
+#: ../sales/sales_order_entry.php:133
msgid "Select A Different &Order"
msgstr ""
-#: ../sales/sales_order_entry.php:137
+#: ../sales/sales_order_entry.php:140
#, php-format
msgid "Quotation # %d has been entered."
msgstr ""
-#: ../sales/sales_order_entry.php:139
-#: ../sales/sales_order_entry.php:157
+#: ../sales/sales_order_entry.php:142
+#: ../sales/sales_order_entry.php:160
msgid "&View This Quotation"
msgstr ""
-#: ../sales/sales_order_entry.php:141
-#: ../sales/sales_order_entry.php:159
+#: ../sales/sales_order_entry.php:144
+#: ../sales/sales_order_entry.php:162
msgid "&Print This Quotation"
msgstr ""
-#: ../sales/sales_order_entry.php:142
-#: ../sales/sales_order_entry.php:160
+#: ../sales/sales_order_entry.php:145
+#: ../sales/sales_order_entry.php:163
msgid "&Email This Quotation"
msgstr ""
-#: ../sales/sales_order_entry.php:145
-#: ../sales/sales_order_entry.php:163
+#: ../sales/sales_order_entry.php:148
+#: ../sales/sales_order_entry.php:166
msgid "Make &Sales Order Against This Quotation"
msgstr ""
-#: ../sales/sales_order_entry.php:148
+#: ../sales/sales_order_entry.php:151
msgid "Enter a New &Quotation"
msgstr ""
-#: ../sales/sales_order_entry.php:155
+#: ../sales/sales_order_entry.php:158
#, php-format
msgid "Quotation # %d has been updated."
msgstr ""
-#: ../sales/sales_order_entry.php:166
+#: ../sales/sales_order_entry.php:169
msgid "Select A Different &Quotation"
msgstr ""
-#: ../sales/sales_order_entry.php:185
+#: ../sales/sales_order_entry.php:188
msgid "Make &Invoice Against This Delivery"
msgstr ""
-#: ../sales/sales_order_entry.php:189
+#: ../sales/sales_order_entry.php:192
msgid "Enter a New Template &Delivery"
msgstr ""
-#: ../sales/sales_order_entry.php:192
+#: ../sales/sales_order_entry.php:195
msgid "Enter a &New Delivery"
msgstr ""
-#: ../sales/sales_order_entry.php:200
+#: ../sales/sales_order_entry.php:203
#, php-format
msgid "Invoice # %d has been entered."
msgstr ""
-#: ../sales/sales_order_entry.php:204
+#: ../sales/sales_order_entry.php:207
msgid "&Print Sales Invoice"
msgstr ""
-#: ../sales/sales_order_entry.php:205
+#: ../sales/sales_order_entry.php:208
msgid "&Email Sales Invoice"
msgstr ""
-#: ../sales/sales_order_entry.php:213
+#: ../sales/sales_order_entry.php:216
msgid "Print &Receipt"
msgstr ""
-#: ../sales/sales_order_entry.php:218
+#: ../sales/sales_order_entry.php:221
msgid "Enter a &New Template Invoice"
msgstr ""
-#: ../sales/sales_order_entry.php:221
+#: ../sales/sales_order_entry.php:224
msgid "Enter a &New Direct Invoice"
msgstr ""
-#: ../sales/sales_order_entry.php:338
-msgid "The entered date is not in fiscal year"
+#: ../sales/sales_order_entry.php:362
+msgid "Pre-payment required have to be positive and less than total amount."
msgstr ""
-#: ../sales/sales_order_entry.php:349
+#: ../sales/sales_order_entry.php:367
msgid ""
"You must enter the person or company to whom delivery should be made to."
msgstr ""
-#: ../sales/sales_order_entry.php:356
+#: ../sales/sales_order_entry.php:374
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:365
+#: ../sales/sales_order_entry.php:383
msgid "The shipping cost entered is expected to be numeric."
msgstr ""
-#: ../sales/sales_order_entry.php:371
+#: ../sales/sales_order_entry.php:389
msgid "The Valid date is invalid."
msgstr ""
-#: ../sales/sales_order_entry.php:373
+#: ../sales/sales_order_entry.php:391
msgid "The delivery date is invalid."
msgstr ""
-#: ../sales/sales_order_entry.php:380
+#: ../sales/sales_order_entry.php:398
msgid "The requested valid date is before the date of the quotation."
msgstr ""
-#: ../sales/sales_order_entry.php:382
+#: ../sales/sales_order_entry.php:400
msgid "The requested delivery date is before the date of the order."
msgstr ""
-#: ../sales/sales_order_entry.php:391
+#: ../sales/sales_order_entry.php:409
msgid "You need to define a cash account for your Sales Point."
msgstr ""
-#: ../sales/sales_order_entry.php:457
+#: ../sales/sales_order_entry.php:480
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:461
-msgid "Price for item must be entered and can not be less than 0"
+#: ../sales/sales_order_entry.php:484
+msgid "Price for inventory item must be entered and can not be less than 0"
msgstr ""
-#: ../sales/sales_order_entry.php:468
+#: ../sales/sales_order_entry.php:491
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:508
+#: ../sales/sales_order_entry.php:522
+#, php-format
+msgid "Price %s is below Standard Cost %s"
+msgstr ""
+
+#: ../sales/sales_order_entry.php:547
msgid ""
"This item cannot be deleted because some of it has already been delivered."
msgstr ""
-#: ../sales/sales_order_entry.php:537
+#: ../sales/sales_order_entry.php:576
msgid "Direct delivery entry has been cancelled as requested."
msgstr ""
-#: ../sales/sales_order_entry.php:538
+#: ../sales/sales_order_entry.php:577
msgid "Enter a New Sales Delivery"
msgstr ""
-#: ../sales/sales_order_entry.php:541
+#: ../sales/sales_order_entry.php:580
msgid "Direct invoice entry has been cancelled as requested."
msgstr ""
-#: ../sales/sales_order_entry.php:542
+#: ../sales/sales_order_entry.php:581
msgid "Enter a New Sales Invoice"
msgstr ""
-#: ../sales/sales_order_entry.php:547
+#: ../sales/sales_order_entry.php:586
msgid ""
"This order cannot be cancelled because some of it has already been invoiced "
"or dispatched. However, the line item quantities may be modified."
msgstr ""
-#: ../sales/sales_order_entry.php:552
+#: ../sales/sales_order_entry.php:591
msgid "This sales quotation has been cancelled as requested."
msgstr ""
-#: ../sales/sales_order_entry.php:553
+#: ../sales/sales_order_entry.php:592
msgid "Enter a New Sales Quotation"
msgstr ""
-#: ../sales/sales_order_entry.php:557
+#: ../sales/sales_order_entry.php:596
msgid "This sales order has been cancelled as requested."
msgstr ""
-#: ../sales/sales_order_entry.php:558
+#: ../sales/sales_order_entry.php:597
msgid "Enter a New Sales Order"
msgstr ""
-#: ../sales/sales_order_entry.php:641
+#: ../sales/sales_order_entry.php:676
msgid "Sales Invoice Items"
msgstr ""
-#: ../sales/sales_order_entry.php:642
+#: ../sales/sales_order_entry.php:677
msgid "Enter Delivery Details and Confirm Invoice"
msgstr ""
-#: ../sales/sales_order_entry.php:644
+#: ../sales/sales_order_entry.php:679
msgid "Place Invoice"
msgstr ""
-#: ../sales/sales_order_entry.php:647
+#: ../sales/sales_order_entry.php:682
msgid "Delivery Note Items"
msgstr ""
-#: ../sales/sales_order_entry.php:648
+#: ../sales/sales_order_entry.php:683
msgid "Enter Delivery Details and Confirm Dispatch"
msgstr ""
-#: ../sales/sales_order_entry.php:649
+#: ../sales/sales_order_entry.php:684
msgid "Cancel Delivery"
msgstr ""
-#: ../sales/sales_order_entry.php:650
+#: ../sales/sales_order_entry.php:685
msgid "Place Delivery"
msgstr ""
-#: ../sales/sales_order_entry.php:652
+#: ../sales/sales_order_entry.php:687
msgid "Quotation Date:"
msgstr ""
-#: ../sales/sales_order_entry.php:653
+#: ../sales/sales_order_entry.php:688
msgid "Sales Quotation Items"
msgstr ""
-#: ../sales/sales_order_entry.php:654
+#: ../sales/sales_order_entry.php:689
msgid "Enter Delivery Details and Confirm Quotation"
msgstr ""
-#: ../sales/sales_order_entry.php:655
+#: ../sales/sales_order_entry.php:690
msgid "Cancel Quotation"
msgstr ""
-#: ../sales/sales_order_entry.php:656
+#: ../sales/sales_order_entry.php:691
msgid "Place Quotation"
msgstr ""
-#: ../sales/sales_order_entry.php:657
+#: ../sales/sales_order_entry.php:692
msgid "Commit Quotations Changes"
msgstr ""
-#: ../sales/sales_order_entry.php:660
-msgid "Sales Order Items"
-msgstr ""
-
-#: ../sales/sales_order_entry.php:661
+#: ../sales/sales_order_entry.php:696
msgid "Enter Delivery Details and Confirm Order"
msgstr ""
-#: ../sales/sales_order_entry.php:664
+#: ../sales/sales_order_entry.php:699
msgid "Commit Order Changes"
msgstr ""
-#: ../sales/sales_order_entry.php:686
+#: ../sales/sales_order_entry.php:720
msgid "You are about to void this Document.\\nDo you want to continue?"
msgstr ""
-#: ../sales/sales_order_entry.php:689
+#: ../sales/sales_order_entry.php:723
msgid "Validate changes and update document"
msgstr ""
-#: ../sales/sales_order_entry.php:693
+#: ../sales/sales_order_entry.php:727
msgid ""
"Cancels document entry or removes sales order when editing an old document"
msgstr ""
msgstr ""
#: ../sales/allocations/customer_allocation_main.php:32
-#: ../sales/manage/customer_branches.php:281
-#: ../sales/manage/customers.php:280
+#: ../sales/manage/customer_branches.php:282
+#: ../sales/manage/customers.php:322
+#: ../sales/manage/sav.customers.php:322
#: ../sales/inquiry/customer_allocation_inquiry.php:42
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:42
#: ../sales/inquiry/customer_inquiry.php:44
+#: ../sales/inquiry/customer_inquiry.php.orig:45
+#: ../sales/inquiry/sales_orders_view.php:265
+#: ../sales/inquiry/sales_orders_view.php.orig:242
msgid "Select a customer: "
msgstr ""
msgstr ""
#: ../sales/manage/customer_branches.php:242
+#: ../sales/manage/customers.php:290
+#: ../sales/manage/sav.customers.php:290
msgid "Sales Person:"
msgstr ""
#: ../sales/manage/customer_branches.php:243
+#: ../sales/manage/customers.php:291
+#: ../sales/manage/sav.customers.php:291
msgid "Sales Area:"
msgstr ""
#: ../sales/manage/customer_branches.php:244
-#: ../sales/manage/recurrent_invoices.php:156
+#: ../sales/manage/recurrent_invoices.php:174
msgid "Sales Group:"
msgstr ""
msgid "Accounts Receivable Account:"
msgstr ""
-#: ../sales/manage/customer_branches.php:259
+#: ../sales/manage/customer_branches.php:260
msgid "General contact data"
msgstr ""
-#: ../sales/manage/customer_branches.php:269
+#: ../sales/manage/customer_branches.php:270
msgid "Billing Address:"
msgstr ""
-#: ../sales/manage/customer_branches.php:273
+#: ../sales/manage/customer_branches.php:274
msgid "Disable this Branch:"
msgstr ""
-#: ../sales/manage/customer_branches.php:296
+#: ../sales/manage/customer_branches.php:297
#: ../sales/inquiry/sales_deliveries_view.php:183
+#: ../sales/inquiry/sales_deliveries_view.php.orig:183
msgid "Contact"
msgstr ""
-#: ../sales/manage/customer_branches.php:298
+#: ../sales/manage/customer_branches.php:299
msgid "Area"
msgstr ""
-#: ../sales/manage/customer_branches.php:299
+#: ../sales/manage/customer_branches.php:300
msgid "Phone No"
msgstr ""
-#: ../sales/manage/customer_branches.php:300
+#: ../sales/manage/customer_branches.php:301
msgid "Fax No"
msgstr ""
-#: ../sales/manage/customer_branches.php:302
+#: ../sales/manage/customer_branches.php:303
msgid "Tax Group"
msgstr ""
-#: ../sales/manage/customer_branches.php:320
-#: ../sales/includes/ui/sales_order_ui.inc:300
+#: ../sales/manage/customer_branches.php:321
+#: ../sales/includes/ui/sales_order_ui.inc:299
+#: ../sales/includes/ui/sales_order_ui.inc.orig:299
msgid ""
"The selected customer does not have any branches. Please create at least one "
"branch."
msgstr ""
-#: ../sales/manage/customers.php:35
+#: ../sales/manage/customers.php:42
+#: ../sales/manage/sav.customers.php:42
msgid "The customer name cannot be empty."
msgstr ""
-#: ../sales/manage/customers.php:42
+#: ../sales/manage/customers.php:49
+#: ../sales/manage/sav.customers.php:49
msgid "The customer short name cannot be empty."
msgstr ""
-#: ../sales/manage/customers.php:49
+#: ../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:56
+#: ../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:63
+#: ../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:91
+#: ../sales/manage/customers.php:98
+#: ../sales/manage/sav.customers.php:98
msgid "Customer has been updated."
msgstr ""
-#: ../sales/manage/customers.php:105
+#: ../sales/manage/customers.php:127
+#: ../sales/manage/sav.customers.php:127
msgid "A new customer has been added."
msgstr ""
-#: ../sales/manage/customers.php:127
+#: ../sales/manage/customers.php:130
+#: ../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:153
+#: ../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:134
+#: ../sales/manage/customers.php:160
+#: ../sales/manage/sav.customers.php:160
msgid ""
"Cannot delete the customer record because orders have been created against "
"it."
msgstr ""
-#: ../sales/manage/customers.php:141
+#: ../sales/manage/customers.php:167
+#: ../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:152
+#: ../sales/manage/customers.php:178
+#: ../sales/manage/sav.customers.php:178
msgid "Selected customer has been deleted."
msgstr ""
-#: ../sales/manage/customers.php:199
+#: ../sales/manage/customers.php:227
+#: ../sales/manage/sav.customers.php:227
msgid "Name and Address"
msgstr ""
-#: ../sales/manage/customers.php:201
+#: ../sales/manage/customers.php:229
+#: ../sales/manage/sav.customers.php:229
msgid "Customer Name:"
msgstr ""
-#: ../sales/manage/customers.php:202
+#: ../sales/manage/customers.php:230
+#: ../sales/manage/sav.customers.php:230
msgid "Customer Short Name:"
msgstr ""
-#: ../sales/manage/customers.php:210
-#: ../sales/manage/customers.php:214
+#: ../sales/manage/customers.php:238
+#: ../sales/manage/customers.php:242
+#: ../sales/manage/sav.customers.php:238
+#: ../sales/manage/sav.customers.php:242
msgid "Customer's Currency:"
msgstr ""
-#: ../sales/manage/customers.php:217
+#: ../sales/manage/customers.php:245
+#: ../sales/manage/sav.customers.php:245
msgid "Sales Type/Price List:"
msgstr ""
-#: ../sales/manage/customers.php:220
+#: ../sales/manage/customers.php:248
+#: ../sales/manage/sav.customers.php:248
msgid "Customer status:"
msgstr ""
-#: ../sales/manage/customers.php:226
+#: ../sales/manage/customers.php:261
+#: ../sales/manage/sav.customers.php:261
msgid "Discount Percent:"
msgstr ""
-#: ../sales/manage/customers.php:227
+#: ../sales/manage/customers.php:262
+#: ../sales/manage/sav.customers.php:262
msgid "Prompt Payment Discount Percent:"
msgstr ""
-#: ../sales/manage/customers.php:231
+#: ../sales/manage/customers.php:266
+#: ../sales/manage/sav.customers.php:266
msgid "Credit Status:"
msgstr ""
-#: ../sales/manage/customers.php:244
+#: ../sales/manage/customers.php:279
+#: ../sales/manage/sav.customers.php:279
msgid "Customer branches"
msgstr ""
-#: ../sales/manage/customers.php:246
+#: ../sales/manage/customers.php:281
+#: ../sales/manage/sav.customers.php:281
msgid "Select or &Add"
msgstr ""
-#: ../sales/manage/customers.php:246
+#: ../sales/manage/customers.php:281
+#: ../sales/manage/sav.customers.php:281
msgid "&Add or Edit "
msgstr ""
-#: ../sales/manage/customers.php:257
+#: ../sales/manage/customers.php:299
+#: ../sales/manage/sav.customers.php:299
msgid "Add New Customer"
msgstr ""
-#: ../sales/manage/customers.php:261
+#: ../sales/manage/customers.php:303
+#: ../sales/manage/sav.customers.php:303
msgid "Update Customer"
msgstr ""
-#: ../sales/manage/customers.php:262
+#: ../sales/manage/customers.php:304
+#: ../sales/manage/sav.customers.php:304
msgid "Update customer data"
msgstr ""
-#: ../sales/manage/customers.php:263
+#: ../sales/manage/customers.php:305
+#: ../sales/manage/sav.customers.php:305
msgid "Select this customer and return to document entry."
msgstr ""
-#: ../sales/manage/customers.php:264
+#: ../sales/manage/customers.php:306
+#: ../sales/manage/sav.customers.php:306
msgid "Delete Customer"
msgstr ""
-#: ../sales/manage/customers.php:265
+#: ../sales/manage/customers.php:307
+#: ../sales/manage/sav.customers.php:307
msgid "Delete customer data if have been never used"
msgstr ""
-#: ../sales/manage/customers.php:272
+#: ../sales/manage/customers.php:314
+#: ../sales/manage/sav.customers.php:314
msgid ""
"There are no sales types defined. Please define at least one sales type "
"before adding a customer."
msgstr ""
-#: ../sales/manage/customers.php:281
+#: ../sales/manage/customers.php:323
+#: ../sales/manage/sav.customers.php:323
msgid "New customer"
msgstr ""
+#: ../sales/manage/customers.php:345
+#: ../sales/manage/sav.customers.php:345
+msgid "Sales &Orders"
+msgstr ""
+
#: ../sales/manage/recurrent_invoices.php:24
msgid "Recurrent Invoices"
msgstr ""
msgid "The area description cannot be empty."
msgstr ""
-#: ../sales/manage/recurrent_invoices.php:46
+#: ../sales/manage/recurrent_invoices.php:63
msgid "Selected recurrent invoice has been updated"
msgstr ""
-#: ../sales/manage/recurrent_invoices.php:52
+#: ../sales/manage/recurrent_invoices.php:69
msgid "New recurrent invoice has been added"
msgstr ""
-#: ../sales/manage/recurrent_invoices.php:69
+#: ../sales/manage/recurrent_invoices.php:86
msgid "Selected recurrent invoice has been deleted"
msgstr ""
-#: ../sales/manage/recurrent_invoices.php:149
+#: ../sales/manage/recurrent_invoices.php:167
msgid "Template:"
msgstr ""
-#: ../sales/manage/recurrent_invoices.php:158
+#: ../sales/manage/recurrent_invoices.php:176
msgid "Days:"
msgstr ""
-#: ../sales/manage/recurrent_invoices.php:160
+#: ../sales/manage/recurrent_invoices.php:178
msgid "Monthly:"
msgstr ""
-#: ../sales/manage/recurrent_invoices.php:162
+#: ../sales/manage/recurrent_invoices.php:180
msgid "Begin:"
msgstr ""
-#: ../sales/manage/recurrent_invoices.php:164
+#: ../sales/manage/recurrent_invoices.php:182
msgid "End:"
msgstr ""
msgstr ""
#: ../sales/view/view_dispatch.php:65
-#: ../sales/view/view_invoice.php:65
+#: ../sales/view/view_invoice.php:67
msgid "Charge Branch"
msgstr ""
#: ../sales/view/view_dispatch.php:91
-#: ../sales/view/view_invoice.php:90
-#: ../sales/view/view_sales_order.php:62
+#: ../sales/view/view_invoice.php:91
+#: ../sales/view/view_sales_order.php:63
+#: ../sales/view/view_sales_order.php.orig:63
msgid "Customer Order Ref."
msgstr ""
msgid "View Sales Invoice"
msgstr ""
-#: ../sales/view/view_invoice.php:43
+#: ../sales/view/view_invoice.php:45
+#, php-format
+msgid "FINAL INVOICE #%d"
+msgstr ""
+
+#: ../sales/view/view_invoice.php:45
+#, php-format
+msgid "PREPAYMENT INVOICE #%d"
+msgstr ""
+
+#: ../sales/view/view_invoice.php:45
#, php-format
msgid "SALES INVOICE #%d"
msgstr ""
-#: ../sales/view/view_invoice.php:152
+#: ../sales/view/view_invoice.php:154
msgid "There are no line items on this invoice."
msgstr ""
msgstr ""
#: ../sales/view/view_sales_order.php:28
+#: ../sales/view/view_sales_order.php.orig:28
msgid "View Sales Quotation"
msgstr ""
#: ../sales/view/view_sales_order.php:29
+#: ../sales/view/view_sales_order.php.orig:29
#, php-format
msgid "Sales Quotation #%d"
msgstr ""
#: ../sales/view/view_sales_order.php:33
+#: ../sales/view/view_sales_order.php.orig:33
msgid "View Sales Order"
msgstr ""
#: ../sales/view/view_sales_order.php:34
+#: ../sales/view/view_sales_order.php.orig:34
#, php-format
msgid "Sales Order #%d"
msgstr ""
-#: ../sales/view/view_sales_order.php:46
+#: ../sales/view/view_sales_order.php:49
+#: ../sales/view/view_sales_order.php.orig:49
msgid "Order Information"
msgstr ""
-#: ../sales/view/view_sales_order.php:59
+#: ../sales/view/view_sales_order.php:60
+#: ../sales/view/view_sales_order.php.orig:60
msgid "Customer Name"
msgstr ""
-#: ../sales/view/view_sales_order.php:63
+#: ../sales/view/view_sales_order.php:64
+#: ../sales/view/view_sales_order.php.orig:64
msgid "Deliver To Branch"
msgstr ""
-#: ../sales/view/view_sales_order.php:70
+#: ../sales/view/view_sales_order.php:71
+#: ../sales/view/view_sales_order.php.orig:71
msgid "Requested Delivery"
msgstr ""
-#: ../sales/view/view_sales_order.php:74
+#: ../sales/view/view_sales_order.php:75
+#: ../sales/view/view_sales_order.php.orig:75
msgid "Deliver From Location"
msgstr ""
-#: ../sales/view/view_sales_order.php:81
+#: ../sales/view/view_sales_order.php:86
+msgid "Non-Invoiced Prepayments"
+msgstr ""
+
+#: ../sales/view/view_sales_order.php:87
+msgid "All Payments Allocated"
+msgstr ""
+
+#: ../sales/view/view_sales_order.php:95
+#: ../sales/view/view_sales_order.php.orig:82
msgid "Telephone"
msgstr ""
-#: ../sales/view/view_sales_order.php:196
+#: ../sales/view/view_sales_order.php:215
+#: ../sales/view/view_sales_order.php.orig:197
msgid "This Sales Order is used as a Template."
msgstr ""
-#: ../sales/view/view_sales_order.php:201
+#: ../sales/view/view_sales_order.php:220
+#: ../sales/view/view_sales_order.php.orig:202
msgid "Quantity Delivered"
msgstr ""
#: ../sales/inquiry/customer_allocation_inquiry.php:25
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:25
msgid "Customer Allocation Inquiry"
msgstr ""
#: ../sales/inquiry/customer_allocation_inquiry.php:96
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:96
msgid "Allocation"
msgstr ""
+#: ../sales/inquiry/customer_allocation_inquiry.php:116
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:116
+msgid "Payment"
+msgstr ""
+
#: ../sales/inquiry/customer_inquiry.php:26
+#: ../sales/inquiry/customer_inquiry.php.orig:27
msgid "Customer Transactions"
msgstr ""
#: ../sales/inquiry/customer_inquiry.php:68
+#: ../sales/inquiry/customer_inquiry.php.orig:69
msgid "CUSTOMER ACCOUNT IS ON HOLD"
msgstr ""
-#: ../sales/inquiry/customer_inquiry.php:193
+#: ../sales/inquiry/customer_inquiry.php:181
+#: ../sales/inquiry/customer_inquiry.php.orig:205
msgid "Print Receipt"
msgstr ""
-#: ../sales/inquiry/customer_inquiry.php:223
-#: ../sales/inquiry/customer_inquiry.php:236
+#: ../sales/inquiry/customer_inquiry.php:211
+#: ../sales/inquiry/customer_inquiry.php:224
+#: ../sales/inquiry/customer_inquiry.php.orig:235
+#: ../sales/inquiry/customer_inquiry.php.orig:248
msgid "RB"
msgstr ""
#: ../sales/inquiry/sales_deliveries_view.php:29
+#: ../sales/inquiry/sales_deliveries_view.php.orig:29
msgid "Search Not Invoiced Deliveries"
msgstr ""
#: ../sales/inquiry/sales_deliveries_view.php:34
+#: ../sales/inquiry/sales_deliveries_view.php.orig:34
msgid "Search All Deliveries"
msgstr ""
#: ../sales/inquiry/sales_deliveries_view.php:70
+#: ../sales/inquiry/sales_deliveries_view.php.orig:70
msgid ""
"For batch invoicing you should\n"
"\t\t select at least one delivery. All items must be dispatched to\n"
msgstr ""
#: ../sales/inquiry/sales_deliveries_view.php:179
+#: ../sales/inquiry/sales_deliveries_view.php.orig:179
msgid "Delivery #"
msgstr ""
#: ../sales/inquiry/sales_deliveries_view.php:185
+#: ../sales/inquiry/sales_deliveries_view.php.orig:185
msgid "Cust Ref"
msgstr ""
#: ../sales/inquiry/sales_deliveries_view.php:187
+#: ../sales/inquiry/sales_deliveries_view.php.orig:187
msgid "Due By"
msgstr ""
#: ../sales/inquiry/sales_deliveries_view.php:188
+#: ../sales/inquiry/sales_deliveries_view.php.orig:188
msgid "Delivery Total"
msgstr ""
#: ../sales/inquiry/sales_deliveries_view.php:190
+#: ../sales/inquiry/sales_deliveries_view.php.orig:190
msgid "Batch"
msgstr ""
#: ../sales/inquiry/sales_deliveries_view.php:190
+#: ../sales/inquiry/sales_deliveries_view.php.orig:190
msgid "Batch Invoicing"
msgstr ""
-#: ../sales/inquiry/sales_orders_view.php:46
+#: ../sales/inquiry/sales_orders_view.php:44
+#: ../sales/inquiry/sales_orders_view.php.orig:40
msgid "Search Outstanding Sales Orders"
msgstr ""
-#: ../sales/inquiry/sales_orders_view.php:51
+#: ../sales/inquiry/sales_orders_view.php:49
+#: ../sales/inquiry/sales_orders_view.php.orig:45
msgid "Search Template for Invoicing"
msgstr ""
-#: ../sales/inquiry/sales_orders_view.php:56
+#: ../sales/inquiry/sales_orders_view.php:54
+#: ../sales/inquiry/sales_orders_view.php.orig:50
msgid "Select Template for Delivery"
msgstr ""
-#: ../sales/inquiry/sales_orders_view.php:61
+#: ../sales/inquiry/sales_orders_view.php:59
+msgid "Invoicing Prepayment Orders"
+msgstr ""
+
+#: ../sales/inquiry/sales_orders_view.php:64
+#: ../sales/inquiry/sales_orders_view.php.orig:55
msgid "Search All Sales Orders"
msgstr ""
-#: ../sales/inquiry/sales_orders_view.php:67
+#: ../sales/inquiry/sales_orders_view.php:70
+#: ../sales/inquiry/sales_orders_view.php.orig:61
msgid "Search All Sales Quotations"
msgstr ""
-#: ../sales/inquiry/sales_orders_view.php:131
+#: ../sales/inquiry/sales_orders_view.php:148
+#: ../sales/inquiry/sales_orders_view.php.orig:135
msgid "Dispatch"
msgstr ""
-#: ../sales/inquiry/sales_orders_view.php:171
+#: ../sales/inquiry/sales_orders_view.php:191
+#: ../sales/inquiry/sales_orders_view.php.orig:178
msgid "Set this order as a template for direct deliveries/invoices"
msgstr ""
-#: ../sales/inquiry/sales_orders_view.php:242
+#: ../sales/inquiry/sales_orders_view.php:200
+msgid "Prepayment Invoice"
+msgstr ""
+
+#: ../sales/inquiry/sales_orders_view.php:200
+msgid "Final Invoice"
+msgstr ""
+
+#: ../sales/inquiry/sales_orders_view.php:267
+#: ../sales/inquiry/sales_orders_view.php.orig:244
msgid "Show All:"
msgstr ""
-#: ../sales/inquiry/sales_orders_view.php:258
+#: ../sales/inquiry/sales_orders_view.php:284
+#: ../sales/inquiry/sales_orders_view.php.orig:261
msgid "Order #"
msgstr ""
-#: ../sales/inquiry/sales_orders_view.php:262
-#: ../sales/inquiry/sales_orders_view.php:276
+#: ../sales/inquiry/sales_orders_view.php:288
+#: ../sales/inquiry/sales_orders_view.php:302
+#: ../sales/inquiry/sales_orders_view.php.orig:265
+#: ../sales/inquiry/sales_orders_view.php.orig:279
msgid "Cust Order Ref"
msgstr ""
-#: ../sales/inquiry/sales_orders_view.php:265
-#: ../sales/inquiry/sales_orders_view.php:279
+#: ../sales/inquiry/sales_orders_view.php:291
+#: ../sales/inquiry/sales_orders_view.php:305
+#: ../sales/inquiry/sales_orders_view.php.orig:268
+#: ../sales/inquiry/sales_orders_view.php.orig:282
msgid "Delivery To"
msgstr ""
-#: ../sales/inquiry/sales_orders_view.php:272
+#: ../sales/inquiry/sales_orders_view.php:298
+#: ../sales/inquiry/sales_orders_view.php.orig:275
msgid "Quote #"
msgstr ""
-#: ../sales/inquiry/sales_orders_view.php:277
+#: ../sales/inquiry/sales_orders_view.php:303
+#: ../sales/inquiry/sales_orders_view.php.orig:280
msgid "Quote Date"
msgstr ""
-#: ../sales/inquiry/sales_orders_view.php:280
+#: ../sales/inquiry/sales_orders_view.php:306
+#: ../sales/inquiry/sales_orders_view.php.orig:283
msgid "Quote Total"
msgstr ""
-#: ../sales/inquiry/sales_orders_view.php:305
+#: ../sales/inquiry/sales_orders_view.php:337
+#: ../sales/inquiry/sales_orders_view.php.orig:310
msgid "Tmpl"
msgstr ""
-#: ../sales/includes/cart_class.inc:357
+#: ../sales/includes/cart_class.inc:359
msgid "You have to enter valid stock code or nonempty description"
msgstr ""
"browser tab. You cannot edit more than one sales document at once."
msgstr ""
-#: ../sales/includes/db/custalloc_db.inc:265
+#: ../sales/includes/db/custalloc_db.inc:350
msgid ""
"Unsuspected overallocation happened due to sparse credit notes exists for "
"this invoice.\n"
"charges."
msgstr ""
-#: ../sales/includes/db/sales_invoice_db.inc:179
+#: ../sales/includes/db/sales_invoice_db.inc:196
msgid "Cash invoice"
msgstr ""
-#: ../sales/includes/db/sales_order_db.inc:105
-#: ../sales/includes/db/sales_order_db.inc:257
+#: ../sales/includes/db/sales_order_db.inc:109
+#: ../sales/includes/db/sales_order_db.inc:271
msgid "Stocks below Re-Order Level at "
msgstr ""
-#: ../sales/includes/db/sales_order_db.inc:108
-#: ../sales/includes/db/sales_order_db.inc:262
+#: ../sales/includes/db/sales_order_db.inc:112
+#: ../sales/includes/db/sales_order_db.inc:276
msgid "Below"
msgstr ""
-#: ../sales/includes/db/sales_order_db.inc:109
-#: ../sales/includes/db/sales_order_db.inc:263
+#: ../sales/includes/db/sales_order_db.inc:113
+#: ../sales/includes/db/sales_order_db.inc:277
msgid "Please reorder"
msgstr ""
-#: ../sales/includes/db/sales_order_db.inc:137
+#: ../sales/includes/db/sales_order_db.inc:141
msgid "Deleted."
msgstr ""
#: ../sales/includes/ui/sales_credit_ui.inc:94
-#: ../sales/includes/ui/sales_order_ui.inc:380
+#: ../sales/includes/ui/sales_order_ui.inc:379
+#: ../sales/includes/ui/sales_order_ui.inc.orig:379
msgid "Customer Currency:"
msgstr ""
#: ../sales/includes/ui/sales_credit_ui.inc:112
-#: ../sales/includes/ui/sales_order_ui.inc:645
+#: ../sales/includes/ui/sales_order_ui.inc:647
+#: ../sales/includes/ui/sales_order_ui.inc.orig:639
msgid "Shipping Company:"
msgstr ""
#: ../sales/includes/ui/sales_credit_ui.inc:114
-#: ../sales/includes/ui/sales_order_ui.inc:387
+#: ../sales/includes/ui/sales_order_ui.inc:386
+#: ../sales/includes/ui/sales_order_ui.inc.orig:386
msgid "Customer Discount:"
msgstr ""
#: ../sales/includes/ui/sales_order_ui.inc:61
+#: ../sales/includes/ui/sales_order_ui.inc.orig:61
msgid "This item is already on this document. You have been warned."
msgstr ""
#: ../sales/includes/ui/sales_order_ui.inc:104
+#: ../sales/includes/ui/sales_order_ui.inc.orig:104
msgid ""
"The selected customer and branch are not valid, or the customer does not "
"have any branches."
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:225
+#: ../sales/includes/ui/sales_order_ui.inc:224
+#: ../sales/includes/ui/sales_order_ui.inc.orig:224
msgid "Shipping Charge"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:298
+#: ../sales/includes/ui/sales_order_ui.inc:297
+#: ../sales/includes/ui/sales_order_ui.inc.orig:297
msgid "No customer found for entered text."
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:324
+#: ../sales/includes/ui/sales_order_ui.inc:323
+#: ../sales/includes/ui/sales_order_ui.inc.orig:323
#, php-format
msgid "Customer's payment terms '%s' cannot be selected on this POS"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:374
+#: ../sales/includes/ui/sales_order_ui.inc:373
+#: ../sales/includes/ui/sales_order_ui.inc.orig:373
msgid "Reference number unique for this document type"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:418
+#: ../sales/includes/ui/sales_order_ui.inc:413
+#: ../sales/includes/ui/sales_order_ui.inc:415
+#: ../sales/includes/ui/sales_order_ui.inc.orig:413
+#: ../sales/includes/ui/sales_order_ui.inc.orig:415
msgid "Price List:"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:435
+#: ../sales/includes/ui/sales_order_ui.inc:432
+#: ../sales/includes/ui/sales_order_ui.inc.orig:432
msgid "Date of order receive"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:591
+#: ../sales/includes/ui/sales_order_ui.inc:582
+#: ../sales/includes/ui/sales_order_ui.inc.orig:582
msgid "Cash payment"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:594
-#: ../sales/includes/ui/sales_order_ui.inc:623
+#: ../sales/includes/ui/sales_order_ui.inc:585
+#: ../sales/includes/ui/sales_order_ui.inc:617
+#: ../sales/includes/ui/sales_order_ui.inc.orig:585
+#: ../sales/includes/ui/sales_order_ui.inc.orig:617
msgid "Deliver from Location:"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:595
+#: ../sales/includes/ui/sales_order_ui.inc:588
+#: ../sales/includes/ui/sales_order_ui.inc.orig:588
msgid "Cash account:"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:601
+#: ../sales/includes/ui/sales_order_ui.inc:595
+#: ../sales/includes/ui/sales_order_ui.inc.orig:595
msgid "Delivery Details"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:606
+#: ../sales/includes/ui/sales_order_ui.inc:600
+#: ../sales/includes/ui/sales_order_ui.inc.orig:600
msgid "Invoice Delivery Details"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:607
+#: ../sales/includes/ui/sales_order_ui.inc:601
+#: ../sales/includes/ui/sales_order_ui.inc.orig:601
msgid "Invoice before"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:611
+#: ../sales/includes/ui/sales_order_ui.inc:605
+#: ../sales/includes/ui/sales_order_ui.inc.orig:605
msgid "Quotation Delivery Details"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:616
+#: ../sales/includes/ui/sales_order_ui.inc:610
+#: ../sales/includes/ui/sales_order_ui.inc.orig:610
msgid "Order Delivery Details"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:629
+#: ../sales/includes/ui/sales_order_ui.inc:631
+#: ../sales/includes/ui/sales_order_ui.inc.orig:623
msgid "Enter requested day of delivery"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:630
+#: ../sales/includes/ui/sales_order_ui.inc:632
+#: ../sales/includes/ui/sales_order_ui.inc.orig:624
msgid "Enter Valid until Date"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:631
+#: ../sales/includes/ui/sales_order_ui.inc:633
+#: ../sales/includes/ui/sales_order_ui.inc.orig:625
msgid "Deliver To:"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:632
+#: ../sales/includes/ui/sales_order_ui.inc:634
+#: ../sales/includes/ui/sales_order_ui.inc.orig:626
msgid "Additional identifier for delivery e.g. name of receiving person"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:635
+#: ../sales/includes/ui/sales_order_ui.inc:637
+#: ../sales/includes/ui/sales_order_ui.inc.orig:629
msgid "Delivery address. Default is address of customer branch"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:639
+#: ../sales/includes/ui/sales_order_ui.inc:641
+#: ../sales/includes/ui/sales_order_ui.inc.orig:633
msgid "Contact Phone Number:"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:640
+#: ../sales/includes/ui/sales_order_ui.inc:642
+#: ../sales/includes/ui/sales_order_ui.inc.orig:634
msgid "Phone number of ordering person. Defaults to branch phone number"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:641
+#: ../sales/includes/ui/sales_order_ui.inc:643
+#: ../sales/includes/ui/sales_order_ui.inc.orig:635
msgid "Customer Reference:"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:642
+#: ../sales/includes/ui/sales_order_ui.inc:644
+#: ../sales/includes/ui/sales_order_ui.inc.orig:636
msgid "Customer reference number for this order (if any)"
msgstr ""
"to it."
msgstr ""
-#: ../taxes/item_tax_types.php:93
+#: ../taxes/item_tax_types.php:82
+msgid ""
+"Cannot delete this item tax type because item categories have been created "
+"referring to it."
+msgstr ""
+
+#: ../taxes/item_tax_types.php:98
msgid "Selected item tax type has been deleted"
msgstr ""
-#: ../taxes/item_tax_types.php:112
+#: ../taxes/item_tax_types.php:117
msgid "Tax exempt"
msgstr ""
-#: ../taxes/item_tax_types.php:170
+#: ../taxes/item_tax_types.php:175
msgid "Is Fully Tax-exempt:"
msgstr ""
-#: ../taxes/item_tax_types.php:177
+#: ../taxes/item_tax_types.php:182
msgid "Select which taxes this item tax type is exempt from."
msgstr ""
-#: ../taxes/item_tax_types.php:180
+#: ../taxes/item_tax_types.php:185
msgid "Tax Name"
msgstr ""
-#: ../taxes/item_tax_types.php:180
+#: ../taxes/item_tax_types.php:185
msgid "Is exempt"
msgstr ""
#: ../taxes/tax_groups.php:17
+#: ../taxes/tax_groups.php.orig:17
+#: ../taxes/tax_groups.php.sav:17
msgid "Tax Groups"
msgstr ""
#: ../taxes/tax_groups.php:27
+#: ../taxes/tax_groups.php.orig:27
+#: ../taxes/tax_groups.php.sav:27
msgid ""
"There are no tax types defined. Define tax types before defining tax groups."
msgstr ""
#: ../taxes/tax_groups.php:40
+#: ../taxes/tax_groups.php.orig:40
+#: ../taxes/tax_groups.php.sav:40
msgid "The tax group name cannot be empty."
msgstr ""
-#: ../taxes/tax_groups.php:84
+#: ../taxes/tax_groups.php:60
+#: ../taxes/tax_groups.php.orig:62
+#: ../taxes/tax_groups.php.sav:62
msgid "Selected tax group has been updated"
msgstr ""
-#: ../taxes/tax_groups.php:89
+#: ../taxes/tax_groups.php:65
+#: ../taxes/tax_groups.php.orig:67
+#: ../taxes/tax_groups.php.sav:67
msgid "New tax group has been added"
msgstr ""
-#: ../taxes/tax_groups.php:104
+#: ../taxes/tax_groups.php:80
+#: ../taxes/tax_groups.php.orig:82
+#: ../taxes/tax_groups.php.sav:82
msgid ""
"Cannot delete this tax group because customer branches been created "
"referring to it."
msgstr ""
-#: ../taxes/tax_groups.php:110
+#: ../taxes/tax_groups.php:86
+#: ../taxes/tax_groups.php.orig:88
+#: ../taxes/tax_groups.php.sav:88
msgid ""
"Cannot delete this tax group because suppliers been created referring to it."
msgstr ""
-#: ../taxes/tax_groups.php:127
+#: ../taxes/tax_groups.php:103
+#: ../taxes/tax_groups.php.orig:105
+#: ../taxes/tax_groups.php.sav:105
msgid "Selected tax group has been deleted"
msgstr ""
-#: ../taxes/tax_groups.php:146
-msgid "Shipping Tax"
-msgstr ""
-
-#: ../taxes/tax_groups.php:205
-msgid "Tax applied to Shipping:"
-msgstr ""
-
-#: ../taxes/tax_groups.php:209
+#: ../taxes/tax_groups.php:166
+#: ../taxes/tax_groups.php.orig:168
+#: ../taxes/tax_groups.php.sav:168
msgid "Select the taxes that are included in this group."
msgstr ""
-#: ../taxes/tax_groups.php:214
-msgid "Rate (%)"
+#: ../taxes/tax_groups.php:171
+#: ../taxes/tax_groups.php.orig:173
+#: ../taxes/tax_groups.php.sav:173
+msgid "Shipping Tax"
msgstr ""
#: ../taxes/tax_types.php:16
msgid "Purchasing GL Account:"
msgstr ""
-#: ../themes/default/renderer.php:17
-#: ../themes/exclusive/renderer.php:19
+#: ../themes/default/renderer.php:27
msgid "Main Menu"
msgstr ""
-#: ../themes/default/renderer.php:43
-#: ../themes/default/renderer.php:66
-#: ../themes/exclusive/renderer.php:43
-#: ../themes/exclusive/renderer.php:50
+#: ../themes/default/renderer.php:53
+#: ../themes/default/renderer.php:76
msgid "Help"
msgstr ""
-#: ../themes/default/renderer.php:61
-#: ../themes/exclusive/renderer.php:46
+#: ../themes/default/renderer.php:71
msgid "Preferences"
msgstr ""
-#: ../themes/exclusive/renderer.php:216
-msgid "Top 10 customers in fiscal year"
-msgstr ""
-
-#: ../themes/exclusive/renderer.php:269
-msgid " overdue Sales Invoices"
-msgstr ""
-
-#: ../themes/exclusive/renderer.php:273
-#: ../themes/exclusive/renderer.php:367
-msgid "Ref."
-msgstr ""
-
-#: ../themes/exclusive/renderer.php:313
-msgid "Top 10 suppliers in fiscal year"
-msgstr ""
-
-#: ../themes/exclusive/renderer.php:363
-msgid " overdue Purchase Invoices"
-msgstr ""
-
-#: ../themes/exclusive/renderer.php:411
-msgid "Top 10 Manufactured Items in fiscal year"
-msgstr ""
-
-#: ../themes/exclusive/renderer.php:413
-msgid "Top 10 Sold Items in fiscal year"
-msgstr ""
-
-#: ../themes/exclusive/renderer.php:468
-msgid "Top 10 Dimensions in fiscal year"
-msgstr ""
-
-#: ../themes/exclusive/renderer.php:524
-msgid "Class Balances"
-msgstr ""
-
-#: ../themes/exclusive/renderer.php:553
-msgid "Class"
-msgstr ""
-
#: ../sql/alter2.1.php:18
msgid "Upgrade from version 2.0 to 2.1"
msgstr ""
-#: ../sql/alter2.1.php:35
+#: ../sql/alter2.1.php:36
msgid "Cannot retrieve bank accounts codes"
msgstr ""
-#: ../sql/alter2.1.php:43
+#: ../sql/alter2.1.php:44
msgid "Cannot update bank transactions"
msgstr ""
-#: ../sql/alter2.1.php:52
+#: ../sql/alter2.1.php:53
msgid "Cannot select stock identificators"
msgstr ""
-#: ../sql/alter2.1.php:63
+#: ../sql/alter2.1.php:64
msgid "Cannot insert stock id into item_codes"
msgstr ""
-#: ../sql/alter2.1.php:139
+#: ../sql/alter2.1.php:140
msgid ""
"Seems that system upgrade to version 2.1 has \n"
"\t\t\tbeen performed for this company already.<br> If something has gone \n"
msgid "Upgrade from version 2.1/2.2beta to 2.2"
msgstr ""
-#: ../sql/alter2.2.php:84
+#: ../sql/alter2.2.php:85
msgid "Cannot query max sales order number."
msgstr ""
-#: ../sql/alter2.2.php:95
+#: ../sql/alter2.2.php:96
msgid "Cannot store next sales order reference."
msgstr ""
-#: ../sql/alter2.2.php:246
+#: ../sql/alter2.2.php:251
msgid ""
"Cannot upgrade extensions system: file /modules/installed_modules.php is not "
"writeable"
#: ../sql/alter2.3.php:20
msgid "Upgrade from version 2.2 to 2.3"
msgstr ""
+
+#: ../sql/alter2.4.php:19
+msgid "Upgrade from version 2.3 to 2.4"
+msgstr ""
projects / fa-stable.git / blobdiff