msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-27 08:46+0100\n"
+"POT-Creation-Date: 2013-10-27 17:26+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
#: ../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 ""
#: ../includes/ui/contacts_view.inc:64
#: ../includes/ui/simple_crud_class.inc:52
#: ../includes/ui/ui_input.inc:961
-#: ../inventory/prices.php:158
-#: ../inventory/purchasing_data.php:164
+#: ../inventory/prices.php.orig:161
+#: ../inventory/purchasing_data.php.orig:166
#: ../inventory/includes/item_adjustments_ui.inc:87
#: ../inventory/includes/stock_transfers_ui.inc:79
#: ../inventory/manage/item_categories.php:121
#: ../manufacturing/manage/bom_edit.php:86
#: ../manufacturing/manage/work_centres.php:114
#: ../manufacturing/includes/work_order_issue_ui.inc:58
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:542
-#: ../purchasing/includes/ui/po_ui.inc.orig:273
+#: ../purchasing/includes/ui/invoice_ui.inc:557
+#: ../purchasing/includes/ui/po_ui.inc:271
#: ../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/sales_points.php:99
#: ../sales/manage/sales_types.php:121
#: ../sales/inquiry/sales_deliveries_view.php:154
+#: ../sales/inquiry/sales_orders_view.php:136
#: ../sales/inquiry/sales_orders_view.php.orig:136
#: ../sales/includes/ui/sales_credit_ui.inc:197
#: ../sales/includes/ui/sales_order_ui.inc:209
#: ../includes/ui/contacts_view.inc:67
#: ../includes/ui/simple_crud_class.inc:54
#: ../includes/ui/ui_input.inc:286
-#: ../inventory/prices.php:159
-#: ../inventory/purchasing_data.php:165
+#: ../inventory/prices.php.orig:162
+#: ../inventory/purchasing_data.php.orig:167
#: ../inventory/includes/item_adjustments_ui.inc:89
#: ../inventory/includes/stock_transfers_ui.inc:81
#: ../inventory/manage/item_categories.php:122
#: ../manufacturing/manage/bom_edit.php:87
#: ../manufacturing/manage/work_centres.php:115
#: ../manufacturing/includes/work_order_issue_ui.inc:60
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:304
-#: ../purchasing/includes/ui/po_ui.inc.orig:275
+#: ../purchasing/includes/ui/invoice_ui.inc:319
+#: ../purchasing/includes/ui/po_ui.inc:273
#: ../sales/manage/credit_status.php:120
#: ../sales/manage/customer_branches.php:163
#: ../sales/manage/recurrent_invoices.php:131
#: ../gl/inquiry/gl_account_inquiry.php:126
#: ../gl/inquiry/journal_inquiry.php:127
#: ../gl/inquiry/journal_inquiry.php:140
-#: ../includes/ui/allocation_cart.inc.orig:264
+#: ../includes/ui/allocation_cart.inc:289
#: ../inventory/inquiry/stock_movements.php:78
#: ../manufacturing/search_work_orders.php:159
#: ../manufacturing/includes/manufacturing_ui.inc:157
#: ../purchasing/view/view_po.php:115
#: ../purchasing/view/view_po.php:140
#: ../purchasing/inquiry/po_search_completed.php:120
-#: ../purchasing/inquiry/po_search_completed.php.orig:119
#: ../purchasing/inquiry/po_search.php:130
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:126
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:127
#: ../purchasing/inquiry/supplier_inquiry.php:174
#: ../purchasing/allocations/supplier_allocation_main.php:95
-#: ../reporting/rep101.php:118
-#: ../reporting/rep201.php:110
+#: ../reporting/rep101.php:147
+#: ../reporting/rep201.php:135
#: ../reporting/rep203.php:93
#: ../reporting/rep306.php:141
#: ../reporting/rep601.php:79
#: ../sales/view/view_sales_order.php:109
#: ../sales/view/view_sales_order.php:142
#: ../sales/view/view_sales_order.php:179
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:145
-#: ../sales/inquiry/customer_inquiry.php.orig:201
+#: ../sales/inquiry/customer_allocation_inquiry.php:145
+#: ../sales/inquiry/customer_inquiry.php:201
msgid "#"
msgstr ""
#: ../inventory/view/view_transfer.php:56
#: ../manufacturing/manage/bom_edit.php:70
#: ../manufacturing/includes/manufacturing_ui.inc:28
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:492
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:504
+#: ../purchasing/includes/ui/invoice_ui.inc:507
+#: ../purchasing/includes/ui/invoice_ui.inc:519
#: ../purchasing/po_receive_items.php:62
#: ../reporting/rep104.php:111
#: ../reporting/rep105.php:114
#: ../includes/system_tests.inc:126
#: ../includes/ui/ui_lists.inc:1679
#: ../purchasing/manage/suppliers.php:122
-#: ../purchasing/manage/suppliers.php.orig:122
-#: ../reporting/rep101.php:114
+#: ../reporting/rep101.php:143
#: ../reporting/rep102.php:114
#: ../reporting/rep102.php:116
#: ../reporting/rep104.php:105
#: ../reporting/rep106.php:75
#: ../reporting/rep114.php:74
-#: ../reporting/rep201.php:106
+#: ../reporting/rep201.php:131
#: ../reporting/rep202.php:118
#: ../reporting/rep202.php:120
#: ../reporting/rep203.php:89
msgstr ""
#: ../admin/company_preferences.php:59
-#: ../inventory/manage/items.php.orig:87
+#: ../inventory/manage/items.php:86
msgid ""
"The file size is over the maximum allowed. The maximum size allowed in KB is"
msgstr ""
#: ../admin/company_preferences.php:64
-#: ../inventory/manage/items.php.orig:77
-#: ../inventory/manage/items.php.orig:92
+#: ../inventory/manage/items.php:76
+#: ../inventory/manage/items.php:91
msgid "Only graphics files can be uploaded"
msgstr ""
#: ../admin/company_preferences.php:72
#: ../admin/company_preferences.php:93
-#: ../inventory/manage/items.php.orig:100
+#: ../inventory/manage/items.php:99
msgid "The existing image could not be removed"
msgstr ""
#: ../includes/ui/contacts_view.inc:109
#: ../inventory/manage/locations.php:202
#: ../sales/manage/customers.php:234
-#: ../sales/manage/sav.customers.php:231
#: ../sales/includes/ui/sales_order_ui.inc:642
msgid "Address:"
msgstr ""
#: ../admin/company_preferences.php:168
#: ../admin/shipping_companies.php:138
#: ../purchasing/manage/suppliers.php:135
-#: ../purchasing/manage/suppliers.php.orig:135
#: ../sales/manage/customer_branches.php:262
msgid "Phone Number:"
msgstr ""
#: ../admin/company_preferences.php:169
#: ../includes/ui/contacts_view.inc:104
#: ../purchasing/manage/suppliers.php:138
-#: ../purchasing/manage/suppliers.php.orig:138
#: ../sales/manage/customer_branches.php:264
#: ../sales/manage/customers.php:257
-#: ../sales/manage/sav.customers.php:254
msgid "Fax Number:"
msgstr ""
#: ../admin/company_preferences.php:175
#: ../purchasing/manage/suppliers.php:96
-#: ../purchasing/manage/suppliers.php.orig:96
#: ../sales/manage/customers.php:236
-#: ../sales/manage/sav.customers.php:233
msgid "GSTNo:"
msgstr ""
#: ../includes/ui/ui_input.inc:208
#: ../includes/ui/ui_input.inc:906
#: ../inventory/adjustments.php:233
-#: ../inventory/cost_update.php:136
-#: ../inventory/reorder_level.php:111
+#: ../inventory/cost_update.php.orig:138
+#: ../inventory/reorder_level.php.orig:114
#: ../inventory/transfers.php:234
#: ../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:459
#: ../manufacturing/includes/work_order_issue_ui.inc:131
-#: ../purchasing/includes/ui/po_ui.inc.orig:306
-#: ../purchasing/includes/ui/po_ui.inc.orig:455
+#: ../purchasing/includes/ui/po_ui.inc:304
+#: ../purchasing/includes/ui/po_ui.inc:455
#: ../purchasing/po_receive_items.php:332
#: ../sales/credit_note_entry.php:284
#: ../sales/customer_credit_invoice.php:380
#: ../includes/system_tests.inc:126
#: ../includes/ui/ui_lists.inc:1680
#: ../purchasing/manage/suppliers.php:122
-#: ../purchasing/manage/suppliers.php.orig:122
-#: ../reporting/rep101.php:113
+#: ../reporting/rep101.php:142
#: ../reporting/rep102.php:113
#: ../reporting/rep102.php:115
#: ../reporting/rep104.php:107
#: ../reporting/rep106.php:77
#: ../reporting/rep114.php:76
-#: ../reporting/rep201.php:105
+#: ../reporting/rep201.php:130
#: ../reporting/rep202.php:117
#: ../reporting/rep202.php:119
#: ../reporting/rep203.php:88
#: ../admin/inst_theme.php:93
#: ../admin/inst_upgrade.php:153
#: ../gl/manage/gl_account_types.php:190
-#: ../includes/ui/allocation_cart.inc.orig:288
+#: ../includes/ui/allocation_cart.inc:315
#: ../taxes/sav.tax_types.php:168
msgid "None"
msgstr ""
#: ../admin/gl_setup.php:179
#: ../admin/gl_setup.php:220
#: ../inventory/manage/item_categories.php:196
-#: ../inventory/manage/items.php.orig:366
+#: ../inventory/manage/items.php:365
#: ../sales/manage/customer_branches.php:251
msgid "Sales Account:"
msgstr ""
#: ../admin/gl_setup.php:208
#: ../purchasing/manage/suppliers.php:132
-#: ../purchasing/manage/suppliers.php.orig:132
msgid "Purchase Discount Account:"
msgstr ""
msgstr ""
#: ../admin/gl_setup.php:214
+#: ../reporting/reports_main.php:206
msgid "Inventory"
msgstr ""
#: ../admin/gl_setup.php:222
#: ../inventory/manage/item_categories.php:206
-#: ../inventory/manage/items.php.orig:370
+#: ../inventory/manage/items.php:369
msgid "Inventory Account:"
msgstr ""
#: ../admin/gl_setup.php:224
#: ../inventory/manage/item_categories.php:200
#: ../inventory/manage/item_categories.php:208
-#: ../inventory/manage/items.php.orig:371
-#: ../inventory/manage/items.php.orig:376
+#: ../inventory/manage/items.php:370
+#: ../inventory/manage/items.php:375
msgid "C.O.G.S. Account:"
msgstr ""
#: ../admin/gl_setup.php:226
#: ../inventory/manage/item_categories.php:209
-#: ../inventory/manage/items.php.orig:372
+#: ../inventory/manage/items.php:371
msgid "Inventory Adjustments Account:"
msgstr ""
#: ../admin/gl_setup.php:228
#: ../inventory/manage/item_categories.php:213
-#: ../inventory/manage/items.php.orig:383
+#: ../inventory/manage/items.php:382
msgid "Item Assembly Costs Account:"
msgstr ""
#: ../admin/inst_module.php:105
#: ../admin/inst_theme.php:74
#: ../inventory/inquiry/stock_status.php:71
-#: ../inventory/inquiry/stock_status.php.orig:77
#: ../reporting/rep303.php:114
msgid "Available"
msgstr ""
#: ../dimensions/view/view_dimension.php:55
#: ../inventory/manage/item_categories.php:98
#: ../manufacturing/manage/work_centres.php:101
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:265
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:267
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:269
+#: ../purchasing/includes/ui/invoice_ui.inc:280
+#: ../purchasing/includes/ui/invoice_ui.inc:282
+#: ../purchasing/includes/ui/invoice_ui.inc:284
#: ../reporting/rep501.php:87
#: ../reporting/rep709.php:111
#: ../reporting/rep709.php:112
#: ../gl/manage/gl_quick_entries.php:186
#: ../gl/view/accrual_trans.php:52
#: ../gl/includes/ui/gl_bank_ui.inc:93
-#: ../includes/ui/ui_view.inc.orig:488
+#: ../includes/ui/ui_view.inc:547
#: ../inventory/inquiry/stock_movements.php:78
#: ../inventory/manage/item_categories.php:98
#: ../manufacturing/search_work_orders.php:161
#: ../manufacturing/includes/manufacturing_ui.inc:276
#: ../manufacturing/includes/manufacturing_ui.inc:280
#: ../manufacturing/includes/manufacturing_ui.inc:331
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:125
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:126
#: ../purchasing/inquiry/supplier_inquiry.php:173
#: ../reporting/rep102.php:134
#: ../reporting/rep202.php:139
#: ../reporting/includes/doctext.inc:162
#: ../reporting/includes/doctext.inc:203
#: ../reporting/includes/doctext.inc:222
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:144
-#: ../sales/inquiry/customer_inquiry.php.orig:200
+#: ../sales/inquiry/customer_allocation_inquiry.php:144
+#: ../sales/inquiry/customer_inquiry.php:200
msgid "Type"
msgstr ""
#: ../admin/security_roles.php:180
#: ../gl/manage/gl_accounts.php:198
-#: ../inventory/manage/items.php.orig:445
-#: ../purchasing/manage/suppliers.php.orig:291
+#: ../inventory/manage/items.php:444
+#: ../purchasing/manage/suppliers.php:291
#: ../sales/manage/customers.php:329
-#: ../sales/manage/sav.customers.php:324
msgid "Show inactive:"
msgstr ""
#: ../includes/ui/ui_input.inc:211
#: ../inventory/includes/item_adjustments_ui.inc:159
#: ../inventory/includes/stock_transfers_ui.inc:139
-#: ../inventory/manage/items.php.orig:428
+#: ../inventory/manage/items.php:427
#: ../manufacturing/includes/work_order_issue_ui.inc:133
-#: ../purchasing/includes/ui/po_ui.inc.orig:457
+#: ../purchasing/includes/ui/po_ui.inc:457
#: ../sales/includes/ui/sales_credit_ui.inc:295
#: ../sales/includes/ui/sales_order_ui.inc:563
#: ../taxes/sav.tax_types.php:173
msgstr ""
#: ../admin/security_roles.php:249
-#: ../inventory/manage/items.php.orig:428
+#: ../inventory/manage/items.php:427
msgid "Cancel Edition"
msgstr ""
#: ../admin/shipping_companies.php:134
#: ../gl/manage/gl_account_types.php:188
#: ../gl/includes/ui/gl_bank_ui.inc:57
-#: ../inventory/manage/items.php.orig:308
+#: ../inventory/manage/items.php:307
#: ../manufacturing/manage/work_centres.php:137
msgid "Name:"
msgstr ""
#: ../includes/ui/contacts_view.inc:103
#: ../inventory/manage/locations.php:205
#: ../purchasing/manage/suppliers.php:136
-#: ../purchasing/manage/suppliers.php.orig:136
#: ../sales/manage/customer_branches.php:263
#: ../sales/manage/customers.php:256
-#: ../sales/manage/sav.customers.php:253
msgid "Secondary Phone Number:"
msgstr ""
#: ../admin/view_print_transaction.php:129
#: ../includes/ui/ui_controls.inc:195
#: ../purchasing/inquiry/po_search_completed.php:112
-#: ../purchasing/inquiry/po_search_completed.php.orig:111
#: ../purchasing/inquiry/po_search.php:93
-#: ../sales/inquiry/customer_inquiry.php.orig:185
+#: ../sales/inquiry/customer_inquiry.php:185
#: ../sales/inquiry/sales_deliveries_view.php:160
#: ../sales/inquiry/sales_orders_view.php:125
#: ../sales/inquiry/sales_orders_view.php.orig:125
#: ../dimensions/inquiry/search_dimensions.php:88
#: ../gl/inquiry/journal_inquiry.php:53
#: ../manufacturing/search_work_orders.php:78
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:474
+#: ../purchasing/includes/ui/invoice_ui.inc:489
#: ../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_allocation_inquiry.php.orig:57
#: ../purchasing/inquiry/supplier_inquiry.php:55
#: ../sales/inquiry/customer_allocation_inquiry.php:51
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:51
#: ../sales/inquiry/customer_inquiry.php:54
-#: ../sales/inquiry/customer_inquiry.php.orig:54
#: ../sales/inquiry/sales_deliveries_view.php:116
#: ../sales/inquiry/sales_orders_view.php.orig:269
msgid "Search"
#: ../manufacturing/includes/manufacturing_ui.inc:331
#: ../purchasing/includes/ui/grn_ui.inc:32
#: ../purchasing/includes/ui/grn_ui.inc:64
-#: ../purchasing/includes/ui/po_ui.inc.orig:321
+#: ../purchasing/includes/ui/po_ui.inc:319
#: ../purchasing/view/view_po.php:115
#: ../purchasing/view/view_supp_credit.php:43
#: ../purchasing/view/view_supp_invoice.php:47
#: ../purchasing/view/view_supp_payment.php:73
#: ../purchasing/inquiry/po_search_completed.php:121
-#: ../purchasing/inquiry/po_search_completed.php.orig:120
#: ../purchasing/inquiry/po_search.php:131
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:127
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:128
#: ../purchasing/inquiry/supplier_inquiry.php:175
#: ../purchasing/allocations/supplier_allocation_main.php:96
#: ../reporting/rep501.php:87
#: ../sales/view/view_invoice.php:85
#: ../sales/view/view_receipt.php:39
#: ../sales/view/view_sales_order.php:94
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:146
-#: ../sales/inquiry/customer_inquiry.php.orig:203
+#: ../sales/inquiry/customer_allocation_inquiry.php:146
+#: ../sales/inquiry/customer_inquiry.php:203
#: ../sales/inquiry/sales_deliveries_view.php:184
#: ../sales/includes/ui/sales_credit_ui.inc:85
#: ../sales/includes/ui/sales_credit_ui.inc:87
#: ../gl/view/gl_deposit_view.php:68
#: ../gl/view/gl_payment_view.php:66
#: ../gl/view/gl_trans_view.php:36
-#: ../includes/ui/allocation_cart.inc.orig:264
-#: ../includes/ui/ui_view.inc.orig:488
+#: ../includes/ui/allocation_cart.inc:289
+#: ../includes/ui/ui_view.inc:547
#: ../inventory/inquiry/stock_movements.php:80
#: ../inventory/view/view_adjustment.php:45
#: ../inventory/view/view_transfer.php:47
#: ../manufacturing/includes/manufacturing_ui.inc:277
#: ../manufacturing/includes/manufacturing_ui.inc:281
#: ../manufacturing/includes/manufacturing_ui.inc:332
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:114
-#: ../purchasing/includes/ui/po_ui.inc.orig:335
+#: ../purchasing/includes/ui/invoice_ui.inc:129
+#: ../purchasing/includes/ui/po_ui.inc:333
#: ../purchasing/view/view_po.php:140
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:130
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:131
#: ../purchasing/inquiry/supplier_inquiry.php:178
#: ../purchasing/allocations/supplier_allocation_main.php:97
-#: ../reporting/rep101.php:118
-#: ../reporting/rep201.php:110
+#: ../reporting/rep101.php:147
+#: ../reporting/rep201.php:135
#: ../reporting/rep306.php:141
#: ../reporting/rep501.php:87
#: ../reporting/rep601.php:79
#: ../sales/view/view_sales_order.php:109
#: ../sales/view/view_sales_order.php:142
#: ../sales/view/view_sales_order.php:179
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:148
-#: ../sales/inquiry/customer_inquiry.php.orig:204
+#: ../sales/inquiry/customer_allocation_inquiry.php:148
+#: ../sales/inquiry/customer_inquiry.php:204
msgid "Date"
msgstr ""
#: ../admin/view_print_transaction.php:130
#: ../admin/void_transaction.php:184
#: ../includes/ui/ui_view.inc:51
-#: ../includes/ui/ui_view.inc.orig:51
msgid "GL"
msgstr ""
#: ../gl/inquiry/journal_inquiry.php:56
#: ../gl/manage/revaluate_currencies.php:106
#: ../includes/ui/ui_view.inc:344
-#: ../includes/ui/ui_view.inc.orig:308
#: ../manufacturing/work_order_add_finished.php:210
#: ../manufacturing/work_order_costs.php:146
#: ../manufacturing/work_order_entry.php:451
#: ../manufacturing/work_order_release.php:103
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:180
-#: ../purchasing/includes/ui/po_ui.inc.orig:490
-#: ../purchasing/po_entry_items.php.orig:562
-#: ../purchasing/supplier_payment.php.orig:316
+#: ../purchasing/includes/ui/invoice_ui.inc:195
+#: ../purchasing/includes/ui/po_ui.inc:490
+#: ../purchasing/po_entry_items.php:566
+#: ../purchasing/supplier_payment.php.orig:321
#: ../sales/customer_invoice.php:680
-#: ../sales/customer_payments.php.orig:413
+#: ../sales/customer_payments.php.orig:409
msgid "Memo:"
msgstr ""
#: ../manufacturing/work_order_add_finished.php:98
#: ../manufacturing/work_order_costs.php:80
#: ../purchasing/po_receive_items.php:174
-#: ../purchasing/supplier_payment.php:185
-#: ../purchasing/supplier_payment.php.orig:174
+#: ../purchasing/supplier_payment.php.orig:175
#: ../sales/customer_credit_invoice.php:91
#: ../sales/sales_order_entry.php:360
#: ../sales/manage/recurrent_invoices.php:41
msgstr ""
#: ../admin/db/fiscalyears_db.inc:214
-#: ../reporting/rep101.php:175
-#: ../reporting/rep201.php:170
#: ../reporting/rep706.php:185
msgid "Open Balance"
msgstr ""
msgstr ""
#: ../admin/db/voiding_db.inc:114
-#: ../sales/includes/db/sales_invoice_db.inc.orig:249
+#: ../manufacturing/includes/db/work_orders_db.inc.orig:261
+#: ../sales/includes/db/sales_invoice_db.inc:251
msgid "Voided."
msgstr ""
msgstr ""
#: ../applications/inventory.php:47
+#: ../inventory/manage/items.php:469
msgid "&Reorder Levels"
msgstr ""
msgstr ""
#: ../applications/inventory.php:55
+#: ../inventory/manage/items.php:468
msgid "Standard &Costs"
msgstr ""
#: ../manufacturing/work_order_entry.php:139
#: ../manufacturing/work_order_issue.php:97
#: ../purchasing/po_entry_items.php:368
-#: ../purchasing/po_entry_items.php.orig:368
#: ../purchasing/po_receive_items.php:193
#: ../purchasing/supplier_credit.php:172
#: ../purchasing/supplier_invoice.php:179
-#: ../purchasing/supplier_payment.php:214
-#: ../purchasing/supplier_payment.php.orig:203
+#: ../purchasing/supplier_payment.php.orig:204
#: ../sales/create_recurrent_invoices.php:57
#: ../sales/credit_note_entry.php:181
#: ../sales/customer_credit_invoice.php:205
#: ../sales/customer_delivery.php:324
#: ../sales/customer_invoice.php:379
-#: ../sales/customer_payments.php:169
-#: ../sales/customer_payments.php:176
-#: ../sales/customer_payments.php.orig:158
-#: ../sales/customer_payments.php.orig:165
-#: ../sales/customer_payments.php.orig:248
+#: ../sales/customer_payments.php.orig:164
+#: ../sales/customer_payments.php.orig:171
+#: ../sales/customer_payments.php.orig:247
#: ../sales/sales_order_entry.php:458
msgid "The entered reference is already in use."
msgstr ""
#: ../manufacturing/work_order_entry.php:154
#: ../manufacturing/work_order_entry.php:234
#: ../purchasing/po_entry_items.php:241
-#: ../purchasing/po_entry_items.php.orig:241
msgid "The date entered is in an invalid format."
msgstr ""
#: ../reporting/reports_main.php:80
#: ../reporting/reports_main.php:89
#: ../reporting/reports_main.php:151
+#: ../reporting/reports_main.php:233
+#: ../reporting/reports_main.php:242
+#: ../reporting/reports_main.php:248
+#: ../reporting/reports_main.php:258
+#: ../reporting/reports_main.php:266
+#: ../reporting/reports_main.php:274
+#: ../reporting/reports_main.php:311
msgid "Start Date"
msgstr ""
#: ../dimensions/dimension_entry.php:302
#: ../includes/ui/simple_crud_class.inc:225
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:206
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:412
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:414
+#: ../purchasing/includes/ui/invoice_ui.inc:221
+#: ../purchasing/includes/ui/invoice_ui.inc:427
+#: ../purchasing/includes/ui/invoice_ui.inc:429
#: ../taxes/sav.tax_types.php:172
msgid "Add"
msgstr ""
#: ../dimensions/includes/dimensions_ui.inc:31
#: ../gl/accruals.php:94
#: ../gl/inquiry/gl_account_inquiry.php:129
+#: ../gl/inquiry/gl_trial_balance.php.orig:179
#: ../gl/manage/gl_quick_entries.php:241
#: ../gl/manage/gl_quick_entries.php:333
#: ../includes/sysnames.inc:165
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:265
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:267
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:269
+#: ../purchasing/includes/ui/invoice_ui.inc:280
+#: ../purchasing/includes/ui/invoice_ui.inc:282
+#: ../purchasing/includes/ui/invoice_ui.inc:284
#: ../reporting/rep701.php:111
#: ../reporting/rep705.php:238
#: ../reporting/rep706.php:185
#: ../gl/inquiry/bank_inquiry.php:71
#: ../gl/inquiry/gl_account_inquiry.php:141
#: ../gl/inquiry/gl_account_inquiry.php:143
+#: ../gl/inquiry/gl_trial_balance.php.orig:185
+#: ../gl/inquiry/gl_trial_balance.php.orig:187
+#: ../gl/inquiry/gl_trial_balance.php.orig:189
#: ../gl/view/accrual_trans.php:60
#: ../gl/view/gl_trans_view.php:69
#: ../gl/view/gl_trans_view.php:72
#: ../gl/includes/ui/gl_journal_ui.inc:87
#: ../gl/includes/ui/gl_journal_ui.inc:90
#: ../gl/includes/ui/gl_journal_ui.inc:93
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:133
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:134
#: ../purchasing/inquiry/supplier_inquiry.php:181
#: ../reporting/rep601.php:80
#: ../reporting/rep602.php:81
#: ../reporting/rep704.php:90
#: ../reporting/rep708.php:192
#: ../reporting/rep708.php:193
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:152
-#: ../sales/inquiry/customer_inquiry.php.orig:209
+#: ../sales/inquiry/customer_allocation_inquiry.php:152
+#: ../sales/inquiry/customer_inquiry.php:209
msgid "Debit"
msgstr ""
#: ../gl/inquiry/bank_inquiry.php:71
#: ../gl/inquiry/gl_account_inquiry.php:141
#: ../gl/inquiry/gl_account_inquiry.php:143
+#: ../gl/inquiry/gl_trial_balance.php.orig:186
+#: ../gl/inquiry/gl_trial_balance.php.orig:188
+#: ../gl/inquiry/gl_trial_balance.php.orig:190
#: ../gl/view/accrual_trans.php:60
#: ../gl/view/gl_trans_view.php:69
#: ../gl/view/gl_trans_view.php:72
#: ../gl/includes/ui/gl_journal_ui.inc:90
#: ../gl/includes/ui/gl_journal_ui.inc:93
#: ../includes/sysnames.inc:85
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:134
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:135
#: ../purchasing/inquiry/supplier_inquiry.php:182
#: ../reporting/rep601.php:80
#: ../reporting/rep602.php:81
#: ../reporting/rep704.php:90
#: ../reporting/rep708.php:192
#: ../reporting/rep708.php:193
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:153
-#: ../sales/inquiry/customer_inquiry.php.orig:210
+#: ../sales/inquiry/customer_allocation_inquiry.php:153
+#: ../sales/inquiry/customer_inquiry.php:210
msgid "Credit"
msgstr ""
#: ../dimensions/inquiry/search_dimensions.php:134
#: ../gl/inquiry/bank_inquiry.php:71
#: ../gl/inquiry/gl_account_inquiry.php:141
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:136
-#: ../reporting/rep101.php:122
-#: ../reporting/rep201.php:114
+#: ../gl/inquiry/gl_trial_balance.php.orig:183
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:137
+#: ../reporting/rep101.php:151
+#: ../reporting/rep201.php:139
#: ../reporting/rep203.php:94
#: ../reporting/rep204.php:84
#: ../reporting/rep307.php:117
#: ../reporting/rep704.php:87
#: ../reporting/rep704.php:90
#: ../reporting/rep708.php:185
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:155
+#: ../sales/inquiry/customer_allocation_inquiry.php:155
msgid "Balance"
msgstr ""
#: ../manufacturing/work_order_entry.php:378
#: ../manufacturing/work_order_entry.php:385
#: ../manufacturing/includes/work_order_issue_ui.inc:156
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:104
-#: ../purchasing/includes/ui/po_ui.inc.orig:166
-#: ../purchasing/includes/ui/po_ui.inc.orig:171
-#: ../purchasing/supplier_payment.php.orig:289
-#: ../sales/customer_payments.php.orig:382
+#: ../purchasing/includes/ui/invoice_ui.inc:119
+#: ../purchasing/includes/ui/po_ui.inc:184
+#: ../purchasing/includes/ui/po_ui.inc:189
+#: ../purchasing/supplier_payment.php.orig:294
+#: ../sales/customer_payments.php.orig:378
msgid "Reference:"
msgstr ""
#: ../dimensions/inquiry/search_dimensions.php:75
-#: ../includes/ui/allocation_cart.inc.orig:286
+#: ../includes/ui/allocation_cart.inc:313
#: ../includes/ui/ui_lists.inc:1927
-#: ../reporting/rep101.php:100
+#: ../reporting/rep101.php:129
#: ../reporting/rep102.php:96
#: ../reporting/rep104.php:97
#: ../reporting/rep104.php:101
#: ../reporting/rep105.php:95
#: ../reporting/rep105.php:99
-#: ../reporting/rep201.php:92
+#: ../reporting/rep201.php:117
#: ../reporting/rep202.php:100
#: ../reporting/rep203.php:74
#: ../reporting/rep204.php:77
#: ../dimensions/inquiry/search_dimensions.php:76
#: ../gl/inquiry/bank_inquiry.php:49
#: ../gl/inquiry/gl_trial_balance.php:54
+#: ../gl/inquiry/gl_trial_balance.php.orig:49
#: ../gl/inquiry/journal_inquiry.php:48
#: ../gl/inquiry/profit_loss.php:168
#: ../gl/includes/ui/gl_bank_ui.inc:52
#: ../gl/includes/ui/gl_bank_ui.inc:120
#: ../inventory/inquiry/stock_movements.php:58
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:50
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:50
#: ../purchasing/inquiry/supplier_inquiry.php:50
#: ../sales/inquiry/customer_inquiry.php:46
-#: ../sales/inquiry/customer_inquiry.php.orig:46
msgid "From:"
msgstr ""
#: ../dimensions/inquiry/search_dimensions.php:77
#: ../gl/inquiry/bank_inquiry.php:50
#: ../gl/inquiry/gl_trial_balance.php:55
+#: ../gl/inquiry/gl_trial_balance.php.orig:50
#: ../gl/inquiry/journal_inquiry.php:49
#: ../gl/inquiry/profit_loss.php:169
#: ../inventory/inquiry/stock_movements.php:59
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:51
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:51
#: ../purchasing/inquiry/supplier_inquiry.php:51
#: ../sales/inquiry/customer_inquiry.php:47
-#: ../sales/inquiry/customer_inquiry.php.orig:47
msgid "To:"
msgstr ""
#: ../dimensions/inquiry/search_dimensions.php:132
#: ../dimensions/view/view_dimension.php:55
-#: ../includes/ui/allocation_cart.inc.orig:264
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:123
+#: ../includes/ui/allocation_cart.inc:289
+#: ../purchasing/includes/ui/invoice_ui.inc:138
#: ../purchasing/view/view_supp_credit.php:48
#: ../purchasing/view/view_supp_invoice.php:52
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:131
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:132
#: ../purchasing/inquiry/supplier_inquiry.php:179
-#: ../reporting/rep101.php:118
-#: ../reporting/rep201.php:110
+#: ../reporting/rep101.php:147
+#: ../reporting/rep201.php:135
#: ../reporting/rep203.php:93
#: ../reporting/rep501.php:87
#: ../reporting/includes/doctext.inc:112
#: ../sales/customer_invoice.php:510
#: ../sales/view/view_dispatch.php:97
#: ../sales/view/view_invoice.php:96
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:149
-#: ../sales/inquiry/customer_inquiry.php.orig:205
+#: ../sales/inquiry/customer_allocation_inquiry.php:149
+#: ../sales/inquiry/customer_inquiry.php:205
#: ../sales/includes/ui/sales_order_ui.inc:602
msgid "Due Date"
msgstr ""
#: ../gl/inquiry/gl_account_inquiry.php:71
#: ../gl/inquiry/tax_inquiry.php:61
#: ../purchasing/inquiry/po_search_completed.php:62
-#: ../purchasing/inquiry/po_search_completed.php.orig:63
#: ../purchasing/inquiry/po_search.php:64
#: ../sales/inquiry/customer_allocation_inquiry.php:44
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:44
#: ../sales/inquiry/sales_deliveries_view.php:104
+#: ../sales/inquiry/sales_orders_view.php:251
#: ../sales/inquiry/sales_orders_view.php.orig:251
msgid "from:"
msgstr ""
#: ../gl/inquiry/gl_account_inquiry.php:72
#: ../gl/inquiry/tax_inquiry.php:62
#: ../purchasing/inquiry/po_search_completed.php:63
-#: ../purchasing/inquiry/po_search_completed.php.orig:64
#: ../purchasing/inquiry/po_search.php:65
#: ../sales/inquiry/customer_allocation_inquiry.php:45
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:45
#: ../sales/inquiry/sales_deliveries_view.php:105
+#: ../sales/inquiry/sales_orders_view.php:252
#: ../sales/inquiry/sales_orders_view.php.orig:252
msgid "to:"
msgstr ""
#: ../gl/inquiry/bank_inquiry.php:52
#: ../gl/inquiry/gl_account_inquiry.php:85
#: ../gl/inquiry/gl_trial_balance.php:63
+#: ../gl/inquiry/gl_trial_balance.php.orig:58
#: ../gl/inquiry/profit_loss.php:183
#: ../gl/inquiry/tax_inquiry.php:63
msgid "Show"
#: ../manufacturing/work_order_entry.php:160
#: ../manufacturing/work_order_issue.php:84
#: ../purchasing/po_entry_items.php:345
-#: ../purchasing/po_entry_items.php.orig:345
#: ../purchasing/po_receive_items.php:179
#: ../purchasing/supplier_credit.php:192
#: ../purchasing/supplier_invoice.php:199
-#: ../purchasing/supplier_payment.php:191
-#: ../purchasing/supplier_payment.php.orig:180
+#: ../purchasing/supplier_payment.php.orig:181
#: ../sales/create_recurrent_invoices.php:121
#: ../sales/credit_note_entry.php:157
#: ../sales/customer_credit_invoice.php:95
#: ../sales/customer_delivery.php:165
#: ../sales/customer_invoice.php:318
-#: ../sales/customer_payments.php:156
-#: ../sales/customer_payments.php.orig:145
+#: ../sales/customer_payments.php.orig:151
#: ../sales/sales_order_entry.php:365
msgid ""
"The entered date is out of fiscal year or is closed for further data entry."
#: ../gl/inquiry/gl_account_inquiry.php:136
#: ../gl/inquiry/gl_trial_balance.php:57
#: ../gl/inquiry/gl_trial_balance.php:59
+#: ../gl/inquiry/gl_trial_balance.php.orig:52
+#: ../gl/inquiry/gl_trial_balance.php.orig:54
#: ../gl/inquiry/profit_loss.php:179
#: ../gl/inquiry/profit_loss.php:181
#: ../gl/manage/gl_quick_entries.php:261
#: ../includes/sysnames.inc:166
#: ../inventory/manage/item_categories.php:220
#: ../inventory/manage/item_categories.php:222
-#: ../inventory/manage/items.php.orig:355
-#: ../inventory/manage/items.php.orig:357
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:265
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:267
+#: ../inventory/manage/items.php:354
+#: ../inventory/manage/items.php:356
+#: ../purchasing/includes/ui/invoice_ui.inc:280
+#: ../purchasing/includes/ui/invoice_ui.inc:282
#: ../purchasing/manage/suppliers.php:145
#: ../purchasing/manage/suppliers.php:146
#: ../purchasing/manage/suppliers.php:148
-#: ../purchasing/manage/suppliers.php.orig:145
-#: ../purchasing/manage/suppliers.php.orig:146
-#: ../purchasing/manage/suppliers.php.orig:148
#: ../reporting/rep103.php:243
#: ../reporting/rep103.php:255
#: ../reporting/rep205.php:161
#: ../sales/customer_invoice.php:518
#: ../sales/manage/customers.php:273
#: ../sales/manage/customers.php:275
-#: ../sales/manage/sav.customers.php:269
-#: ../sales/manage/sav.customers.php:271
#: ../sales/includes/ui/sales_credit_ui.inc:132
#: ../sales/includes/ui/sales_credit_ui.inc:137
#: ../sales/includes/ui/sales_order_ui.inc:457
#: ../inventory/includes/stock_transfers_ui.inc:161
#: ../manufacturing/view/wo_costs_view.php:46
#: ../manufacturing/includes/work_order_issue_ui.inc:169
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:265
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:267
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:269
+#: ../purchasing/includes/ui/invoice_ui.inc:280
+#: ../purchasing/includes/ui/invoice_ui.inc:282
+#: ../purchasing/includes/ui/invoice_ui.inc:284
#: ../sales/customer_credit_invoice.php:364
#: ../sales/customer_delivery.php:543
#: ../sales/includes/ui/sales_credit_ui.inc:339
#: ../gl/includes/ui/gl_bank_ui.inc:156
#: ../gl/includes/ui/gl_bank_ui.inc:159
#: ../includes/sysnames.inc:133
-#: ../includes/ui/allocation_cart.inc.orig:264
+#: ../includes/ui/allocation_cart.inc:289
#: ../includes/ui/ui_lists.inc:1185
#: ../manufacturing/view/wo_costs_view.php:46
#: ../manufacturing/includes/manufacturing_ui.inc:236
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:265
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:267
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:269
+#: ../purchasing/includes/ui/invoice_ui.inc:280
+#: ../purchasing/includes/ui/invoice_ui.inc:282
+#: ../purchasing/includes/ui/invoice_ui.inc:284
#: ../purchasing/view/view_supp_payment.php:60
#: ../purchasing/view/view_supp_payment.php:72
-#: ../reporting/rep102.php:245
-#: ../reporting/rep109.php:190
+#: ../reporting/rep109.php:195
#: ../reporting/rep110.php:193
-#: ../reporting/rep111.php:173
+#: ../reporting/rep111.php:174
#: ../reporting/rep113.php:178
#: ../reporting/rep202.php:253
#: ../reporting/rep209.php:195
#: ../gl/bank_transfer.php:87
#: ../gl/bank_transfer.php:94
-#: ../sales/customer_payments.php.orig:411
+#: ../sales/customer_payments.php.orig:407
msgid "Amount:"
msgstr ""
#: ../gl/bank_transfer.php:88
#: ../gl/bank_transfer.php:95
-#: ../purchasing/supplier_payment.php.orig:302
-#: ../sales/customer_payments.php.orig:396
+#: ../purchasing/supplier_payment.php.orig:307
+#: ../sales/customer_payments.php.orig:392
msgid "Bank Charge:"
msgstr ""
#: ../gl/bank_transfer.php:128
#: ../gl/bank_transfer.php:158
#: ../gl/bank_transfer.php:190
-#: ../purchasing/supplier_payment.php:135
-#: ../purchasing/supplier_payment.php:141
-#: ../purchasing/supplier_payment.php.orig:125
-#: ../purchasing/supplier_payment.php.orig:131
+#: ../purchasing/supplier_payment.php.orig:126
+#: ../purchasing/supplier_payment.php.orig:132
msgid "The entered amount is invalid or less than zero."
msgstr ""
msgstr ""
#: ../gl/bank_transfer.php:163
-#: ../purchasing/supplier_payment.php:149
-#: ../purchasing/supplier_payment.php.orig:139
-#: ../sales/customer_payments.php:195
-#: ../sales/customer_payments.php.orig:184
+#: ../purchasing/supplier_payment.php.orig:140
+#: ../sales/customer_payments.php.orig:190
msgid ""
"The Bank Charge Account has not been set in System and General GL Setup."
msgstr ""
#: ../manufacturing/work_order_entry.php:132
#: ../manufacturing/work_order_issue.php:90
#: ../purchasing/po_receive_items.php:186
-#: ../purchasing/supplier_payment.php:207
-#: ../purchasing/supplier_payment.php.orig:196
+#: ../purchasing/supplier_payment.php.orig:197
#: ../sales/credit_note_entry.php:147
#: ../sales/customer_credit_invoice.php:102
#: ../sales/customer_delivery.php:178
#: ../sales/customer_invoice.php:332
-#: ../sales/customer_payments.php:162
-#: ../sales/customer_payments.php.orig:151
+#: ../sales/customer_payments.php.orig:157
#: ../sales/sales_order_entry.php:429
msgid "You must enter a reference."
msgstr ""
#: ../manufacturing/work_order_entry.php:68
#: ../purchasing/po_entry_items.php:115
#: ../purchasing/po_entry_items.php:139
-#: ../purchasing/po_entry_items.php.orig:115
-#: ../purchasing/po_entry_items.php.orig:139
#: ../purchasing/supplier_credit.php:83
#: ../purchasing/supplier_invoice.php:75
#: ../sales/credit_note_entry.php:77
msgstr ""
#: ../gl/gl_bank.php:238
-#: ../purchasing/supplier_payment.php:200
-#: ../purchasing/supplier_payment.php.orig:189
+#: ../purchasing/supplier_payment.php.orig:190
#, php-format
msgid "The total bank amount exceeds allowed limit (%s)."
msgstr ""
#: ../gl/gl_budget.php:93
#: ../gl/inquiry/profit_loss.php:236
#: ../gl/manage/gl_quick_entries.php:240
-#: ../reporting/rep101.php:126
+#: ../reporting/rep101.php:155
#: ../reporting/rep105.php:118
#: ../reporting/rep106.php:92
#: ../reporting/rep114.php:90
-#: ../reporting/rep201.php:118
+#: ../reporting/rep201.php:143
#: ../reporting/rep304.php:121
#: ../reporting/rep305.php:106
#: ../reporting/rep306.php:148
#: ../gl/inquiry/balance_sheet.php:98
#: ../gl/inquiry/balance_sheet.php:205
#: ../gl/inquiry/balance_sheet.php:236
+#: ../gl/inquiry/gl_trial_balance.php.orig:218
#: ../gl/inquiry/profit_loss.php:115
#: ../gl/inquiry/profit_loss.php:288
#: ../gl/view/gl_deposit_view.php:137
#: ../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.orig:329
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:495
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:566
+#: ../purchasing/includes/ui/invoice_ui.inc:344
+#: ../purchasing/includes/ui/invoice_ui.inc:510
+#: ../purchasing/includes/ui/invoice_ui.inc:581
#: ../purchasing/po_receive_items.php:63
#: ../purchasing/view/view_po.php:140
#: ../purchasing/allocations/supplier_allocation_main.php:100
-#: ../reporting/rep101.php:234
#: ../reporting/rep106.php:84
#: ../reporting/rep106.php:119
#: ../reporting/rep106.php:162
#: ../reporting/rep114.php:161
-#: ../reporting/rep201.php:223
#: ../reporting/rep203.php:94
#: ../reporting/rep203.php:171
#: ../reporting/rep204.php:113
#: ../reporting/rep305.php:127
#: ../reporting/rep305.php:183
#: ../reporting/rep306.php:141
-#: ../reporting/rep306.php:176
-#: ../reporting/rep306.php:196
-#: ../reporting/rep306.php:212
-#: ../reporting/rep306.php:261
-#: ../reporting/rep306.php:276
-#: ../reporting/rep306.php:287
#: ../reporting/rep309.php:126
#: ../reporting/rep309.php:153
#: ../reporting/rep702.php:142
msgstr ""
#: ../gl/gl_journal.php:248
-#: ../includes/ui/ui_view.inc.orig:674
+#: ../includes/ui/ui_view.inc:733
#: ../purchasing/supplier_credit.php:135
#: ../purchasing/supplier_invoice.php:144
msgid "Cannot post to GL account used by more than one tax type."
#: ../gl/inquiry/bank_inquiry.php:124
#: ../gl/inquiry/gl_account_inquiry.php:211
+#: ../gl/inquiry/gl_trial_balance.php.orig:228
#: ../reporting/rep601.php:157
#: ../reporting/rep602.php:157
#: ../reporting/rep704.php:192
msgstr ""
#: ../gl/inquiry/gl_trial_balance.php:28
+#: ../gl/inquiry/gl_trial_balance.php.orig:28
#: ../reporting/rep708.php:219
msgid "Trial Balance"
msgstr ""
#: ../gl/inquiry/gl_trial_balance.php:60
+#: ../gl/inquiry/gl_trial_balance.php.orig:55
msgid "No zero values"
msgstr ""
#: ../gl/inquiry/gl_trial_balance.php:61
+#: ../gl/inquiry/gl_trial_balance.php.orig:56
msgid "Only balances"
msgstr ""
+#: ../gl/inquiry/gl_trial_balance.php.orig:88
+#: ../gl/inquiry/gl_trial_balance.php.orig:149
+#: ../reporting/rep706.php:308
+#: ../reporting/rep707.php:326
+#: ../reporting/rep708.php:51
+#: ../reporting/rep708.php:126
+#: ../sales/create_recurrent_invoices.php:134
+#: ../sales/manage/recurrent_invoices.php:102
+msgid "Group"
+msgstr ""
+
+#: ../gl/inquiry/gl_trial_balance.php.orig:167
+msgid "The from date cannot be bigger than the fiscal year end."
+msgstr ""
+
+#: ../gl/inquiry/gl_trial_balance.php.orig:180
+#: ../gl/manage/bank_accounts.php:109
+#: ../gl/view/gl_trans_view.php:68
+#: ../gl/view/gl_trans_view.php:71
+#: ../gl/view/gl_trans_view.php:74
+#: ../reporting/rep701.php:111
+#: ../reporting/rep702.php:53
+#: ../reporting/rep705.php:238
+#: ../reporting/rep706.php:185
+#: ../reporting/rep707.php:210
+#: ../reporting/rep708.php:192
+msgid "Account Name"
+msgstr ""
+
+#: ../gl/inquiry/gl_trial_balance.php.orig:181
+#: ../reporting/rep708.php:185
+msgid "Brought Forward"
+msgstr ""
+
+#: ../gl/inquiry/gl_trial_balance.php.orig:182
+#: ../reporting/rep708.php:185
+msgid "This Period"
+msgstr ""
+
+#: ../gl/inquiry/gl_trial_balance.php.orig:201
+#: ../gl/manage/gl_account_types.php:128
+msgid "Class"
+msgstr ""
+
+#: ../gl/inquiry/gl_trial_balance.php.orig:236
+#: ../reporting/rep708.php:283
+msgid ""
+"The Opening Balance is not in balance, probably due to a non closed Previous "
+"Fiscalyear."
+msgstr ""
+
#: ../gl/inquiry/journal_inquiry.php:27
msgid "Journal Inquiry"
msgstr ""
msgstr ""
#: ../gl/manage/bank_accounts.php:16
+#: ../reporting/reports_main.php:310
msgid "Bank Accounts"
msgstr ""
msgid "Selected bank account has been deleted"
msgstr ""
-#: ../gl/manage/bank_accounts.php:109
-#: ../gl/view/gl_trans_view.php:68
-#: ../gl/view/gl_trans_view.php:71
-#: ../gl/view/gl_trans_view.php:74
-#: ../reporting/rep701.php:111
-#: ../reporting/rep702.php:53
-#: ../reporting/rep705.php:238
-#: ../reporting/rep706.php:185
-#: ../reporting/rep707.php:210
-#: ../reporting/rep708.php:192
-msgid "Account Name"
-msgstr ""
-
#: ../gl/manage/bank_accounts.php:109
#: ../gl/view/bank_transfer_view.php:69
#: ../gl/view/bank_transfer_view.php:78
#: ../gl/view/gl_deposit_view.php:66
#: ../gl/view/gl_payment_view.php:64
-#: ../inventory/prices.php:146
-#: ../inventory/purchasing_data.php:147
+#: ../inventory/prices.php.orig:149
+#: ../inventory/purchasing_data.php.orig:149
#: ../purchasing/view/view_supp_credit.php:49
#: ../purchasing/view/view_supp_invoice.php:54
#: ../purchasing/inquiry/po_search_completed.php:126
-#: ../purchasing/inquiry/po_search_completed.php.orig:125
#: ../purchasing/inquiry/po_search.php:136
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:132
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:142
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:133
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:143
#: ../purchasing/inquiry/supplier_inquiry.php:73
#: ../purchasing/inquiry/supplier_inquiry.php:180
#: ../purchasing/inquiry/supplier_inquiry.php:192
#: ../purchasing/allocations/supplier_allocation_main.php:99
#: ../purchasing/allocations/supplier_allocation_main.php:107
-#: ../reporting/rep101.php:128
+#: ../reporting/rep101.php:157
#: ../reporting/rep102.php:133
#: ../reporting/rep102.php:139
#: ../reporting/rep103.php:232
#: ../reporting/rep104.php:116
-#: ../reporting/rep201.php:120
+#: ../reporting/rep201.php:145
#: ../reporting/rep202.php:138
#: ../reporting/rep203.php:101
#: ../reporting/rep205.php:150
#: ../sales/view/view_credit.php:70
#: ../sales/view/view_dispatch.php:86
#: ../sales/view/view_invoice.php:86
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:151
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:161
+#: ../sales/inquiry/customer_allocation_inquiry.php:151
+#: ../sales/inquiry/customer_allocation_inquiry.php:161
#: ../sales/inquiry/customer_inquiry.php:76
-#: ../sales/inquiry/customer_inquiry.php.orig:76
-#: ../sales/inquiry/customer_inquiry.php.orig:208
-#: ../sales/inquiry/customer_inquiry.php.orig:221
+#: ../sales/inquiry/customer_inquiry.php:208
+#: ../sales/inquiry/customer_inquiry.php:221
#: ../sales/inquiry/sales_deliveries_view.php:189
#: ../sales/inquiry/sales_orders_view.php.orig:294
#: ../sales/inquiry/sales_orders_view.php.orig:308
msgstr ""
#: ../gl/manage/bank_accounts.php:110
-#: ../includes/ui/ui_view.inc.orig:488
+#: ../includes/ui/ui_view.inc:547
msgid "Number"
msgstr ""
#: ../gl/manage/exchange_rates.php:141
#: ../includes/ui/ui_view.inc:325
-#: ../includes/ui/ui_view.inc.orig:288
-#: ../includes/ui/ui_view.inc.orig:290
msgid "Exchange Rate:"
msgstr ""
msgid "Subgroup Of"
msgstr ""
-#: ../gl/manage/gl_account_types.php:128
-msgid "Class"
-msgstr ""
-
#: ../gl/manage/gl_account_types.php:187
msgid "ID:"
msgstr ""
#: ../reporting/reports_main.php:136
#: ../reporting/reports_main.php:143
#: ../reporting/reports_main.php:192
+#: ../reporting/reports_main.php:199
+#: ../reporting/reports_main.php:289
msgid "From"
msgstr ""
#: ../reporting/reports_main.php:137
#: ../reporting/reports_main.php:144
#: ../reporting/reports_main.php:193
+#: ../reporting/reports_main.php:200
+#: ../reporting/reports_main.php:290
msgid "To"
msgstr ""
#: ../gl/includes/db/gl_db_banking.inc:444
+#: ../purchasing/includes/db/invoice_db.inc:136
#: ../purchasing/includes/db/invoice_db.inc.orig:136
msgid "Document reentered."
msgstr ""
msgstr ""
#: ../gl/includes/ui/gl_bank_ui.inc:64
-#: ../inventory/purchasing_data.php:208
-#: ../inventory/purchasing_data.php:212
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:80
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:88
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:90
-#: ../purchasing/includes/ui/po_ui.inc.orig:125
-#: ../purchasing/includes/ui/po_ui.inc.orig:130
+#: ../inventory/purchasing_data.php.orig:210
+#: ../inventory/purchasing_data.php.orig:214
+#: ../purchasing/includes/ui/invoice_ui.inc:95
+#: ../purchasing/includes/ui/invoice_ui.inc:103
+#: ../purchasing/includes/ui/invoice_ui.inc:105
+#: ../purchasing/includes/ui/po_ui.inc:133
+#: ../purchasing/includes/ui/po_ui.inc:138
msgid "Supplier:"
msgstr ""
msgstr ""
#: ../gl/includes/ui/gl_bank_ui.inc:71
-#: ../sales/customer_payments.php.orig:363
+#: ../sales/customer_payments.php.orig:359
#: ../sales/manage/recurrent_invoices.php:172
#: ../sales/includes/ui/sales_credit_ui.inc:37
#: ../sales/includes/ui/sales_order_ui.inc:292
#: ../gl/includes/ui/gl_bank_ui.inc:85
#: ../gl/includes/ui/gl_bank_ui.inc:88
-#: ../sales/customer_payments.php.orig:372
+#: ../sales/customer_payments.php.orig:368
msgid "This customer account is on hold."
msgstr ""
#: ../gl/includes/ui/gl_bank_ui.inc:101
#: ../gl/includes/ui/gl_journal_ui.inc:58
#: ../gl/includes/ui/gl_journal_ui.inc:62
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:251
+#: ../purchasing/includes/ui/invoice_ui.inc:266
msgid "Go"
msgstr ""
#: ../inventory/includes/item_adjustments_ui.inc:88
#: ../inventory/includes/stock_transfers_ui.inc:80
#: ../manufacturing/includes/work_order_issue_ui.inc:59
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:542
-#: ../purchasing/includes/ui/po_ui.inc.orig:274
+#: ../purchasing/includes/ui/invoice_ui.inc:557
+#: ../purchasing/includes/ui/po_ui.inc:272
#: ../sales/includes/ui/sales_credit_ui.inc:198
#: ../sales/includes/ui/sales_order_ui.inc:210
msgid "Edit document line"
#: ../inventory/includes/item_adjustments_ui.inc:90
#: ../inventory/includes/stock_transfers_ui.inc:82
#: ../manufacturing/includes/work_order_issue_ui.inc:61
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:305
-#: ../purchasing/includes/ui/po_ui.inc.orig:276
+#: ../purchasing/includes/ui/invoice_ui.inc:320
+#: ../purchasing/includes/ui/po_ui.inc:274
#: ../sales/includes/ui/sales_credit_ui.inc:200
#: ../sales/includes/ui/sales_order_ui.inc:212
msgid "Remove line from document"
#: ../inventory/includes/item_adjustments_ui.inc:158
#: ../inventory/includes/stock_transfers_ui.inc:138
#: ../manufacturing/includes/work_order_issue_ui.inc:132
-#: ../purchasing/includes/ui/po_ui.inc.orig:456
+#: ../purchasing/includes/ui/po_ui.inc:456
#: ../sales/includes/ui/sales_credit_ui.inc:294
#: ../sales/includes/ui/sales_order_ui.inc:562
msgid "Confirm changes"
#: ../inventory/includes/item_adjustments_ui.inc:160
#: ../inventory/includes/stock_transfers_ui.inc:140
#: ../manufacturing/includes/work_order_issue_ui.inc:134
-#: ../purchasing/includes/ui/po_ui.inc.orig:458
+#: ../purchasing/includes/ui/po_ui.inc:458
#: ../sales/includes/ui/sales_credit_ui.inc:296
#: ../sales/includes/ui/sales_order_ui.inc:564
msgid "Cancel changes"
#: ../inventory/includes/item_adjustments_ui.inc:166
#: ../inventory/includes/stock_transfers_ui.inc:146
#: ../manufacturing/includes/work_order_issue_ui.inc:140
-#: ../purchasing/includes/ui/po_ui.inc.orig:464
+#: ../purchasing/includes/ui/po_ui.inc:464
#: ../sales/includes/ui/sales_credit_ui.inc:302
#: ../sales/includes/ui/sales_order_ui.inc:570
msgid "Add Item"
#: ../inventory/includes/item_adjustments_ui.inc:167
#: ../inventory/includes/stock_transfers_ui.inc:147
#: ../manufacturing/includes/work_order_issue_ui.inc:141
-#: ../purchasing/includes/ui/po_ui.inc.orig:465
+#: ../purchasing/includes/ui/po_ui.inc:465
#: ../sales/includes/ui/sales_credit_ui.inc:303
#: ../sales/includes/ui/sales_order_ui.inc:571
msgid "Add new item to document"
msgstr ""
#: ../includes/access_levels.inc:72
-#: ../inventory/manage/items.php.orig:353
+#: ../inventory/manage/items.php:352
+#: ../reporting/reports_main.php:294
msgid "Dimensions"
msgstr ""
#: ../includes/current_user.inc:102
#: ../includes/ui/ui_controls.inc:197
-#: ../includes/ui/ui_view.inc.orig:845
+#: ../includes/ui/ui_view.inc:904
msgid "Back"
msgstr ""
msgstr ""
#: ../includes/session.inc:136
-#: ../includes/session.inc.orig:132
msgid "Incorrect Password"
msgstr ""
#: ../includes/session.inc:137
-#: ../includes/session.inc.orig:133
msgid "The user and password combination is not valid for the system."
msgstr ""
#: ../includes/session.inc:139
-#: ../includes/session.inc.orig:135
msgid ""
"If you are not an authorized user, please contact your system administrator "
"to obtain an account to enable you to use the system."
msgstr ""
#: ../includes/session.inc:140
-#: ../includes/session.inc.orig:136
msgid "Try again"
msgstr ""
#: ../includes/session.inc:180
-#: ../includes/session.inc.orig:176
#, php-format
msgid ""
"Brute force attack on account '%s' detected. Access for non-logged users "
msgstr ""
#: ../includes/session.inc:211
-#: ../includes/session.inc.orig:207
msgid "Security settings have not been defined for your user account."
msgstr ""
#: ../includes/session.inc:212
-#: ../includes/session.inc.orig:208
msgid "Please contact your system administrator."
msgstr ""
#: ../includes/session.inc:213
-#: ../includes/session.inc.orig:209
msgid ""
"Please remove $security_groups and $security_headings arrays from config.php "
"file!"
msgstr ""
#: ../includes/session.inc:215
-#: ../includes/session.inc.orig:211
msgid ""
"Access to application has been blocked until database upgrade is completed "
"by system administrator."
msgstr ""
#: ../includes/session.inc:229
-#: ../includes/session.inc.orig:225
msgid ""
"The security settings on your account do not permit you to access this "
"function"
msgstr ""
#: ../includes/session.inc:238
-#: ../includes/session.inc.orig:234
msgid ""
"System is blocked after source upgrade until database is updated on System/"
"Software Upgrade page"
msgstr ""
#: ../includes/sysnames.inc:32
-#: ../purchasing/includes/ui/po_ui.inc.orig:330
+#: ../purchasing/includes/ui/po_ui.inc:328
#: ../purchasing/view/view_po.php:30
msgid "Purchase Order"
msgstr ""
msgstr ""
#: ../includes/sysnames.inc:40
+#: ../sales/inquiry/sales_orders_view.php:151
+#: ../sales/inquiry/sales_orders_view.php:173
#: ../sales/inquiry/sales_orders_view.php.orig:151
#: ../sales/inquiry/sales_orders_view.php.orig:173
msgid "Sales Order"
#: ../includes/sysnames.inc:96
#: ../includes/sysnames.inc:195
-#: ../reporting/rep101.php:127
+#: ../reporting/rep101.php:156
#: ../reporting/rep102.php:125
#: ../reporting/rep102.php:132
#: ../reporting/rep105.php:109
#: ../reporting/reports_main.php:45
#: ../reporting/reports_main.php:102
#: ../reporting/reports_main.php:121
+#: ../reporting/reports_main.php:237
#: ../sales/create_recurrent_invoices.php:134
#: ../sales/customer_credit_invoice.php:235
#: ../sales/customer_delivery.php:352
#: ../sales/allocations/customer_allocation_main.php:105
#: ../sales/manage/recurrent_invoices.php:102
#: ../sales/view/view_credit.php:47
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:150
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:160
-#: ../sales/inquiry/customer_inquiry.php.orig:206
-#: ../sales/inquiry/customer_inquiry.php.orig:220
+#: ../sales/inquiry/customer_allocation_inquiry.php:150
+#: ../sales/inquiry/customer_allocation_inquiry.php:160
+#: ../sales/inquiry/customer_inquiry.php:206
+#: ../sales/inquiry/customer_inquiry.php:220
#: ../sales/inquiry/sales_deliveries_view.php:180
#: ../sales/inquiry/sales_orders_view.php.orig:286
#: ../sales/inquiry/sales_orders_view.php.orig:300
#: ../includes/sysnames.inc:97
#: ../includes/sysnames.inc:173
#: ../includes/sysnames.inc:196
-#: ../inventory/purchasing_data.php:147
+#: ../inventory/purchasing_data.php.orig:149
#: ../purchasing/includes/ui/grn_ui.inc:20
#: ../purchasing/includes/ui/grn_ui.inc:52
-#: ../purchasing/includes/ui/po_ui.inc.orig:323
+#: ../purchasing/includes/ui/po_ui.inc:321
#: ../purchasing/view/view_supp_credit.php:42
#: ../purchasing/view/view_supp_invoice.php:46
#: ../purchasing/inquiry/po_search_completed.php:122
-#: ../purchasing/inquiry/po_search_completed.php.orig:121
#: ../purchasing/inquiry/po_search.php:132
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:128
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:141
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:129
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:142
#: ../purchasing/inquiry/supplier_inquiry.php:176
#: ../purchasing/inquiry/supplier_inquiry.php:191
#: ../purchasing/allocations/supplier_allocation_main.php:98
#: ../purchasing/allocations/supplier_allocation_main.php:106
-#: ../reporting/rep201.php:119
+#: ../reporting/rep201.php:144
#: ../reporting/rep202.php:130
#: ../reporting/rep202.php:137
#: ../reporting/rep203.php:100
#: ../reporting/reports_main.php:162
#: ../reporting/reports_main.php:173
#: ../reporting/reports_main.php:180
+#: ../reporting/reports_main.php:252
msgid "Supplier"
msgstr ""
msgstr ""
#: ../includes/sysnames.inc:200
-#: ../includes/ui/ui_view.inc.orig:842
+#: ../includes/ui/ui_view.inc:901
msgid "May"
msgstr ""
#: ../includes/system_tests.inc:15
#: ../includes/ui/ui_view.inc:210
-#: ../includes/ui/ui_view.inc.orig:210
#: ../reporting/rep705.php:254
#: ../reporting/rep705.php:265
#: ../reporting/rep705.php:274
#: ../reporting/reports_main.php:176
#: ../reporting/reports_main.php:181
#: ../reporting/reports_main.php:188
+#: ../reporting/reports_main.php:196
+#: ../reporting/reports_main.php:203
+#: ../reporting/reports_main.php:212
+#: ../reporting/reports_main.php:218
+#: ../reporting/reports_main.php:229
+#: ../reporting/reports_main.php:238
+#: ../reporting/reports_main.php:244
+#: ../reporting/reports_main.php:254
+#: ../reporting/reports_main.php:262
+#: ../reporting/reports_main.php:270
+#: ../reporting/reports_main.php:277
+#: ../reporting/reports_main.php:285
+#: ../reporting/reports_main.php:292
+#: ../reporting/reports_main.php:301
+#: ../reporting/reports_main.php:314
#: ../reporting/includes/excel_report.inc:295
#: ../reporting/includes/excel_report.inc:428
#: ../reporting/includes/pdf_report.inc:346
msgstr ""
#: ../includes/db/inventory_db.inc:294
-#: ../includes/db/inventory_db.inc.orig:292
msgid "Zero/negative inventory handling"
msgstr ""
-#: ../includes/db/inventory_db.inc.orig:252
-msgid "Cost was "
-msgstr ""
-
-#: ../includes/db/inventory_db.inc.orig:252
-msgid " changed to "
-msgstr ""
-
-#: ../includes/db/inventory_db.inc.orig:252
-msgid " for item "
+#: ../includes/ui/allocation_cart.inc:287
+#, php-format
+msgid "Allocated amounts in %s:"
msgstr ""
-#: ../includes/ui/allocation_cart.inc.orig:264
+#: ../includes/ui/allocation_cart.inc:289
#: ../purchasing/allocations/supplier_allocation_main.php:94
#: ../sales/allocations/customer_allocation_main.php:93
msgid "Transaction Type"
msgstr ""
-#: ../includes/ui/allocation_cart.inc.orig:264
+#: ../includes/ui/allocation_cart.inc:289
+msgid "Supplier Ref"
+msgstr ""
+
+#: ../includes/ui/allocation_cart.inc:289
#: ../reporting/rep704.php:83
#: ../reporting/rep704.php:86
#: ../reporting/rep704.php:89
#: ../sales/view/view_sales_order.php:109
#: ../sales/view/view_sales_order.php:142
#: ../sales/view/view_sales_order.php:179
+#: ../sales/inquiry/sales_orders_view.php:248
#: ../sales/inquiry/sales_orders_view.php.orig:248
#: ../sales/inquiry/sales_orders_view.php.orig:285
#: ../sales/inquiry/sales_orders_view.php.orig:299
msgid "Ref"
msgstr ""
-#: ../includes/ui/allocation_cart.inc.orig:265
+#: ../includes/ui/allocation_cart.inc:290
msgid "Other Allocations"
msgstr ""
-#: ../includes/ui/allocation_cart.inc.orig:265
-#: ../includes/ui/ui_view.inc.orig:489
-#: ../reporting/includes/doctext.inc:167
-#: ../reporting/includes/doctext.inc:208
-msgid "This Allocation"
-msgstr ""
-
-#: ../includes/ui/allocation_cart.inc.orig:265
-#: ../includes/ui/allocation_cart.inc.orig:314
-#: ../includes/ui/ui_view.inc.orig:489
+#: ../includes/ui/allocation_cart.inc:290
+#: ../includes/ui/allocation_cart.inc:343
+#: ../includes/ui/ui_view.inc:548
#: ../purchasing/allocations/supplier_allocation_main.php:101
#: ../reporting/rep112.php:145
#: ../reporting/rep210.php:152
msgid "Left to Allocate"
msgstr ""
-#: ../includes/ui/allocation_cart.inc.orig:297
+#: ../includes/ui/allocation_cart.inc:290
+#: ../includes/ui/ui_view.inc:548
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
+msgid "This Allocation"
+msgstr ""
+
+#: ../includes/ui/allocation_cart.inc:323
#: ../reporting/rep112.php:142
#: ../reporting/rep210.php:149
msgid "Total Allocated"
msgstr ""
-#: ../includes/ui/allocation_cart.inc.orig:334
+#: ../includes/ui/allocation_cart.inc:365
msgid "The entry for one or more amounts is invalid or negative."
msgstr ""
-#: ../includes/ui/allocation_cart.inc.orig:343
+#: ../includes/ui/allocation_cart.inc:376
msgid "At least one transaction is overallocated."
msgstr ""
-#: ../includes/ui/allocation_cart.inc.orig:361
+#: ../includes/ui/allocation_cart.inc:395
msgid ""
"These allocations cannot be processed because the amount allocated is more "
"than the total amount left to allocate."
#: ../includes/ui/contacts_view.inc:102
#: ../sales/manage/customers.php:255
-#: ../sales/manage/sav.customers.php:252
msgid "Phone:"
msgstr ""
#: ../includes/ui/contacts_view.inc:105
#: ../inventory/manage/locations.php:207
#: ../purchasing/manage/suppliers.php:139
-#: ../purchasing/manage/suppliers.php.orig:139
#: ../sales/manage/customer_branches.php:265
#: ../sales/manage/customers.php:258
#: ../sales/manage/sales_people.php:158
-#: ../sales/manage/sav.customers.php:255
msgid "E-mail:"
msgstr ""
#: ../includes/ui/contacts_view.inc:110
#: ../purchasing/manage/suppliers.php:140
-#: ../purchasing/manage/suppliers.php.orig:140
#: ../sales/manage/customer_branches.php:266
msgid "Document Language:"
msgstr ""
#: ../includes/ui/ui_controls.inc:459
#: ../sales/manage/customers.php:23
-#: ../sales/manage/sav.customers.php:23
msgid "Customers"
msgstr ""
#: ../includes/ui/ui_controls.inc:463
#: ../purchasing/manage/suppliers.php:22
-#: ../purchasing/manage/suppliers.php.orig:22
msgid "Suppliers"
msgstr ""
#: ../includes/ui/ui_controls.inc:465
#: ../inventory/transfers.php:228
#: ../inventory/manage/items.php:22
-#: ../inventory/manage/items.php.orig:22
+#: ../reporting/reports_main.php:253
msgid "Items"
msgstr ""
#: ../reporting/rep303.php:184
#: ../reporting/rep304.php:170
#: ../reporting/rep304.php:174
-#: ../reporting/rep306.php:235
-#: ../reporting/rep306.php:242
#: ../sales/manage/customer_branches.php:304
msgid "Inactive"
msgstr ""
#: ../includes/ui/ui_lists.inc:1947
#: ../includes/ui/ui_lists.inc:1964
#: ../includes/ui/ui_lists.inc:1982
-#: ../includes/ui/ui_view.inc.orig:551
-#: ../includes/ui/ui_view.inc.orig:555
+#: ../includes/ui/ui_view.inc:610
+#: ../includes/ui/ui_view.inc:614
msgid "Payments"
msgstr ""
msgstr ""
#: ../includes/ui/ui_view.inc:342
-#: ../includes/ui/ui_view.inc.orig:306
msgid "Date Voided:"
msgstr ""
#: ../includes/ui/ui_view.inc:443
-#: ../includes/ui/ui_view.inc.orig:407
-#: ../reporting/rep109.php:181
+#: ../reporting/rep109.php:186
#: ../reporting/rep110.php:184
-#: ../reporting/rep111.php:164
+#: ../reporting/rep111.php:165
#: ../reporting/rep113.php:169
#: ../reporting/rep209.php:186
msgid "Total Tax Excluded"
#: ../includes/ui/ui_view.inc:468
#: ../includes/ui/ui_view.inc:492
#: ../includes/ui/ui_view.inc:509
-#: ../includes/ui/ui_view.inc.orig:413
-#: ../includes/ui/ui_view.inc.orig:432
-#: ../includes/ui/ui_view.inc.orig:451
-#: ../reporting/rep109.php:190
+#: ../reporting/rep109.php:195
#: ../reporting/rep110.php:193
-#: ../reporting/rep111.php:173
+#: ../reporting/rep111.php:174
#: ../reporting/rep113.php:178
#: ../reporting/rep209.php:195
msgid "Included"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:488
+#: ../includes/ui/ui_view.inc:547
#: ../reporting/includes/doctext.inc:167
#: ../reporting/includes/doctext.inc:208
msgid "Total Amount"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:512
+#: ../includes/ui/ui_view.inc:571
msgid "Total Allocated:"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:518
+#: ../includes/ui/ui_view.inc:577
msgid "Left to Allocate:"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:534
-#: ../includes/ui/ui_view.inc.orig:538
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:99
+#: ../includes/ui/ui_view.inc:593
+#: ../includes/ui/ui_view.inc:597
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:100
msgid "Allocations"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:551
-#: ../includes/ui/ui_view.inc.orig:555
+#: ../includes/ui/ui_view.inc:610
+#: ../includes/ui/ui_view.inc:614
msgid "Pre-Payments"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:571
+#: ../includes/ui/ui_view.inc:630
msgid "No Quick Entries are defined."
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:599
+#: ../includes/ui/ui_view.inc:658
msgid "No Quick Entry lines are defined."
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:781
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:473
+#: ../includes/ui/ui_view.inc:840
+#: ../purchasing/includes/ui/invoice_ui.inc:488
msgid "and"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:842
+#: ../includes/ui/ui_view.inc:901
msgid "January"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:842
+#: ../includes/ui/ui_view.inc:901
msgid "February"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:842
+#: ../includes/ui/ui_view.inc:901
msgid "March"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:842
+#: ../includes/ui/ui_view.inc:901
msgid "April"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:842
+#: ../includes/ui/ui_view.inc:901
msgid "June"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:842
+#: ../includes/ui/ui_view.inc:901
msgid "July"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:842
+#: ../includes/ui/ui_view.inc:901
msgid "August"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:842
+#: ../includes/ui/ui_view.inc:901
msgid "September"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:842
+#: ../includes/ui/ui_view.inc:901
msgid "October"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:842
+#: ../includes/ui/ui_view.inc:901
msgid "November"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:842
+#: ../includes/ui/ui_view.inc:901
msgid "December"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:843
+#: ../includes/ui/ui_view.inc:902
msgid "Su"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:843
+#: ../includes/ui/ui_view.inc:902
msgid "Mo"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:843
+#: ../includes/ui/ui_view.inc:902
msgid "Tu"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:843
+#: ../includes/ui/ui_view.inc:902
msgid "We"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:843
+#: ../includes/ui/ui_view.inc:902
msgid "Th"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:843
+#: ../includes/ui/ui_view.inc:902
msgid "Fr"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:843
+#: ../includes/ui/ui_view.inc:902
msgid "Sa"
msgstr ""
-#: ../includes/ui/ui_view.inc.orig:844
+#: ../includes/ui/ui_view.inc:903
msgid "W"
msgstr ""
msgstr ""
#: ../inventory/cost_update.php:31
+#: ../inventory/cost_update.php.orig:31
msgid "Inventory Item Cost Update"
msgstr ""
#: ../inventory/cost_update.php:36
+#: ../inventory/cost_update.php.orig:36
msgid ""
"There are no costable inventory items defined in the system (Purchased or "
"manufactured items)."
msgstr ""
#: ../inventory/cost_update.php:57
+#: ../inventory/cost_update.php.orig:57
msgid "The entered cost is not numeric."
msgstr ""
#: ../inventory/cost_update.php:63
+#: ../inventory/cost_update.php.orig:63
msgid "The new cost is the same as the old cost. Cost was not updated."
msgstr ""
#: ../inventory/cost_update.php:73
+#: ../inventory/cost_update.php.orig:73
msgid "Cost has been updated."
msgstr ""
#: ../inventory/cost_update.php:77
+#: ../inventory/cost_update.php.orig:77
msgid "View the GL Journal Entries for this Cost Update"
msgstr ""
-#: ../inventory/cost_update.php:95
-#: ../inventory/prices.php:61
-#: ../inventory/purchasing_data.php:117
-#: ../inventory/reorder_level.php:48
+#: ../inventory/cost_update.php.orig:97
+#: ../inventory/prices.php.orig:64
+#: ../inventory/purchasing_data.php.orig:119
+#: ../inventory/reorder_level.php.orig:51
#: ../inventory/inquiry/stock_movements.php:49
#: ../inventory/inquiry/stock_status.php:41
-#: ../inventory/inquiry/stock_status.php.orig:47
#: ../inventory/manage/item_codes.php:105
#: ../manufacturing/work_order_entry.php:396
#: ../manufacturing/work_order_entry.php:401
#: ../purchasing/inquiry/po_search.php:74
#: ../sales/inquiry/sales_deliveries_view.php:114
+#: ../sales/inquiry/sales_orders_view.php:263
#: ../sales/inquiry/sales_orders_view.php.orig:263
msgid "Item:"
msgstr ""
-#: ../inventory/cost_update.php:116
+#: ../inventory/cost_update.php.orig:118
msgid "Standard Material Cost Per Unit"
msgstr ""
-#: ../inventory/cost_update.php:125
+#: ../inventory/cost_update.php.orig:127
msgid "Standard Labour Cost Per Unit"
msgstr ""
-#: ../inventory/cost_update.php:126
+#: ../inventory/cost_update.php.orig:128
msgid "Standard Overhead Cost Per Unit"
msgstr ""
#: ../inventory/prices.php:26
+#: ../inventory/prices.php.orig:26
msgid "Inventory Item Sales prices"
msgstr ""
#: ../inventory/prices.php:30
+#: ../inventory/prices.php.orig:30
#: ../inventory/inquiry/stock_movements.php:29
#: ../inventory/inquiry/stock_status.php:32
-#: ../inventory/inquiry/stock_status.php.orig:37
#: ../inventory/manage/sales_kits.php:24
#: ../manufacturing/inquiry/where_used_inquiry.php:21
#: ../sales/credit_note_entry.php:49
msgstr ""
#: ../inventory/prices.php:32
+#: ../inventory/prices.php.orig:32
msgid ""
"There are no sales types in the system. Please set up sales types befor "
"entering pricing."
msgstr ""
-#: ../inventory/prices.php:77
+#: ../inventory/prices.php.orig:80
msgid "The price entered must be numeric."
msgstr ""
-#: ../inventory/prices.php:83
+#: ../inventory/prices.php.orig:86
msgid ""
"The sales pricing for this item, sales type and currency has already been "
"added."
msgstr ""
-#: ../inventory/prices.php:96
+#: ../inventory/prices.php.orig:99
msgid "This price has been updated."
msgstr ""
-#: ../inventory/prices.php:104
+#: ../inventory/prices.php.orig:107
msgid "The new price has been added."
msgstr ""
-#: ../inventory/prices.php:118
+#: ../inventory/prices.php.orig:121
msgid "The selected price has been deleted."
msgstr ""
-#: ../inventory/prices.php:146
+#: ../inventory/prices.php.orig:149
#: ../reporting/rep104.php:118
#: ../sales/customer_delivery.php:369
#: ../sales/customer_invoice.php:468
msgid "Sales Type"
msgstr ""
-#: ../inventory/prices.php:146
-#: ../inventory/purchasing_data.php:147
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:505
+#: ../inventory/prices.php.orig:149
+#: ../inventory/purchasing_data.php.orig:149
+#: ../purchasing/includes/ui/invoice_ui.inc:520
#: ../purchasing/po_receive_items.php:63
#: ../purchasing/view/view_grn.php:41
#: ../purchasing/view/view_po.php:45
msgid "Price"
msgstr ""
-#: ../inventory/prices.php:168
+#: ../inventory/prices.php.orig:171
msgid "There are no prices set up for this part."
msgstr ""
-#: ../inventory/prices.php:192
+#: ../inventory/prices.php.orig:195
msgid "Currency:"
msgstr ""
-#: ../inventory/prices.php:194
+#: ../inventory/prices.php.orig:197
msgid "Sales Type:"
msgstr ""
-#: ../inventory/prices.php:202
-#: ../inventory/purchasing_data.php:215
+#: ../inventory/prices.php.orig:205
+#: ../inventory/purchasing_data.php.orig:217
msgid "Price:"
msgstr ""
-#: ../inventory/prices.php:202
+#: ../inventory/prices.php.orig:205
msgid "per"
msgstr ""
-#: ../inventory/prices.php:206
+#: ../inventory/prices.php.orig:209
msgid "The price is calculated."
msgstr ""
#: ../inventory/purchasing_data.php:25
+#: ../inventory/purchasing_data.php.orig:25
msgid "Supplier Purchasing Data"
msgstr ""
#: ../inventory/purchasing_data.php:27
+#: ../inventory/purchasing_data.php.orig:27
#: ../purchasing/po_entry_items.php:70
-#: ../purchasing/po_entry_items.php.orig:70
msgid "There are no purchasable inventory items defined in the system."
msgstr ""
#: ../inventory/purchasing_data.php:28
+#: ../inventory/purchasing_data.php.orig:28
#: ../purchasing/po_entry_items.php:68
-#: ../purchasing/po_entry_items.php.orig:68
#: ../purchasing/supplier_credit.php:31
#: ../purchasing/supplier_invoice.php:30
#: ../purchasing/supplier_payment.php:40
msgstr ""
#: ../inventory/purchasing_data.php:46
+#: ../inventory/purchasing_data.php.orig:46
#: ../inventory/manage/item_codes.php:35
msgid "There is no item selected."
msgstr ""
#: ../inventory/purchasing_data.php:52
+#: ../inventory/purchasing_data.php.orig:52
msgid "The price entered was not numeric."
msgstr ""
#: ../inventory/purchasing_data.php:58
+#: ../inventory/purchasing_data.php.orig:58
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:64
+#: ../inventory/purchasing_data.php.orig:64
msgid "The purchasing data for this supplier has already been added."
msgstr ""
#: ../inventory/purchasing_data.php:73
+#: ../inventory/purchasing_data.php.orig:73
msgid "This supplier purchasing data has been added."
msgstr ""
#: ../inventory/purchasing_data.php:79
+#: ../inventory/purchasing_data.php.orig:79
msgid "Supplier purchasing data has been updated."
msgstr ""
#: ../inventory/purchasing_data.php:90
+#: ../inventory/purchasing_data.php.orig:90
msgid "The purchasing data item has been sucessfully deleted."
msgstr ""
-#: ../inventory/purchasing_data.php:132
+#: ../inventory/purchasing_data.php.orig:134
msgid "Entered item is not defined. Please re-enter."
msgstr ""
-#: ../inventory/purchasing_data.php:141
+#: ../inventory/purchasing_data.php.orig:143
msgid "There is no purchasing data set up for the part selected"
msgstr ""
-#: ../inventory/purchasing_data.php:148
+#: ../inventory/purchasing_data.php.orig:150
msgid "Supplier's Unit"
msgstr ""
-#: ../inventory/purchasing_data.php:148
+#: ../inventory/purchasing_data.php.orig:150
msgid "Conversion Factor"
msgstr ""
-#: ../inventory/purchasing_data.php:148
+#: ../inventory/purchasing_data.php.orig:150
msgid "Supplier's Description"
msgstr ""
-#: ../inventory/purchasing_data.php:216
+#: ../inventory/purchasing_data.php.orig:218
msgid "Suppliers Unit of Measure:"
msgstr ""
-#: ../inventory/purchasing_data.php:222
+#: ../inventory/purchasing_data.php.orig:224
msgid "Conversion Factor (to our UOM):"
msgstr ""
-#: ../inventory/purchasing_data.php:224
+#: ../inventory/purchasing_data.php.orig:226
msgid "Supplier's Code or Description:"
msgstr ""
#: ../inventory/reorder_level.php:25
+#: ../inventory/reorder_level.php.orig:25
msgid "Reorder Levels"
msgstr ""
#: ../inventory/reorder_level.php:27
+#: ../inventory/reorder_level.php.orig:27
#: ../inventory/transfers.php:32
msgid ""
"There are no inventory items defined in the system (Purchased or "
"manufactured items)."
msgstr ""
-#: ../inventory/reorder_level.php:65
+#: ../inventory/reorder_level.php.orig:68
#: ../inventory/inquiry/stock_movements.php:79
#: ../inventory/inquiry/stock_status.php:66
#: ../inventory/inquiry/stock_status.php:70
-#: ../inventory/inquiry/stock_status.php.orig:72
-#: ../inventory/inquiry/stock_status.php.orig:76
#: ../manufacturing/search_work_orders.php:162
#: ../manufacturing/inquiry/where_used_inquiry.php:45
#: ../manufacturing/manage/bom_edit.php:70
#: ../purchasing/inquiry/po_search_completed.php:123
#: ../purchasing/inquiry/po_search_completed.php:133
-#: ../purchasing/inquiry/po_search_completed.php.orig:122
-#: ../purchasing/inquiry/po_search_completed.php.orig:132
#: ../purchasing/inquiry/po_search.php:133
#: ../purchasing/inquiry/po_search.php:144
#: ../reporting/rep105.php:120
#: ../reporting/rep306.php:150
#: ../reporting/rep307.php:124
#: ../reporting/rep308.php:157
+#: ../reporting/reports_main.php:210
+#: ../reporting/reports_main.php:217
+#: ../reporting/reports_main.php:223
+#: ../reporting/reports_main.php:236
+#: ../reporting/reports_main.php:251
+#: ../reporting/reports_main.php:261
+#: ../reporting/reports_main.php:269
#: ../sales/manage/sales_points.php:84
msgid "Location"
msgstr ""
-#: ../inventory/reorder_level.php:65
+#: ../inventory/reorder_level.php.orig:68
#: ../inventory/inquiry/stock_movements.php:80
#: ../inventory/inquiry/stock_status.php:70
-#: ../inventory/inquiry/stock_status.php.orig:76
#: ../purchasing/supplier_credit.php:219
#: ../sales/sales_order_entry.php:531
#: ../sales/includes/ui/sales_order_ui.inc:182
msgid "Quantity On Hand"
msgstr ""
-#: ../inventory/reorder_level.php:65
+#: ../inventory/reorder_level.php.orig:68
#: ../inventory/inquiry/stock_status.php:70
-#: ../inventory/inquiry/stock_status.php.orig:76
#: ../sales/includes/db/old.sales_order_db.inc:110
#: ../sales/includes/db/old.sales_order_db.inc:263
#: ../sales/includes/db/sales_order_db.inc:112
-#: ../sales/includes/db/sales_order_db.inc.orig:112
-#: ../sales/includes/db/sales_order_db.inc.orig:275
+#: ../sales/includes/db/sales_order_db.inc:291
msgid "Re-Order Level"
msgstr ""
-#: ../inventory/reorder_level.php:89
+#: ../inventory/reorder_level.php.orig:92
msgid "Reorder levels has been updated."
msgstr ""
#: ../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:254
#: ../sales/inquiry/sales_orders_view.php.orig:254
msgid "Location:"
msgstr ""
#: ../inventory/includes/item_adjustments_ui.inc:62
#: ../inventory/includes/stock_transfers_ui.inc:60
#: ../manufacturing/includes/work_order_issue_ui.inc:33
-#: ../purchasing/includes/ui/po_ui.inc.orig:243
+#: ../purchasing/includes/ui/po_ui.inc:241
#: ../purchasing/po_receive_items.php:62
#: ../purchasing/view/view_grn.php:40
#: ../purchasing/view/view_po.php:45
#: ../inventory/includes/item_adjustments_ui.inc:62
#: ../inventory/includes/stock_transfers_ui.inc:60
#: ../manufacturing/includes/work_order_issue_ui.inc:33
-#: ../purchasing/includes/ui/po_ui.inc.orig:243
+#: ../purchasing/includes/ui/po_ui.inc:241
#: ../purchasing/view/view_grn.php:40
#: ../purchasing/view/view_po.php:45
#: ../reporting/includes/doctext.inc:29
#: ../manufacturing/includes/manufacturing_ui.inc:157
#: ../manufacturing/includes/manufacturing_ui.inc:332
#: ../manufacturing/includes/work_order_issue_ui.inc:33
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:505
-#: ../purchasing/includes/ui/po_ui.inc.orig:243
+#: ../purchasing/includes/ui/invoice_ui.inc:520
+#: ../purchasing/includes/ui/po_ui.inc:241
#: ../purchasing/view/view_grn.php:40
#: ../purchasing/view/view_po.php:45
#: ../reporting/rep301.php:105
#: ../inventory/includes/stock_transfers_ui.inc:60
#: ../inventory/manage/item_units.php:94
#: ../manufacturing/includes/work_order_issue_ui.inc:34
-#: ../purchasing/includes/ui/po_ui.inc.orig:244
+#: ../purchasing/includes/ui/po_ui.inc:242
#: ../purchasing/view/view_grn.php:41
#: ../purchasing/view/view_po.php:45
#: ../reporting/includes/doctext.inc:30
msgstr ""
#: ../inventory/inquiry/stock_movements.php:61
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:474
+#: ../purchasing/includes/ui/invoice_ui.inc:489
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:57
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:57
#: ../purchasing/inquiry/supplier_inquiry.php:55
#: ../sales/inquiry/customer_allocation_inquiry.php:51
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:51
#: ../sales/inquiry/customer_inquiry.php:54
-#: ../sales/inquiry/customer_inquiry.php.orig:54
msgid "Refresh Inquiry"
msgstr ""
msgstr ""
#: ../inventory/inquiry/stock_status.php:16
-#: ../inventory/inquiry/stock_status.php.orig:19
-#: ../inventory/inquiry/stock_status.php.orig:21
msgid "Inventory Item Status"
msgstr ""
#: ../inventory/inquiry/stock_status.php:56
-#: ../inventory/inquiry/stock_status.php.orig:62
msgid ""
"This is a service and cannot have a stock holding, only the total quantity "
"on outstanding sales orders is shown."
#: ../inventory/inquiry/stock_status.php:66
#: ../inventory/inquiry/stock_status.php:71
-#: ../inventory/inquiry/stock_status.php.orig:72
-#: ../inventory/inquiry/stock_status.php.orig:77
#: ../reporting/rep303.php:121
#: ../reporting/rep303.php:127
msgid "Demand"
msgstr ""
#: ../inventory/inquiry/stock_status.php:71
-#: ../inventory/inquiry/stock_status.php.orig:77
#: ../reporting/rep303.php:121
#: ../reporting/rep303.php:127
msgid "On Order"
msgstr ""
#: ../inventory/manage/item_categories.php:186
-#: ../inventory/manage/items.php.orig:336
+#: ../inventory/manage/items.php:335
msgid "Item Tax Type:"
msgstr ""
#: ../inventory/manage/item_categories.php:188
-#: ../inventory/manage/items.php.orig:338
+#: ../inventory/manage/items.php:337
msgid "Item Type:"
msgstr ""
#: ../inventory/manage/item_categories.php:190
-#: ../inventory/manage/items.php.orig:340
+#: ../inventory/manage/items.php:339
msgid "Units of Measure:"
msgstr ""
#: ../inventory/manage/item_categories.php:192
-#: ../inventory/manage/items.php.orig:344
+#: ../inventory/manage/items.php:343
msgid "Exclude from sales:"
msgstr ""
#: ../inventory/manage/item_categories.php:194
-#: ../inventory/manage/items.php.orig:346
+#: ../inventory/manage/items.php:345
msgid "Exclude from purchases:"
msgstr ""
msgstr ""
#: ../inventory/manage/item_codes.php:55
-#: ../inventory/manage/items.php.orig:164
+#: ../inventory/manage/items.php:163
#: ../inventory/manage/sales_kits.php:88
msgid "This item code is already assigned to stock item or sale kit."
msgstr ""
msgstr ""
#: ../inventory/manage/item_codes.php:180
-#: ../inventory/manage/items.php.orig:310
+#: ../inventory/manage/items.php:309
#: ../inventory/manage/movement_types.php:129
#: ../inventory/manage/sales_kits.php:206
#: ../inventory/manage/sales_kits.php:232
msgstr ""
#: ../inventory/manage/item_codes.php:181
-#: ../inventory/manage/items.php.orig:312
+#: ../inventory/manage/items.php:311
#: ../inventory/manage/sales_kits.php:207
#: ../inventory/manage/sales_kits.php:233
msgid "Category:"
msgstr ""
-#: ../inventory/manage/items.php.orig:82
+#: ../inventory/manage/items.php:81
msgid ""
"Only graphics files are supported - a file extension of .jpg, .png or .gif "
"is expected"
msgstr ""
-#: ../inventory/manage/items.php.orig:113
+#: ../inventory/manage/items.php:112
msgid ""
"There are no item categories defined in the system. At least one item "
"category is required to add a item."
msgstr ""
-#: ../inventory/manage/items.php.orig:115
+#: ../inventory/manage/items.php:114
msgid ""
"There are no item tax types defined in the system. At least one item tax "
"type is required to add a item."
msgstr ""
-#: ../inventory/manage/items.php.orig:143
+#: ../inventory/manage/items.php:142
msgid "The item name must be entered."
msgstr ""
-#: ../inventory/manage/items.php.orig:149
+#: ../inventory/manage/items.php:148
msgid "The item code cannot be empty"
msgstr ""
-#: ../inventory/manage/items.php.orig:157
+#: ../inventory/manage/items.php:156
msgid ""
"The item code cannot contain any of the following characters - & + OR a "
"space OR quotes"
msgstr ""
-#: ../inventory/manage/items.php.orig:193
+#: ../inventory/manage/items.php:192
msgid "Item has been updated."
msgstr ""
-#: ../inventory/manage/items.php.orig:206
+#: ../inventory/manage/items.php:205
msgid "A new item has been added."
msgstr ""
-#: ../inventory/manage/items.php.orig:249
+#: ../inventory/manage/items.php:248
msgid "Selected item has been deleted."
msgstr ""
-#: ../inventory/manage/items.php.orig:266
+#: ../inventory/manage/items.php:265
#: ../inventory/view/view_adjustment.php:56
#: ../inventory/view/view_transfer.php:39
#: ../inventory/view/view_transfer.php:56
#: ../manufacturing/search_work_orders.php:163
#: ../manufacturing/view/wo_issue_view.php:44
#: ../manufacturing/view/wo_production_view.php:45
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:492
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:504
+#: ../purchasing/includes/ui/invoice_ui.inc:507
+#: ../purchasing/includes/ui/invoice_ui.inc:519
#: ../reporting/rep204.php:84
#: ../reporting/rep306.php:152
msgid "Item"
msgstr ""
-#: ../inventory/manage/items.php.orig:271
-#: ../inventory/manage/items.php.orig:303
+#: ../inventory/manage/items.php:270
+#: ../inventory/manage/items.php:302
msgid "Item Code:"
msgstr ""
-#: ../inventory/manage/items.php.orig:342
+#: ../inventory/manage/items.php:341
msgid "Editable description:"
msgstr ""
-#: ../inventory/manage/items.php.orig:364
+#: ../inventory/manage/items.php:363
#: ../sales/manage/customer_branches.php:249
msgid "GL Accounts"
msgstr ""
-#: ../inventory/manage/items.php.orig:387
+#: ../inventory/manage/items.php:386
msgid "Other"
msgstr ""
-#: ../inventory/manage/items.php.orig:390
+#: ../inventory/manage/items.php:389
msgid "Image File (.jpg)"
msgstr ""
-#: ../inventory/manage/items.php.orig:405
+#: ../inventory/manage/items.php:404
msgid "No image"
msgstr ""
-#: ../inventory/manage/items.php.orig:410
+#: ../inventory/manage/items.php:409
msgid "Delete Image:"
msgstr ""
-#: ../inventory/manage/items.php.orig:412
+#: ../inventory/manage/items.php:411
msgid "Item status:"
msgstr ""
-#: ../inventory/manage/items.php.orig:418
+#: ../inventory/manage/items.php:417
msgid "Insert New Item"
msgstr ""
-#: ../inventory/manage/items.php.orig:422
+#: ../inventory/manage/items.php:421
msgid "Update Item"
msgstr ""
-#: ../inventory/manage/items.php.orig:425
+#: ../inventory/manage/items.php:424
msgid "Select this items and return to document entry."
msgstr ""
-#: ../inventory/manage/items.php.orig:426
+#: ../inventory/manage/items.php:425
msgid "Clone This Item"
msgstr ""
-#: ../inventory/manage/items.php.orig:427
+#: ../inventory/manage/items.php:426
msgid "Delete This Item"
msgstr ""
-#: ../inventory/manage/items.php.orig:442
+#: ../inventory/manage/items.php:441
msgid "Select an item:"
msgstr ""
-#: ../inventory/manage/items.php.orig:443
+#: ../inventory/manage/items.php:442
msgid "New item"
msgstr ""
-#: ../inventory/manage/items.php.orig:466
-#: ../purchasing/manage/suppliers.php.orig:308
+#: ../inventory/manage/items.php:465
+#: ../purchasing/manage/suppliers.php:308
#: ../sales/manage/customer_branches.php:324
#: ../sales/manage/customers.php:347
-#: ../sales/manage/sav.customers.php:342
msgid "&General settings"
msgstr ""
-#: ../inventory/manage/items.php.orig:467
-#: ../purchasing/manage/suppliers.php.orig:310
+#: ../inventory/manage/items.php:466
+msgid "S&ales Pricing"
+msgstr ""
+
+#: ../inventory/manage/items.php:467
+msgid "&Purchasing Pricing"
+msgstr ""
+
+#: ../inventory/manage/items.php:470
+#: ../purchasing/manage/suppliers.php:310
#: ../sales/manage/customers.php:349
-#: ../sales/manage/sav.customers.php:344
msgid "&Transactions"
msgstr ""
-#: ../inventory/manage/items.php.orig:468
+#: ../inventory/manage/items.php:471
msgid "&Status"
msgstr ""
#: ../manufacturing/search_work_orders.php:76
#: ../purchasing/inquiry/po_search_completed.php:72
-#: ../purchasing/inquiry/po_search_completed.php.orig:73
msgid "for item:"
msgstr ""
#: ../manufacturing/search_work_orders.php:78
#: ../purchasing/inquiry/po_search_completed.php:74
-#: ../purchasing/inquiry/po_search_completed.php.orig:75
#: ../purchasing/inquiry/po_search.php:76
#: ../sales/inquiry/sales_deliveries_view.php:116
#: ../sales/inquiry/sales_orders_view.php.orig:269
msgstr ""
#: ../manufacturing/view/work_order_view.php:56
-#: ../reporting/rep409.php:88
msgid "Work Order Requirements"
msgstr ""
msgid "Reversed the production "
msgstr ""
+#: ../manufacturing/includes/db/work_orders_db.inc:79
#: ../manufacturing/includes/db/work_orders_db.inc.orig:79
#: ../purchasing/includes/db/po_db.inc:123
-#: ../sales/includes/db/cust_trans_db.inc:118
-#: ../sales/includes/db/cust_trans_db.inc.orig:114
+#: ../sales/includes/db/cust_trans_db.inc:114
#: ../sales/includes/db/old.sales_order_db.inc:249
-#: ../sales/includes/db/sales_order_db.inc.orig:261
+#: ../sales/includes/db/sales_order_db.inc:275
msgid "Updated."
msgstr ""
+#: ../manufacturing/includes/db/work_orders_db.inc:100
#: ../manufacturing/includes/db/work_orders_db.inc.orig:100
msgid "Canceled."
msgstr ""
+#: ../manufacturing/includes/db/work_orders_db.inc:176
#: ../manufacturing/includes/db/work_orders_db.inc.orig:176
msgid "Released."
msgstr ""
-#: ../manufacturing/includes/db/work_orders_quick_db.inc.orig:89
+#: ../manufacturing/includes/db/work_orders_db.inc.orig:260
+msgid "Voiding Work Order Trans # "
+msgstr ""
+
+#: ../manufacturing/includes/db/work_orders_quick_db.inc:104
msgid "Quick production."
msgstr ""
-#: ../manufacturing/includes/db/work_orders_quick_db.inc.orig:169
+#: ../manufacturing/includes/db/work_orders_quick_db.inc:184
msgid "Produced"
msgstr ""
-#: ../purchasing/includes/db/invoice_db.inc.orig:298
+#: ../purchasing/includes/db/invoice_db.inc.orig:296
msgid "Supplier invoice adjustment for zero inventory of "
msgstr ""
-#: ../purchasing/includes/db/invoice_db.inc.orig:298
+#: ../purchasing/includes/db/invoice_db.inc.orig:296
#: ../reporting/rep106.php:83
#: ../sales/inquiry/sales_deliveries_view.php:166
+#: ../sales/inquiry/sales_orders_view.php:159
#: ../sales/inquiry/sales_orders_view.php.orig:159
msgid "Invoice"
msgstr ""
-#: ../purchasing/includes/db/invoice_db.inc.orig:716
-#: ../purchasing/includes/db/invoice_db.inc.orig:718
+#: ../purchasing/includes/db/invoice_db.inc.orig:707
+#: ../purchasing/includes/db/invoice_db.inc.orig:709
msgid "GRN Removal"
msgstr ""
#: ../purchasing/includes/ui/grn_ui.inc:23
#: ../purchasing/includes/ui/grn_ui.inc:55
-#: ../purchasing/includes/ui/po_ui.inc.orig:326
+#: ../purchasing/includes/ui/po_ui.inc:324
#: ../sales/view/view_sales_order.php:74
msgid "Order Currency"
msgstr ""
#: ../purchasing/includes/ui/grn_ui.inc:33
#: ../purchasing/includes/ui/grn_ui.inc:69
-#: ../purchasing/includes/ui/po_ui.inc.orig:341
-#: ../purchasing/includes/ui/po_ui.inc.orig:346
+#: ../purchasing/includes/ui/po_ui.inc:339
+#: ../purchasing/includes/ui/po_ui.inc:344
msgid "Deliver Into Location"
msgstr ""
#: ../purchasing/includes/ui/grn_ui.inc:34
#: ../purchasing/includes/ui/grn_ui.inc:79
-#: ../purchasing/includes/ui/po_ui.inc.orig:351
+#: ../purchasing/includes/ui/po_ui.inc:349
#: ../purchasing/view/view_supp_credit.php:44
#: ../purchasing/view/view_supp_invoice.php:48
#: ../purchasing/inquiry/po_search_completed.php:124
-#: ../purchasing/inquiry/po_search_completed.php.orig:123
#: ../purchasing/inquiry/po_search.php:134
#: ../purchasing/inquiry/supplier_inquiry.php:177
#: ../reporting/includes/doctext.inc:164
#: ../purchasing/includes/ui/grn_ui.inc:38
#: ../purchasing/includes/ui/grn_ui.inc:81
-#: ../purchasing/includes/ui/po_ui.inc.orig:355
+#: ../purchasing/includes/ui/po_ui.inc:353
#: ../sales/view/view_sales_order.php:92
msgid "Delivery Address"
msgstr ""
#: ../purchasing/includes/ui/grn_ui.inc:41
#: ../purchasing/includes/ui/grn_ui.inc:84
-#: ../purchasing/includes/ui/po_ui.inc.orig:367
+#: ../purchasing/includes/ui/po_ui.inc:365
msgid "Order Comments"
msgstr ""
msgid "Date Items Received"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:108
+#: ../purchasing/includes/ui/invoice_ui.inc:123
msgid "Source Invoices:"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:110
+#: ../purchasing/includes/ui/invoice_ui.inc:125
msgid "Supplier's Ref.:"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:125
+#: ../purchasing/includes/ui/invoice_ui.inc:140
msgid "Terms:"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:137
+#: ../purchasing/includes/ui/invoice_ui.inc:152
#: ../purchasing/manage/suppliers.php:100
#: ../purchasing/manage/suppliers.php:105
-#: ../purchasing/manage/suppliers.php.orig:100
-#: ../purchasing/manage/suppliers.php.orig:105
msgid "Supplier's Currency:"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:141
+#: ../purchasing/includes/ui/invoice_ui.inc:156
#: ../purchasing/manage/suppliers.php:107
-#: ../purchasing/manage/suppliers.php.orig:107
#: ../sales/manage/customer_branches.php:247
#: ../sales/manage/customers.php:297
-#: ../sales/manage/sav.customers.php:292
msgid "Tax Group:"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:159
+#: ../purchasing/includes/ui/invoice_ui.inc:174
msgid "Sub-total:"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:167
+#: ../purchasing/includes/ui/invoice_ui.inc:182
msgid "Invoice Total:"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:170
+#: ../purchasing/includes/ui/invoice_ui.inc:185
#: ../sales/customer_credit_invoice.php:330
#: ../sales/includes/ui/sales_credit_ui.inc:233
msgid "Credit Note Total"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:175
-#: ../purchasing/includes/ui/po_ui.inc.orig:485
-#: ../purchasing/po_entry_items.php.orig:558
+#: ../purchasing/includes/ui/invoice_ui.inc:190
+#: ../purchasing/includes/ui/po_ui.inc:485
+#: ../purchasing/po_entry_items.php:562
msgid "Tax algorithm:"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:207
+#: ../purchasing/includes/ui/invoice_ui.inc:222
msgid "Add GL Line"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:208
+#: ../purchasing/includes/ui/invoice_ui.inc:223
msgid "Reset"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:209
+#: ../purchasing/includes/ui/invoice_ui.inc:224
#: ../purchasing/po_receive_items.php:333
msgid "Clear all GL entry fields"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:227
+#: ../purchasing/includes/ui/invoice_ui.inc:242
msgid "GL Items for this Invoice"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:229
+#: ../purchasing/includes/ui/invoice_ui.inc:244
msgid "GL Items for this Credit Note"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:239
+#: ../purchasing/includes/ui/invoice_ui.inc:254
msgid "Quick Entry:"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:412
+#: ../purchasing/includes/ui/invoice_ui.inc:427
msgid "Add to Invoice"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:414
+#: ../purchasing/includes/ui/invoice_ui.inc:429
msgid "Add to Credit Note"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:416
+#: ../purchasing/includes/ui/invoice_ui.inc:431
#: ../sales/customer_invoice.php:603
msgid "Remove"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:416
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:451
+#: ../purchasing/includes/ui/invoice_ui.inc:431
+#: ../purchasing/includes/ui/invoice_ui.inc:466
msgid ""
"WARNING! Be careful with removal. The operation is executed immediately and "
"cannot be undone !!!"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:418
+#: ../purchasing/includes/ui/invoice_ui.inc:433
#, php-format
msgid ""
"You are about to remove all yet non-invoiced items from delivery line #%d. "
"continue ?"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:449
+#: ../purchasing/includes/ui/invoice_ui.inc:464
msgid "Items Received Yet to be Invoiced"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:454
+#: ../purchasing/includes/ui/invoice_ui.inc:469
msgid "Delivery Item Selected For Adding To A Supplier Credit Note"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:459
+#: ../purchasing/includes/ui/invoice_ui.inc:474
msgid "Received Items Charged on this Invoice"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:461
+#: ../purchasing/includes/ui/invoice_ui.inc:476
msgid "Received Items Credited on this Note"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:471
+#: ../purchasing/includes/ui/invoice_ui.inc:486
msgid "Received between"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:483
+#: ../purchasing/includes/ui/invoice_ui.inc:498
msgid "Add All Items"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:492
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:504
+#: ../purchasing/includes/ui/invoice_ui.inc:507
+#: ../purchasing/includes/ui/invoice_ui.inc:519
#: ../reporting/rep308.php:149
+#: ../sales/inquiry/sales_orders_view.php:167
#: ../sales/inquiry/sales_orders_view.php.orig:167
msgid "Delivery"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:492
+#: ../purchasing/includes/ui/invoice_ui.inc:507
msgid "Sequence #"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:492
+#: ../purchasing/includes/ui/invoice_ui.inc:507
msgid "P.O."
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:493
+#: ../purchasing/includes/ui/invoice_ui.inc:508
msgid "Received On"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:493
+#: ../purchasing/includes/ui/invoice_ui.inc:508
#: ../purchasing/view/view_po.php:46
msgid "Quantity Received"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:493
+#: ../purchasing/includes/ui/invoice_ui.inc:508
#: ../purchasing/view/view_grn.php:41
#: ../purchasing/view/view_po.php:46
msgid "Quantity Invoiced"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:494
+#: ../purchasing/includes/ui/invoice_ui.inc:509
msgid "Qty Yet To Invoice"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:494
-#: ../purchasing/includes/ui/po_ui.inc.orig:245
+#: ../purchasing/includes/ui/invoice_ui.inc:509
+#: ../purchasing/includes/ui/po_ui.inc:243
#: ../sales/includes/ui/sales_order_ui.inc:147
msgid "Price after Tax"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:494
-#: ../purchasing/includes/ui/po_ui.inc.orig:245
+#: ../purchasing/includes/ui/invoice_ui.inc:509
+#: ../purchasing/includes/ui/po_ui.inc:243
#: ../sales/includes/ui/sales_order_ui.inc:147
msgid "Price before Tax"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:500
+#: ../purchasing/includes/ui/invoice_ui.inc:515
msgid "Qty Yet To Credit"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:505
+#: ../purchasing/includes/ui/invoice_ui.inc:520
msgid "Line Value"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:573
+#: ../purchasing/includes/ui/invoice_ui.inc:588
msgid ""
"There are no outstanding items received from this supplier that have not "
"been invoiced by them."
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:576
+#: ../purchasing/includes/ui/invoice_ui.inc:591
msgid ""
"There are no received items for the selected supplier that have been "
"invoiced."
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc.orig:577
+#: ../purchasing/includes/ui/invoice_ui.inc:592
msgid "Credits can only be applied to invoiced items."
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:156
-msgid "Supplier Currency:"
-msgstr ""
-
-#: ../purchasing/includes/ui/po_ui.inc.orig:185
+#: ../purchasing/includes/ui/po_ui.inc:162
#: ../sales/sales_order_entry.php:722
msgid "Order Date:"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:186
+#: ../purchasing/includes/ui/po_ui.inc:163
#: ../sales/sales_order_entry.php:709
msgid "Delivery Date:"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:186
+#: ../purchasing/includes/ui/po_ui.inc:163
#: ../sales/sales_order_entry.php:703
msgid "Invoice Date:"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:197
+#: ../purchasing/includes/ui/po_ui.inc:176
+msgid "Supplier Currency:"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:195
msgid "Due Date:"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:199
+#: ../purchasing/includes/ui/po_ui.inc:197
msgid "Supplier's Reference:"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:200
+#: ../purchasing/includes/ui/po_ui.inc:198
msgid "Receive Into:"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:225
+#: ../purchasing/includes/ui/po_ui.inc:223
msgid ""
"The default stock location set up for this user is not a currently defined "
"stock location. Your system administrator needs to amend your user record."
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:229
+#: ../purchasing/includes/ui/po_ui.inc:227
msgid "Deliver to:"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:238
+#: ../purchasing/includes/ui/po_ui.inc:236
msgid "Order Items"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:244
+#: ../purchasing/includes/ui/po_ui.inc:242
#: ../purchasing/po_receive_items.php:62
msgid "Received"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:245
+#: ../purchasing/includes/ui/po_ui.inc:243
#: ../sales/includes/ui/sales_order_ui.inc:617
msgid "Required Delivery Date"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:245
+#: ../purchasing/includes/ui/po_ui.inc:243
#: ../purchasing/view/view_grn.php:41
#: ../purchasing/view/view_po.php:46
msgid "Line Total"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:296
+#: ../purchasing/includes/ui/po_ui.inc:294
#: ../purchasing/po_receive_items.php:114
-#: ../reporting/rep109.php:150
+#: ../reporting/rep109.php:155
#: ../reporting/rep110.php:159
-#: ../reporting/rep111.php:133
+#: ../reporting/rep111.php:134
#: ../reporting/rep113.php:144
#: ../reporting/rep209.php:162
#: ../sales/customer_credit_invoice.php:322
msgid "Sub-total"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:305
+#: ../purchasing/includes/ui/po_ui.inc:303
#: ../purchasing/po_receive_items.php:122
#: ../purchasing/view/view_grn.php:79
#: ../purchasing/view/view_po.php:93
msgid "Amount Total"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:306
+#: ../purchasing/includes/ui/po_ui.inc:304
#: ../purchasing/allocations/supplier_allocate.php:73
#: ../sales/allocations/customer_allocate.php:71
#: ../sales/includes/ui/sales_order_ui.inc:244
msgid "Refresh"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:361
+#: ../purchasing/includes/ui/po_ui.inc:359
#: ../sales/view/view_sales_order.php:83
msgid "Required Pre-Payment"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:362
+#: ../purchasing/includes/ui/po_ui.inc:360
msgid "Pre-Payments Allocated"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:486
-#: ../purchasing/po_entry_items.php.orig:559
+#: ../purchasing/includes/ui/po_ui.inc:486
+#: ../purchasing/po_entry_items.php:563
#: ../sales/customer_invoice.php:454
#: ../sales/includes/ui/sales_order_ui.inc:413
#: ../sales/includes/ui/sales_order_ui.inc:415
msgid "Payment:"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:486
-#: ../purchasing/po_entry_items.php.orig:559
+#: ../purchasing/includes/ui/po_ui.inc:486
+#: ../purchasing/po_entry_items.php:563
msgid "Delayed"
msgstr ""
-#: ../purchasing/includes/ui/po_ui.inc.orig:488
+#: ../purchasing/includes/ui/po_ui.inc:488
#: ../sales/includes/ui/sales_order_ui.inc:628
#: ../sales/includes/ui/sales_order_ui.inc:630
msgid "Pre-Payment Required:"
msgstr ""
#: ../purchasing/po_entry_items.php:41
-#: ../purchasing/po_entry_items.php.orig:41
msgid "Modify Purchase Order #"
msgstr ""
#: ../purchasing/po_entry_items.php:46
-#: ../purchasing/po_entry_items.php.orig:46
msgid "Purchase Order Entry"
msgstr ""
#: ../purchasing/po_entry_items.php:51
-#: ../purchasing/po_entry_items.php.orig:51
msgid "Direct GRN Entry"
msgstr ""
#: ../purchasing/po_entry_items.php:56
-#: ../purchasing/po_entry_items.php.orig:56
msgid "Direct Purchase Invoice Entry"
msgstr ""
#: ../purchasing/po_entry_items.php:80
-#: ../purchasing/po_entry_items.php.orig:80
msgid "Purchase Order has been entered"
msgstr ""
#: ../purchasing/po_entry_items.php:82
-#: ../purchasing/po_entry_items.php.orig:82
msgid "Purchase Order has been updated"
msgstr ""
#: ../purchasing/po_entry_items.php:83
-#: ../purchasing/po_entry_items.php.orig:83
msgid "&View this order"
msgstr ""
#: ../purchasing/po_entry_items.php:85
-#: ../purchasing/po_entry_items.php.orig:85
#: ../sales/sales_order_entry.php:119
#: ../sales/sales_order_entry.php:139
msgid "&Print This Order"
msgstr ""
#: ../purchasing/po_entry_items.php:87
-#: ../purchasing/po_entry_items.php.orig:87
#: ../sales/sales_order_entry.php:120
#: ../sales/sales_order_entry.php:140
msgid "&Email This Order"
msgstr ""
#: ../purchasing/po_entry_items.php:89
-#: ../purchasing/po_entry_items.php.orig:89
msgid "&Receive Items on this Purchase Order"
msgstr ""
#: ../purchasing/po_entry_items.php:91
-#: ../purchasing/po_entry_items.php.orig:91
msgid "Enter &Another Purchase Order"
msgstr ""
#: ../purchasing/po_entry_items.php:93
-#: ../purchasing/po_entry_items.php.orig:93
msgid "Select An &Outstanding Purchase Order"
msgstr ""
#: ../purchasing/po_entry_items.php:102
-#: ../purchasing/po_entry_items.php.orig:102
msgid "Direct GRN has been entered"
msgstr ""
#: ../purchasing/po_entry_items.php:104
-#: ../purchasing/po_entry_items.php.orig:104
msgid "&View this GRN"
msgstr ""
#: ../purchasing/po_entry_items.php:108
-#: ../purchasing/po_entry_items.php.orig:108
#: ../purchasing/po_receive_items.php:40
msgid "View the GL Journal Entries for this Delivery"
msgstr ""
#: ../purchasing/po_entry_items.php:113
-#: ../purchasing/po_entry_items.php.orig:113
#: ../purchasing/po_receive_items.php:42
msgid "Entry purchase &invoice for this receival"
msgstr ""
#: ../purchasing/po_entry_items.php:118
-#: ../purchasing/po_entry_items.php.orig:118
msgid "Enter &Another GRN"
msgstr ""
#: ../purchasing/po_entry_items.php:127
-#: ../purchasing/po_entry_items.php.orig:127
msgid "Direct Purchase Invoice has been entered"
msgstr ""
#: ../purchasing/po_entry_items.php:129
-#: ../purchasing/po_entry_items.php.orig:129
msgid "&View this Invoice"
msgstr ""
#: ../purchasing/po_entry_items.php:134
-#: ../purchasing/po_entry_items.php.orig:134
#: ../purchasing/supplier_invoice.php:69
msgid "View the GL Journal Entries for this Invoice"
msgstr ""
#: ../purchasing/po_entry_items.php:136
-#: ../purchasing/po_entry_items.php.orig:136
#: ../purchasing/supplier_invoice.php:71
msgid "Entry supplier &payment for this invoice"
msgstr ""
#: ../purchasing/po_entry_items.php:142
-#: ../purchasing/po_entry_items.php.orig:142
msgid "Enter &Another Direct Invoice"
msgstr ""
#: ../purchasing/po_entry_items.php:174
-#: ../purchasing/po_entry_items.php.orig:174
msgid ""
"This item cannot be deleted because some of it has already been received."
msgstr ""
#: ../purchasing/po_entry_items.php:189
-#: ../purchasing/po_entry_items.php.orig:189
msgid ""
"This order cannot be cancelled because some of it has already been received."
msgstr ""
#: ../purchasing/po_entry_items.php:190
-#: ../purchasing/po_entry_items.php.orig:190
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 "
msgstr ""
#: ../purchasing/po_entry_items.php:205
-#: ../purchasing/po_entry_items.php.orig:205
msgid "This purchase order has been cancelled."
msgstr ""
#: ../purchasing/po_entry_items.php:207
-#: ../purchasing/po_entry_items.php.orig:207
msgid "Enter a new purchase order"
msgstr ""
#: ../purchasing/po_entry_items.php:219
-#: ../purchasing/po_entry_items.php.orig:219
#: ../sales/sales_order_entry.php:503
msgid "Item description cannot be empty."
msgstr ""
#: ../purchasing/po_entry_items.php:229
-#: ../purchasing/po_entry_items.php.orig:229
msgid "The quantity of the order item must be numeric and not less than "
msgstr ""
#: ../purchasing/po_entry_items.php:236
-#: ../purchasing/po_entry_items.php.orig:236
msgid "The price entered must be numeric and not less than zero."
msgstr ""
#: ../purchasing/po_entry_items.php:260
-#: ../purchasing/po_entry_items.php.orig:260
msgid ""
"You are attempting to make the quantity ordered a quantity less than has "
"already been invoiced or received. This is prohibited."
msgstr ""
#: ../purchasing/po_entry_items.php:261
-#: ../purchasing/po_entry_items.php.orig:261
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 "
msgstr ""
#: ../purchasing/po_entry_items.php:289
-#: ../purchasing/po_entry_items.php.orig:289
msgid "The selected item is already on this order."
msgstr ""
#: ../purchasing/po_entry_items.php:316
-#: ../purchasing/po_entry_items.php.orig:316
msgid ""
"The selected item does not exist or it is a kit part and therefore cannot be "
"purchased."
msgstr ""
#: ../purchasing/po_entry_items.php:332
-#: ../purchasing/po_entry_items.php.orig:332
#: ../purchasing/supplier_invoice.php:384
-#: ../purchasing/supplier_payment.php:123
-#: ../purchasing/supplier_payment.php.orig:113
+#: ../purchasing/supplier_payment.php.orig:114
msgid "There is no supplier selected."
msgstr ""
#: ../purchasing/po_entry_items.php:339
-#: ../purchasing/po_entry_items.php.orig:339
msgid "The entered order date is invalid."
msgstr ""
#: ../purchasing/po_entry_items.php:352
-#: ../purchasing/po_entry_items.php.orig:352
msgid "The entered due date is invalid."
msgstr ""
#: ../purchasing/po_entry_items.php:361
-#: ../purchasing/po_entry_items.php.orig:361
msgid "There is no reference entered for this purchase order."
msgstr ""
#: ../purchasing/po_entry_items.php:376
-#: ../purchasing/po_entry_items.php.orig:376
#: ../purchasing/supplier_invoice.php:186
msgid "You must enter a supplier's invoice reference."
msgstr ""
#: ../purchasing/po_entry_items.php:383
-#: ../purchasing/po_entry_items.php.orig:383
#: ../purchasing/supplier_invoice.php:212
msgid ""
"This invoice number has already been entered. It cannot be entered again."
msgstr ""
#: ../purchasing/po_entry_items.php:389
-#: ../purchasing/po_entry_items.php.orig:389
msgid "There is no delivery address specified."
msgstr ""
#: ../purchasing/po_entry_items.php:395
-#: ../purchasing/po_entry_items.php.orig:395
msgid "There is no location specified to move any items into."
msgstr ""
#: ../purchasing/po_entry_items.php:403
-#: ../purchasing/po_entry_items.php.orig:403
msgid ""
"The order cannot be placed because there are no lines entered on this order."
msgstr ""
#: ../purchasing/po_entry_items.php:408
-#: ../purchasing/po_entry_items.php.orig:408
msgid "Required prepayment is greater than total invoice value."
msgstr ""
-#: ../purchasing/po_entry_items.php.orig:496
+#: ../purchasing/po_entry_items.php:500
msgid "Payment for:"
msgstr ""
-#: ../purchasing/po_entry_items.php.orig:567
+#: ../purchasing/po_entry_items.php:571
#: ../sales/sales_order_entry.php:726
msgid "Place Order"
msgstr ""
-#: ../purchasing/po_entry_items.php.orig:568
+#: ../purchasing/po_entry_items.php:572
msgid "Update Order"
msgstr ""
-#: ../purchasing/po_entry_items.php.orig:569
+#: ../purchasing/po_entry_items.php:573
#: ../sales/sales_order_entry.php:725
msgid "Cancel Order"
msgstr ""
-#: ../purchasing/po_entry_items.php.orig:571
+#: ../purchasing/po_entry_items.php:575
msgid "Process GRN"
msgstr ""
-#: ../purchasing/po_entry_items.php.orig:572
+#: ../purchasing/po_entry_items.php:576
msgid "Update GRN"
msgstr ""
-#: ../purchasing/po_entry_items.php.orig:573
+#: ../purchasing/po_entry_items.php:577
msgid "Cancel GRN"
msgstr ""
-#: ../purchasing/po_entry_items.php.orig:576
+#: ../purchasing/po_entry_items.php:580
#: ../sales/customer_invoice.php:686
msgid "Process Invoice"
msgstr ""
-#: ../purchasing/po_entry_items.php.orig:577
+#: ../purchasing/po_entry_items.php:581
msgid "Update Invoice"
msgstr ""
-#: ../purchasing/po_entry_items.php.orig:578
+#: ../purchasing/po_entry_items.php:582
#: ../sales/sales_order_entry.php:706
msgid "Cancel Invoice"
msgstr ""
msgstr ""
#: ../purchasing/po_receive_items.php:63
-#: ../reporting/rep101.php:119
+#: ../reporting/rep101.php:148
#: ../reporting/rep105.php:115
#: ../reporting/rep105.php:166
-#: ../reporting/rep201.php:111
+#: ../reporting/rep201.php:136
#: ../reporting/includes/doctext.inc:247
msgid "Outstanding"
msgstr ""
msgid "View the GL &Journal Entries for this Payment"
msgstr ""
-#: ../purchasing/supplier_payment.php:106
-#: ../purchasing/supplier_payment.php.orig:100
-msgid "Enter another supplier &payment"
-msgstr ""
-
-#: ../purchasing/supplier_payment.php:107
-#: ../sales/customer_payments.php:106
-msgid "Enter Other &Payment"
-msgstr ""
-
-#: ../purchasing/supplier_payment.php:108
-msgid "Enter &Customer Payment"
+#: ../purchasing/supplier_payment.php.orig:98
+msgid "Select Another &Supplier Transaction for Payment"
msgstr ""
-#: ../purchasing/supplier_payment.php:109
-#: ../sales/customer_payments.php:104
-msgid "Enter Other &Deposit"
+#: ../purchasing/supplier_payment.php.orig:101
+msgid "Enter Another Supplier &Payment"
msgstr ""
-#: ../purchasing/supplier_payment.php:110
-#: ../sales/customer_payments.php:107
-msgid "Bank Account &Transfer"
+#: ../purchasing/supplier_payment.php.orig:148
+#: ../sales/customer_payments.php.orig:198
+msgid "The exchange rate must be numeric and greater than zero."
msgstr ""
-#: ../purchasing/supplier_payment.php:162
-#: ../purchasing/supplier_payment.php.orig:159
+#: ../purchasing/supplier_payment.php.orig:160
msgid "The entered discount is invalid or less than zero."
msgstr ""
-#: ../purchasing/supplier_payment.php:170
-#: ../purchasing/supplier_payment.php.orig:167
+#: ../purchasing/supplier_payment.php.orig:168
msgid ""
"The total of the amount and the discount is zero or negative. Please enter "
"positive values."
msgstr ""
-#: ../purchasing/supplier_payment.php:177
-msgid "The entered bank amount is zero or negative."
-msgstr ""
-
-#: ../purchasing/supplier_payment.php:274
-#: ../purchasing/supplier_payment.php.orig:270
+#: ../purchasing/supplier_payment.php.orig:275
msgid "Payment To:"
msgstr ""
-#: ../purchasing/supplier_payment.php.orig:147
-#: ../sales/customer_payments.php.orig:192
-msgid "The exchange rate must be numeric and greater than zero."
-msgstr ""
-
-#: ../purchasing/supplier_payment.php.orig:283
+#: ../purchasing/supplier_payment.php.orig:288
msgid "From Bank Account:"
msgstr ""
-#: ../purchasing/supplier_payment.php.orig:291
+#: ../purchasing/supplier_payment.php.orig:296
#: ../purchasing/view/view_supp_payment.php:55
msgid "Date Paid"
msgstr ""
-#: ../purchasing/supplier_payment.php.orig:314
-#: ../sales/customer_payments.php.orig:409
+#: ../purchasing/supplier_payment.php.orig:319
+#: ../sales/customer_payments.php.orig:405
msgid "Amount of Discount:"
msgstr ""
-#: ../purchasing/supplier_payment.php.orig:315
+#: ../purchasing/supplier_payment.php.orig:320
msgid "Amount of Payment:"
msgstr ""
-#: ../purchasing/supplier_payment.php.orig:321
+#: ../purchasing/supplier_payment.php.orig:326
msgid "The amount and discount are in the bank account's currency."
msgstr ""
-#: ../purchasing/supplier_payment.php.orig:324
+#: ../purchasing/supplier_payment.php.orig:329
msgid "Enter Payment"
msgstr ""
msgstr ""
#: ../purchasing/view/view_po.php:100
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:147
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:148
#: ../purchasing/inquiry/supplier_inquiry.php:197
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:165
-#: ../sales/inquiry/customer_inquiry.php.orig:227
+#: ../sales/inquiry/customer_allocation_inquiry.php:165
+#: ../sales/inquiry/customer_inquiry.php:227
#: ../sales/inquiry/sales_deliveries_view.php:206
#: ../sales/inquiry/sales_orders_view.php.orig:344
msgid "Marked items are overdue."
msgstr ""
#: ../purchasing/manage/suppliers.php:27
-#: ../purchasing/manage/suppliers.php.orig:27
#: ../sales/manage/customer_branches.php:33
msgid ""
"There are no tax groups defined in the system. At least one tax group is "
msgstr ""
#: ../purchasing/manage/suppliers.php:91
-#: ../purchasing/manage/suppliers.php.orig:91
msgid "Basic Data"
msgstr ""
#: ../purchasing/manage/suppliers.php:93
-#: ../purchasing/manage/suppliers.php.orig:93
msgid "Supplier Name:"
msgstr ""
#: ../purchasing/manage/suppliers.php:94
-#: ../purchasing/manage/suppliers.php.orig:94
msgid "Supplier Short Name:"
msgstr ""
#: ../purchasing/manage/suppliers.php:97
-#: ../purchasing/manage/suppliers.php.orig:97
msgid "Website:"
msgstr ""
#: ../purchasing/manage/suppliers.php:108
-#: ../purchasing/manage/suppliers.php.orig:108
msgid "Our Customer No:"
msgstr ""
#: ../purchasing/manage/suppliers.php:110
-#: ../purchasing/manage/suppliers.php.orig:110
msgid "Purchasing"
msgstr ""
#: ../purchasing/manage/suppliers.php:111
-#: ../purchasing/manage/suppliers.php.orig:111
msgid "Bank Name/Account:"
msgstr ""
#: ../purchasing/manage/suppliers.php:112
-#: ../purchasing/manage/suppliers.php.orig:112
#: ../sales/manage/customers.php:267
-#: ../sales/manage/sav.customers.php:263
msgid "Credit Limit:"
msgstr ""
#: ../purchasing/manage/suppliers.php:113
-#: ../purchasing/manage/suppliers.php.orig:113
#: ../sales/manage/customers.php:269
-#: ../sales/manage/sav.customers.php:265
msgid "Payment Terms:"
msgstr ""
#: ../purchasing/manage/suppliers.php:119
#: ../purchasing/manage/suppliers.php:122
-#: ../purchasing/manage/suppliers.php.orig:119
-#: ../purchasing/manage/suppliers.php.orig:122
msgid "Prices contain tax included:"
msgstr ""
#: ../purchasing/manage/suppliers.php:124
-#: ../purchasing/manage/suppliers.php.orig:124
msgid "Tax Calculation Algorithm:"
msgstr ""
#: ../purchasing/manage/suppliers.php:128
-#: ../purchasing/manage/suppliers.php.orig:128
#: ../reporting/rep704.php:96
#: ../reporting/rep704.php:106
#: ../reporting/rep704.php:114
msgstr ""
#: ../purchasing/manage/suppliers.php:129
-#: ../purchasing/manage/suppliers.php.orig:129
msgid "Accounts Payable Account:"
msgstr ""
#: ../purchasing/manage/suppliers.php:130
-#: ../purchasing/manage/suppliers.php.orig:130
msgid "Purchase Account:"
msgstr ""
#: ../purchasing/manage/suppliers.php:131
-#: ../purchasing/manage/suppliers.php.orig:131
msgid "Use Item Inventory/COGS Account"
msgstr ""
#: ../purchasing/manage/suppliers.php:134
#: ../purchasing/manage/suppliers.php:137
-#: ../purchasing/manage/suppliers.php.orig:134
-#: ../purchasing/manage/suppliers.php.orig:137
msgid "Contact Data"
msgstr ""
#: ../purchasing/manage/suppliers.php:140
-#: ../purchasing/manage/suppliers.php.orig:140
msgid "System default"
msgstr ""
#: ../purchasing/manage/suppliers.php:157
-#: ../purchasing/manage/suppliers.php.orig:157
#: ../sales/manage/customer_branches.php:268
msgid "Addresses"
msgstr ""
#: ../purchasing/manage/suppliers.php:158
-#: ../purchasing/manage/suppliers.php.orig:158
#: ../reporting/rep205.php:102
#: ../sales/manage/customer_branches.php:269
msgid "Mailing Address:"
msgstr ""
#: ../purchasing/manage/suppliers.php:159
-#: ../purchasing/manage/suppliers.php.orig:159
msgid "Physical Address:"
msgstr ""
#: ../purchasing/manage/suppliers.php:161
-#: ../purchasing/manage/suppliers.php.orig:161
msgid "General"
msgstr ""
#: ../purchasing/manage/suppliers.php:162
-#: ../purchasing/manage/suppliers.php.orig:162
#: ../sales/manage/customer_branches.php:271
#: ../sales/manage/customers.php:290
-#: ../sales/manage/sav.customers.php:286
msgid "General Notes:"
msgstr ""
#: ../purchasing/manage/suppliers.php:164
-#: ../purchasing/manage/suppliers.php.orig:164
msgid "Supplier status:"
msgstr ""
#: ../purchasing/manage/suppliers.php:170
-#: ../purchasing/manage/suppliers.php.orig:170
msgid "Update Supplier"
msgstr ""
#: ../purchasing/manage/suppliers.php:171
-#: ../purchasing/manage/suppliers.php.orig:171
msgid "Update supplier data"
msgstr ""
#: ../purchasing/manage/suppliers.php:172
-#: ../purchasing/manage/suppliers.php.orig:172
msgid "Select this supplier and return to document entry."
msgstr ""
#: ../purchasing/manage/suppliers.php:173
-#: ../purchasing/manage/suppliers.php.orig:173
msgid "Delete Supplier"
msgstr ""
#: ../purchasing/manage/suppliers.php:174
-#: ../purchasing/manage/suppliers.php.orig:174
msgid "Delete supplier data if have been never used"
msgstr ""
#: ../purchasing/manage/suppliers.php:178
-#: ../purchasing/manage/suppliers.php.orig:178
msgid "Add New Supplier Details"
msgstr ""
#: ../purchasing/manage/suppliers.php:197
-#: ../purchasing/manage/suppliers.php.orig:197
msgid "The supplier name must be entered."
msgstr ""
#: ../purchasing/manage/suppliers.php:204
-#: ../purchasing/manage/suppliers.php.orig:204
msgid "The supplier short name must be entered."
msgstr ""
-#: ../purchasing/manage/suppliers.php.orig:224
+#: ../purchasing/manage/suppliers.php:224
msgid "Supplier has been updated."
msgstr ""
-#: ../purchasing/manage/suppliers.php.orig:242
+#: ../purchasing/manage/suppliers.php:242
msgid "A new supplier has been added."
msgstr ""
-#: ../purchasing/manage/suppliers.php.orig:260
+#: ../purchasing/manage/suppliers.php:260
msgid ""
"Cannot delete this supplier because there are transactions that refer to "
"this supplier."
msgstr ""
-#: ../purchasing/manage/suppliers.php.orig:268
+#: ../purchasing/manage/suppliers.php:268
msgid ""
"Cannot delete the supplier record because purchase orders have been created "
"against this supplier."
msgstr ""
-#: ../purchasing/manage/suppliers.php.orig:289
+#: ../purchasing/manage/suppliers.php:289
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:48
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:48
msgid "Select a supplier: "
msgstr ""
-#: ../purchasing/manage/suppliers.php.orig:290
+#: ../purchasing/manage/suppliers.php:290
msgid "New supplier"
msgstr ""
-#: ../purchasing/manage/suppliers.php.orig:309
+#: ../purchasing/manage/suppliers.php:309
#: ../sales/manage/customer_branches.php:325
#: ../sales/manage/customers.php:348
-#: ../sales/manage/sav.customers.php:343
msgid "&Contacts"
msgstr ""
-#: ../purchasing/manage/suppliers.php.orig:311
+#: ../purchasing/manage/suppliers.php:311
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:247
#: ../sales/inquiry/sales_orders_view.php.orig:247
msgid "#:"
msgstr ""
#: ../purchasing/inquiry/po_search_completed.php:65
-#: ../purchasing/inquiry/po_search_completed.php.orig:66
msgid "into location:"
msgstr ""
#: ../purchasing/inquiry/po_search_completed.php:125
-#: ../purchasing/inquiry/po_search_completed.php.orig:124
#: ../purchasing/inquiry/po_search.php:135
#: ../reporting/includes/doctext.inc:188
#: ../sales/inquiry/sales_orders_view.php.orig:289
msgstr ""
#: ../purchasing/inquiry/po_search_completed.php:127
-#: ../purchasing/inquiry/po_search_completed.php.orig:126
#: ../purchasing/inquiry/po_search.php:137
#: ../sales/inquiry/sales_orders_view.php.orig:292
msgid "Order Total"
msgstr ""
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:23
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:23
msgid "Supplier Allocation Inquiry"
msgstr ""
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:55
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:55
#: ../sales/inquiry/customer_allocation_inquiry.php:49
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:49
msgid "show settled:"
msgstr ""
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:129
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:103
+msgid "Pay"
+msgstr ""
+
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:130
msgid "Supp Reference"
msgstr ""
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:135
-#: ../reporting/rep101.php:119
-#: ../reporting/rep201.php:111
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:136
+#: ../reporting/rep101.php:148
+#: ../reporting/rep201.php:136
#: ../reporting/includes/doctext.inc:247
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:154
+#: ../sales/inquiry/customer_allocation_inquiry.php:154
msgid "Allocated"
msgstr ""
#: ../reporting/rep102.php:120
#: ../reporting/rep102.php:121
#: ../reporting/rep102.php:122
-#: ../reporting/rep102.php:244
-#: ../reporting/rep108.php:151
-#: ../reporting/rep108.php:152
-#: ../reporting/rep108.php:153
#: ../reporting/rep202.php:124
#: ../reporting/rep202.php:125
#: ../reporting/rep202.php:126
#: ../sales/inquiry/customer_inquiry.php:71
#: ../sales/inquiry/customer_inquiry.php:72
#: ../sales/inquiry/customer_inquiry.php:73
-#: ../sales/inquiry/customer_inquiry.php.orig:71
-#: ../sales/inquiry/customer_inquiry.php.orig:72
-#: ../sales/inquiry/customer_inquiry.php.orig:73
msgid "Days"
msgstr ""
#: ../purchasing/inquiry/supplier_inquiry.php:69
#: ../reporting/rep102.php:122
-#: ../reporting/rep108.php:153
#: ../reporting/rep202.php:126
#: ../reporting/rep202.php:160
#: ../sales/inquiry/customer_inquiry.php:73
-#: ../sales/inquiry/customer_inquiry.php.orig:73
msgid "Over"
msgstr ""
#: ../purchasing/inquiry/supplier_inquiry.php:73
#: ../sales/inquiry/customer_inquiry.php:76
-#: ../sales/inquiry/customer_inquiry.php.orig:76
msgid "Terms"
msgstr ""
#: ../purchasing/inquiry/supplier_inquiry.php:73
#: ../reporting/rep102.php:125
-#: ../reporting/rep102.php:242
-#: ../reporting/rep108.php:155
#: ../reporting/rep202.php:130
#: ../reporting/rep202.php:250
#: ../sales/inquiry/customer_inquiry.php:76
-#: ../sales/inquiry/customer_inquiry.php.orig:76
msgid "Current"
msgstr ""
#: ../purchasing/inquiry/supplier_inquiry.php:74
#: ../reporting/rep102.php:126
-#: ../reporting/rep108.php:155
#: ../reporting/rep202.php:131
#: ../sales/inquiry/customer_inquiry.php:77
-#: ../sales/inquiry/customer_inquiry.php.orig:77
msgid "Total Balance"
msgstr ""
#: ../purchasing/inquiry/supplier_inquiry.php:133
#: ../sales/inquiry/customer_inquiry.php:162
-#: ../sales/inquiry/customer_inquiry.php.orig:162
msgid "Credit This"
msgstr ""
msgid "Marked items are settled."
msgstr ""
-#: ../reporting/rep101.php:108
+#: ../reporting/rep101.php:137
#: ../reporting/rep102.php:108
#: ../reporting/rep114.php:108
#: ../reporting/rep202.php:112
msgid "Balances in Home Currency"
msgstr ""
-#: ../reporting/rep101.php:118
-#: ../reporting/rep201.php:110
+#: ../reporting/rep101.php:147
+#: ../reporting/rep201.php:135
#: ../reporting/rep203.php:93
#: ../reporting/rep709.php:111
#: ../reporting/includes/doctext.inc:167
msgid "Trans Type"
msgstr ""
-#: ../reporting/rep101.php:118
-#: ../reporting/rep201.php:110
+#: ../reporting/rep101.php:147
+#: ../reporting/rep201.php:135
#: ../reporting/includes/doctext.inc:246
msgid "Charges"
msgstr ""
-#: ../reporting/rep101.php:118
-#: ../reporting/rep201.php:111
+#: ../reporting/rep101.php:147
+#: ../reporting/rep201.php:136
#: ../reporting/includes/doctext.inc:247
msgid "Credits"
msgstr ""
-#: ../reporting/rep101.php:129
+#: ../reporting/rep101.php:158
#: ../reporting/rep102.php:136
-#: ../reporting/rep201.php:121
+#: ../reporting/rep201.php:146
#: ../reporting/rep202.php:141
#: ../reporting/rep203.php:102
#: ../reporting/rep303.php:136
#: ../reporting/reports_main.php:156
#: ../reporting/reports_main.php:166
#: ../reporting/reports_main.php:175
+#: ../reporting/reports_main.php:227
msgid "Suppress Zeros"
msgstr ""
-#: ../reporting/rep101.php:131
+#: ../reporting/rep101.php:160
msgid "Customer Balances"
msgstr ""
-#: ../reporting/rep101.php:241
-#: ../reporting/rep102.php:228
-#: ../reporting/rep106.php:171
-#: ../reporting/rep201.php:233
-#: ../reporting/rep202.php:235
-#: ../reporting/rep203.php:181
-#: ../reporting/rep204.php:148
-#: ../reporting/rep301.php:179
-#: ../reporting/rep304.php:195
-#: ../reporting/rep305.php:188
-#: ../reporting/rep306.php:293
-#: ../reporting/rep309.php:158
-msgid "Grand Total"
-msgstr ""
-
#: ../reporting/rep102.php:102
#: ../reporting/rep106.php:93
#: ../reporting/rep202.php:106
#: ../reporting/reports_main.php:48
#: ../reporting/reports_main.php:91
#: ../reporting/reports_main.php:165
+#: ../reporting/reports_main.php:211
msgid "Summary Only"
msgstr ""
#: ../reporting/reports_main.php:152
#: ../reporting/reports_main.php:161
#: ../reporting/reports_main.php:172
+#: ../reporting/reports_main.php:208
+#: ../reporting/reports_main.php:234
+#: ../reporting/reports_main.php:243
+#: ../reporting/reports_main.php:249
+#: ../reporting/reports_main.php:259
+#: ../reporting/reports_main.php:267
+#: ../reporting/reports_main.php:275
+#: ../reporting/reports_main.php:312
msgid "End Date"
msgstr ""
#: ../reporting/rep105.php:109
#: ../reporting/rep204.php:84
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:147
-#: ../sales/inquiry/customer_inquiry.php.orig:202
+#: ../sales/inquiry/customer_allocation_inquiry.php:147
+#: ../sales/inquiry/customer_inquiry.php:202
msgid "Order"
msgstr ""
#: ../sales/manage/customers.php:254
#: ../sales/manage/customers.php:293
#: ../sales/manage/recurrent_invoices.php:102
-#: ../sales/manage/sav.customers.php:251
-#: ../sales/manage/sav.customers.php:289
#: ../sales/view/view_credit.php:58
-#: ../sales/inquiry/customer_inquiry.php.orig:207
+#: ../sales/inquiry/customer_inquiry.php:207
#: ../sales/inquiry/sales_deliveries_view.php:182
#: ../sales/inquiry/sales_orders_view.php.orig:287
#: ../sales/inquiry/sales_orders_view.php.orig:301
msgid "Salesman Listing"
msgstr ""
-#: ../reporting/rep108.php:85
-#: ../reporting/rep108.php:110
-#: ../reporting/includes/doctext.inc:238
-msgid "STATEMENT"
-msgstr ""
-
-#: ../reporting/rep108.php:127
-msgid "Outstanding Transactions"
-msgstr ""
-
-#: ../reporting/rep108.php:170
-msgid "Statement"
+#: ../reporting/rep106.php:171
+#: ../reporting/rep202.php:235
+#: ../reporting/rep203.php:181
+#: ../reporting/rep204.php:148
+#: ../reporting/rep301.php:179
+#: ../reporting/rep304.php:195
+#: ../reporting/rep305.php:188
+#: ../reporting/rep309.php:158
+msgid "Grand Total"
msgstr ""
-#: ../reporting/rep108.php:170
-msgid "as of"
+#: ../reporting/rep107.php:88
+#: ../reporting/includes/doctext.inc:118
+msgid "INVOICE"
msgstr ""
#: ../reporting/rep109.php:66
-#: ../reporting/rep109.php:89
#: ../reporting/rep109.php:94
+#: ../reporting/rep109.php:99
#: ../reporting/includes/doctext.inc:65
msgid "SALES ORDER"
msgstr ""
#: ../reporting/rep109.php:68
-#: ../reporting/rep109.php:84
-#: ../reporting/rep109.php:94
+#: ../reporting/rep109.php:89
+#: ../reporting/rep109.php:99
#: ../reporting/includes/doctext.inc:65
msgid "QUOTE"
msgstr ""
-#: ../reporting/rep109.php:153
+#: ../reporting/rep109.php:158
#: ../reporting/rep110.php:162
-#: ../reporting/rep111.php:136
+#: ../reporting/rep111.php:137
#: ../reporting/rep113.php:147
#: ../sales/view/view_credit.php:138
#: ../sales/view/view_dispatch.php:155
msgid "Shipping"
msgstr ""
-#: ../reporting/rep109.php:159
-#: ../reporting/rep111.php:142
+#: ../reporting/rep109.php:164
+#: ../reporting/rep111.php:143
msgid "TOTAL ORDER EX VAT"
msgstr ""
-#: ../reporting/rep109.php:205
-#: ../reporting/rep111.php:188
+#: ../reporting/rep109.php:210
+#: ../reporting/rep111.php:189
msgid "TOTAL ORDER VAT INCL."
msgstr ""
msgid "Tax"
msgstr ""
-#: ../reporting/rep201.php:100
+#: ../reporting/rep201.php:125
msgid "Balances in Home currency"
msgstr ""
-#: ../reporting/rep201.php:123
+#: ../reporting/rep201.php:148
msgid "Supplier Balances"
msgstr ""
#: ../reporting/rep309.php:98
#: ../sales/manage/customer_branches.php:241
#: ../sales/manage/customers.php:263
-#: ../sales/manage/sav.customers.php:259
msgid "Sales"
msgstr ""
msgid "Bill of Material Listing"
msgstr ""
-#: ../reporting/rep409.php:60
-#: ../reporting/rep409.php:73
-#: ../reporting/includes/doctext.inc:214
-msgid "WORK ORDER"
-msgstr ""
-
-#: ../reporting/rep409.php:129
-msgid "Insufficient stock"
-msgstr ""
-
#: ../reporting/rep501.php:87
msgid "YTD"
msgstr ""
msgid "Close Balance"
msgstr ""
-#: ../reporting/rep706.php:308
-#: ../reporting/rep707.php:326
-#: ../reporting/rep708.php:51
-#: ../reporting/rep708.php:126
-#: ../sales/create_recurrent_invoices.php:134
-#: ../sales/manage/recurrent_invoices.php:102
-msgid "Group"
-msgstr ""
-
#: ../reporting/rep707.php:258
msgid "Profit and Loss Statement"
msgstr ""
-#: ../reporting/rep708.php:185
-msgid "Brought Forward"
-msgstr ""
-
-#: ../reporting/rep708.php:185
-msgid "This Period"
-msgstr ""
-
-#: ../reporting/rep708.php:283
-msgid ""
-"The Opening Balance is not in balance, probably due to a non closed Previous "
-"Fiscalyear."
-msgstr ""
-
#: ../reporting/rep709.php:93
msgid "Tax Report"
msgstr ""
#: ../reporting/reports_main.php:37
#: ../reporting/reports_main.php:154
+#: ../reporting/reports_main.php:300
msgid "Show Balance"
msgstr ""
#: ../reporting/reports_main.php:163
#: ../reporting/reports_main.php:174
#: ../reporting/reports_main.php:194
+#: ../reporting/reports_main.php:201
msgid "Currency Filter"
msgstr ""
#: ../reporting/reports_main.php:177
#: ../reporting/reports_main.php:182
#: ../reporting/reports_main.php:189
+#: ../reporting/reports_main.php:197
+#: ../reporting/reports_main.php:204
+#: ../reporting/reports_main.php:213
+#: ../reporting/reports_main.php:219
+#: ../reporting/reports_main.php:230
+#: ../reporting/reports_main.php:239
+#: ../reporting/reports_main.php:245
+#: ../reporting/reports_main.php:255
+#: ../reporting/reports_main.php:263
+#: ../reporting/reports_main.php:271
+#: ../reporting/reports_main.php:278
+#: ../reporting/reports_main.php:286
+#: ../reporting/reports_main.php:293
+#: ../reporting/reports_main.php:302
+#: ../reporting/reports_main.php:315
msgid "Orientation"
msgstr ""
#: ../reporting/reports_main.php:178
#: ../reporting/reports_main.php:183
#: ../reporting/reports_main.php:190
+#: ../reporting/reports_main.php:214
+#: ../reporting/reports_main.php:220
+#: ../reporting/reports_main.php:231
+#: ../reporting/reports_main.php:240
+#: ../reporting/reports_main.php:246
+#: ../reporting/reports_main.php:256
+#: ../reporting/reports_main.php:264
+#: ../reporting/reports_main.php:272
+#: ../reporting/reports_main.php:279
+#: ../reporting/reports_main.php:287
+#: ../reporting/reports_main.php:303
msgid "Destination"
msgstr ""
#: ../reporting/reports_main.php:72
#: ../reporting/reports_main.php:82
+#: ../reporting/reports_main.php:209
+#: ../reporting/reports_main.php:216
+#: ../reporting/reports_main.php:222
+#: ../reporting/reports_main.php:235
+#: ../reporting/reports_main.php:250
+#: ../reporting/reports_main.php:260
+#: ../reporting/reports_main.php:268
+#: ../reporting/reports_main.php:276
msgid "Inventory Category"
msgstr ""
msgstr ""
#: ../reporting/reports_main.php:74
+#: ../reporting/reports_main.php:224
msgid "Show Pictures"
msgstr ""
#: ../reporting/reports_main.php:131
#: ../reporting/reports_main.php:139
#: ../reporting/reports_main.php:195
+#: ../reporting/reports_main.php:202
msgid "Email Customers"
msgstr ""
msgid "Print Purchase &Orders"
msgstr ""
+#: ../reporting/reports_main.php:198
+msgid "Print Remi&ttances"
+msgstr ""
+
+#: ../reporting/reports_main.php:207
+msgid "Inventory &Valuation Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:215
+msgid "Inventory &Planning Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:221
+msgid "Stock &Check Sheets"
+msgstr ""
+
+#: ../reporting/reports_main.php:225
+msgid "Inventory Column"
+msgstr ""
+
+#: ../reporting/reports_main.php:226
+msgid "Show Shortage"
+msgstr ""
+
+#: ../reporting/reports_main.php:228
+msgid "Item Like"
+msgstr ""
+
+#: ../reporting/reports_main.php:232
+msgid "Inventory &Sales Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:241
+msgid "&GRN Valuation Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:247
+msgid "Inventory P&urchasing Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:257
+msgid "Inventory &Movement Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:265
+msgid "C&osted Inventory Movement Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:273
+msgid "Item &Sales Summary Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:281
+msgid "Manufacturing"
+msgstr ""
+
+#: ../reporting/reports_main.php:282
+msgid "&Bill of Material Listing"
+msgstr ""
+
+#: ../reporting/reports_main.php:283
+msgid "From product"
+msgstr ""
+
+#: ../reporting/reports_main.php:284
+msgid "To product"
+msgstr ""
+
+#: ../reporting/reports_main.php:288
+msgid "Print &Work Orders"
+msgstr ""
+
+#: ../reporting/reports_main.php:291
+msgid "Email Locations"
+msgstr ""
+
+#: ../reporting/reports_main.php:297
+msgid "Dimension &Summary"
+msgstr ""
+
+#: ../reporting/reports_main.php:298
+msgid "From Dimension"
+msgstr ""
+
+#: ../reporting/reports_main.php:299
+msgid "To Dimension"
+msgstr ""
+
+#: ../reporting/reports_main.php:308
+msgid "Banking"
+msgstr ""
+
+#: ../reporting/reports_main.php:309
+msgid "Bank &Statement"
+msgstr ""
+
+#: ../reporting/reports_main.php:313
+msgid "Zero values"
+msgstr ""
+
#: ../reporting/includes/doctext.inc:18
#: ../reporting/includes/doctext.inc:156
#: ../sales/view/view_dispatch.php:51
msgid "FINAL INVOICE"
msgstr ""
-#: ../reporting/includes/doctext.inc:118
-msgid "INVOICE"
-msgstr ""
-
#: ../reporting/includes/doctext.inc:119
msgid "Invoice No."
msgstr ""
msgid "With thanks from"
msgstr ""
+#: ../reporting/includes/doctext.inc:214
+msgid "WORK ORDER"
+msgstr ""
+
#: ../reporting/includes/doctext.inc:215
msgid "Work Order No."
msgstr ""
+#: ../reporting/includes/doctext.inc:238
+msgid "STATEMENT"
+msgstr ""
+
#: ../reporting/includes/doctext.inc:246
msgid "DueDate"
msgstr ""
msgstr ""
#: ../sales/customer_payments.php:97
-#: ../sales/customer_payments.php.orig:92
+#: ../sales/customer_payments.php.orig:94
msgid "The customer payment has been successfully entered."
msgstr ""
#: ../sales/customer_payments.php:99
-#: ../sales/customer_payments.php:118
-#: ../sales/customer_payments.php.orig:94
-#: ../sales/customer_payments.php.orig:109
+#: ../sales/customer_payments.php.orig:96
+#: ../sales/customer_payments.php.orig:113
msgid "&Print This Receipt"
msgstr ""
msgstr ""
#: ../sales/customer_payments.php:103
-#: ../sales/customer_payments.php:126
-#: ../sales/customer_payments.php.orig:100
-#: ../sales/customer_payments.php.orig:115
+#: ../sales/customer_payments.php.orig:104
+#: ../sales/customer_payments.php.orig:121
msgid "Enter Another &Customer Payment"
msgstr ""
+#: ../sales/customer_payments.php:104
+msgid "Enter Other &Deposit"
+msgstr ""
+
#: ../sales/customer_payments.php:105
msgid "Enter Payment to &Supplier"
msgstr ""
+#: ../sales/customer_payments.php:106
+msgid "Enter Other &Payment"
+msgstr ""
+
+#: ../sales/customer_payments.php:107
+msgid "Bank Account &Transfer"
+msgstr ""
+
#: ../sales/customer_payments.php:109
-#: ../sales/customer_payments.php:120
-#: ../sales/customer_payments.php.orig:96
-#: ../sales/customer_payments.php.orig:111
+#: ../sales/customer_payments.php.orig:98
+#: ../sales/customer_payments.php.orig:115
msgid "&View the GL Journal Entries for this Customer Payment"
msgstr ""
-#: ../sales/customer_payments.php:116
-#: ../sales/customer_payments.php.orig:107
+#: ../sales/customer_payments.php.orig:102
+msgid "Select Another &Customer Transaction for Payment"
+msgstr ""
+
+#: ../sales/customer_payments.php.orig:111
msgid "The customer payment has been successfully updated."
msgstr ""
-#: ../sales/customer_payments.php:124
+#: ../sales/customer_payments.php.orig:119
msgid "Select Another Customer Payment for &Edition"
msgstr ""
-#: ../sales/customer_payments.php:139
-#: ../sales/customer_payments.php.orig:128
+#: ../sales/customer_payments.php.orig:134
#: ../sales/sales_order_entry.php:347
msgid "There is no customer selected."
msgstr ""
-#: ../sales/customer_payments.php:146
-#: ../sales/customer_payments.php.orig:135
+#: ../sales/customer_payments.php.orig:141
#: ../sales/sales_order_entry.php:354
msgid "This customer has no branch defined."
msgstr ""
-#: ../sales/customer_payments.php:152
-#: ../sales/customer_payments.php.orig:141
+#: ../sales/customer_payments.php.orig:147
msgid "The entered date is invalid. Please enter a valid date for the payment."
msgstr ""
-#: ../sales/customer_payments.php:182
-#: ../sales/customer_payments.php:188
-#: ../sales/customer_payments.php.orig:171
#: ../sales/customer_payments.php.orig:177
+#: ../sales/customer_payments.php.orig:183
msgid "The entered amount is invalid or negative and cannot be processed."
msgstr ""
-#: ../sales/customer_payments.php:214
-#: ../sales/customer_payments.php.orig:203
+#: ../sales/customer_payments.php.orig:209
msgid "The entered discount is not a valid number."
msgstr ""
-#: ../sales/customer_payments.php:221
-msgid ""
-"The balance of the amount and discount is zero or negative. Please enter "
-"valid amounts."
-msgstr ""
-
-#: ../sales/customer_payments.php:228
-msgid "The entered payment amount is zero or negative."
-msgstr ""
-
-#: ../sales/customer_payments.php.orig:210
+#: ../sales/customer_payments.php.orig:216
msgid ""
"The balance of the amount and discout is zero or negative. Please enter "
"valid amounts."
msgstr ""
-#: ../sales/customer_payments.php.orig:338
-#: ../sales/customer_payments.php.orig:340
+#: ../sales/customer_payments.php.orig:346
+#: ../sales/customer_payments.php.orig:348
msgid "From Customer:"
msgstr ""
-#: ../sales/customer_payments.php.orig:381
+#: ../sales/customer_payments.php.orig:377
msgid "Into Bank Account:"
msgstr ""
-#: ../sales/customer_payments.php.orig:386
+#: ../sales/customer_payments.php.orig:382
msgid "Date of Deposit:"
msgstr ""
-#: ../sales/customer_payments.php.orig:408
+#: ../sales/customer_payments.php.orig:404
msgid "Customer prompt payment discount :"
msgstr ""
-#: ../sales/customer_payments.php.orig:417
+#: ../sales/customer_payments.php.orig:413
msgid "Amount and discount are in customer's currency."
msgstr ""
-#: ../sales/customer_payments.php.orig:422
+#: ../sales/customer_payments.php.orig:418
msgid "Update Payment"
msgstr ""
-#: ../sales/customer_payments.php.orig:424
+#: ../sales/customer_payments.php.orig:420
msgid "Add Payment"
msgstr ""
#: ../sales/allocations/customer_allocation_main.php:32
#: ../sales/manage/customer_branches.php:282
#: ../sales/manage/customers.php:327
-#: ../sales/manage/sav.customers.php:322
#: ../sales/inquiry/customer_allocation_inquiry.php:42
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:42
#: ../sales/inquiry/customer_inquiry.php:44
-#: ../sales/inquiry/customer_inquiry.php.orig:44
#: ../sales/inquiry/sales_orders_view.php.orig:265
msgid "Select a customer: "
msgstr ""
#: ../sales/manage/customer_branches.php:242
#: ../sales/manage/customers.php:259
-#: ../sales/manage/sav.customers.php:290
msgid "Sales Person:"
msgstr ""
#: ../sales/manage/customer_branches.php:243
#: ../sales/manage/customers.php:296
-#: ../sales/manage/sav.customers.php:291
msgid "Sales Area:"
msgstr ""
msgstr ""
#: ../sales/manage/customers.php:42
-#: ../sales/manage/sav.customers.php:42
msgid "The customer name cannot be empty."
msgstr ""
#: ../sales/manage/customers.php:49
-#: ../sales/manage/sav.customers.php:49
msgid "The customer short name cannot be empty."
msgstr ""
#: ../sales/manage/customers.php:56
-#: ../sales/manage/sav.customers.php:56
msgid "The credit limit must be numeric and not less than zero."
msgstr ""
#: ../sales/manage/customers.php:63
-#: ../sales/manage/sav.customers.php:63
msgid ""
"The payment discount must be numeric and is expected to be less than 100% "
"and greater than or equal to 0."
msgstr ""
#: ../sales/manage/customers.php:70
-#: ../sales/manage/sav.customers.php:70
msgid ""
"The discount percentage must be numeric and is expected to be less than 100% "
"and greater than or equal to 0."
msgstr ""
#: ../sales/manage/customers.php:98
-#: ../sales/manage/sav.customers.php:98
msgid "Customer has been updated."
msgstr ""
#: ../sales/manage/customers.php:130
-#: ../sales/manage/sav.customers.php:127
msgid "A new customer has been added."
msgstr ""
#: ../sales/manage/customers.php:133
-#: ../sales/manage/sav.customers.php:130
msgid ""
"A default Branch has been automatically created, please check default Branch "
"values by using link below."
msgstr ""
#: ../sales/manage/customers.php:156
-#: ../sales/manage/sav.customers.php:153
msgid ""
"This customer cannot be deleted because there are transactions that refer to "
"it."
msgstr ""
#: ../sales/manage/customers.php:163
-#: ../sales/manage/sav.customers.php:160
msgid ""
"Cannot delete the customer record because orders have been created against "
"it."
msgstr ""
#: ../sales/manage/customers.php:170
-#: ../sales/manage/sav.customers.php:167
msgid ""
"Cannot delete this customer because there are branch records set up against "
"it."
msgstr ""
#: ../sales/manage/customers.php:181
-#: ../sales/manage/sav.customers.php:178
msgid "Selected customer has been deleted."
msgstr ""
#: ../sales/manage/customers.php:230
-#: ../sales/manage/sav.customers.php:227
msgid "Name and Address"
msgstr ""
#: ../sales/manage/customers.php:232
-#: ../sales/manage/sav.customers.php:229
msgid "Customer Name:"
msgstr ""
#: ../sales/manage/customers.php:233
-#: ../sales/manage/sav.customers.php:230
msgid "Customer Short Name:"
msgstr ""
#: ../sales/manage/customers.php:241
#: ../sales/manage/customers.php:245
-#: ../sales/manage/sav.customers.php:238
-#: ../sales/manage/sav.customers.php:242
msgid "Customer's Currency:"
msgstr ""
#: ../sales/manage/customers.php:248
-#: ../sales/manage/sav.customers.php:245
msgid "Sales Type/Price List:"
msgstr ""
#: ../sales/manage/customers.php:251
-#: ../sales/manage/sav.customers.php:248
msgid "Customer status:"
msgstr ""
#: ../sales/manage/customers.php:265
-#: ../sales/manage/sav.customers.php:261
msgid "Discount Percent:"
msgstr ""
#: ../sales/manage/customers.php:266
-#: ../sales/manage/sav.customers.php:262
msgid "Prompt Payment Discount Percent:"
msgstr ""
#: ../sales/manage/customers.php:270
-#: ../sales/manage/sav.customers.php:266
msgid "Credit Status:"
msgstr ""
#: ../sales/manage/customers.php:283
-#: ../sales/manage/sav.customers.php:279
msgid "Customer branches"
msgstr ""
#: ../sales/manage/customers.php:285
-#: ../sales/manage/sav.customers.php:281
msgid "Select or &Add"
msgstr ""
#: ../sales/manage/customers.php:285
-#: ../sales/manage/sav.customers.php:281
msgid "&Add or Edit "
msgstr ""
#: ../sales/manage/customers.php:304
-#: ../sales/manage/sav.customers.php:299
msgid "Add New Customer"
msgstr ""
#: ../sales/manage/customers.php:308
-#: ../sales/manage/sav.customers.php:303
msgid "Update Customer"
msgstr ""
#: ../sales/manage/customers.php:309
-#: ../sales/manage/sav.customers.php:304
msgid "Update customer data"
msgstr ""
#: ../sales/manage/customers.php:310
-#: ../sales/manage/sav.customers.php:305
msgid "Select this customer and return to document entry."
msgstr ""
#: ../sales/manage/customers.php:311
-#: ../sales/manage/sav.customers.php:306
msgid "Delete Customer"
msgstr ""
#: ../sales/manage/customers.php:312
-#: ../sales/manage/sav.customers.php:307
msgid "Delete customer data if have been never used"
msgstr ""
#: ../sales/manage/customers.php:319
-#: ../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:328
-#: ../sales/manage/sav.customers.php:323
msgid "New customer"
msgstr ""
#: ../sales/manage/customers.php:350
-#: ../sales/manage/sav.customers.php:345
msgid "Sales &Orders"
msgstr ""
msgstr ""
#: ../sales/inquiry/customer_allocation_inquiry.php:25
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:25
msgid "Customer Allocation Inquiry"
msgstr ""
#: ../sales/inquiry/customer_allocation_inquiry.php:96
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:96
msgid "Allocation"
msgstr ""
-#: ../sales/inquiry/customer_allocation_inquiry.php.orig:116
+#: ../sales/inquiry/customer_allocation_inquiry.php:116
msgid "Payment"
msgstr ""
#: ../sales/inquiry/customer_inquiry.php:26
-#: ../sales/inquiry/customer_inquiry.php.orig:26
msgid "Customer Transactions"
msgstr ""
#: ../sales/inquiry/customer_inquiry.php:68
-#: ../sales/inquiry/customer_inquiry.php.orig:68
msgid "CUSTOMER ACCOUNT IS ON HOLD"
msgstr ""
-#: ../sales/inquiry/customer_inquiry.php.orig:181
+#: ../sales/inquiry/customer_inquiry.php:181
msgid "Print Receipt"
msgstr ""
-#: ../sales/inquiry/customer_inquiry.php.orig:211
-#: ../sales/inquiry/customer_inquiry.php.orig:224
+#: ../sales/inquiry/customer_inquiry.php:211
+#: ../sales/inquiry/customer_inquiry.php:224
msgid "RB"
msgstr ""
msgid "Search All Sales Quotations"
msgstr ""
+#: ../sales/inquiry/sales_orders_view.php:148
#: ../sales/inquiry/sales_orders_view.php.orig:148
msgid "Dispatch"
msgstr ""
+#: ../sales/inquiry/sales_orders_view.php:191
#: ../sales/inquiry/sales_orders_view.php.orig:191
msgid "Set this order as a template for direct deliveries/invoices"
msgstr ""
+#: ../sales/inquiry/sales_orders_view.php:200
#: ../sales/inquiry/sales_orders_view.php.orig:200
msgid "Prepayment Invoice"
msgstr ""
+#: ../sales/inquiry/sales_orders_view.php:200
#: ../sales/inquiry/sales_orders_view.php.orig:200
msgid "Final Invoice"
msgstr ""
msgid "Tmpl"
msgstr ""
+#: ../sales/includes/cart_class.inc:391
+msgid "You have to enter valid stock code or nonempty description"
+msgstr ""
+
#: ../sales/includes/sales_ui.inc:50
msgid ""
"This edit session has been abandoned by opening sales document in another "
"browser tab. You cannot edit more than one sales document at once."
msgstr ""
-#: ../sales/includes/db/custalloc_db.inc.orig:351
+#: ../sales/includes/db/custalloc_db.inc:351
msgid ""
"Unsuspected overallocation happened due to sparse credit notes exists for "
"this invoice.\n"
#: ../sales/includes/db/old.sales_order_db.inc:107
#: ../sales/includes/db/old.sales_order_db.inc:259
#: ../sales/includes/db/sales_order_db.inc:109
-#: ../sales/includes/db/sales_order_db.inc.orig:109
-#: ../sales/includes/db/sales_order_db.inc.orig:271
+#: ../sales/includes/db/sales_order_db.inc:287
msgid "Stocks below Re-Order Level at "
msgstr ""
#: ../sales/includes/db/old.sales_order_db.inc:110
#: ../sales/includes/db/old.sales_order_db.inc:264
#: ../sales/includes/db/sales_order_db.inc:112
-#: ../sales/includes/db/sales_order_db.inc.orig:112
-#: ../sales/includes/db/sales_order_db.inc.orig:276
+#: ../sales/includes/db/sales_order_db.inc:292
msgid "Below"
msgstr ""
#: ../sales/includes/db/old.sales_order_db.inc:111
#: ../sales/includes/db/old.sales_order_db.inc:265
#: ../sales/includes/db/sales_order_db.inc:113
-#: ../sales/includes/db/sales_order_db.inc.orig:113
-#: ../sales/includes/db/sales_order_db.inc.orig:277
+#: ../sales/includes/db/sales_order_db.inc:293
msgid "Please reorder"
msgstr ""
#: ../sales/includes/db/old.sales_order_db.inc:139
#: ../sales/includes/db/sales_order_db.inc:141
-#: ../sales/includes/db/sales_order_db.inc.orig:141
msgid "Deleted."
msgstr ""
#: ../sales/includes/db/sales_invoice_db.inc:198
-#: ../sales/includes/db/sales_invoice_db.inc.orig:196
msgid "Cash invoice"
msgstr ""
projects / fa-stable.git / blobdiff