msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-15 09:38+0200\n"
+"POT-Creation-Date: 2014-03-10 10:17+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"
"Language: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
#: frontaccounting.php:73 frontaccounting.php:74
msgid "Main Menu"
msgstr ""
-#: frontaccounting.php:75 access/logout.php:18 themes/default/renderer.php:52
-#: themes/default/renderer.php:78 themes/default/renderer.php:53
-#: themes/default/renderer.php:82
+#: frontaccounting.php:75 access/logout.php:18 themes/default/renderer.php:70
+#: themes/default/renderer.php:83
msgid "Logout"
msgstr ""
-#: access/login.php:13 admin/db/login.php:13
+#: access/login.php:13
msgid "Restricted access"
msgstr ""
-#: access/login.php:27 admin/db/login.php:28
+#: access/login.php:27
msgid "Login as user: demouser and password: password"
msgstr ""
-#: access/login.php:31 admin/db/login.php:32
+#: access/login.php:31
msgid "Please login here"
msgstr ""
-#: access/login.php:39 access/login.php:69 admin/db/login.php:40
-#: admin/db/login.php:70 access/login.php:49 access/login.php:79
+#: access/login.php:36
+msgid "Too many failed login attempts.<br>Please wait a while or try later."
+msgstr ""
+
+#: access/login.php:49 access/login.php:80
msgid "Authorization timeout"
msgstr ""
-#: access/login.php:39 access/login.php:76 admin/db/login.php:40
-#: admin/db/login.php:77 access/login.php:49 access/login.php:86
+#: access/login.php:49 access/login.php:87
msgid "Login"
msgstr ""
-#: access/login.php:76 admin/inst_upgrade.php:137 admin/db/login.php:77
-#: access/login.php:86
+#: access/login.php:87 admin/inst_upgrade.php:137
msgid "Version"
msgstr ""
-#: access/login.php:79 admin/db/login.php:80 access/login.php:89
+#: access/login.php:90
msgid "User name"
msgstr ""
-#: access/login.php:83 admin/change_current_user_password.php:78
-#: admin/users.php:191 admin/db/login.php:84 access/login.php:93
+#: access/login.php:94 admin/users.php:191
msgid "Password:"
msgstr ""
-#: access/login.php:92 admin/create_coy.php:249 admin/create_coy.php:331
-#: admin/db/login.php:93 access/login.php:103 access/login.php:110
-#: admin/create_coy.php:253 admin/create_coy.php:336
+#: access/login.php:104 access/login.php:111 admin/create_coy.php:253
+#: admin/create_coy.php:336
msgid "Company"
msgstr ""
-#: access/login.php:101 admin/db/login.php:102 access/login.php:117
+#: access/login.php:118
msgid "Login -->"
msgstr ""
-#: access/login.php:132 admin/display_prefs.php:111 admin/db/login.php:133
-#: themes/default/renderer.php:123 access/login.php:148
-#: themes/default/renderer.php:127
+#: access/login.php:149 admin/display_prefs.php:112
+#: themes/default/renderer.php:129
msgid "Theme:"
msgstr ""
msgid "Click here to Login Again."
msgstr ""
-#: admin/attachments.php:72
+#: admin/attachments.php:74
msgid "Attach Documents"
msgstr ""
-#: admin/attachments.php:123 admin/attachments.php:121
+#: admin/attachments.php:86
+msgid "Selected transaction does not exists."
+msgstr ""
+
+#: admin/attachments.php:88
+msgid "Select attachment file."
+msgstr ""
+
+#: admin/attachments.php:128
msgid "Attachment has been inserted."
msgstr ""
-#: admin/attachments.php:129 admin/attachments.php:127
+#: admin/attachments.php:134
msgid "Attachment has been updated."
msgstr ""
-#: admin/attachments.php:141 admin/attachments.php:140
+#: admin/attachments.php:149
msgid "Attachment has been deleted."
msgstr ""
-#: admin/attachments.php:159 admin/view_print_transaction.php:72
+#: admin/attachments.php:167 admin/view_print_transaction.php:72
#: admin/void_transaction.php:157 gl/inquiry/journal_inquiry.php:47
#: inventory/includes/item_adjustments_ui.inc:47
#: manufacturing/work_order_add_finished.php:203
#: manufacturing/work_order_entry.php:379
#: manufacturing/work_order_entry.php:387
#: manufacturing/includes/work_order_issue_ui.inc:161
-#: sales/inquiry/customer_allocation_inquiry.php:47 admin/attachments.php:158
+#: sales/inquiry/customer_allocation_inquiry.php:47
msgid "Type:"
msgstr ""
-#: admin/attachments.php:171 admin/view_print_transaction.php:126
-#: admin/void_transaction.php:181 dimensions/inquiry/search_dimensions.php:127
-#: dimensions/view/view_dimension.php:54 gl/bank_account_reconcile.php:234
-#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126
-#: gl/inquiry/journal_inquiry.php:127 gl/inquiry/journal_inquiry.php:140
-#: includes/ui/allocation_cart.inc:263
-#: inventory/inquiry/stock_movements.php:81
-#: manufacturing/search_work_orders.php:159
-#: manufacturing/includes/manufacturing_ui.inc:157
-#: manufacturing/includes/manufacturing_ui.inc:200
-#: manufacturing/includes/manufacturing_ui.inc:236
-#: manufacturing/includes/manufacturing_ui.inc:276
-#: manufacturing/includes/manufacturing_ui.inc:280
-#: manufacturing/includes/manufacturing_ui.inc:331
-#: purchasing/view/view_po.php:115 purchasing/view/view_po.php:140
-#: purchasing/inquiry/po_search_completed.php:121
-#: purchasing/inquiry/po_search.php:130
-#: purchasing/inquiry/supplier_allocation_inquiry.php:127
-#: purchasing/inquiry/supplier_inquiry.php:169
-#: purchasing/inquiry/supplier_inquiry.php.orig:163
-#: purchasing/allocations/supplier_allocation_main.php:95
-#: reporting/rep101.php:130 reporting/rep201.php:118 reporting/rep203.php:91
-#: reporting/rep601.php:76 reporting/rep704.php:79 reporting/rep704.php:82
-#: reporting/rep704.php:85 reporting/rep710.php:76
-#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
-#: reporting/includes/doctext.inc:224
-#: sales/allocations/customer_allocation_main.php:94
-#: sales/view/view_sales_order.php:96 sales/view/view_sales_order.php:129
-#: sales/view/view_sales_order.php:161
-#: sales/inquiry/customer_allocation_inquiry.php:145
-#: sales/inquiry/customer_inquiry.php:225
-#: sales/inquiry/customer_inquiry.php.orig:225 admin/attachments.php:170
-msgid "#"
-msgstr ""
-
-#: admin/attachments.php:171 admin/attachments.php:221
-#: admin/crm_categories.php:88 admin/inst_upgrade.php:137
-#: admin/payment_terms.php:127 admin/printers.php:84
-#: admin/print_profiles.php:148 gl/inquiry/tax_inquiry.php:82
-#: gl/manage/gl_quick_entries.php:186 gl/manage/gl_quick_entries.php:224
-#: includes/ui/view_package.php:22 inventory/manage/item_codes.php:125
-#: inventory/manage/item_units.php:94 inventory/manage/movement_types.php:95
-#: inventory/manage/sales_kits.php:40 inventory/view/view_adjustment.php:56
-#: inventory/view/view_transfer.php:56 manufacturing/manage/bom_edit.php:70
-#: manufacturing/includes/manufacturing_ui.inc:28
-#: purchasing/includes/ui/invoice_ui.inc:471
-#: purchasing/includes/ui/invoice_ui.inc:483
-#: purchasing/po_receive_items.php:62 reporting/rep104.php:109
-#: reporting/rep105.php:112 reporting/rep204.php:82 reporting/rep303.php:109
-#: reporting/rep303.php:115 reporting/rep304.php:112 reporting/rep305.php:95
-#: reporting/rep401.php:69 sales/create_recurrent_invoices.php:115
-#: sales/manage/credit_status.php:97 sales/manage/recurrent_invoices.php:102
-#: sales/inquiry/sales_orders_view.php:295
-#: sales/inquiry/sales_orders_view.php:299
-#: sales/inquiry/sales_orders_view.php.orig:293
-#: sales/inquiry/sales_orders_view.php.orig:297 taxes/tax_groups.php:124
-#: taxes/tax_types.php:115 admin/attachments.php:170 admin/attachments.php:220
-#: reporting/rep305.php:98 sales/create_recurrent_invoices.php:132
-msgid "Description"
-msgstr ""
-
-#: admin/attachments.php:171 admin/backups.php:63 admin/backups.php:149
-#: admin/attachments.php:170
-msgid "Filename"
-msgstr ""
-
-#: admin/attachments.php:171 admin/attachments.php:170
-msgid "Size"
-msgstr ""
-
-#: admin/attachments.php:171 admin/attachments.php:170
-msgid "Filetype"
-msgstr ""
-
-#: admin/attachments.php:171 admin/attachments.php:170
-msgid "Date Uploaded"
-msgstr ""
-
-#: admin/attachments.php:186 admin/create_coy.php:273
-#: admin/crm_categories.php:106 admin/fiscalyears.php:164
-#: admin/inst_lang.php:100 admin/inst_lang.php.orig:100
-#: admin/payment_terms.php:142 admin/printers.php:96
+#: admin/attachments.php:183 admin/create_coy.php:277
+#: admin/crm_categories.php:115 admin/fiscalyears.php:164
+#: admin/inst_lang.php:100 admin/payment_terms.php:142 admin/printers.php:96
#: admin/shipping_companies.php:106 admin/tags.php:140 admin/users.php:144
#: dimensions/inquiry/search_dimensions.php:120
#: gl/inquiry/journal_inquiry.php:118 gl/manage/bank_accounts.php:130
-#: gl/manage/bank_accounts.php.orig:130 gl/manage/currencies.php:164
-#: gl/manage/exchange_rates.php:94 gl/manage/gl_account_classes.php:132
-#: gl/manage/gl_account_types.php:154 gl/manage/gl_quick_entries.php:196
-#: gl/manage/gl_quick_entries.php:295 gl/includes/ui/gl_bank_ui.inc:184
-#: gl/includes/ui/gl_bank_ui.inc.orig:166 gl/includes/ui/gl_journal_ui.inc:122
+#: gl/manage/currencies.php:164 gl/manage/exchange_rates.php:94
+#: gl/manage/gl_account_classes.php:132 gl/manage/gl_account_types.php:154
+#: gl/manage/gl_quick_entries.php:196 gl/manage/gl_quick_entries.php:295
+#: gl/includes/ui/gl_bank_ui.inc:186 gl/includes/ui/gl_journal_ui.inc:122
#: includes/ui/contacts_view.inc:64 includes/ui/simple_crud_class.inc:52
-#: inventory/prices.php:145 inventory/purchasing_data.php:146
+#: inventory/prices.php:158 inventory/purchasing_data.php:164
#: 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:520
-#: purchasing/includes/ui/po_ui.inc:266
+#: purchasing/includes/ui/invoice_ui.inc:533
+#: purchasing/includes/ui/po_ui.inc:263
#: purchasing/inquiry/po_search_completed.php:106
#: purchasing/inquiry/po_search.php:87 sales/manage/credit_status.php:119
#: sales/manage/customer_branches.php:159
#: sales/manage/recurrent_invoices.php:130 sales/manage/sales_areas.php:103
#: sales/manage/sales_groups.php:99 sales/manage/sales_people.php:119
#: sales/manage/sales_points.php:99 sales/manage/sales_types.php:121
-#: sales/inquiry/customer_inquiry.php:198
-#: sales/inquiry/customer_inquiry.php.orig:198
+#: sales/inquiry/customer_inquiry.php:192
#: sales/inquiry/sales_deliveries_view.php:154
#: sales/inquiry/sales_orders_view.php:128
-#: sales/inquiry/sales_orders_view.php.orig:126
#: sales/includes/ui/sales_credit_ui.inc:197
-#: sales/includes/ui/sales_order_ui.inc:202 taxes/item_tax_types.php:139
-#: taxes/tax_groups.php:142 taxes/tax_types.php:132 admin/attachments.php:185
-#: sales/includes/ui/sales_order_ui.inc:206 admin/create_coy.php:277
+#: sales/includes/ui/sales_order_ui.inc:208 taxes/item_tax_types.php:139
+#: taxes/tax_groups.php:142 taxes/tax_types.php:132
msgid "Edit"
msgstr ""
-#: admin/attachments.php:187 gl/inquiry/journal_inquiry.php:135
-#: admin/attachments.php:186
+#: admin/attachments.php:188 gl/inquiry/journal_inquiry.php:135
msgid "View"
msgstr ""
-#: admin/attachments.php:188 admin/attachments.php:187
+#: admin/attachments.php:193
msgid "Download"
msgstr ""
-#: admin/attachments.php:189 admin/create_coy.php:274
-#: admin/crm_categories.php:110 admin/fiscalyears.php:166
-#: admin/inst_chart.php:80 admin/inst_lang.php:109
-#: admin/inst_lang.php.orig:109 admin/inst_module.php:144
+#: admin/attachments.php:198 admin/create_coy.php:278
+#: admin/crm_categories.php:119 admin/fiscalyears.php:166
+#: admin/inst_chart.php:80 admin/inst_lang.php:109 admin/inst_module.php:143
#: admin/inst_theme.php:102 admin/payment_terms.php:143 admin/printers.php:97
#: admin/shipping_companies.php:107 admin/tags.php:141 admin/users.php:146
#: gl/gl_budget.php:137 gl/manage/bank_accounts.php:131
-#: gl/manage/bank_accounts.php.orig:131 gl/manage/currencies.php:166
-#: gl/manage/exchange_rates.php:99 gl/manage/gl_account_classes.php:133
-#: gl/manage/gl_account_types.php:155 gl/manage/gl_quick_entries.php:197
-#: gl/manage/gl_quick_entries.php:296 gl/includes/ui/gl_bank_ui.inc:186
-#: gl/includes/ui/gl_bank_ui.inc.orig:168 gl/includes/ui/gl_journal_ui.inc:124
-#: includes/ui/contacts_view.inc:67 includes/ui/radio.ui_input.inc:284
-#: includes/ui/simple_crud_class.inc:54 includes/ui/ui_input.inc:284
-#: inventory/prices.php:146 inventory/purchasing_data.php:147
+#: gl/manage/currencies.php:166 gl/manage/exchange_rates.php:99
+#: gl/manage/gl_account_classes.php:133 gl/manage/gl_account_types.php:155
+#: gl/manage/gl_quick_entries.php:197 gl/manage/gl_quick_entries.php:296
+#: gl/includes/ui/gl_bank_ui.inc:188 gl/includes/ui/gl_journal_ui.inc:124
+#: includes/ui/contacts_view.inc:67 includes/ui/simple_crud_class.inc:54
+#: includes/ui/ui_input.inc:285 inventory/prices.php:159
+#: inventory/purchasing_data.php:165
#: inventory/includes/item_adjustments_ui.inc:89
#: inventory/includes/stock_transfers_ui.inc:81
#: inventory/manage/item_categories.php:122
#: inventory/manage/sales_kits.php:56 manufacturing/manage/bom_edit.php:87
#: manufacturing/manage/work_centres.php:115
#: manufacturing/includes/work_order_issue_ui.inc:60
-#: purchasing/includes/ui/invoice_ui.inc:284
-#: purchasing/includes/ui/po_ui.inc:268 sales/manage/credit_status.php:120
+#: purchasing/includes/ui/invoice_ui.inc:297
+#: purchasing/includes/ui/po_ui.inc:265 sales/manage/credit_status.php:120
#: sales/manage/customer_branches.php:163
#: sales/manage/recurrent_invoices.php:131 sales/manage/sales_areas.php:104
#: sales/manage/sales_groups.php:100 sales/manage/sales_people.php:120
#: sales/manage/sales_points.php:100 sales/manage/sales_types.php:122
#: sales/includes/ui/sales_credit_ui.inc:199
-#: sales/includes/ui/sales_order_ui.inc:204 taxes/item_tax_types.php:140
-#: taxes/tax_groups.php:143 taxes/tax_types.php:133 admin/attachments.php:188
-#: sales/includes/ui/sales_order_ui.inc:208 admin/create_coy.php:278
-#: includes/ui/ui_input.inc:285
+#: sales/includes/ui/sales_order_ui.inc:210 taxes/item_tax_types.php:140
+#: taxes/tax_groups.php:143 taxes/tax_types.php:133
msgid "Delete"
msgstr ""
-#: admin/attachments.php:215 admin/attachments.php:220
-#: admin/attachments.php:214 admin/attachments.php:219
+#: admin/attachments.php:205 admin/view_print_transaction.php:126
+#: admin/void_transaction.php:181 dimensions/inquiry/search_dimensions.php:127
+#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:234
+#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126
+#: gl/inquiry/journal_inquiry.php:127 gl/inquiry/journal_inquiry.php:140
+#: includes/ui/allocation_cart.inc:288 includes/ui/mk.allocation_cart.inc:288
+#: inventory/inquiry/stock_movements.php:82
+#: manufacturing/search_work_orders.php:159
+#: manufacturing/includes/manufacturing_ui.inc:157
+#: manufacturing/includes/manufacturing_ui.inc:200
+#: manufacturing/includes/manufacturing_ui.inc:236
+#: manufacturing/includes/manufacturing_ui.inc:276
+#: manufacturing/includes/manufacturing_ui.inc:280
+#: manufacturing/includes/manufacturing_ui.inc:331
+#: purchasing/view/view_po.php:115 purchasing/view/view_po.php:140
+#: purchasing/inquiry/po_search_completed.php:121
+#: purchasing/inquiry/po_search.php:130
+#: purchasing/inquiry/supplier_allocation_inquiry.php:127
+#: purchasing/inquiry/supplier_inquiry.php:169
+#: purchasing/allocations/supplier_allocation_main.php:95
+#: reporting/rep101.php:118 reporting/rep201.php:110 reporting/rep203.php:93
+#: reporting/rep306.php:141 reporting/rep601.php:79 reporting/rep704.php:83
+#: reporting/rep704.php:86 reporting/rep704.php:89 reporting/rep710.php:78
+#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
+#: reporting/includes/doctext.inc:224
+#: sales/allocations/customer_allocation_main.php:94
+#: sales/view/view_sales_order.php:96 sales/view/view_sales_order.php:129
+#: sales/view/view_sales_order.php:161
+#: sales/inquiry/customer_allocation_inquiry.php:145
+#: sales/inquiry/customer_inquiry.php:218
+msgid "#"
+msgstr ""
+
+#: admin/attachments.php:206 admin/attachments.php:250
+#: admin/crm_categories.php:97 admin/inst_upgrade.php:137
+#: admin/payment_terms.php:127 admin/printers.php:84
+#: admin/print_profiles.php:148 gl/inquiry/tax_inquiry.php:82
+#: gl/manage/gl_quick_entries.php:186 gl/manage/gl_quick_entries.php:224
+#: includes/ui/view_package.php:32 inventory/manage/item_codes.php:125
+#: inventory/manage/item_units.php:94 inventory/manage/movement_types.php:95
+#: inventory/manage/sales_kits.php:40 inventory/view/view_adjustment.php:56
+#: inventory/view/view_transfer.php:56 manufacturing/manage/bom_edit.php:70
+#: manufacturing/includes/manufacturing_ui.inc:28
+#: purchasing/includes/ui/invoice_ui.inc:484
+#: purchasing/includes/ui/invoice_ui.inc:496
+#: purchasing/po_receive_items.php:62 reporting/rep104.php:111
+#: reporting/rep105.php:114 reporting/rep204.php:84 reporting/rep303.php:121
+#: reporting/rep303.php:127 reporting/rep304.php:114 reporting/rep305.php:101
+#: reporting/rep306.php:141 reporting/rep307.php:117 reporting/rep308.php:149
+#: reporting/rep309.php:98 reporting/rep401.php:71
+#: sales/create_recurrent_invoices.php:134 sales/manage/credit_status.php:97
+#: sales/manage/recurrent_invoices.php:102
+#: sales/inquiry/sales_orders_view.php:295
+#: sales/inquiry/sales_orders_view.php:299 taxes/tax_groups.php:124
+#: taxes/tax_types.php:115
+msgid "Description"
+msgstr ""
+
+#: admin/attachments.php:207 admin/backups.php:63 admin/backups.php:149
+msgid "Filename"
+msgstr ""
+
+#: admin/attachments.php:208
+msgid "Size"
+msgstr ""
+
+#: admin/attachments.php:209
+msgid "Filetype"
+msgstr ""
+
+#: admin/attachments.php:210
+msgid "Date Uploaded"
+msgstr ""
+
+#: admin/attachments.php:244 admin/attachments.php:249
msgid "Transaction #"
msgstr ""
-#: admin/attachments.php:222 admin/attachments.php:221
+#: admin/attachments.php:251
msgid "Attached File"
msgstr ""
msgid "Database backup failed."
msgstr ""
-#: admin/backups.php:98 admin/create_coy.php:261 admin/fiscalyears.php:155
-#: admin/inst_lang.php:85 admin/inst_lang.php:97 admin/inst_lang.php.orig:85
-#: admin/inst_lang.php.orig:97 admin/void_transaction.php:125
-#: dimensions/inquiry/search_dimensions.php:107
-#: gl/manage/bank_accounts.php:127 gl/manage/bank_accounts.php.orig:127
-#: gl/manage/currencies.php:162 gl/manage/gl_account_classes.php:127
-#: gl/manage/gl_quick_entries.php:230 includes/system_tests.inc:38
-#: includes/system_tests.inc:113 includes/system_tests.inc:126
-#: includes/ui/sav.ui_lists.inc:1649 includes/ui/ui_lists.inc:1670
-#: purchasing/manage/suppliers.php:120 reporting/rep101.php:126
-#: reporting/rep102.php:112 reporting/rep102.php:114 reporting/rep104.php:103
-#: reporting/rep106.php:73 reporting/rep114.php:73 reporting/rep201.php:114
-#: reporting/rep202.php:116 reporting/rep202.php:118 reporting/rep203.php:87
-#: reporting/rep303.php:101 reporting/rep303.php:105 reporting/rep501.php:109
+#: admin/backups.php:98 admin/create_coy.php:265 admin/fiscalyears.php:155
+#: admin/inst_lang.php:85 admin/inst_lang.php:97
+#: admin/void_transaction.php:125 dimensions/inquiry/search_dimensions.php:107
+#: gl/manage/bank_accounts.php:127 gl/manage/currencies.php:162
+#: gl/manage/gl_account_classes.php:127 gl/manage/gl_quick_entries.php:230
+#: includes/system_tests.inc:38 includes/system_tests.inc:113
+#: includes/system_tests.inc:126 includes/ui/ui_lists.inc:1675
+#: purchasing/manage/suppliers.php:120 reporting/rep101.php:114
+#: 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/rep202.php:118 reporting/rep202.php:120 reporting/rep203.php:89
+#: reporting/rep303.php:113 reporting/rep303.php:117 reporting/rep501.php:113
#: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95
#: sales/manage/sales_types.php:119 taxes/item_tax_types.php:129
-#: taxes/tax_groups.php:139 admin/create_coy.php:265
+#: taxes/tax_groups.php:139
msgid "No"
msgstr ""
msgid "You can only upload *.sql backup files"
msgstr ""
+#: admin/backups.php:168
+msgid "File uploaded to backup directory"
+msgstr ""
+
#: admin/backups.php:171
msgid "File was not uploaded into the system."
msgstr ""
msgid "Create backup"
msgstr ""
-#: admin/backups.php:181 sales/includes/ui/sales_order_ui.inc:589
-#: sales/includes/ui/sales_order_ui.inc:637
-#: sales/includes/ui/sales_order_ui.inc:593
-#: sales/includes/ui/sales_order_ui.inc:641
+#: admin/backups.php:181 sales/includes/ui/sales_order_ui.inc:594
+#: sales/includes/ui/sales_order_ui.inc:642
msgid "Comments:"
msgstr ""
msgstr ""
#: admin/change_current_user_password.php:16
-#: admin/change_current_user_password.php:85 themes/default/renderer.php:72
-#: themes/default/renderer.php:76
+#: admin/change_current_user_password.php:99 themes/default/renderer.php:77
msgid "Change password"
msgstr ""
-#: admin/change_current_user_password.php:28 admin/users.php:40
+#: admin/change_current_user_password.php:33
+msgid "Invalid password entered."
+msgstr ""
+
+#: admin/change_current_user_password.php:40 admin/users.php:40
msgid "The password entered must be at least 4 characters long."
msgstr ""
-#: admin/change_current_user_password.php:35 admin/users.php:47
+#: admin/change_current_user_password.php:47 admin/users.php:47
msgid "The password cannot contain the user login."
msgstr ""
-#: admin/change_current_user_password.php:42
+#: admin/change_current_user_password.php:54
msgid "The passwords entered are not the same."
msgstr ""
-#: admin/change_current_user_password.php:56
+#: admin/change_current_user_password.php:68
msgid "Password cannot be changed in demo mode."
msgstr ""
-#: admin/change_current_user_password.php:61
+#: admin/change_current_user_password.php:73
msgid "Your password has been updated."
msgstr ""
-#: admin/change_current_user_password.php:73 admin/users.php:180
+#: admin/change_current_user_password.php:85 admin/users.php:180
msgid "User login:"
msgstr ""
-#: admin/change_current_user_password.php:79
-msgid "Repeat password:"
+#: admin/change_current_user_password.php:91
+msgid "Current Password:"
+msgstr ""
+
+#: admin/change_current_user_password.php:92
+msgid "New Password:"
+msgstr ""
+
+#: admin/change_current_user_password.php:93
+msgid "Repeat New Password:"
msgstr ""
-#: admin/change_current_user_password.php:81
+#: admin/change_current_user_password.php:95
msgid "Enter your new password in the fields."
msgstr ""
#: admin/company_preferences.php:16 applications/setup.php:18
-#: applications/setup.php.orig:18
msgid "Company Setup"
msgstr ""
msgid "Error uploading logo file"
msgstr ""
-#: admin/company_preferences.php:115
+#: admin/company_preferences.php:116
msgid "Company setup has been updated."
msgstr ""
-#: admin/company_preferences.php:159
+#: admin/company_preferences.php:164
msgid "Name (to appear on reports):"
msgstr ""
-#: admin/company_preferences.php:160 admin/shipping_companies.php:142
+#: admin/company_preferences.php:165 admin/shipping_companies.php:142
#: includes/ui/contacts_view.inc:109 inventory/manage/locations.php:202
-#: sales/manage/customers.php:231 sales/manage/customers.php.orig:228
-#: sales/includes/ui/sales_order_ui.inc:628
-#: sales/includes/ui/sales_order_ui.inc:632
+#: sales/manage/customers.php:234 sales/includes/ui/sales_order_ui.inc:633
msgid "Address:"
msgstr ""
-#: admin/company_preferences.php:161
+#: admin/company_preferences.php:166
msgid "Domicile:"
msgstr ""
-#: admin/company_preferences.php:163 admin/shipping_companies.php:138
+#: admin/company_preferences.php:168 admin/shipping_companies.php:138
#: purchasing/manage/suppliers.php:129 sales/manage/customer_branches.php:260
msgid "Phone Number:"
msgstr ""
-#: admin/company_preferences.php:164 includes/ui/contacts_view.inc:104
+#: admin/company_preferences.php:169 includes/ui/contacts_view.inc:104
#: purchasing/manage/suppliers.php:159 sales/manage/customer_branches.php:262
-#: sales/manage/customers.php:254 sales/manage/customers.php.orig:251
+#: sales/manage/customers.php:257
msgid "Fax Number:"
msgstr ""
-#: admin/company_preferences.php:165 admin/users.php:202
+#: admin/company_preferences.php:170 admin/users.php:202
msgid "Email Address:"
msgstr ""
-#: admin/company_preferences.php:167
+#: admin/company_preferences.php:172
+msgid "BCC Address for all outgoing mails:"
+msgstr ""
+
+#: admin/company_preferences.php:174
msgid "Official Company Number:"
msgstr ""
-#: admin/company_preferences.php:168 purchasing/manage/suppliers.php:94
-#: sales/manage/customers.php:233 sales/manage/customers.php.orig:230
+#: admin/company_preferences.php:175 purchasing/manage/suppliers.php:94
+#: sales/manage/customers.php:236
msgid "GSTNo:"
msgstr ""
-#: admin/company_preferences.php:170
+#: admin/company_preferences.php:177
msgid "Home Currency:"
msgstr ""
-#: admin/company_preferences.php:171 gl/gl_budget.php:63
+#: admin/company_preferences.php:178 gl/gl_budget.php:63
msgid "Fiscal Year:"
msgstr ""
-#: admin/company_preferences.php:172
+#: admin/company_preferences.php:179
msgid "Tax Periods:"
msgstr ""
-#: admin/company_preferences.php:172
+#: admin/company_preferences.php:179
msgid "Months."
msgstr ""
-#: admin/company_preferences.php:173
+#: admin/company_preferences.php:180
msgid "Tax Last Period:"
msgstr ""
-#: admin/company_preferences.php:173
+#: admin/company_preferences.php:180
msgid "Months back."
msgstr ""
-#: admin/company_preferences.php:177
+#: admin/company_preferences.php:184
msgid "Company Logo:"
msgstr ""
-#: admin/company_preferences.php:178
+#: admin/company_preferences.php:185
msgid "New Company Logo (.jpg)"
msgstr ""
-#: admin/company_preferences.php:179
+#: admin/company_preferences.php:186
msgid "Delete Company Logo:"
msgstr ""
-#: admin/company_preferences.php:181
+#: admin/company_preferences.php:188
msgid "Use Dimensions:"
msgstr ""
-#: admin/company_preferences.php:182
+#: admin/company_preferences.php:189
msgid "Base for auto price calculations:"
msgstr ""
-#: admin/company_preferences.php:183
+#: admin/company_preferences.php:190
msgid "No base price list"
msgstr ""
-#: admin/company_preferences.php:184
+#: admin/company_preferences.php:191
msgid "Add Price from Std Cost:"
msgstr ""
-#: admin/company_preferences.php:186
+#: admin/company_preferences.php:193
msgid "Round to nearest:"
msgstr ""
-#: admin/company_preferences.php:189
+#: admin/company_preferences.php:196
msgid "Search Item List"
msgstr ""
-#: admin/company_preferences.php:190
+#: admin/company_preferences.php:197
msgid "Search Customer List"
msgstr ""
-#: admin/company_preferences.php:191
+#: admin/company_preferences.php:198
msgid "Search Supplier List"
msgstr ""
-#: admin/company_preferences.php:193
+#: admin/company_preferences.php:200
msgid "Automatic Revaluation Currency Accounts"
msgstr ""
-#: admin/company_preferences.php:194
+#: admin/company_preferences.php:201
msgid "Time Zone on Reports"
msgstr ""
-#: admin/company_preferences.php:195
+#: admin/company_preferences.php:202
msgid "Login Timeout:"
msgstr ""
-#: admin/company_preferences.php:195
+#: admin/company_preferences.php:202
msgid "seconds"
msgstr ""
-#: admin/company_preferences.php:196
+#: admin/company_preferences.php:203
msgid "Version Id"
msgstr ""
-#: admin/company_preferences.php:201 admin/display_prefs.php:142
-#: admin/forms_setup.php:61 admin/gl_setup.php:221 admin/inst_chart.php:74
-#: admin/inst_lang.php:103 admin/inst_lang.php.orig:103
-#: admin/inst_module.php:138 admin/inst_module.php:156
-#: admin/inst_module.php:199 admin/inst_theme.php:96
-#: dimensions/dimension_entry.php:293 gl/gl_bank.php:401 gl/gl_budget.php:135
-#: gl/manage/gl_quick_entries.php:60 gl/includes/ui/gl_bank_ui.inc:275
-#: gl/includes/ui/gl_bank_ui.inc.orig:257 gl/includes/ui/gl_journal_ui.inc:221
-#: includes/ui/db_pager_view.inc:174 includes/ui/radio.ui_input.inc:206
-#: includes/ui/radio.ui_input.inc:901 includes/ui/simple_crud_class.inc:56
-#: includes/ui/simple_crud_class.inc:227 includes/ui/ui_input.inc:206
-#: includes/ui/ui_input.inc:900 inventory/adjustments.php:235
-#: inventory/cost_update.php:116 inventory/reorder_level.php:97
-#: inventory/transfers.php:236 inventory/includes/item_adjustments_ui.inc:157
+#: admin/company_preferences.php:208 admin/display_prefs.php:143
+#: admin/forms_setup.php:61 admin/gl_setup.php:226 admin/inst_chart.php:74
+#: admin/inst_lang.php:103 admin/inst_module.php:137 admin/inst_module.php:155
+#: admin/inst_module.php:198 admin/inst_theme.php:96
+#: dimensions/dimension_entry.php:293 gl/gl_bank.php:413 gl/gl_budget.php:135
+#: gl/manage/gl_quick_entries.php:60 gl/includes/ui/gl_bank_ui.inc:277
+#: gl/includes/ui/gl_journal_ui.inc:221 includes/ui/db_pager_view.inc:174
+#: includes/ui/simple_crud_class.inc:56 includes/ui/simple_crud_class.inc:227
+#: includes/ui/ui_input.inc:207 includes/ui/ui_input.inc:905
+#: inventory/adjustments.php:233 inventory/cost_update.php:136
+#: inventory/reorder_level.php:111 inventory/transfers.php:234
+#: inventory/includes/item_adjustments_ui.inc:157
#: inventory/includes/stock_transfers_ui.inc:137
#: inventory/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:299 purchasing/includes/ui/po_ui.inc:442
-#: purchasing/po_receive_items.php:333 sales/credit_note_entry.php:282
-#: sales/customer_credit_invoice.php:382 sales/customer_delivery.php:523
-#: sales/customer_invoice.php:580 sales/inquiry/sales_orders_view.php:323
-#: sales/inquiry/sales_orders_view.php.orig:321
+#: purchasing/includes/ui/po_ui.inc:296 purchasing/includes/ui/po_ui.inc:439
+#: purchasing/po_receive_items.php:334 sales/credit_note_entry.php:284
+#: sales/customer_credit_invoice.php:380 sales/customer_delivery.php:533
+#: sales/customer_invoice.php:591 sales/inquiry/sales_orders_view.php:323
#: sales/includes/ui/sales_credit_ui.inc:293
-#: sales/includes/ui/sales_order_ui.inc:237
-#: sales/includes/ui/sales_order_ui.inc:555 sales/credit_note_entry.php:284
-#: sales/customer_credit_invoice.php:380 sales/customer_invoice.php:582
-#: sales/includes/ui/sales_order_ui.inc:241
-#: sales/includes/ui/sales_order_ui.inc:559 gl/gl_bank.php:403
-#: includes/ui/ui_input.inc:207 includes/ui/ui_input.inc:904
+#: sales/includes/ui/sales_order_ui.inc:243
+#: sales/includes/ui/sales_order_ui.inc:560
msgid "Update"
msgstr ""
msgid "Cannot create new company due to bugs in sql file."
msgstr ""
-#: admin/create_coy.php:145 admin/create_coy.php:212 admin/create_coy.php:149
-#: admin/create_coy.php:216
+#: admin/create_coy.php:149 admin/create_coy.php:216
msgid "Cannot open the configuration file - "
msgstr ""
-#: admin/create_coy.php:147 admin/create_coy.php:214 admin/create_coy.php:151
-#: admin/create_coy.php:218
+#: admin/create_coy.php:151 admin/create_coy.php:218
msgid "Cannot write to the configuration file - "
msgstr ""
-#: admin/create_coy.php:149 admin/create_coy.php:185 admin/create_coy.php:216
#: admin/create_coy.php:153 admin/create_coy.php:189 admin/create_coy.php:220
msgid "The configuration file "
msgstr ""
-#: admin/create_coy.php:149 admin/create_coy.php:185 admin/create_coy.php:216
-#: admin/db/maintenance_db.inc:250 admin/db/maintenance_db.inc.orig:248
#: admin/create_coy.php:153 admin/create_coy.php:189 admin/create_coy.php:220
+#: admin/db/maintenance_db.inc:250
msgid ""
" is not writable. Change its permissions so it is, then re-run the operation."
msgstr ""
-#: admin/create_coy.php:161 admin/create_coy.php:165
+#: admin/create_coy.php:165
msgid "New company has been created."
msgstr ""
-#: admin/create_coy.php:161 admin/create_coy.php:165
+#: admin/create_coy.php:165
msgid "Company has been updated."
msgstr ""
-#: admin/create_coy.php:178 admin/create_coy.php:182
+#: admin/create_coy.php:182
msgid ""
"Broken company subdirectories system. You have to remove this company "
"manually."
msgstr ""
-#: admin/create_coy.php:194 admin/create_coy.php:198
+#: admin/create_coy.php:198
msgid "Cannot rename subdirectory to temporary name."
msgstr ""
-#: admin/create_coy.php:200 admin/create_coy.php:204
+#: admin/create_coy.php:204
msgid "Cannot rename company subdirectory"
msgstr ""
-#: admin/create_coy.php:206 admin/create_coy.php:210
+#: admin/create_coy.php:210
msgid "Error removing Database: "
msgstr ""
-#: admin/create_coy.php:206 admin/create_coy.php:210
+#: admin/create_coy.php:210
msgid ", please remove it manually"
msgstr ""
-#: admin/create_coy.php:225 admin/create_coy.php:229
+#: admin/create_coy.php:229
msgid "Cannot remove temporary renamed company data directory "
msgstr ""
-#: admin/create_coy.php:228 admin/create_coy.php:232
+#: admin/create_coy.php:232
msgid "Selected company has been deleted"
msgstr ""
-#: admin/create_coy.php:242 admin/create_coy.php:246
+#: admin/create_coy.php:246
msgid "Are you sure you want to delete company no. "
msgstr ""
-#: admin/create_coy.php:249 admin/create_coy.php:253
+#: admin/create_coy.php:253
msgid "Database Host"
msgstr ""
-#: admin/create_coy.php:249 admin/create_coy.php:336 admin/create_coy.php:342
#: admin/create_coy.php:253 admin/create_coy.php:341 admin/create_coy.php:347
msgid "Database User"
msgstr ""
-#: admin/create_coy.php:250 admin/create_coy.php:338 admin/create_coy.php:343
-#: admin/create_coy.php:254 admin/create_coy.php:348
+#: admin/create_coy.php:254 admin/create_coy.php:343 admin/create_coy.php:348
msgid "Database Name"
msgstr ""
-#: admin/create_coy.php:250 admin/create_coy.php:339 admin/create_coy.php:344
-#: admin/create_coy.php:254 admin/create_coy.php:349
+#: admin/create_coy.php:254 admin/create_coy.php:344 admin/create_coy.php:349
msgid "Table Pref"
msgstr ""
-#: admin/create_coy.php:250 admin/create_coy.php:346 admin/inst_lang.php:36
-#: admin/inst_lang.php.orig:36 admin/print_profiles.php:162
-#: admin/create_coy.php:254 admin/create_coy.php:351
+#: admin/create_coy.php:254 admin/create_coy.php:351 admin/inst_lang.php:36
+#: admin/print_profiles.php:162
msgid "Default"
msgstr ""
-#: admin/create_coy.php:259 admin/fiscalyears.php:159 admin/inst_lang.php:85
-#: admin/inst_lang.php:97 admin/inst_lang.php.orig:85
-#: admin/inst_lang.php.orig:97 dimensions/inquiry/search_dimensions.php:107
-#: gl/manage/bank_accounts.php:125 gl/manage/bank_accounts.php.orig:125
-#: gl/manage/currencies.php:162 gl/manage/gl_account_classes.php:127
-#: gl/manage/gl_quick_entries.php:230 includes/system_tests.inc:38
-#: includes/system_tests.inc:113 includes/system_tests.inc:126
-#: includes/ui/sav.ui_lists.inc:1650 includes/ui/ui_lists.inc:1671
-#: purchasing/manage/suppliers.php:120 reporting/rep101.php:125
-#: reporting/rep102.php:111 reporting/rep102.php:113 reporting/rep104.php:105
-#: reporting/rep106.php:75 reporting/rep114.php:75 reporting/rep201.php:113
-#: reporting/rep202.php:115 reporting/rep202.php:117 reporting/rep203.php:86
-#: reporting/rep303.php:96 reporting/rep303.php:104 reporting/rep501.php:107
+#: admin/create_coy.php:263 admin/fiscalyears.php:159 admin/inst_lang.php:85
+#: admin/inst_lang.php:97 dimensions/inquiry/search_dimensions.php:107
+#: gl/manage/bank_accounts.php:125 gl/manage/currencies.php:162
+#: gl/manage/gl_account_classes.php:127 gl/manage/gl_quick_entries.php:230
+#: includes/system_tests.inc:38 includes/system_tests.inc:113
+#: includes/system_tests.inc:126 includes/ui/ui_lists.inc:1676
+#: purchasing/manage/suppliers.php:120 reporting/rep101.php:113
+#: 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/rep202.php:117 reporting/rep202.php:119 reporting/rep203.php:88
+#: reporting/rep303.php:108 reporting/rep303.php:116 reporting/rep501.php:111
#: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95
#: sales/manage/sales_types.php:119 taxes/item_tax_types.php:133
-#: taxes/tax_groups.php:137 admin/create_coy.php:263
+#: taxes/tax_groups.php:137
msgid "Yes"
msgstr ""
-#: admin/create_coy.php:288 admin/create_coy.php:292
+#: admin/create_coy.php:292
msgid "The marked company is the current company which cannot be deleted."
msgstr ""
-#: admin/create_coy.php:335 admin/create_coy.php:341 admin/printers.php:84
-#: admin/create_coy.php:340 admin/create_coy.php:346
+#: admin/create_coy.php:293
+msgid ""
+"If no Admin Password is entered, the new Admin Password will be "
+"'<b>password</b>' by default "
+msgstr ""
+
+#: admin/create_coy.php:340 admin/create_coy.php:346 admin/printers.php:84
msgid "Host"
msgstr ""
-#: admin/create_coy.php:337 admin/create_coy.php:342
+#: admin/create_coy.php:342
msgid "Database Password"
msgstr ""
-#: admin/create_coy.php:339 admin/inst_chart.php:68 admin/inst_chart.php:70
-#: admin/inst_lang.php:87 admin/inst_lang.php:90 admin/inst_lang.php.orig:87
-#: admin/inst_lang.php.orig:90 admin/inst_module.php:127
+#: admin/create_coy.php:344 admin/inst_chart.php:68 admin/inst_chart.php:70
+#: admin/inst_lang.php:87 admin/inst_lang.php:90 admin/inst_module.php:126
#: admin/inst_theme.php:91 admin/inst_theme.php:93 admin/inst_upgrade.php:149
-#: gl/manage/gl_account_types.php:190 includes/ui/allocation_cart.inc:286
-#: admin/create_coy.php:344
+#: gl/manage/gl_account_types.php:190 includes/ui/allocation_cart.inc:314
+#: includes/ui/mk.allocation_cart.inc:314
msgid "None"
msgstr ""
-#: admin/create_coy.php:350 admin/create_coy.php:355
+#: admin/create_coy.php:355
msgid "Database Script"
msgstr ""
-#: admin/create_coy.php:351 admin/create_coy.php:356
+#: admin/create_coy.php:356
msgid "New script Admin Password"
msgstr ""
-#: admin/create_coy.php:355 gl/gl_budget.php:136 admin/create_coy.php:360
+#: admin/create_coy.php:360 gl/gl_budget.php:136
msgid "Save"
msgstr ""
-#: admin/create_coy.php:377 admin/create_coy.php:382
+#: admin/create_coy.php:382
msgid "Create a new company"
msgstr ""
msgid "New contact category has been added"
msgstr ""
-#: admin/crm_categories.php:62
+#: admin/crm_categories.php:71
msgid "Cannot delete this category because there are contacts related to it."
msgstr ""
-#: admin/crm_categories.php:68
+#: admin/crm_categories.php:77
msgid "Category has been deleted"
msgstr ""
-#: admin/crm_categories.php:88
-msgid "Type id"
+#: admin/crm_categories.php:97
+msgid "Category Type"
msgstr ""
-#: admin/crm_categories.php:88
-msgid "Action id"
+#: admin/crm_categories.php:97
+msgid "Category Subtype"
msgstr ""
-#: admin/crm_categories.php:88 sales/manage/customer_branches.php:293
+#: admin/crm_categories.php:97 sales/manage/customer_branches.php:293
msgid "Short Name"
msgstr ""
-#: admin/crm_categories.php:135 admin/crm_categories.php:139
+#: admin/crm_categories.php:144 admin/crm_categories.php:148
msgid "Contact Category Type:"
msgstr ""
-#: admin/crm_categories.php:136 admin/crm_categories.php:140
+#: admin/crm_categories.php:145 admin/crm_categories.php:149
msgid "Contact Category Subtype:"
msgstr ""
-#: admin/crm_categories.php:143
+#: admin/crm_categories.php:152
msgid "Category Short Name:"
msgstr ""
-#: admin/crm_categories.php:144
+#: admin/crm_categories.php:153
msgid "Category Description:"
msgstr ""
msgid "Query size must be integer and greater than zero."
msgstr ""
-#: admin/display_prefs.php:59
+#: admin/display_prefs.php:60
msgid ""
"Display settings have been updated. Keep in mind that changed settings are "
"restored on every login in demo mode."
msgstr ""
-#: admin/display_prefs.php:61
+#: admin/display_prefs.php:62
msgid "Display settings have been updated."
msgstr ""
-#: admin/display_prefs.php:70
+#: admin/display_prefs.php:71
msgid "Decimal Places"
msgstr ""
-#: admin/display_prefs.php:72
+#: admin/display_prefs.php:73
msgid "Prices/Amounts:"
msgstr ""
-#: admin/display_prefs.php:73
+#: admin/display_prefs.php:74
msgid "Quantities:"
msgstr ""
-#: admin/display_prefs.php:74
+#: admin/display_prefs.php:75
msgid "Exchange Rates:"
msgstr ""
-#: admin/display_prefs.php:75
+#: admin/display_prefs.php:76
msgid "Percentages:"
msgstr ""
-#: admin/display_prefs.php:77
+#: admin/display_prefs.php:78
msgid "Dateformat and Separators"
msgstr ""
-#: admin/display_prefs.php:79
+#: admin/display_prefs.php:80
msgid "Dateformat:"
msgstr ""
-#: admin/display_prefs.php:81
+#: admin/display_prefs.php:82
msgid "Date Separator:"
msgstr ""
-#: admin/display_prefs.php:86
+#: admin/display_prefs.php:87
msgid "Thousand Separator:"
msgstr ""
-#: admin/display_prefs.php:91
+#: admin/display_prefs.php:92
msgid "Decimal Separator:"
msgstr ""
-#: admin/display_prefs.php:98 admin/inst_lang.php:35
-#: admin/inst_lang.php.orig:35
+#: admin/display_prefs.php:99 admin/inst_lang.php:35
msgid "Language"
msgstr ""
-#: admin/display_prefs.php:100 admin/users.php:206
+#: admin/display_prefs.php:101 admin/users.php:206
msgid "Language:"
msgstr ""
-#: admin/display_prefs.php:103 applications/setup.php:42
-#: applications/setup.php.orig:42 includes/sysnames.inc:94
+#: admin/display_prefs.php:104 applications/setup.php:42
+#: includes/sysnames.inc:94
msgid "Miscellaneous"
msgstr ""
-#: admin/display_prefs.php:105
+#: admin/display_prefs.php:106
msgid "Show hints for new users:"
msgstr ""
-#: admin/display_prefs.php:107
+#: admin/display_prefs.php:108
msgid "Show GL Information:"
msgstr ""
-#: admin/display_prefs.php:109
+#: admin/display_prefs.php:110
msgid "Show Item Codes:"
msgstr ""
-#: admin/display_prefs.php:116
+#: admin/display_prefs.php:117
msgid "Page Size:"
msgstr ""
-#: admin/display_prefs.php:118
+#: admin/display_prefs.php:119
msgid "Start-up Tab"
msgstr ""
-#: admin/display_prefs.php:126 admin/users.php:210
+#: admin/display_prefs.php:127 admin/users.php:210
msgid "Printing profile"
msgstr ""
-#: admin/display_prefs.php:127 admin/users.php:211
+#: admin/display_prefs.php:128 admin/users.php:211
msgid "Browser printing support"
msgstr ""
-#: admin/display_prefs.php:129
+#: admin/display_prefs.php:130
msgid "Use popup window to display reports:"
msgstr ""
-#: admin/display_prefs.php:130 admin/users.php:214
+#: admin/display_prefs.php:131 admin/users.php:214
msgid "Set this option to on if your browser directly supports pdf files"
msgstr ""
-#: admin/display_prefs.php:132
+#: admin/display_prefs.php:133
msgid "Use icons instead of text links:"
msgstr ""
-#: admin/display_prefs.php:133
+#: admin/display_prefs.php:134
msgid "Set this option to on for using icons instead of text links"
msgstr ""
-#: admin/display_prefs.php:135
+#: admin/display_prefs.php:136
msgid "Query page size:"
msgstr ""
-#: admin/display_prefs.php:137
+#: admin/display_prefs.php:138
msgid "Remember last document date:"
msgstr ""
-#: admin/display_prefs.php:138
+#: admin/display_prefs.php:139
msgid ""
"If set document date is remembered on subsequent documents, otherwise "
"default is current date"
msgstr ""
#: admin/fiscalyears.php:102
-msgid "Cannot delete this fiscal year because thera are fiscal years before."
+msgid "Cannot delete this fiscal year because there are fiscal years before."
msgstr ""
#: admin/fiscalyears.php:107
msgstr ""
#: admin/fiscalyears.php:138 dimensions/inquiry/search_dimensions.php:133
-#: dimensions/inquiry/search_dimensions.php:139
-#: includes/ui/sav.ui_lists.inc:659 includes/ui/ui_lists.inc:676
-#: manufacturing/search_work_orders.php:108 reporting/rep501.php:85
-#: reporting/rep710.php:109 reporting/includes/excel_report.inc:234
+#: dimensions/inquiry/search_dimensions.php:139 includes/ui/ui_lists.inc:676
+#: manufacturing/search_work_orders.php:108 reporting/rep501.php:87
+#: reporting/rep710.php:113 reporting/includes/excel_report.inc:234
#: reporting/includes/pdf_report.inc:266
msgid "Closed"
msgstr ""
msgid "Before GRN Clearing Account can be changed all GRNs have to be invoiced"
msgstr ""
-#: admin/gl_setup.php:75
+#: admin/gl_setup.php:59 admin/db/fiscalyears_db.inc:141
+msgid ""
+"The Retained Earnings Account should be a Balance Account or the Profit and "
+"Loss Year Account should be an Expense Account (preferred the last one in "
+"the Expense Class)"
+msgstr ""
+
+#: admin/gl_setup.php:80
msgid "The general GL setup has been updated."
msgstr ""
-#: admin/gl_setup.php:132
+#: admin/gl_setup.php:137
msgid "General GL"
msgstr ""
-#: admin/gl_setup.php:134
+#: admin/gl_setup.php:139
msgid "Past Due Days Interval:"
msgstr ""
-#: admin/gl_setup.php:134 admin/gl_setup.php:169 admin/gl_setup.php:177
-#: admin/gl_setup.php:214 admin/payment_terms.php:140
+#: admin/gl_setup.php:139 admin/gl_setup.php:174 admin/gl_setup.php:182
+#: admin/gl_setup.php:219 admin/payment_terms.php:140
msgid "days"
msgstr ""
-#: admin/gl_setup.php:136
+#: admin/gl_setup.php:141
msgid "Retained Earnings:"
msgstr ""
-#: admin/gl_setup.php:138
+#: admin/gl_setup.php:143
msgid "Profit/Loss Year:"
msgstr ""
-#: admin/gl_setup.php:140
+#: admin/gl_setup.php:145
msgid "Exchange Variances Account:"
msgstr ""
-#: admin/gl_setup.php:142
+#: admin/gl_setup.php:147
msgid "Bank Charges Account:"
msgstr ""
-#: admin/gl_setup.php:146
+#: admin/gl_setup.php:151
msgid "Customers and Sales"
msgstr ""
-#: admin/gl_setup.php:148
+#: admin/gl_setup.php:153
msgid "Default Credit Limit:"
msgstr ""
-#: admin/gl_setup.php:150
+#: admin/gl_setup.php:155
msgid "Accumulate batch shipping:"
msgstr ""
-#: admin/gl_setup.php:152
+#: admin/gl_setup.php:157
msgid "Legal Text on Invoice:"
msgstr ""
-#: admin/gl_setup.php:154
+#: admin/gl_setup.php:159
msgid "Shipping Charged Account:"
msgstr ""
-#: admin/gl_setup.php:158
+#: admin/gl_setup.php:163
msgid "Customers and Sales Defaults"
msgstr ""
-#: admin/gl_setup.php:160
+#: admin/gl_setup.php:165
msgid "Receivable Account:"
msgstr ""
-#: admin/gl_setup.php:162 admin/gl_setup.php:200
+#: admin/gl_setup.php:167 admin/gl_setup.php:205
#: inventory/manage/item_categories.php:192 inventory/manage/items.php:354
#: sales/manage/customer_branches.php:250
msgid "Sales Account:"
msgstr ""
-#: admin/gl_setup.php:165 sales/manage/customer_branches.php:251
+#: admin/gl_setup.php:170 sales/manage/customer_branches.php:251
msgid "Sales Discount Account:"
msgstr ""
-#: admin/gl_setup.php:167 sales/manage/customer_branches.php:253
+#: admin/gl_setup.php:172 sales/manage/customer_branches.php:253
msgid "Prompt Payment Discount Account:"
msgstr ""
-#: admin/gl_setup.php:169
+#: admin/gl_setup.php:174
msgid "Delivery Required By:"
msgstr ""
-#: admin/gl_setup.php:175
+#: admin/gl_setup.php:180
msgid "Dimension Defaults"
msgstr ""
-#: admin/gl_setup.php:177
+#: admin/gl_setup.php:182
msgid "Dimension Required By After:"
msgstr ""
-#: admin/gl_setup.php:180
+#: admin/gl_setup.php:185
msgid "Suppliers and Purchasing"
msgstr ""
-#: admin/gl_setup.php:182
+#: admin/gl_setup.php:187
msgid "Delivery Over-Receive Allowance:"
msgstr ""
-#: admin/gl_setup.php:184
+#: admin/gl_setup.php:189
msgid "Invoice Over-Charge Allowance:"
msgstr ""
-#: admin/gl_setup.php:186
+#: admin/gl_setup.php:191
msgid "Suppliers and Purchasing Defaults"
msgstr ""
-#: admin/gl_setup.php:188
+#: admin/gl_setup.php:193
msgid "Payable Account:"
msgstr ""
-#: admin/gl_setup.php:190 purchasing/manage/suppliers.php:126
+#: admin/gl_setup.php:195 purchasing/manage/suppliers.php:126
msgid "Purchase Discount Account:"
msgstr ""
-#: admin/gl_setup.php:192
+#: admin/gl_setup.php:197
msgid "GRN Clearing Account:"
msgstr ""
-#: admin/gl_setup.php:192
+#: admin/gl_setup.php:197
msgid "No postings on GRN"
msgstr ""
-#: admin/gl_setup.php:194 reporting/reports_main.php:175
+#: admin/gl_setup.php:199 reporting/reports_main.php:206
msgid "Inventory"
msgstr ""
-#: admin/gl_setup.php:196
+#: admin/gl_setup.php:201
msgid "Allow Negative Inventory:"
msgstr ""
-#: admin/gl_setup.php:197
+#: admin/gl_setup.php:202
msgid "Warning: This may cause a delay in GL postings"
msgstr ""
-#: admin/gl_setup.php:199
+#: admin/gl_setup.php:204
msgid "Items Defaults"
msgstr ""
-#: admin/gl_setup.php:202 inventory/manage/item_categories.php:202
+#: admin/gl_setup.php:207 inventory/manage/item_categories.php:202
#: inventory/manage/items.php:358
msgid "Inventory Account:"
msgstr ""
-#: admin/gl_setup.php:204 inventory/manage/item_categories.php:196
+#: admin/gl_setup.php:209 inventory/manage/item_categories.php:196
#: inventory/manage/item_categories.php:204 inventory/manage/items.php:359
#: inventory/manage/items.php:364
msgid "C.O.G.S. Account:"
msgstr ""
-#: admin/gl_setup.php:206 inventory/manage/item_categories.php:205
+#: admin/gl_setup.php:211 inventory/manage/item_categories.php:205
#: inventory/manage/items.php:360
msgid "Inventory Adjustments Account:"
msgstr ""
-#: admin/gl_setup.php:208 inventory/manage/item_categories.php:209
+#: admin/gl_setup.php:213 inventory/manage/item_categories.php:209
#: inventory/manage/items.php:371
msgid "Item Assembly Costs Account:"
msgstr ""
-#: admin/gl_setup.php:212
+#: admin/gl_setup.php:217
msgid "Manufacturing Defaults"
msgstr ""
-#: admin/gl_setup.php:214
+#: admin/gl_setup.php:219
msgid "Work Order Required By After:"
msgstr ""
msgid "Chart"
msgstr ""
-#: admin/inst_chart.php:50 admin/inst_lang.php:36 admin/inst_lang.php.orig:36
-#: admin/inst_module.php:105 admin/inst_theme.php:74
-#: admin/inst_upgrade.php:155
+#: admin/inst_chart.php:50 admin/inst_lang.php:36 admin/inst_module.php:105
+#: admin/inst_theme.php:74 admin/inst_upgrade.php:155
msgid "Installed"
msgstr ""
-#: admin/inst_chart.php:50 admin/inst_lang.php:36 admin/inst_lang.php.orig:36
-#: admin/inst_module.php:105 admin/inst_theme.php:74
-#: inventory/inquiry/stock_status.php:77 reporting/rep303.php:102
+#: admin/inst_chart.php:50 admin/inst_lang.php:36 admin/inst_module.php:105
+#: admin/inst_theme.php:74 inventory/inquiry/stock_status.php:77
+#: reporting/rep303.php:114
msgid "Available"
msgstr ""
-#: admin/inst_chart.php:50 admin/inst_lang.php:35 admin/inst_lang.php:218
-#: admin/inst_lang.php.orig:35 admin/inst_lang.php.orig:218
+#: admin/inst_chart.php:50 admin/inst_lang.php:35 admin/inst_lang.php:220
msgid "Encoding"
msgstr ""
#: admin/inst_chart.php:69 admin/inst_chart.php:71 admin/inst_lang.php:88
-#: admin/inst_lang.php.orig:88 admin/inst_module.php:128
-#: admin/inst_module.php:129 admin/inst_theme.php:92
+#: admin/inst_module.php:127 admin/inst_module.php:128 admin/inst_theme.php:92
msgid "Unknown"
msgstr ""
-#: admin/inst_chart.php:74 admin/inst_lang.php:103
-#: admin/inst_lang.php.orig:103 admin/inst_module.php:133
-#: admin/inst_module.php:138 admin/inst_theme.php:96
+#: admin/inst_chart.php:74 admin/inst_lang.php:103 admin/inst_module.php:132
+#: admin/inst_module.php:137 admin/inst_theme.php:96
#: admin/inst_upgrade.php:137
msgid "Install"
msgstr ""
-#: admin/inst_chart.php:75 admin/inst_module.php:139 admin/inst_theme.php:97
+#: admin/inst_chart.php:75 admin/inst_module.php:138 admin/inst_theme.php:97
msgid "Upload and install latest extension package"
msgstr ""
-#: admin/inst_chart.php:82 admin/inst_module.php:146 admin/inst_theme.php:104
+#: admin/inst_chart.php:82 admin/inst_module.php:145 admin/inst_theme.php:104
#, php-format
msgid ""
"You are about to remove package \\'%s\\'.\n"
"Do you want to continue ?"
msgstr ""
-#: admin/inst_lang.php:23 admin/inst_lang.php.orig:23
+#: admin/inst_lang.php:23
msgid "Install/Update Languages"
msgstr ""
-#: admin/inst_lang.php:35 admin/inst_lang.php.orig:35 admin/printers.php:84
+#: admin/inst_lang.php:35 admin/printers.php:84
#: admin/shipping_companies.php:91 dimensions/dimension_entry.php:271
#: dimensions/inquiry/search_dimensions.php:129
-#: dimensions/view/view_dimension.php:54
+#: dimensions/view/view_dimension.php:55
#: inventory/manage/item_categories.php:98
#: manufacturing/manage/work_centres.php:101
-#: purchasing/includes/ui/invoice_ui.inc:245
-#: purchasing/includes/ui/invoice_ui.inc:247
-#: purchasing/includes/ui/invoice_ui.inc:249 reporting/rep501.php:85
-#: reporting/rep709.php:109 reporting/rep709.php:110
+#: purchasing/includes/ui/invoice_ui.inc:258
+#: purchasing/includes/ui/invoice_ui.inc:260
+#: purchasing/includes/ui/invoice_ui.inc:262 reporting/rep501.php:87
+#: reporting/rep709.php:111 reporting/rep709.php:112
#: sales/manage/customer_branches.php:294 sales/manage/sales_people.php:99
#: taxes/item_tax_types.php:117
msgid "Name"
msgstr ""
-#: admin/inst_lang.php:35 admin/inst_lang.php:220 admin/inst_lang.php.orig:35
-#: admin/inst_lang.php.orig:220
+#: admin/inst_lang.php:35 admin/inst_lang.php:222
msgid "Right To Left"
msgstr ""
-#: admin/inst_lang.php:47 admin/inst_lang.php.orig:47
+#: admin/inst_lang.php:47
msgid "Supported"
msgstr ""
-#: admin/inst_lang.php:49 admin/inst_lang.php.orig:49
+#: admin/inst_lang.php:49
msgid "Display also languages not supported by server locales"
msgstr ""
-#: admin/inst_lang.php:100 admin/inst_lang.php.orig:100
+#: admin/inst_lang.php:100
msgid "Edit non standard language configuration"
msgstr ""
-#: admin/inst_lang.php:104 admin/inst_lang.php.orig:104
+#: admin/inst_lang.php:104
msgid "Upload and install latest language package"
msgstr ""
-#: admin/inst_lang.php:111 admin/inst_lang.php.orig:111
+#: admin/inst_lang.php:111
#, php-format
msgid ""
"You are about to remove language \\'%s\\'.\n"
"Do you want to continue ?"
msgstr ""
-#: admin/inst_lang.php:118 admin/inst_lang.php.orig:118
+#: admin/inst_lang.php:118
msgid "The marked language is the current language which cannot be deleted."
msgstr ""
-#: admin/inst_lang.php:120 admin/inst_lang.php.orig:120
+#: admin/inst_lang.php:120
msgid "Update default"
msgstr ""
-#: admin/inst_lang.php:122 admin/inst_lang.php.orig:122
+#: admin/inst_lang.php:122
msgid "Add new language manually"
msgstr ""
-#: admin/inst_lang.php:135 admin/inst_lang.php.orig:135
+#: admin/inst_lang.php:135
msgid "Language name, code nor encoding cannot be empty"
msgstr ""
-#: admin/inst_lang.php:140 admin/inst_lang.php.orig:140
+#: admin/inst_lang.php:140
msgid ""
"Standard package for this language is already installed. If you want to "
"install this language manually, uninstall standard language package first."
msgstr ""
-#: admin/inst_lang.php:216 admin/inst_lang.php.orig:216
+#: admin/inst_lang.php:218
msgid "Language Code"
msgstr ""
-#: admin/inst_lang.php:217 admin/inst_lang.php.orig:217
+#: admin/inst_lang.php:219
msgid "Language Name"
msgstr ""
-#: admin/inst_lang.php:221 admin/inst_lang.php.orig:221
+#: admin/inst_lang.php:223
msgid "Default Language"
msgstr ""
-#: admin/inst_lang.php:223 admin/inst_lang.php:224
-#: admin/inst_lang.php.orig:223 admin/inst_lang.php.orig:224
+#: admin/inst_lang.php:225 admin/inst_lang.php:226
msgid "Language File"
msgstr ""
-#: admin/inst_lang.php:227 admin/inst_lang.php.orig:227
+#: admin/inst_lang.php:229
msgid "Select your language files from your local harddisk."
msgstr ""
msgid "Selected extension has been successfully deleted"
msgstr ""
-#: admin/inst_module.php:104 admin/inst_module.php:169
+#: admin/inst_module.php:104 admin/inst_module.php:168
msgid "Extension"
msgstr ""
-#: admin/inst_module.php:104 admin/inst_module.php:169
+#: admin/inst_module.php:104 admin/inst_module.php:168
msgid "Modules provided"
msgstr ""
-#: admin/inst_module.php:104 admin/inst_module.php:169
+#: admin/inst_module.php:104 admin/inst_module.php:168
msgid "Options provided"
msgstr ""
-#: admin/inst_module.php:133
+#: admin/inst_module.php:132
msgid "Install third-party extension."
msgstr ""
-#: admin/inst_module.php:169 includes/ui/sav.ui_lists.inc:659
-#: includes/ui/sav.ui_lists.inc:2131 includes/ui/ui_lists.inc:676
-#: includes/ui/ui_lists.inc:2152 reporting/includes/excel_report.inc:232
+#: admin/inst_module.php:168 includes/ui/ui_lists.inc:676
+#: includes/ui/ui_lists.inc:2156 reporting/includes/excel_report.inc:232
#: reporting/includes/pdf_report.inc:264
msgid "Active"
msgstr ""
-#: admin/inst_module.php:232
+#: admin/inst_module.php:231
msgid "Status change for some extensions failed."
msgstr ""
-#: admin/inst_module.php:235
+#: admin/inst_module.php:234
msgid "Current active extensions set has been saved."
msgstr ""
-#: admin/inst_module.php:257
+#: admin/inst_module.php:256
msgid "Extensions:"
msgstr ""
#: admin/payment_terms.php:127 dimensions/dimension_entry.php:275
#: dimensions/inquiry/search_dimensions.php:75
#: dimensions/inquiry/search_dimensions.php:130
-#: dimensions/view/view_dimension.php:54 gl/bank_account_reconcile.php:233
+#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:233
#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126
#: gl/inquiry/journal_inquiry.php:129 gl/inquiry/tax_inquiry.php:82
-#: gl/manage/bank_accounts.php:106 gl/manage/bank_accounts.php.orig:106
-#: gl/manage/gl_quick_entries.php:186 gl/view/accrual_trans.php:52
-#: gl/includes/ui/gl_bank_ui.inc:92 gl/includes/ui/gl_bank_ui.inc.orig:80
-#: includes/ui/ui_view.inc:488 inventory/inquiry/stock_movements.php:81
+#: gl/manage/bank_accounts.php:106 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:547 inventory/inquiry/stock_movements.php:82
#: inventory/manage/item_categories.php:98
#: manufacturing/search_work_orders.php:161
#: manufacturing/includes/manufacturing_ui.inc:236
#: manufacturing/includes/manufacturing_ui.inc:280
#: manufacturing/includes/manufacturing_ui.inc:331
#: purchasing/inquiry/supplier_allocation_inquiry.php:126
-#: purchasing/inquiry/supplier_inquiry.php:168
-#: purchasing/inquiry/supplier_inquiry.php.orig:162 reporting/rep102.php:132
-#: reporting/rep202.php:137 reporting/rep501.php:85 reporting/rep601.php:76
-#: reporting/rep702.php:58 reporting/rep704.php:79 reporting/rep704.php:82
-#: reporting/rep704.php:85 reporting/rep709.php:105 reporting/rep710.php:76
-#: reporting/rep710.php:84 reporting/reports_main.php:252
-#: reporting/reports_main.php:399 reporting/includes/doctext.inc:140
+#: purchasing/inquiry/supplier_inquiry.php:168 reporting/rep102.php:134
+#: reporting/rep202.php:139 reporting/rep501.php:87 reporting/rep601.php:79
+#: reporting/rep702.php:60 reporting/rep704.php:83 reporting/rep704.php:86
+#: reporting/rep704.php:89 reporting/rep709.php:107 reporting/rep710.php:78
+#: reporting/rep710.php:86 reporting/reports_main.php:327
+#: reporting/reports_main.php:491 reporting/includes/doctext.inc:140
#: reporting/includes/doctext.inc:181 reporting/includes/doctext.inc:200
#: sales/inquiry/customer_allocation_inquiry.php:144
-#: sales/inquiry/customer_inquiry.php:224
-#: sales/inquiry/customer_inquiry.php.orig:224
+#: sales/inquiry/customer_inquiry.php:217
msgid "Type"
msgstr ""
msgid "Role:"
msgstr ""
-#: admin/security_roles.php:180 gl/manage/gl_accounts.php:198
-#: gl/manage/gl_accounts.php.orig:198 inventory/manage/items.php:433
-#: purchasing/manage/suppliers.php:289 sales/manage/customers.php:324
-#: sales/manage/customers.php.orig:321 sales/manage/customers.php:326
-#: gl/manage/gl_accounts.php:199
+#: admin/security_roles.php:180 gl/manage/gl_accounts.php:199
+#: inventory/manage/items.php:433 purchasing/manage/suppliers.php:289
+#: sales/manage/customers.php:329
msgid "Show inactive:"
msgstr ""
msgstr ""
#: admin/security_roles.php:249 admin/void_transaction.php:229
-#: gl/manage/gl_quick_entries.php:61 gl/includes/ui/gl_bank_ui.inc:277
-#: gl/includes/ui/gl_bank_ui.inc.orig:259 gl/includes/ui/gl_journal_ui.inc:223
-#: includes/ui/radio.ui_input.inc:209 includes/ui/simple_crud_class.inc:58
-#: includes/ui/simple_crud_class.inc:231 includes/ui/ui_controls.inc:587
-#: includes/ui/ui_input.inc:209 inventory/includes/item_adjustments_ui.inc:159
+#: gl/manage/gl_quick_entries.php:61 gl/includes/ui/gl_bank_ui.inc:279
+#: gl/includes/ui/gl_journal_ui.inc:223 includes/ui/simple_crud_class.inc:58
+#: includes/ui/simple_crud_class.inc:231 includes/ui/ui_controls.inc:589
+#: includes/ui/ui_input.inc:210 inventory/includes/item_adjustments_ui.inc:159
#: inventory/includes/stock_transfers_ui.inc:139
#: inventory/manage/items.php:416
#: manufacturing/includes/work_order_issue_ui.inc:133
-#: purchasing/includes/ui/po_ui.inc:444
+#: purchasing/includes/ui/po_ui.inc:441
#: sales/includes/ui/sales_credit_ui.inc:295
-#: sales/includes/ui/sales_order_ui.inc:557
-#: sales/includes/ui/sales_order_ui.inc:561 includes/ui/ui_input.inc:210
+#: sales/includes/ui/sales_order_ui.inc:562
msgid "Cancel"
msgstr ""
msgid "Cancel Edition"
msgstr ""
-#: admin/shipping_companies.php:15 sales/customer_credit_invoice.php:256
-#: sales/customer_delivery.php:368 sales/customer_invoice.php:420
+#: admin/shipping_companies.php:15 sales/customer_credit_invoice.php:254
+#: sales/customer_delivery.php:368 sales/customer_invoice.php:431
#: sales/view/view_credit.php:74 sales/view/view_dispatch.php:92
-#: sales/view/view_invoice.php:91 sales/customer_credit_invoice.php:254
-#: sales/customer_invoice.php:422
+#: sales/view/view_invoice.php:91
msgid "Shipping Company"
msgstr ""
msgstr ""
#: admin/shipping_companies.php:134 gl/manage/gl_account_types.php:188
-#: gl/includes/ui/gl_bank_ui.inc:56 gl/includes/ui/gl_bank_ui.inc.orig:55
-#: inventory/manage/items.php:299 manufacturing/manage/work_centres.php:137
+#: gl/includes/ui/gl_bank_ui.inc:57 inventory/manage/items.php:299
+#: manufacturing/manage/work_centres.php:137
msgid "Name:"
msgstr ""
#: admin/shipping_companies.php:140 includes/ui/contacts_view.inc:103
#: inventory/manage/locations.php:205 purchasing/manage/suppliers.php:130
-#: sales/manage/customer_branches.php:261 sales/manage/customers.php:253
-#: sales/manage/customers.php.orig:250
+#: sales/manage/customer_branches.php:261 sales/manage/customers.php:256
msgid "Secondary Phone Number:"
msgstr ""
msgid "Unspecified tag type"
msgstr ""
-#: admin/tags.php:40 reporting/reports_main.php:273
-#: reporting/reports_main.php:281 reporting/reports_main.php:292
-#: reporting/reports_main.php:320 reporting/reports_main.php:327
-#: reporting/reports_main.php:337 reporting/reports_main.php:362
-#: reporting/reports_main.php:368 reporting/reports_main.php:377
+#: admin/tags.php:40 reporting/reports_main.php:350
+#: reporting/reports_main.php:359 reporting/reports_main.php:371
+#: reporting/reports_main.php:402 reporting/reports_main.php:410
+#: reporting/reports_main.php:421 reporting/reports_main.php:449
+#: reporting/reports_main.php:456 reporting/reports_main.php:466
msgid "Account Tags"
msgstr ""
msgstr ""
#: admin/users.php:114 includes/ui/contacts_view.inc:41
-#: inventory/manage/locations.php:146 reporting/rep106.php:86
+#: inventory/manage/locations.php:146 reporting/rep106.php:88
#: reporting/includes/header2.inc:98 sales/manage/sales_people.php:99
msgid "Phone"
msgstr ""
#: admin/view_print_transaction.php:43 admin/view_print_transaction.php:45
#: admin/view_print_transaction.php:129 includes/ui/ui_controls.inc:188
#: purchasing/inquiry/po_search_completed.php:113
-#: purchasing/inquiry/po_search.php:93 sales/inquiry/customer_inquiry.php:209
-#: sales/inquiry/customer_inquiry.php.orig:209
+#: purchasing/inquiry/po_search.php:93 sales/inquiry/customer_inquiry.php:202
#: sales/inquiry/sales_deliveries_view.php:160
#: sales/inquiry/sales_orders_view.php:119
-#: sales/inquiry/sales_orders_view.php.orig:117
msgid "Print"
msgstr ""
#: admin/view_print_transaction.php:83 admin/void_transaction.php:170
#: dimensions/inquiry/search_dimensions.php:88
#: gl/inquiry/journal_inquiry.php:53 manufacturing/search_work_orders.php:78
-#: purchasing/includes/ui/invoice_ui.inc:453
+#: purchasing/includes/ui/invoice_ui.inc:466
#: purchasing/inquiry/po_search_completed.php:77
#: purchasing/inquiry/po_search.php:76
#: purchasing/inquiry/supplier_allocation_inquiry.php:57
#: purchasing/inquiry/supplier_inquiry.php:58
-#: purchasing/inquiry/supplier_inquiry.php.orig:54
#: sales/inquiry/customer_allocation_inquiry.php:51
#: sales/inquiry/customer_inquiry.php:58
-#: sales/inquiry/customer_inquiry.php.orig:58
#: sales/inquiry/sales_deliveries_view.php:116
#: sales/inquiry/sales_orders_view.php:247
-#: sales/inquiry/sales_orders_view.php.orig:245
msgid "Search"
msgstr ""
#: admin/view_print_transaction.php:127 admin/void_transaction.php:182
#: dimensions/inquiry/search_dimensions.php:128
-#: dimensions/view/view_dimension.php:54 gl/bank_account_reconcile.php:235
+#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:235
#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/journal_inquiry.php:131
-#: gl/view/bank_transfer_view.php:86 gl/view/gl_deposit_view.php:75
-#: gl/view/gl_payment_view.php:73 gl/view/gl_trans_view.php:35
-#: includes/ui/contacts_view.inc:41 inventory/inquiry/stock_movements.php:81
+#: gl/view/bank_transfer_view.php:86 gl/view/gl_deposit_view.php:80
+#: gl/view/gl_payment_view.php:78 gl/view/gl_trans_view.php:35
+#: includes/ui/contacts_view.inc:41 inventory/inquiry/stock_movements.php:82
#: inventory/view/view_adjustment.php:44 inventory/view/view_transfer.php:44
#: manufacturing/search_work_orders.php:160
#: manufacturing/view/wo_issue_view.php:43
#: manufacturing/includes/manufacturing_ui.inc:276
#: manufacturing/includes/manufacturing_ui.inc:280
#: manufacturing/includes/manufacturing_ui.inc:331
-#: purchasing/includes/ui/grn_ui.inc:36 purchasing/includes/ui/grn_ui.inc:53
-#: purchasing/includes/ui/po_ui.inc:314 purchasing/view/view_po.php:115
+#: purchasing/includes/ui/grn_ui.inc:32 purchasing/includes/ui/grn_ui.inc:64
+#: purchasing/includes/ui/po_ui.inc:311 purchasing/view/view_po.php:115
#: purchasing/view/view_supp_credit.php:43
#: purchasing/view/view_supp_invoice.php:46
#: purchasing/view/view_supp_payment.php:73
#: purchasing/inquiry/po_search.php:131
#: purchasing/inquiry/supplier_allocation_inquiry.php:128
#: purchasing/inquiry/supplier_inquiry.php:170
-#: purchasing/inquiry/supplier_inquiry.php.orig:164
#: purchasing/allocations/supplier_allocation_main.php:96
-#: reporting/rep501.php:85 reporting/rep601.php:76 reporting/rep702.php:51
-#: reporting/includes/doctext.inc:199 sales/customer_credit_invoice.php:247
-#: sales/customer_credit_invoice.php:249 sales/customer_delivery.php:348
-#: sales/customer_delivery.php:350 sales/customer_invoice.php:392
-#: sales/customer_invoice.php:394
+#: reporting/rep501.php:87 reporting/rep601.php:79 reporting/rep702.php:53
+#: reporting/includes/doctext.inc:199 sales/customer_credit_invoice.php:245
+#: sales/customer_credit_invoice.php:247 sales/customer_delivery.php:348
+#: sales/customer_delivery.php:350 sales/customer_invoice.php:403
+#: sales/customer_invoice.php:405
#: sales/allocations/customer_allocation_main.php:95
#: sales/view/view_dispatch.php:85 sales/view/view_invoice.php:84
-#: sales/view/view_receipt.php:50 sales/view/view_sales_order.php:81
+#: sales/view/view_receipt.php:39 sales/view/view_sales_order.php:81
#: sales/inquiry/customer_allocation_inquiry.php:146
-#: sales/inquiry/customer_inquiry.php:227
-#: sales/inquiry/customer_inquiry.php.orig:227
+#: sales/inquiry/customer_inquiry.php:220
#: sales/inquiry/sales_deliveries_view.php:184
#: sales/includes/ui/sales_credit_ui.inc:85
#: sales/includes/ui/sales_credit_ui.inc:87
-#: sales/includes/ui/sales_order_ui.inc:373
-#: sales/customer_credit_invoice.php:245 sales/customer_invoice.php:396
-#: sales/includes/ui/sales_order_ui.inc:377
+#: sales/includes/ui/sales_order_ui.inc:378
msgid "Reference"
msgstr ""
#: admin/view_print_transaction.php:128 admin/void_transaction.php:183
#: dimensions/inquiry/search_dimensions.php:131
-#: dimensions/view/view_dimension.php:54 gl/accruals.php:90
+#: dimensions/view/view_dimension.php:55 gl/accruals.php:90
#: gl/accruals.php:195 gl/bank_account_reconcile.php:236
#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126
#: gl/inquiry/journal_inquiry.php:128 gl/view/accrual_trans.php:52
#: gl/view/bank_transfer_view.php:83 gl/view/gl_deposit_view.php:68
#: gl/view/gl_payment_view.php:66 gl/view/gl_trans_view.php:36
-#: includes/ui/allocation_cart.inc:263 includes/ui/ui_view.inc:488
-#: inventory/inquiry/stock_movements.php:81
+#: includes/ui/allocation_cart.inc:288 includes/ui/mk.allocation_cart.inc:288
+#: includes/ui/ui_view.inc:547 inventory/inquiry/stock_movements.php:84
#: inventory/view/view_adjustment.php:45 inventory/view/view_transfer.php:47
#: manufacturing/search_work_orders.php:166
#: manufacturing/work_order_entry.php:419
#: manufacturing/includes/manufacturing_ui.inc:277
#: manufacturing/includes/manufacturing_ui.inc:281
#: manufacturing/includes/manufacturing_ui.inc:332
-#: purchasing/includes/ui/invoice_ui.inc:103
-#: purchasing/includes/ui/po_ui.inc:328 purchasing/view/view_po.php:140
+#: purchasing/includes/ui/invoice_ui.inc:116
+#: purchasing/includes/ui/po_ui.inc:325 purchasing/view/view_po.php:140
#: purchasing/inquiry/supplier_allocation_inquiry.php:131
#: purchasing/inquiry/supplier_inquiry.php:173
-#: purchasing/inquiry/supplier_inquiry.php.orig:167
#: purchasing/allocations/supplier_allocation_main.php:97
-#: reporting/rep101.php:130 reporting/rep201.php:118 reporting/rep501.php:85
-#: reporting/rep601.php:76 reporting/rep704.php:79 reporting/rep704.php:82
-#: reporting/rep704.php:85 reporting/rep709.php:109 reporting/rep710.php:75
-#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
-#: reporting/includes/doctext.inc:224 reporting/includes/header2.inc:135
-#: sales/customer_delivery.php:378 sales/customer_invoice.php:430
+#: reporting/rep101.php:118 reporting/rep201.php:110 reporting/rep306.php:141
+#: reporting/rep501.php:87 reporting/rep601.php:79 reporting/rep704.php:83
+#: reporting/rep704.php:86 reporting/rep704.php:89 reporting/rep709.php:111
+#: reporting/rep710.php:77 reporting/includes/doctext.inc:145
+#: reporting/includes/doctext.inc:186 reporting/includes/doctext.inc:224
+#: reporting/includes/header2.inc:135 sales/customer_delivery.php:378
+#: sales/customer_invoice.php:441
#: sales/allocations/customer_allocation_main.php:96
#: sales/view/view_credit.php:69 sales/view/view_sales_order.php:96
#: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
#: sales/inquiry/customer_allocation_inquiry.php:148
-#: sales/inquiry/customer_inquiry.php:228
-#: sales/inquiry/customer_inquiry.php.orig:228 sales/customer_invoice.php:432
+#: sales/inquiry/customer_inquiry.php:221
msgid "Date"
msgstr ""
msgstr ""
#: admin/void_transaction.php:126 admin/void_transaction.php:185
-#: includes/ui/radio.ui_input.inc:136 includes/ui/radio.ui_input.inc:280
-#: includes/ui/sav.ui_lists.inc:20 includes/ui/ui_input.inc:136
-#: includes/ui/ui_input.inc:280 includes/ui/ui_lists.inc:20
#: includes/ui/ui_input.inc:137 includes/ui/ui_input.inc:281
+#: includes/ui/ui_lists.inc:20
msgid "Select"
msgstr ""
msgstr ""
#: admin/void_transaction.php:208 dimensions/dimension_entry.php:283
-#: gl/bank_transfer.php:93 gl/inquiry/journal_inquiry.php:56
-#: gl/manage/revaluate_currencies.php:106 includes/ui/ui_view.inc:308
+#: gl/bank_transfer.php:98 gl/inquiry/journal_inquiry.php:56
+#: gl/manage/revaluate_currencies.php:106 includes/ui/ui_view.inc:344
#: manufacturing/work_order_add_finished.php:210
#: manufacturing/work_order_entry.php:451
-#: manufacturing/work_order_release.php:100
-#: purchasing/includes/ui/invoice_ui.inc:161 purchasing/po_entry_items.php:518
-#: purchasing/supplier_payment.php:313 sales/customer_payments.php:411
-#: gl/bank_transfer.php:98 purchasing/po_entry_items.php:522
-#: purchasing/supplier_payment.php:316 sales/customer_payments.php:414
-#: sales/customer_payments.php.orig:413
+#: manufacturing/work_order_release.php:103
+#: purchasing/includes/ui/invoice_ui.inc:174 purchasing/po_entry_items.php:529
+#: purchasing/supplier_payment.php:325 sales/customer_payments.php:399
msgid "Memo:"
msgstr ""
"undone."
msgstr ""
-#: admin/void_transaction.php:228 includes/ui/ui_controls.inc:586
+#: admin/void_transaction.php:228 includes/ui/ui_controls.inc:588
msgid "Proceed"
msgstr ""
msgid "The selected transaction was closed for edition and cannot be voided."
msgstr ""
-#: admin/void_transaction.php:248 gl/accruals.php:32 gl/bank_transfer.php:110
+#: admin/void_transaction.php:248 gl/accruals.php:32 gl/bank_transfer.php:115
#: gl/gl_journal.php:156 gl/manage/exchange_rates.php:33
#: gl/manage/revaluate_currencies.php:53
#: manufacturing/work_order_add_finished.php:98
#: manufacturing/work_order_costs.php:83 purchasing/po_receive_items.php:174
-#: purchasing/supplier_payment.php:179 sales/customer_credit_invoice.php:91
-#: sales/sales_order_entry.php:340 sales/manage/recurrent_invoices.php:41
+#: purchasing/supplier_payment.php:185 sales/customer_credit_invoice.php:91
+#: sales/sales_order_entry.php:353 sales/manage/recurrent_invoices.php:41
#: sales/manage/recurrent_invoices.php:46
-#: sales/manage/recurrent_invoices.php:51 gl/bank_transfer.php:115
-#: purchasing/supplier_payment.php:174 sales/sales_order_entry.php:349
-#: sales/sales_order_entry.php.orig:348
+#: sales/manage/recurrent_invoices.php:51
msgid "The entered date is invalid."
msgstr ""
-#: admin/void_transaction.php:254 gl/accruals.php:38 gl/bank_transfer.php:116
-#: gl/gl_bank.php:267 gl/gl_journal.php:162
-#: gl/manage/revaluate_currencies.php:59 inventory/adjustments.php:116
-#: inventory/transfers.php:111 manufacturing/work_order_add_finished.php:104
+#: admin/void_transaction.php:254 gl/accruals.php:38 gl/bank_transfer.php:121
+#: gl/gl_bank.php:266 gl/gl_journal.php:162
+#: gl/manage/revaluate_currencies.php:59 inventory/adjustments.php:114
+#: inventory/transfers.php:109 manufacturing/work_order_add_finished.php:104
#: manufacturing/work_order_costs.php:89
#: manufacturing/work_order_entry.php:160
-#: manufacturing/work_order_issue.php:85 purchasing/supplier_credit.php:176
-#: purchasing/supplier_invoice.php:174 purchasing/supplier_payment.php:185
-#: sales/create_recurrent_invoices.php:108 sales/credit_note_entry.php:161
-#: sales/customer_credit_invoice.php:95 sales/customer_payments.php:145
-#: sales/create_recurrent_invoices.php:119 sales/credit_note_entry.php:157
-#: gl/bank_transfer.php:121 purchasing/supplier_payment.php:180
-#: sales/customer_payments.php.orig:145
+#: manufacturing/work_order_issue.php:83 purchasing/supplier_credit.php:176
+#: purchasing/supplier_invoice.php:185 sales/create_recurrent_invoices.php:121
+#: sales/credit_note_entry.php:157 sales/customer_credit_invoice.php:95
+#: sales/customer_payments.php:156
msgid "The entered date is not in fiscal year."
msgstr ""
msgid "Selected transaction has been voided."
msgstr ""
-#: admin/db/current_user.inc:96 includes/current_user.inc:87
-#: includes/ldap.current_user.inc:96 includes/current_user.inc:89
-msgid ""
-"Before software upgrade you have to include old $security_groups and "
-"$security_headings arrays from old config.php file to the new one."
-msgstr ""
-
-#: admin/db/current_user.inc:97 includes/current_user.inc:88
-#: includes/ldap.current_user.inc:97 includes/ui/ui_controls.inc:190
-#: includes/ui/ui_view.inc:843 includes/ui/ui_view.inc:844
-#: includes/current_user.inc:90
-msgid "Back"
-msgstr ""
-
-#: admin/db/current_user.inc:107 includes/current_user.inc:98
-#: includes/ldap.current_user.inc:107 includes/current_user.inc:100
-msgid "System is available for site admin only until full database upgrade"
-msgstr ""
-
-#: admin/db/current_user.inc:445 includes/current_user.inc:450
-#: includes/ldap.current_user.inc:544 includes/current_user.inc:452
-msgid "Requesting data..."
+#: admin/db/attachments_db.inc:67
+msgid "Attached File:"
msgstr ""
#: admin/db/fiscalyears_db.inc:136
"been set in System and General GL Setup"
msgstr ""
-#: admin/db/fiscalyears_db.inc:141
-msgid ""
-"The Retained Earnings Account should be a Balance Account or the Profit and "
-"Loss Year Account should be an Expense Account (preferred the last one in "
-"the Expense Class)"
-msgstr ""
-
#: admin/db/fiscalyears_db.inc:166 admin/db/fiscalyears_db.inc:168
msgid "Closing Year"
msgstr ""
-#: admin/db/fiscalyears_db.inc:214 reporting/rep101.php:175
-#: reporting/rep201.php:167 reporting/rep706.php:181
+#: admin/db/fiscalyears_db.inc:219 reporting/rep101.php:175
+#: reporting/rep201.php:170 reporting/rep706.php:185
msgid "Open Balance"
msgstr ""
-#: admin/db/maintenance_db.inc:152 admin/db/maintenance_db.inc.orig:150
+#: admin/db/maintenance_db.inc:152
#, php-format
msgid "Cannot open the extension setup file '%s' for writing."
msgstr ""
-#: admin/db/maintenance_db.inc:160 admin/db/maintenance_db.inc.orig:158
+#: admin/db/maintenance_db.inc:160
#, php-format
msgid "Cannot write to the extensions setup file '%s'."
msgstr ""
-#: admin/db/maintenance_db.inc:178 admin/db/maintenance_db.inc.orig:176
+#: admin/db/maintenance_db.inc:178
msgid "Cannot update system extensions list."
msgstr ""
-#: admin/db/maintenance_db.inc:196 admin/db/maintenance_db.inc.orig:194
+#: admin/db/maintenance_db.inc:196
#, php-format
msgid "Cannot update extensions list for company '%s'."
msgstr ""
-#: admin/db/maintenance_db.inc:233 admin/db/maintenance_db.inc.orig:231
+#: admin/db/maintenance_db.inc:233
msgid "Cannot open the languages file - "
msgstr ""
-#: admin/db/maintenance_db.inc:240 admin/db/maintenance_db.inc.orig:238
+#: admin/db/maintenance_db.inc:240
msgid "Cannot write to the language file - "
msgstr ""
-#: admin/db/maintenance_db.inc:250 admin/db/maintenance_db.inc.orig:248
+#: admin/db/maintenance_db.inc:250
msgid "The language files folder "
msgstr ""
-#: admin/db/maintenance_db.inc:389 admin/db/maintenance_db.inc.orig:387
-#: admin/db/connect_db2.inc:156
+#: admin/db/maintenance_db.inc:389
#, php-format
msgid "SQL script execution failed in line %d: %s"
msgstr ""
-#: admin/db/session.inc:133 includes/session.inc:133
-#: includes/session.inc.ldap.inc:39
-msgid "Incorrect Password"
-msgstr ""
-
-#: admin/db/session.inc:134 includes/session.inc:134
-#: includes/session.inc.ldap.inc:40
-msgid "The user and password combination is not valid for the system."
-msgstr ""
-
-#: admin/db/session.inc:136 includes/session.inc:136
-#: includes/session.inc.ldap.inc:42
-msgid ""
-"If you are not an authorized user, please contact your system administrator "
-"to obtain an account to enable you to use the system."
-msgstr ""
-
-#: admin/db/session.inc:137 includes/session.inc:137
-#: includes/session.inc.ldap.inc:43
-msgid "Try again"
-msgstr ""
-
-#: admin/db/session.inc:156 includes/session.inc:156
-#: includes/session.inc.ldap.inc:62 includes/session.inc:216
-msgid "Security settings have not been defined for your user account."
-msgstr ""
-
-#: admin/db/session.inc:157 includes/session.inc:157
-#: includes/session.inc.ldap.inc:63 includes/session.inc:217
-msgid "Please contact your system administrator."
-msgstr ""
-
-#: admin/db/session.inc:158 includes/session.inc:158
-#: includes/session.inc.ldap.inc:64 includes/session.inc:218
-msgid ""
-"Please remove $security_groups and $security_headings arrays from config.php "
-"file!"
-msgstr ""
-
-#: admin/db/session.inc:160 includes/session.inc:160
-#: includes/session.inc.ldap.inc:66 includes/session.inc:220
-msgid ""
-"Access to application has been blocked until database upgrade is completed "
-"by system administrator."
-msgstr ""
-
-#: admin/db/session.inc:174 includes/session.inc:174
-#: includes/session.inc.ldap.inc:80 includes/session.inc:234
-msgid ""
-"The security settings on your account do not permit you to access this "
-"function"
-msgstr ""
-
-#: admin/db/session.inc:183 includes/session.inc:183
-#: includes/session.inc.ldap.inc:89 includes/session.inc:243
-msgid ""
-"System is blocked after source upgrade until database is updated on System/"
-"Software Upgrade page"
-msgstr ""
-
-#: admin/db/users_db.inc:210 admin/db/users_db.inc.orig:210
+#: admin/db/users_db.inc:210
msgid "user online"
msgstr ""
-#: admin/db/users_db.inc:210 admin/db/users_db.inc.orig:210
+#: admin/db/users_db.inc:210
msgid "users online"
msgstr ""
#: admin/db/voiding_db.inc:114
#: manufacturing/includes/db/work_orders_db.inc:446
#: manufacturing/includes/db/work_orders_db.inc:462
-#: sales/includes/db/sales_invoice_db.inc:205
-#: sales/includes/db/sales_invoice_db.inc.orig:208
-#: sales/includes/db/sales_invoice_db.inc:206
+#: sales/includes/db/sales_invoice_db.inc:208
msgid "Voided."
msgstr ""
#: applications/customers.php:61 applications/dimensions.php:34
#: applications/generalledger.php:55 applications/inventory.php:32
#: applications/manufacturing.php:34 applications/setup.php:54
-#: applications/setup.php.orig:54 applications/suppliers.php:50
+#: applications/suppliers.php:50
msgid "Maintenance"
msgstr ""
msgid "Ta&x Inquiry"
msgstr ""
-#: applications/generalledger.php:44 reporting/reports_main.php:297
-#: reporting/reports_main.php:342 reporting/reports_main.php:382
+#: applications/generalledger.php:44 reporting/reports_main.php:377
+#: reporting/reports_main.php:427 reporting/reports_main.php:472
msgid "Trial &Balance"
msgstr ""
msgid "&Units of Measure"
msgstr ""
-#: applications/inventory.php:47
+#: applications/inventory.php:47 inventory/manage/items.php:458
msgid "&Reorder Levels"
msgstr ""
msgid "Purchasing &Pricing"
msgstr ""
-#: applications/inventory.php:55
+#: applications/inventory.php:55 inventory/manage/items.php:457
msgid "Standard &Costs"
msgstr ""
msgid "&Manufacturing"
msgstr ""
-#: applications/manufacturing.php:19 sales/sales_order_entry.php:112
-#: sales/sales_order_entry.php:120 sales/sales_order_entry.php.orig:120
+#: applications/manufacturing.php:19 sales/sales_order_entry.php:120
msgid "Work &Order Entry"
msgstr ""
msgid "&Work Centres"
msgstr ""
-#: applications/setup.php:16 applications/setup.php.orig:16
+#: applications/setup.php:16
msgid "S&etup"
msgstr ""
-#: applications/setup.php:19 applications/setup.php.orig:19
+#: applications/setup.php:19
msgid "&Company Setup"
msgstr ""
-#: applications/setup.php:21 applications/setup.php.orig:21
+#: applications/setup.php:21
msgid "&User Accounts Setup"
msgstr ""
-#: applications/setup.php:23 applications/setup.php.orig:23
+#: applications/setup.php:23
msgid "&Access Setup"
msgstr ""
-#: applications/setup.php:25 applications/setup.php.orig:25
+#: applications/setup.php:25
msgid "&Display Setup"
msgstr ""
-#: applications/setup.php:27 applications/setup.php.orig:27
+#: applications/setup.php:27
msgid "&Forms Setup"
msgstr ""
-#: applications/setup.php:29 applications/setup.php.orig:29
+#: applications/setup.php:29
msgid "&Taxes"
msgstr ""
-#: applications/setup.php:31 applications/setup.php.orig:31
+#: applications/setup.php:31
msgid "Tax &Groups"
msgstr ""
-#: applications/setup.php:33 applications/setup.php.orig:33
+#: applications/setup.php:33
msgid "Item Ta&x Types"
msgstr ""
-#: applications/setup.php:35 applications/setup.php.orig:35
+#: applications/setup.php:35
msgid "System and &General GL Setup"
msgstr ""
-#: applications/setup.php:37 applications/setup.php.orig:37
+#: applications/setup.php:37
msgid "&Fiscal Years"
msgstr ""
-#: applications/setup.php:39 applications/setup.php.orig:39
+#: applications/setup.php:39
msgid "&Print Profiles"
msgstr ""
-#: applications/setup.php:43 applications/setup.php.orig:43
+#: applications/setup.php:43
msgid "Pa&yment Terms"
msgstr ""
-#: applications/setup.php:45 applications/setup.php.orig:45
+#: applications/setup.php:45
msgid "Shi&pping Company"
msgstr ""
-#: applications/setup.php:47 applications/setup.php.orig:47
+#: applications/setup.php:47
msgid "&Points of Sale"
msgstr ""
-#: applications/setup.php:49 applications/setup.php.orig:49
+#: applications/setup.php:49
msgid "&Printers"
msgstr ""
-#: applications/setup.php:51 applications/setup.php.orig:51
+#: applications/setup.php:51
msgid "Contact &Categories"
msgstr ""
-#: applications/setup.php:55 applications/setup.php.orig:55
+#: applications/setup.php:55
msgid "&Void a Transaction"
msgstr ""
-#: applications/setup.php:57 applications/setup.php.orig:57
+#: applications/setup.php:57
msgid "View or &Print Transactions"
msgstr ""
-#: applications/setup.php:59 applications/setup.php.orig:59
+#: applications/setup.php:59
msgid "&Attach Documents"
msgstr ""
-#: applications/setup.php:61 applications/setup.php.orig:61
+#: applications/setup.php:61
msgid "System &Diagnostics"
msgstr ""
-#: applications/setup.php:64 applications/setup.php.orig:64
+#: applications/setup.php:64
msgid "&Backup and Restore"
msgstr ""
-#: applications/setup.php:66 applications/setup.php.orig:66
+#: applications/setup.php:66
msgid "Create/Update &Companies"
msgstr ""
-#: applications/setup.php:68 applications/setup.php.orig:68
+#: applications/setup.php:68
msgid "Install/Update &Languages"
msgstr ""
-#: applications/setup.php:70 applications/setup.php.orig:70
+#: applications/setup.php:70
msgid "Install/Activate &Extensions"
msgstr ""
-#: applications/setup.php:72 applications/setup.php.orig:72
+#: applications/setup.php:72
msgid "Install/Activate &Themes"
msgstr ""
-#: applications/setup.php:74 applications/setup.php.orig:74
+#: applications/setup.php:74
msgid "Install/Activate &Chart of Accounts"
msgstr ""
-#: applications/setup.php:76 applications/setup.php.orig:76
+#: applications/setup.php:76
msgid "Software &Upgrade"
msgstr ""
msgid "The dimension reference must be entered."
msgstr ""
-#: dimensions/dimension_entry.php:123 gl/bank_transfer.php:171
-#: gl/gl_bank.php:255 gl/gl_journal.php:176
-#: gl/manage/revaluate_currencies.php:72 inventory/adjustments.php:103
-#: inventory/transfers.php:99 manufacturing/work_order_add_finished.php:84
+#: dimensions/dimension_entry.php:123 gl/bank_transfer.php:176
+#: gl/gl_bank.php:254 gl/gl_journal.php:176
+#: gl/manage/revaluate_currencies.php:72 inventory/adjustments.php:101
+#: inventory/transfers.php:97 manufacturing/work_order_add_finished.php:84
#: manufacturing/work_order_entry.php:139
-#: manufacturing/work_order_issue.php:98 purchasing/po_entry_items.php:363
+#: manufacturing/work_order_issue.php:96 purchasing/po_entry_items.php:366
#: purchasing/po_receive_items.php:195 purchasing/supplier_credit.php:156
-#: purchasing/supplier_invoice.php:154 purchasing/supplier_payment.php:208
-#: sales/credit_note_entry.php:151 sales/customer_credit_invoice.php:108
-#: sales/customer_delivery.php:172 sales/customer_invoice.php:286
-#: sales/customer_payments.php:158 sales/customer_payments.php:165
-#: sales/customer_payments.php:246 sales/sales_order_entry.php:409
-#: sales/create_recurrent_invoices.php:55 sales/credit_note_entry.php:181
+#: purchasing/supplier_invoice.php:165 purchasing/supplier_payment.php:214
+#: sales/create_recurrent_invoices.php:57 sales/credit_note_entry.php:181
#: sales/customer_credit_invoice.php:205 sales/customer_delivery.php:312
-#: sales/customer_invoice.php:319 sales/sales_order_entry.php:430
-#: gl/bank_transfer.php:176 purchasing/po_entry_items.php:366
-#: purchasing/supplier_payment.php:203 sales/customer_payments.php:248
-#: sales/customer_payments.php.orig:158 sales/customer_payments.php.orig:165
-#: sales/customer_payments.php.orig:248 sales/sales_order_entry.php:441
-#: sales/sales_order_entry.php.orig:440
+#: sales/customer_invoice.php:328 sales/customer_payments.php:169
+#: sales/customer_payments.php:176 sales/sales_order_entry.php:445
msgid "The entered reference is already in use."
msgstr ""
msgstr ""
#: dimensions/dimension_entry.php:138 manufacturing/work_order_entry.php:154
-#: manufacturing/work_order_entry.php:234 purchasing/po_entry_items.php:235
-#: purchasing/po_entry_items.php:238
+#: manufacturing/work_order_entry.php:234 purchasing/po_entry_items.php:238
msgid "The date entered is in an invalid format."
msgstr ""
msgstr ""
#: dimensions/dimension_entry.php:277 reporting/reports_main.php:34
-#: reporting/reports_main.php:60 reporting/reports_main.php:74
-#: reporting/reports_main.php:82 reporting/reports_main.php:134
-#: reporting/reports_main.php:199 reporting/reports_main.php:207
-#: reporting/reports_main.php:239 reporting/reports_main.php:250
-#: reporting/reports_main.php:261 reporting/reports_main.php:277
-#: reporting/reports_main.php:287 reporting/reports_main.php:298
-#: reporting/reports_main.php:310 reporting/reports_main.php:324
-#: reporting/reports_main.php:333 reporting/reports_main.php:343
-#: reporting/reports_main.php:354 reporting/reports_main.php:366
-#: reporting/reports_main.php:374 reporting/reports_main.php:383
-#: reporting/reports_main.php:391 reporting/reports_main.php:397
+#: reporting/reports_main.php:64 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 reporting/reports_main.php:325
+#: reporting/reports_main.php:337 reporting/reports_main.php:355
+#: reporting/reports_main.php:366 reporting/reports_main.php:378
+#: reporting/reports_main.php:391 reporting/reports_main.php:407
+#: reporting/reports_main.php:417 reporting/reports_main.php:428
+#: reporting/reports_main.php:440 reporting/reports_main.php:454
+#: reporting/reports_main.php:463 reporting/reports_main.php:473
+#: reporting/reports_main.php:482 reporting/reports_main.php:489
msgid "Start Date"
msgstr ""
msgstr ""
#: dimensions/dimension_entry.php:302 includes/ui/simple_crud_class.inc:225
-#: purchasing/includes/ui/invoice_ui.inc:186
-#: purchasing/includes/ui/invoice_ui.inc:392
-#: purchasing/includes/ui/invoice_ui.inc:394
+#: purchasing/includes/ui/invoice_ui.inc:199
+#: purchasing/includes/ui/invoice_ui.inc:405
+#: purchasing/includes/ui/invoice_ui.inc:407
msgid "Add"
msgstr ""
msgstr ""
#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:90
-#: gl/inquiry/gl_account_inquiry.php:129 gl/inquiry/gl_trial_balance.php:171
+#: gl/inquiry/gl_account_inquiry.php:129 gl/inquiry/gl_trial_balance.php:185
#: gl/manage/gl_quick_entries.php:241 gl/manage/gl_quick_entries.php:333
-#: includes/sysnames.inc:164 purchasing/includes/ui/invoice_ui.inc:245
-#: purchasing/includes/ui/invoice_ui.inc:247
-#: purchasing/includes/ui/invoice_ui.inc:249 reporting/rep701.php:109
-#: reporting/rep705.php:234 reporting/rep706.php:181 reporting/rep707.php:206
-#: reporting/rep708.php:179
+#: includes/sysnames.inc:164 purchasing/includes/ui/invoice_ui.inc:258
+#: purchasing/includes/ui/invoice_ui.inc:260
+#: purchasing/includes/ui/invoice_ui.inc:262 reporting/rep701.php:111
+#: reporting/rep705.php:238 reporting/rep706.php:185 reporting/rep707.php:210
+#: reporting/rep708.php:192
msgid "Account"
msgstr ""
#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:98
#: gl/bank_account_reconcile.php:237 gl/inquiry/bank_inquiry.php:71
#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
-#: gl/inquiry/gl_trial_balance.php:177 gl/inquiry/gl_trial_balance.php:179
-#: gl/inquiry/gl_trial_balance.php:181 gl/view/accrual_trans.php:60
+#: gl/inquiry/gl_trial_balance.php:191 gl/inquiry/gl_trial_balance.php:193
+#: gl/inquiry/gl_trial_balance.php:195 gl/view/accrual_trans.php:60
#: gl/view/gl_trans_view.php:64 gl/view/gl_trans_view.php:67
#: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_journal_ui.inc:84
#: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
#: purchasing/inquiry/supplier_allocation_inquiry.php:134
-#: purchasing/inquiry/supplier_inquiry.php:176
-#: purchasing/inquiry/supplier_inquiry.php.orig:170 reporting/rep601.php:77
-#: reporting/rep702.php:52 reporting/rep704.php:80 reporting/rep704.php:83
-#: reporting/rep704.php:86 reporting/rep708.php:179 reporting/rep708.php:180
+#: purchasing/inquiry/supplier_inquiry.php:176 reporting/rep601.php:80
+#: reporting/rep702.php:54 reporting/rep704.php:84 reporting/rep704.php:87
+#: reporting/rep704.php:90 reporting/rep708.php:192 reporting/rep708.php:193
#: sales/inquiry/customer_allocation_inquiry.php:152
-#: sales/inquiry/customer_inquiry.php:233
-#: sales/inquiry/customer_inquiry.php.orig:233
+#: sales/inquiry/customer_inquiry.php:226
msgid "Debit"
msgstr ""
#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:98
#: gl/bank_account_reconcile.php:238 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:178 gl/inquiry/gl_trial_balance.php:180
-#: gl/inquiry/gl_trial_balance.php:182 gl/view/accrual_trans.php:60
+#: gl/inquiry/gl_trial_balance.php:192 gl/inquiry/gl_trial_balance.php:194
+#: gl/inquiry/gl_trial_balance.php:196 gl/view/accrual_trans.php:60
#: gl/view/gl_trans_view.php:64 gl/view/gl_trans_view.php:67
#: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_journal_ui.inc:84
#: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
#: includes/sysnames.inc:85
#: purchasing/inquiry/supplier_allocation_inquiry.php:135
-#: purchasing/inquiry/supplier_inquiry.php:177
-#: purchasing/inquiry/supplier_inquiry.php.orig:171 reporting/rep601.php:77
-#: reporting/rep702.php:52 reporting/rep704.php:80 reporting/rep704.php:83
-#: reporting/rep704.php:86 reporting/rep708.php:179 reporting/rep708.php:180
+#: purchasing/inquiry/supplier_inquiry.php:177 reporting/rep601.php:80
+#: reporting/rep702.php:54 reporting/rep704.php:84 reporting/rep704.php:87
+#: reporting/rep704.php:90 reporting/rep708.php:192 reporting/rep708.php:193
#: sales/inquiry/customer_allocation_inquiry.php:153
-#: sales/inquiry/customer_inquiry.php:234
-#: sales/inquiry/customer_inquiry.php.orig:234
+#: sales/inquiry/customer_inquiry.php:227
msgid "Credit"
msgstr ""
#: dimensions/includes/dimensions_ui.inc:45
#: dimensions/inquiry/search_dimensions.php:134 gl/inquiry/bank_inquiry.php:71
-#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_trial_balance.php:175
+#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_trial_balance.php:189
#: purchasing/inquiry/supplier_allocation_inquiry.php:137
-#: reporting/rep203.php:92 reporting/rep204.php:82 reporting/rep601.php:77
-#: reporting/rep701.php:109 reporting/rep704.php:80 reporting/rep704.php:83
-#: reporting/rep704.php:86 reporting/rep708.php:172
+#: reporting/rep101.php:122 reporting/rep201.php:114 reporting/rep203.php:94
+#: reporting/rep204.php:84 reporting/rep307.php:117 reporting/rep601.php:80
+#: reporting/rep701.php:111 reporting/rep704.php:84 reporting/rep704.php:87
+#: reporting/rep704.php:90 reporting/rep708.php:185
#: sales/inquiry/customer_allocation_inquiry.php:155
msgid "Balance"
msgstr ""
msgid "Search Dimensions"
msgstr ""
-#: dimensions/inquiry/search_dimensions.php:73 gl/bank_transfer.php:91
+#: dimensions/inquiry/search_dimensions.php:73 gl/bank_transfer.php:79
#: gl/inquiry/journal_inquiry.php:45 gl/manage/revaluate_currencies.php:105
-#: gl/includes/ui/gl_bank_ui.inc:26 gl/includes/ui/gl_bank_ui.inc.orig:25
-#: gl/includes/ui/gl_journal_ui.inc:30 includes/ui/contacts_view.inc:94
+#: gl/includes/ui/gl_bank_ui.inc:26 gl/includes/ui/gl_journal_ui.inc:30
+#: includes/ui/contacts_view.inc:94
#: inventory/includes/item_adjustments_ui.inc:35
#: inventory/includes/stock_transfers_ui.inc:40
#: manufacturing/search_work_orders.php:67
#: manufacturing/work_order_entry.php:378
#: manufacturing/work_order_entry.php:385
#: manufacturing/includes/work_order_issue_ui.inc:156
-#: purchasing/includes/ui/invoice_ui.inc:92
-#: purchasing/includes/ui/po_ui.inc:159 purchasing/includes/ui/po_ui.inc:164
-#: purchasing/supplier_payment.php:286 sales/customer_payments.php:380
-#: gl/bank_transfer.php:74 gl/bank_transfer.php:79
-#: purchasing/supplier_payment.php:289 sales/customer_payments.php:383
-#: sales/customer_payments.php.orig:382
+#: purchasing/includes/ui/invoice_ui.inc:105
+#: purchasing/includes/ui/po_ui.inc:176 purchasing/includes/ui/po_ui.inc:181
+#: purchasing/supplier_payment.php:298 sales/customer_payments.php:368
msgid "Reference:"
msgstr ""
#: dimensions/inquiry/search_dimensions.php:75
-#: includes/ui/allocation_cart.inc:284 includes/ui/sav.ui_lists.inc:1898
-#: includes/ui/ui_lists.inc:1919 reporting/rep101.php:112
-#: reporting/rep102.php:94 reporting/rep104.php:95 reporting/rep104.php:99
-#: reporting/rep105.php:93 reporting/rep105.php:97 reporting/rep201.php:100
-#: reporting/rep202.php:98 reporting/rep203.php:72 reporting/rep204.php:75
-#: reporting/rep301.php:90 reporting/rep301.php:97 reporting/rep302.php:103
-#: reporting/rep302.php:110 reporting/rep303.php:84 reporting/rep303.php:91
-#: reporting/rep304.php:96 reporting/rep304.php:101 reporting/rep304.php:106
-#: reporting/rep702.php:59 reporting/rep710.php:84 reporting/rep710.php:85
+#: includes/ui/allocation_cart.inc:312 includes/ui/mk.allocation_cart.inc:312
+#: includes/ui/ui_lists.inc:1923 reporting/rep101.php:100
+#: 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/rep202.php:100 reporting/rep203.php:74 reporting/rep204.php:77
+#: reporting/rep301.php:92 reporting/rep301.php:99 reporting/rep302.php:105
+#: reporting/rep302.php:112 reporting/rep303.php:96 reporting/rep303.php:103
+#: reporting/rep304.php:98 reporting/rep304.php:103 reporting/rep304.php:108
+#: reporting/rep306.php:120 reporting/rep306.php:125 reporting/rep306.php:130
+#: reporting/rep306.php:135 reporting/rep307.php:103 reporting/rep307.php:110
+#: reporting/rep308.php:138 reporting/rep308.php:143 reporting/rep309.php:92
+#: reporting/rep702.php:61 reporting/rep710.php:86 reporting/rep710.php:87
msgid "All"
msgstr ""
#: dimensions/inquiry/search_dimensions.php:76 gl/inquiry/bank_inquiry.php:49
-#: gl/inquiry/gl_trial_balance.php:49 gl/inquiry/journal_inquiry.php:48
-#: gl/inquiry/profit_loss.php:163 gl/includes/ui/gl_bank_ui.inc:51
-#: gl/includes/ui/gl_bank_ui.inc:117 gl/includes/ui/gl_bank_ui.inc.orig:50
-#: gl/includes/ui/gl_bank_ui.inc.orig:105
-#: inventory/inquiry/stock_movements.php:62
+#: gl/inquiry/gl_trial_balance.php:54 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:62
#: purchasing/inquiry/supplier_allocation_inquiry.php:50
#: purchasing/inquiry/supplier_inquiry.php:53
-#: purchasing/inquiry/supplier_inquiry.php.orig:49
#: sales/inquiry/customer_inquiry.php:50
-#: sales/inquiry/customer_inquiry.php.orig:50
msgid "From:"
msgstr ""
#: dimensions/inquiry/search_dimensions.php:77 gl/inquiry/bank_inquiry.php:50
-#: gl/inquiry/gl_trial_balance.php:50 gl/inquiry/journal_inquiry.php:49
-#: gl/inquiry/profit_loss.php:164 gl/includes/ui/gl_bank_ui.inc:117
-#: gl/includes/ui/gl_bank_ui.inc.orig:105
-#: inventory/inquiry/stock_movements.php:63
+#: gl/inquiry/gl_trial_balance.php:55 gl/inquiry/journal_inquiry.php:49
+#: gl/inquiry/profit_loss.php:169 inventory/inquiry/stock_movements.php:63
#: purchasing/inquiry/supplier_allocation_inquiry.php:51
#: purchasing/inquiry/supplier_inquiry.php:54
-#: purchasing/inquiry/supplier_inquiry.php.orig:50
#: sales/inquiry/customer_inquiry.php:51
-#: sales/inquiry/customer_inquiry.php.orig:51
msgid "To:"
msgstr ""
msgstr ""
#: dimensions/inquiry/search_dimensions.php:132
-#: dimensions/view/view_dimension.php:54 includes/ui/allocation_cart.inc:263
-#: purchasing/includes/ui/invoice_ui.inc:112
+#: dimensions/view/view_dimension.php:55 includes/ui/allocation_cart.inc:288
+#: includes/ui/mk.allocation_cart.inc:288
+#: purchasing/includes/ui/invoice_ui.inc:125
#: purchasing/view/view_supp_credit.php:48
#: purchasing/view/view_supp_invoice.php:51
#: purchasing/inquiry/supplier_allocation_inquiry.php:132
-#: purchasing/inquiry/supplier_inquiry.php:174
-#: purchasing/inquiry/supplier_inquiry.php.orig:168 reporting/rep101.php:130
-#: reporting/rep201.php:118 reporting/rep203.php:91 reporting/rep501.php:85
+#: purchasing/inquiry/supplier_inquiry.php:174 reporting/rep101.php:118
+#: reporting/rep201.php:110 reporting/rep203.php:93 reporting/rep501.php:87
#: reporting/includes/doctext.inc:100 reporting/includes/doctext.inc:122
#: reporting/includes/doctext.inc:143 reporting/includes/doctext.inc:145
-#: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:184
-#: reporting/includes/doctext.inc:186 sales/customer_invoice.php:437
-#: sales/view/view_dispatch.php:97 sales/view/view_invoice.php:96
+#: reporting/includes/doctext.inc:184 reporting/includes/doctext.inc:186
+#: sales/customer_invoice.php:448 sales/view/view_dispatch.php:97
+#: sales/view/view_invoice.php:96
#: sales/inquiry/customer_allocation_inquiry.php:149
-#: sales/inquiry/customer_inquiry.php:229
-#: sales/inquiry/customer_inquiry.php.orig:229
-#: sales/includes/ui/sales_order_ui.inc:596 sales/customer_invoice.php:439
-#: sales/includes/ui/sales_order_ui.inc:600
+#: sales/inquiry/customer_inquiry.php:222
+#: sales/includes/ui/sales_order_ui.inc:601
msgid "Due Date"
msgstr ""
msgid "View Dimension"
msgstr ""
-#: dimensions/view/view_dimension.php:48
+#: dimensions/view/view_dimension.php:49
msgid "The dimension number sent is not valid."
msgstr ""
-#: dimensions/view/view_dimension.php:72
+#: dimensions/view/view_dimension.php:73
msgid "This dimension is closed."
msgstr ""
-#: dimensions/view/view_dimension.php:84 gl/inquiry/gl_account_inquiry.php:71
+#: dimensions/view/view_dimension.php:85 gl/inquiry/gl_account_inquiry.php:71
#: gl/inquiry/tax_inquiry.php:61 purchasing/inquiry/po_search_completed.php:65
#: purchasing/inquiry/po_search.php:64
#: sales/inquiry/customer_allocation_inquiry.php:44
#: sales/inquiry/sales_deliveries_view.php:104
#: sales/inquiry/sales_orders_view.php:229
-#: sales/inquiry/sales_orders_view.php.orig:227
msgid "from:"
msgstr ""
-#: dimensions/view/view_dimension.php:85 gl/inquiry/gl_account_inquiry.php:72
+#: dimensions/view/view_dimension.php:86 gl/inquiry/gl_account_inquiry.php:72
#: gl/inquiry/tax_inquiry.php:62 purchasing/inquiry/po_search_completed.php:66
#: purchasing/inquiry/po_search.php:65
#: sales/inquiry/customer_allocation_inquiry.php:45
#: sales/inquiry/sales_deliveries_view.php:105
#: sales/inquiry/sales_orders_view.php:230
-#: sales/inquiry/sales_orders_view.php.orig:228
msgid "to:"
msgstr ""
-#: dimensions/view/view_dimension.php:86 gl/inquiry/balance_sheet.php:131
+#: dimensions/view/view_dimension.php:87 gl/inquiry/balance_sheet.php:131
#: gl/inquiry/bank_inquiry.php:52 gl/inquiry/gl_account_inquiry.php:85
-#: gl/inquiry/gl_trial_balance.php:58 gl/inquiry/profit_loss.php:178
+#: gl/inquiry/gl_trial_balance.php:63 gl/inquiry/profit_loss.php:183
#: gl/inquiry/tax_inquiry.php:63
msgid "Show"
msgstr ""
#: gl/gl_budget.php:76 gl/inquiry/balance_sheet.php:128
#: gl/inquiry/balance_sheet.php:130 gl/inquiry/gl_account_inquiry.php:79
#: gl/inquiry/gl_account_inquiry.php:81 gl/inquiry/gl_account_inquiry.php:134
-#: gl/inquiry/gl_account_inquiry.php:136 gl/inquiry/gl_trial_balance.php:52
-#: gl/inquiry/gl_trial_balance.php:54 gl/inquiry/profit_loss.php:174
-#: gl/inquiry/profit_loss.php:176 gl/manage/gl_quick_entries.php:261
+#: gl/inquiry/gl_account_inquiry.php:136 gl/inquiry/gl_trial_balance.php:57
+#: gl/inquiry/gl_trial_balance.php:59 gl/inquiry/profit_loss.php:179
+#: gl/inquiry/profit_loss.php:181 gl/manage/gl_quick_entries.php:261
#: gl/manage/gl_quick_entries.php:263 gl/manage/gl_quick_entries.php:343
#: gl/manage/gl_quick_entries.php:345 gl/view/accrual_trans.php:54
-#: gl/view/accrual_trans.php:56 gl/view/gl_deposit_view.php:99
-#: gl/view/gl_deposit_view.php:102 gl/view/gl_payment_view.php:98
-#: gl/view/gl_payment_view.php:101 gl/view/gl_trans_view.php:63
-#: gl/view/gl_trans_view.php:66 gl/includes/ui/gl_bank_ui.inc:150
-#: gl/includes/ui/gl_bank_ui.inc:151 gl/includes/ui/gl_bank_ui.inc:153
-#: gl/includes/ui/gl_bank_ui.inc.orig:132
-#: gl/includes/ui/gl_bank_ui.inc.orig:133
-#: gl/includes/ui/gl_bank_ui.inc.orig:135 gl/includes/ui/gl_journal_ui.inc:83
-#: gl/includes/ui/gl_journal_ui.inc:84 gl/includes/ui/gl_journal_ui.inc:86
-#: includes/sysnames.inc:43 includes/sysnames.inc:165
-#: inventory/manage/item_categories.php:216
+#: gl/view/accrual_trans.php:56 gl/view/gl_deposit_view.php:104
+#: gl/view/gl_deposit_view.php:107 gl/view/gl_payment_view.php:103
+#: gl/view/gl_payment_view.php:106 gl/view/gl_trans_view.php:63
+#: gl/view/gl_trans_view.php:66 gl/includes/ui/gl_bank_ui.inc:152
+#: gl/includes/ui/gl_bank_ui.inc:153 gl/includes/ui/gl_bank_ui.inc:155
+#: gl/includes/ui/gl_journal_ui.inc:83 gl/includes/ui/gl_journal_ui.inc:84
+#: gl/includes/ui/gl_journal_ui.inc:86 includes/sysnames.inc:43
+#: includes/sysnames.inc:165 inventory/manage/item_categories.php:216
#: inventory/manage/item_categories.php:218 inventory/manage/items.php:343
-#: inventory/manage/items.php:345 purchasing/includes/ui/invoice_ui.inc:245
-#: purchasing/includes/ui/invoice_ui.inc:247
+#: inventory/manage/items.php:345 purchasing/includes/ui/invoice_ui.inc:258
+#: purchasing/includes/ui/invoice_ui.inc:260
#: purchasing/manage/suppliers.php:137 purchasing/manage/suppliers.php:138
-#: purchasing/manage/suppliers.php:140 reporting/rep501.php:90
-#: reporting/rep704.php:79 reporting/rep704.php:82 reporting/rep704.php:93
-#: reporting/rep704.php:95 reporting/rep704.php:103 reporting/rep705.php:245
-#: reporting/rep705.php:247 reporting/rep705.php:258 reporting/rep706.php:190
-#: reporting/rep706.php:192 reporting/rep706.php:200 reporting/rep707.php:214
-#: reporting/rep707.php:216 reporting/rep707.php:224 reporting/rep708.php:188
-#: reporting/rep708.php:190 reporting/rep708.php:197
-#: reporting/reports_main.php:265 reporting/reports_main.php:266
-#: reporting/reports_main.php:271 reporting/reports_main.php:272
-#: reporting/reports_main.php:279 reporting/reports_main.php:280
-#: reporting/reports_main.php:290 reporting/reports_main.php:291
-#: reporting/reports_main.php:302 reporting/reports_main.php:303
-#: reporting/reports_main.php:314 reporting/reports_main.php:319
-#: reporting/reports_main.php:326 reporting/reports_main.php:336
-#: reporting/reports_main.php:347 sales/customer_delivery.php:395
-#: sales/customer_delivery.php:403 sales/customer_invoice.php:407
-#: sales/customer_invoice.php:445 sales/manage/customers.php:269
-#: sales/manage/customers.php:271 sales/manage/customers.php.orig:266
-#: sales/manage/customers.php.orig:268
-#: sales/includes/ui/sales_credit_ui.inc:132
+#: purchasing/manage/suppliers.php:140 reporting/rep103.php:243
+#: reporting/rep103.php:255 reporting/rep205.php:161 reporting/rep205.php:173
+#: reporting/rep501.php:92 reporting/rep704.php:83 reporting/rep704.php:86
+#: reporting/rep704.php:97 reporting/rep704.php:99 reporting/rep704.php:107
+#: reporting/rep705.php:249 reporting/rep705.php:251 reporting/rep705.php:262
+#: reporting/rep706.php:194 reporting/rep706.php:196 reporting/rep706.php:204
+#: reporting/rep707.php:218 reporting/rep707.php:220 reporting/rep707.php:228
+#: reporting/rep708.php:201 reporting/rep708.php:203 reporting/rep708.php:210
+#: reporting/reports_main.php:341 reporting/reports_main.php:342
+#: reporting/reports_main.php:348 reporting/reports_main.php:349
+#: reporting/reports_main.php:357 reporting/reports_main.php:358
+#: reporting/reports_main.php:369 reporting/reports_main.php:370
+#: reporting/reports_main.php:382 reporting/reports_main.php:383
+#: reporting/reports_main.php:395 reporting/reports_main.php:401
+#: reporting/reports_main.php:409 reporting/reports_main.php:420
+#: reporting/reports_main.php:432 sales/customer_delivery.php:395
+#: sales/customer_delivery.php:403 sales/customer_invoice.php:418
+#: sales/customer_invoice.php:456 sales/manage/customers.php:273
+#: sales/manage/customers.php:275 sales/includes/ui/sales_credit_ui.inc:132
#: sales/includes/ui/sales_credit_ui.inc:137
-#: sales/includes/ui/sales_order_ui.inc:451
-#: sales/includes/ui/sales_order_ui.inc:456 sales/customer_invoice.php:409
-#: sales/customer_invoice.php:447 sales/manage/customers.php:270
-#: sales/manage/customers.php:272 sales/includes/ui/sales_order_ui.inc:455
-#: sales/includes/ui/sales_order_ui.inc:460
+#: sales/includes/ui/sales_order_ui.inc:456
+#: sales/includes/ui/sales_order_ui.inc:461
msgid "Dimension"
msgstr ""
-#: gl/accruals.php:98 gl/accruals.php:213
+#: gl/accruals.php:98 gl/accruals.php:213 gl/inquiry/bank_inquiry.php:71
#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
#: gl/inquiry/journal_inquiry.php:133 gl/view/accrual_trans.php:60
-#: gl/view/gl_deposit_view.php:100 gl/view/gl_deposit_view.php:103
-#: gl/view/gl_deposit_view.php:106 gl/view/gl_payment_view.php:99
-#: gl/view/gl_payment_view.php:102 gl/view/gl_payment_view.php:105
+#: gl/view/gl_deposit_view.php:105 gl/view/gl_deposit_view.php:108
+#: gl/view/gl_deposit_view.php:111 gl/view/gl_payment_view.php:104
+#: gl/view/gl_payment_view.php:107 gl/view/gl_payment_view.php:110
#: gl/view/gl_trans_view.php:64 gl/view/gl_trans_view.php:67
-#: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_bank_ui.inc:151
-#: gl/includes/ui/gl_bank_ui.inc:154 gl/includes/ui/gl_bank_ui.inc:157
-#: gl/includes/ui/gl_bank_ui.inc:297 gl/includes/ui/gl_bank_ui.inc.orig:133
-#: gl/includes/ui/gl_bank_ui.inc.orig:136
-#: gl/includes/ui/gl_bank_ui.inc.orig:139
-#: gl/includes/ui/gl_bank_ui.inc.orig:279 gl/includes/ui/gl_journal_ui.inc:84
+#: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_bank_ui.inc:153
+#: gl/includes/ui/gl_bank_ui.inc:156 gl/includes/ui/gl_bank_ui.inc:159
+#: gl/includes/ui/gl_bank_ui.inc:312 gl/includes/ui/gl_journal_ui.inc:84
#: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
#: gl/includes/ui/gl_journal_ui.inc:240
#: inventory/includes/item_adjustments_ui.inc:181
#: inventory/includes/stock_transfers_ui.inc:161
#: manufacturing/includes/work_order_issue_ui.inc:169
-#: purchasing/includes/ui/invoice_ui.inc:245
-#: purchasing/includes/ui/invoice_ui.inc:247
-#: purchasing/includes/ui/invoice_ui.inc:249
-#: sales/customer_credit_invoice.php:366 sales/customer_delivery.php:519
-#: sales/customer_invoice.php:576 sales/includes/ui/sales_credit_ui.inc:339
-#: sales/customer_credit_invoice.php:364 sales/customer_invoice.php:578
+#: purchasing/includes/ui/invoice_ui.inc:258
+#: purchasing/includes/ui/invoice_ui.inc:260
+#: purchasing/includes/ui/invoice_ui.inc:262
+#: sales/customer_credit_invoice.php:364 sales/customer_delivery.php:529
+#: sales/customer_invoice.php:587 sales/includes/ui/sales_credit_ui.inc:339
msgid "Memo"
msgstr ""
msgstr ""
#: gl/accruals.php:182 gl/manage/gl_quick_entries.php:240
-#: gl/includes/ui/gl_journal_ui.inc:57 sales/create_recurrent_invoices.php:115
+#: gl/includes/ui/gl_journal_ui.inc:57 sales/create_recurrent_invoices.php:134
#: sales/manage/recurrent_invoices.php:102
-#: sales/create_recurrent_invoices.php:132
msgid "Monthly"
msgstr ""
#: gl/manage/gl_quick_entries.php:261 gl/manage/gl_quick_entries.php:263
#: gl/manage/gl_quick_entries.php:265 gl/manage/gl_quick_entries.php:339
#: gl/view/bank_transfer_view.php:70 gl/view/bank_transfer_view.php:80
-#: gl/view/gl_deposit_view.php:67 gl/view/gl_deposit_view.php:100
-#: gl/view/gl_deposit_view.php:103 gl/view/gl_deposit_view.php:106
-#: gl/view/gl_payment_view.php:65 gl/view/gl_payment_view.php:99
-#: gl/view/gl_payment_view.php:102 gl/view/gl_payment_view.php:105
-#: gl/includes/ui/gl_bank_ui.inc:151 gl/includes/ui/gl_bank_ui.inc:154
-#: gl/includes/ui/gl_bank_ui.inc:157 gl/includes/ui/gl_bank_ui.inc.orig:133
-#: gl/includes/ui/gl_bank_ui.inc.orig:136
-#: gl/includes/ui/gl_bank_ui.inc.orig:139 includes/sysnames.inc:132
-#: includes/ui/allocation_cart.inc:263 includes/ui/sav.ui_lists.inc:1163
-#: includes/ui/ui_lists.inc:1184
+#: gl/view/gl_deposit_view.php:67 gl/view/gl_deposit_view.php:105
+#: gl/view/gl_deposit_view.php:108 gl/view/gl_deposit_view.php:111
+#: gl/view/gl_payment_view.php:65 gl/view/gl_payment_view.php:104
+#: gl/view/gl_payment_view.php:107 gl/view/gl_payment_view.php:110
+#: gl/includes/ui/gl_bank_ui.inc:153 gl/includes/ui/gl_bank_ui.inc:156
+#: gl/includes/ui/gl_bank_ui.inc:159 includes/sysnames.inc:132
+#: includes/ui/allocation_cart.inc:288 includes/ui/mk.allocation_cart.inc:288
+#: includes/ui/ui_lists.inc:1187
#: manufacturing/includes/manufacturing_ui.inc:236
-#: purchasing/includes/ui/invoice_ui.inc:245
-#: purchasing/includes/ui/invoice_ui.inc:247
-#: purchasing/includes/ui/invoice_ui.inc:249
+#: purchasing/includes/ui/invoice_ui.inc:258
+#: purchasing/includes/ui/invoice_ui.inc:260
+#: purchasing/includes/ui/invoice_ui.inc:262
#: purchasing/view/view_supp_payment.php:60
-#: purchasing/view/view_supp_payment.php:72 reporting/rep102.php:241
-#: reporting/rep107.php:182 reporting/rep109.php:191 reporting/rep110.php:195
-#: reporting/rep111.php:178 reporting/rep113.php:181 reporting/rep202.php:249
-#: reporting/rep209.php:197 reporting/rep706.php:303 reporting/rep707.php:321
-#: reporting/rep710.php:76 sales/view/view_receipt.php:44
+#: purchasing/view/view_supp_payment.php:72 reporting/rep102.php:245
+#: reporting/rep107.php:184 reporting/rep109.php:189 reporting/rep110.php:193
+#: reporting/rep111.php:174 reporting/rep113.php:178 reporting/rep202.php:253
+#: reporting/rep209.php:192 reporting/rep706.php:309 reporting/rep707.php:327
+#: reporting/rep710.php:78 sales/view/view_receipt.php:44
msgid "Amount"
msgstr ""
#: gl/bank_account_reconcile.php:35 gl/bank_transfer.php:30 gl/gl_bank.php:49
#: gl/inquiry/bank_inquiry.php:30 purchasing/supplier_payment.php:42
-#: sales/customer_payments.php:39 sales/customer_payments.php.orig:39
+#: sales/customer_payments.php:38
msgid "There are no bank accounts defined in the system."
msgstr ""
#: gl/bank_account_reconcile.php:239 gl/inquiry/bank_inquiry.php:71
#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
#: gl/view/accrual_trans.php:60 gl/view/gl_trans_view.php:36
-#: reporting/rep601.php:76 reporting/rep704.php:80 reporting/rep704.php:82
-#: reporting/rep704.php:85
+#: reporting/rep601.php:79 reporting/rep704.php:84 reporting/rep704.php:86
+#: reporting/rep704.php:89
msgid "Person/Item"
msgstr ""
msgid "To Account:"
msgstr ""
-#: gl/bank_transfer.php:72 gl/bank_transfer.php:77
+#: gl/bank_transfer.php:77
msgid "Transfer Date:"
msgstr ""
-#: gl/bank_transfer.php:78 gl/bank_transfer.php:85
-#: sales/customer_payments.php:409 gl/bank_transfer.php:82
-#: gl/bank_transfer.php:89 gl/bank_transfer.php:87 gl/bank_transfer.php:94
-#: sales/customer_payments.php:412 sales/customer_payments.php.orig:411
+#: gl/bank_transfer.php:87 gl/bank_transfer.php:94
+#: sales/customer_payments.php:397
msgid "Amount:"
msgstr ""
-#: gl/bank_transfer.php:79 gl/bank_transfer.php:86
-#: purchasing/supplier_payment.php:299 sales/customer_payments.php:394
-#: gl/bank_transfer.php:83 gl/bank_transfer.php:90 gl/bank_transfer.php:88
-#: gl/bank_transfer.php:95 purchasing/supplier_payment.php:302
-#: sales/customer_payments.php:397 sales/customer_payments.php.orig:396
+#: gl/bank_transfer.php:88 gl/bank_transfer.php:95
+#: purchasing/supplier_payment.php:313 sales/customer_payments.php:383
msgid "Bank Charge:"
msgstr ""
-#: gl/bank_transfer.php:97 gl/bank_transfer.php:102
+#: gl/bank_transfer.php:90
+msgid "Incoming Amount:"
+msgstr ""
+
+#: gl/bank_transfer.php:102
msgid "Enter Transfer"
msgstr ""
-#: gl/bank_transfer.php:123 gl/bank_transfer.php:153
-#: purchasing/supplier_payment.php:130 purchasing/supplier_payment.php:136
-#: gl/bank_transfer.php:128 gl/bank_transfer.php:158
-#: purchasing/supplier_payment.php:125 purchasing/supplier_payment.php:131
+#: 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
msgid "The entered amount is invalid or less than zero."
msgstr ""
-#: gl/bank_transfer.php:128 gl/gl_bank.php:225 gl/bank_transfer.php:133
+#: gl/bank_transfer.php:133 gl/gl_bank.php:224
msgid "The total bank amount cannot be 0."
msgstr ""
-#: gl/bank_transfer.php:139 gl/bank_transfer.php:144
+#: gl/bank_transfer.php:144
#, php-format
msgid "The total bank amount exceeds allowed limit (%s) for source account."
msgstr ""
-#: gl/bank_transfer.php:145 gl/gl_bank.php:242 gl/bank_transfer.php:150
+#: gl/bank_transfer.php:150 gl/gl_bank.php:241
#, php-format
msgid ""
"The bank transaction would result in exceed of authorized overdraft limit "
"for transaction: %s #%s on %s."
msgstr ""
-#: gl/bank_transfer.php:158 purchasing/supplier_payment.php:144
-#: sales/customer_payments.php:184 gl/bank_transfer.php:163
-#: purchasing/supplier_payment.php:139 sales/customer_payments.php.orig:184
+#: gl/bank_transfer.php:163 purchasing/supplier_payment.php:149
+#: sales/customer_payments.php:195
msgid ""
"The Bank Charge Account has not been set in System and General GL Setup."
msgstr ""
-#: gl/bank_transfer.php:164 gl/gl_bank.php:249 gl/gl_journal.php:168
-#: gl/manage/revaluate_currencies.php:65 inventory/adjustments.php:96
-#: inventory/transfers.php:93 manufacturing/work_order_add_finished.php:77
+#: gl/bank_transfer.php:169 gl/gl_bank.php:248 gl/gl_journal.php:168
+#: gl/manage/revaluate_currencies.php:65 inventory/adjustments.php:94
+#: inventory/transfers.php:91 manufacturing/work_order_add_finished.php:77
#: manufacturing/work_order_entry.php:132
-#: manufacturing/work_order_issue.php:91 purchasing/po_receive_items.php:188
-#: purchasing/supplier_payment.php:201 sales/credit_note_entry.php:147
+#: manufacturing/work_order_issue.php:89 purchasing/po_receive_items.php:188
+#: purchasing/supplier_payment.php:207 sales/credit_note_entry.php:147
#: sales/customer_credit_invoice.php:102 sales/customer_delivery.php:166
-#: sales/customer_invoice.php:280 sales/customer_payments.php:151
-#: sales/sales_order_entry.php:403 gl/bank_transfer.php:169
-#: purchasing/supplier_payment.php:196 sales/customer_payments.php.orig:151
-#: sales/sales_order_entry.php:412 sales/sales_order_entry.php.orig:411
+#: sales/customer_invoice.php:289 sales/customer_payments.php:162
+#: sales/sales_order_entry.php:416
msgid "You must enter a reference."
msgstr ""
-#: gl/bank_transfer.php:178 gl/bank_transfer.php:183
+#: gl/bank_transfer.php:183
msgid "The source and destination bank accouts cannot be the same."
msgstr ""
+#: gl/bank_transfer.php:195
+msgid "The incomming bank amount cannot be 0."
+msgstr ""
+
#: gl/gl_bank.php:34
msgid "Bank Account Payment Entry"
msgstr ""
msgid "Modify Bank Deposit Entry"
msgstr ""
-#: gl/gl_bank.php:73
+#: gl/gl_bank.php:74
#, php-format
msgid "Payment %d has been entered"
msgstr ""
-#: gl/gl_bank.php:75 gl/gl_bank.php:93
+#: gl/gl_bank.php:76 gl/gl_bank.php:94
msgid "&View the GL Postings for this Payment"
msgstr ""
-#: gl/gl_bank.php:77 gl/gl_bank.php:95
+#: gl/gl_bank.php:78 gl/gl_bank.php:96
msgid "Enter Another &Payment"
msgstr ""
-#: gl/gl_bank.php:79 gl/gl_bank.php:97
+#: gl/gl_bank.php:80 gl/gl_bank.php:98
msgid "Enter A &Deposit"
msgstr ""
-#: gl/gl_bank.php:81 gl/gl_journal.php:61 inventory/adjustments.php:50
-#: manufacturing/work_order_entry.php:68 purchasing/po_entry_items.php:109
-#: purchasing/po_entry_items.php:133 purchasing/supplier_credit.php:49
-#: purchasing/supplier_invoice.php:52 sales/credit_note_entry.php:77
-#: sales/customer_credit_invoice.php:62 sales/customer_invoice.php:66
-#: sales/sales_order_entry.php:226 purchasing/po_entry_items.php:112
-#: purchasing/po_entry_items.php:136 sales/sales_order_entry.php:234
-#: sales/sales_order_entry.php.orig:234
+#: gl/gl_bank.php:82 gl/gl_journal.php:61 inventory/adjustments.php:50
+#: manufacturing/work_order_entry.php:68 purchasing/po_entry_items.php:112
+#: purchasing/po_entry_items.php:136 purchasing/supplier_credit.php:49
+#: purchasing/supplier_invoice.php:53 sales/credit_note_entry.php:77
+#: sales/customer_credit_invoice.php:62 sales/customer_invoice.php:75
+#: sales/sales_order_entry.php:237
msgid "Add an Attachment"
msgstr ""
-#: gl/gl_bank.php:107
+#: gl/gl_bank.php:92
+#, php-format
+msgid "Payment %d has been modified"
+msgstr ""
+
+#: gl/gl_bank.php:108
#, php-format
msgid "Deposit %d has been entered"
msgstr ""
-#: gl/gl_bank.php:109
+#: gl/gl_bank.php:110
msgid "View the GL Postings for this Deposit"
msgstr ""
-#: gl/gl_bank.php:111
+#: gl/gl_bank.php:112
msgid "Enter Another Deposit"
msgstr ""
-#: gl/gl_bank.php:113
+#: gl/gl_bank.php:114
msgid "Enter A Payment"
msgstr ""
-#: gl/gl_bank.php:124
+#: gl/gl_bank.php:123
+#, php-format
+msgid "Deposit %d has been modified"
+msgstr ""
+
+#: gl/gl_bank.php:125
msgid "&View the GL Postings for this Deposit"
msgstr ""
-#: gl/gl_bank.php:126
+#: gl/gl_bank.php:127
msgid "Enter Another &Deposit"
msgstr ""
-#: gl/gl_bank.php:128
+#: gl/gl_bank.php:129
msgid "Enter A &Payment"
msgstr ""
-#: gl/gl_bank.php:219
+#: gl/gl_bank.php:218
msgid "You must enter at least one payment line."
msgstr ""
-#: gl/gl_bank.php:236 purchasing/supplier_payment.php:194
-#: purchasing/supplier_payment.php:189
+#: gl/gl_bank.php:235 purchasing/supplier_payment.php:200
#, php-format
msgid "The total bank amount exceeds allowed limit (%s)."
msgstr ""
-#: gl/gl_bank.php:261
+#: gl/gl_bank.php:260
msgid "The entered date for the payment is invalid."
msgstr ""
-#: gl/gl_bank.php:273
+#: gl/gl_bank.php:272
msgid "You have to select customer and customer branch."
msgstr ""
-#: gl/gl_bank.php:277
+#: gl/gl_bank.php:276
msgid "You have to select supplier."
msgstr ""
-#: gl/gl_bank.php:323 gl/gl_bank.php:325
+#: gl/gl_bank.php:284
+msgid "Settled amount have to be positive number."
+msgstr ""
+
+#: gl/gl_bank.php:329
msgid "The amount entered is not a valid number or is less than zero."
msgstr ""
-#: gl/gl_bank.php:395 gl/gl_bank.php:397
+#: gl/gl_bank.php:335 gl/manage/exchange_rates.php:39
+msgid "The exchange rate cannot be zero or a negative number."
+msgstr ""
+
+#: gl/gl_bank.php:407
msgid "Payment Items"
msgstr ""
-#: gl/gl_bank.php:395 gl/gl_bank.php:397
+#: gl/gl_bank.php:407
msgid "Deposit Items"
msgstr ""
-#: gl/gl_bank.php:403 gl/gl_bank.php:405
+#: gl/gl_bank.php:415
msgid "Process Payment"
msgstr ""
-#: gl/gl_bank.php:403 gl/gl_bank.php:405
+#: gl/gl_bank.php:415
msgid "Process Deposit"
msgstr ""
msgstr ""
#: gl/gl_budget.php:26 gl/manage/gl_accounts.php:23
-#: gl/manage/gl_accounts.php.orig:23
msgid ""
"There are no account groups defined. Please define at least one account "
"group before entering accounts."
msgid "The Budget has been deleted."
msgstr ""
-#: gl/gl_budget.php:64 gl/manage/gl_accounts.php:230
-#: gl/manage/gl_accounts.php:240 gl/manage/gl_accounts.php.orig:230
-#: gl/manage/gl_accounts.php.orig:240 gl/manage/gl_accounts.php:231
+#: gl/gl_budget.php:64 gl/manage/gl_accounts.php:231
#: gl/manage/gl_accounts.php:241
msgid "Account Code:"
msgstr ""
msgid "Get"
msgstr ""
-#: gl/gl_budget.php:91 gl/gl_budget.php:93 gl/inquiry/profit_loss.php:231
-#: gl/manage/gl_quick_entries.php:240 reporting/rep101.php:136
-#: reporting/rep105.php:116 reporting/rep106.php:90 reporting/rep114.php:88
-#: reporting/rep201.php:124 reporting/rep304.php:119 reporting/rep305.php:100
-#: reporting/rep601.php:82 reporting/rep702.php:57 reporting/rep704.php:91
-#: reporting/rep704.php:101 reporting/rep704.php:109 reporting/rep706.php:181
-#: reporting/rep706.php:189 reporting/rep706.php:199 reporting/rep706.php:207
-#: reporting/rep707.php:206 reporting/rep707.php:213 reporting/rep707.php:223
-#: reporting/rep707.php:231 reporting/rep708.php:187 reporting/rep708.php:196
-#: reporting/rep708.php:203 reporting/rep709.php:104 reporting/rep710.php:83
-#: reporting/rep305.php:103
+#: gl/gl_budget.php:91 gl/gl_budget.php:93 gl/inquiry/profit_loss.php:236
+#: gl/manage/gl_quick_entries.php:240 reporting/rep101.php:126
+#: reporting/rep105.php:118 reporting/rep106.php:92 reporting/rep114.php:90
+#: reporting/rep201.php:118 reporting/rep304.php:121 reporting/rep305.php:106
+#: reporting/rep306.php:148 reporting/rep307.php:122 reporting/rep308.php:155
+#: reporting/rep309.php:103 reporting/rep601.php:85 reporting/rep702.php:59
+#: reporting/rep704.php:95 reporting/rep704.php:105 reporting/rep704.php:113
+#: reporting/rep706.php:185 reporting/rep706.php:193 reporting/rep706.php:203
+#: reporting/rep706.php:211 reporting/rep707.php:210 reporting/rep707.php:217
+#: reporting/rep707.php:227 reporting/rep707.php:235 reporting/rep708.php:200
+#: reporting/rep708.php:209 reporting/rep708.php:216 reporting/rep709.php:106
+#: reporting/rep710.php:85
msgid "Period"
msgstr ""
#: gl/gl_budget.php:127 gl/inquiry/balance_sheet.php:98
#: gl/inquiry/balance_sheet.php:205 gl/inquiry/balance_sheet.php:236
-#: gl/inquiry/gl_trial_balance.php:210 gl/inquiry/profit_loss.php:115
-#: gl/inquiry/profit_loss.php:283 gl/view/gl_deposit_view.php:132
-#: gl/view/gl_payment_view.php:131 gl/view/gl_trans_view.php:106
-#: gl/includes/ui/gl_bank_ui.inc:200 gl/includes/ui/gl_bank_ui.inc.orig:182
-#: gl/includes/ui/gl_journal_ui.inc:141
+#: gl/inquiry/gl_trial_balance.php:224 gl/inquiry/profit_loss.php:115
+#: gl/inquiry/profit_loss.php:288 gl/view/gl_deposit_view.php:137
+#: gl/view/gl_payment_view.php:136 gl/view/gl_trans_view.php:106
+#: gl/includes/ui/gl_bank_ui.inc:202 gl/includes/ui/gl_journal_ui.inc:141
#: inventory/includes/item_adjustments_ui.inc:63
#: inventory/includes/item_adjustments_ui.inc:102
#: manufacturing/includes/manufacturing_ui.inc:178
-#: purchasing/includes/ui/invoice_ui.inc:309
-#: purchasing/includes/ui/invoice_ui.inc:474
-#: purchasing/includes/ui/invoice_ui.inc:544
+#: purchasing/includes/ui/invoice_ui.inc:322
+#: purchasing/includes/ui/invoice_ui.inc:487
+#: purchasing/includes/ui/invoice_ui.inc:557
#: purchasing/po_receive_items.php:63 purchasing/view/view_po.php:140
#: purchasing/allocations/supplier_allocation_main.php:100
-#: reporting/rep101.php:237 reporting/rep106.php:82 reporting/rep106.php:115
-#: reporting/rep106.php:158 reporting/rep114.php:156 reporting/rep201.php:221
-#: reporting/rep203.php:92 reporting/rep203.php:167 reporting/rep204.php:109
-#: reporting/rep204.php:137 reporting/rep301.php:130 reporting/rep301.php:167
-#: reporting/rep304.php:142 reporting/rep304.php:184 reporting/rep305.php:95
-#: reporting/rep305.php:119 reporting/rep305.php:176 reporting/rep702.php:138
-#: reporting/rep705.php:152 reporting/rep705.php:309 reporting/rep706.php:106
-#: reporting/rep706.php:249 reporting/rep706.php:284 reporting/rep707.php:115
-#: reporting/rep707.php:291 reporting/rep708.php:235
+#: 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/rep204.php:141 reporting/rep301.php:133 reporting/rep301.php:170
+#: reporting/rep304.php:146 reporting/rep304.php:188 reporting/rep305.php:101
+#: 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
+#: reporting/rep705.php:152 reporting/rep705.php:315 reporting/rep706.php:106
+#: reporting/rep706.php:255 reporting/rep706.php:290 reporting/rep707.php:115
+#: reporting/rep707.php:297 reporting/rep708.php:253
#: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:170
-#: sales/customer_credit_invoice.php:283 sales/customer_delivery.php:433
-#: sales/customer_invoice.php:468
+#: sales/customer_credit_invoice.php:281 sales/customer_delivery.php:433
+#: sales/customer_invoice.php:479
#: sales/allocations/customer_allocation_main.php:99
#: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
#: sales/view/view_invoice.php:114 sales/view/view_sales_order.php:96
#: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
#: sales/view/view_sales_order.php:202
#: sales/includes/ui/sales_credit_ui.inc:168
-#: sales/includes/ui/sales_order_ui.inc:142 reporting/rep305.php:98
-#: reporting/rep305.php:122 reporting/rep305.php:178
-#: sales/customer_credit_invoice.php:281 sales/customer_invoice.php:470
#: sales/includes/ui/sales_order_ui.inc:146
msgid "Total"
msgstr ""
msgid "The credit amount entered is not a valid number or is less than zero."
msgstr ""
-#: gl/gl_journal.php:243 includes/ui/ui_view.inc:672
-#: purchasing/supplier_credit.php:119 purchasing/supplier_invoice.php:119
-#: includes/ui/ui_view.inc:673
+#: gl/gl_journal.php:243 includes/ui/ui_view.inc:732
+#: purchasing/supplier_credit.php:119 purchasing/supplier_invoice.php:129
msgid "Cannot post to GL account used by more than one tax type."
msgstr ""
msgid "As at:"
msgstr ""
-#: gl/inquiry/balance_sheet.php:228 gl/inquiry/profit_loss.php:294
-#: reporting/rep705.php:319 reporting/rep706.php:272 reporting/rep706.php:297
-#: reporting/rep707.php:303 reporting/rep707.php:309
+#: gl/inquiry/balance_sheet.php:228 gl/inquiry/profit_loss.php:299
+#: reporting/rep705.php:325 reporting/rep706.php:278 reporting/rep706.php:303
+#: reporting/rep707.php:309 reporting/rep707.php:315
msgid "Calculated Return"
msgstr ""
#: gl/inquiry/balance_sheet.php:236 includes/sysnames.inc:120
-#: reporting/rep706.php:284
+#: reporting/rep706.php:290
msgid "Liabilities"
msgstr ""
-#: gl/inquiry/balance_sheet.php:236 reporting/rep706.php:284
+#: gl/inquiry/balance_sheet.php:236 reporting/rep706.php:290
msgid " and "
msgstr ""
-#: gl/inquiry/balance_sheet.php:236 reporting/rep706.php:284
+#: gl/inquiry/balance_sheet.php:236 reporting/rep706.php:290
msgid "Equities"
msgstr ""
-#: gl/inquiry/bank_inquiry.php:28 reporting/rep601.php:69
+#: gl/inquiry/bank_inquiry.php:28 reporting/rep601.php:72
msgid "Bank Statement"
msgstr ""
#: gl/inquiry/bank_inquiry.php:78 gl/inquiry/gl_account_inquiry.php:162
-#: reporting/rep601.php:99 reporting/rep704.php:138
+#: reporting/rep601.php:104 reporting/rep704.php:144
msgid "Opening Balance"
msgstr ""
-#: gl/inquiry/bank_inquiry.php:123 gl/inquiry/gl_account_inquiry.php:211
-#: gl/inquiry/gl_trial_balance.php:220 reporting/rep601.php:150
-#: reporting/rep704.php:186 reporting/rep708.php:244
+#: gl/inquiry/bank_inquiry.php:124 gl/inquiry/gl_account_inquiry.php:213
+#: gl/inquiry/gl_trial_balance.php:234 reporting/rep601.php:157
+#: reporting/rep704.php:192 reporting/rep708.php:262
msgid "Ending Balance"
msgstr ""
msgid "Amount max:"
msgstr ""
-#: gl/inquiry/gl_account_inquiry.php:220
+#: gl/inquiry/gl_account_inquiry.php:222
msgid ""
"No general ledger transactions have been created for the specified criteria."
msgstr ""
-#: gl/inquiry/gl_trial_balance.php:28 reporting/rep708.php:206
+#: gl/inquiry/gl_trial_balance.php:28 reporting/rep708.php:219
msgid "Trial Balance"
msgstr ""
-#: gl/inquiry/gl_trial_balance.php:55
+#: gl/inquiry/gl_trial_balance.php:60
msgid "No zero values"
msgstr ""
-#: gl/inquiry/gl_trial_balance.php:56 reporting/reports_main.php:301
-#: reporting/reports_main.php:346 reporting/reports_main.php:386
+#: gl/inquiry/gl_trial_balance.php:61 reporting/reports_main.php:381
+#: reporting/reports_main.php:431 reporting/reports_main.php:476
msgid "Only balances"
msgstr ""
-#: gl/inquiry/gl_trial_balance.php:90 gl/inquiry/gl_trial_balance.php:142
-#: reporting/rep706.php:302 reporting/rep707.php:320 reporting/rep708.php:51
-#: reporting/rep708.php:117 sales/create_recurrent_invoices.php:115
+#: gl/inquiry/gl_trial_balance.php:95 gl/inquiry/gl_trial_balance.php:156
+#: 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
-#: sales/create_recurrent_invoices.php:132
msgid "Group"
msgstr ""
-#: gl/inquiry/gl_trial_balance.php:159
+#: gl/inquiry/gl_trial_balance.php:173
msgid "The from date cannot be bigger than the fiscal year end."
msgstr ""
-#: gl/inquiry/gl_trial_balance.php:172 gl/manage/bank_accounts.php:106
-#: gl/manage/bank_accounts.php.orig:106 gl/view/gl_trans_view.php:63
-#: gl/view/gl_trans_view.php:66 gl/view/gl_trans_view.php:69
-#: reporting/rep701.php:109 reporting/rep702.php:51 reporting/rep705.php:234
-#: reporting/rep706.php:181 reporting/rep707.php:206 reporting/rep708.php:179
+#: gl/inquiry/gl_trial_balance.php:186 gl/manage/bank_accounts.php:106
+#: gl/view/gl_trans_view.php:63 gl/view/gl_trans_view.php:66
+#: gl/view/gl_trans_view.php:69 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:173 reporting/rep708.php:172
+#: gl/inquiry/gl_trial_balance.php:187 reporting/rep708.php:185
msgid "Brought Forward"
msgstr ""
-#: gl/inquiry/gl_trial_balance.php:174 reporting/rep708.php:172
+#: gl/inquiry/gl_trial_balance.php:188 reporting/rep708.php:185
msgid "This Period"
msgstr ""
-#: gl/inquiry/gl_trial_balance.php:193
+#: gl/inquiry/gl_trial_balance.php:207 gl/manage/gl_account_types.php:128
msgid "Class"
msgstr ""
-#: gl/inquiry/gl_trial_balance.php:228 reporting/rep708.php:265
+#: gl/inquiry/gl_trial_balance.php:242 reporting/rep708.php:283
msgid ""
"The Opening Balance is not in balance, probably due to a non closed Previous "
"Fiscalyear."
msgid "Trans #"
msgstr ""
-#: gl/inquiry/journal_inquiry.php:134 reporting/rep710.php:75
-#: reporting/rep710.php:85 reporting/reports_main.php:400
+#: gl/inquiry/journal_inquiry.php:134 reporting/rep710.php:77
+#: reporting/rep710.php:87 reporting/reports_main.php:492
msgid "User"
msgstr ""
msgid "Profit & Loss Drilldown"
msgstr ""
-#: gl/inquiry/profit_loss.php:168 reporting/rep707.php:206
-#: reporting/includes/reports_classes.inc:234
-#: reporting/includes/reports_classes.inc:238
+#: gl/inquiry/profit_loss.php:173 reporting/rep707.php:210
+#: reporting/includes/reports_classes.inc:245
msgid "Accumulated"
msgstr ""
-#: gl/inquiry/profit_loss.php:168 reporting/rep707.php:251
-#: reporting/includes/reports_classes.inc:234
-#: reporting/includes/reports_classes.inc:238
+#: gl/inquiry/profit_loss.php:173 reporting/rep707.php:255
+#: reporting/includes/reports_classes.inc:245
msgid "Period Y-1"
msgstr ""
-#: gl/inquiry/profit_loss.php:168 reporting/rep707.php:242
-#: reporting/includes/reports_classes.inc:234
-#: reporting/includes/reports_classes.inc:238
+#: gl/inquiry/profit_loss.php:173 reporting/rep707.php:246
+#: reporting/includes/reports_classes.inc:245
msgid "Budget"
msgstr ""
-#: gl/inquiry/profit_loss.php:169 reporting/reports_main.php:289
-#: reporting/reports_main.php:335 reporting/reports_main.php:376
+#: gl/inquiry/profit_loss.php:174 reporting/reports_main.php:368
+#: reporting/reports_main.php:419 reporting/reports_main.php:465
msgid "Compare to"
msgstr ""
-#: gl/inquiry/profit_loss.php:230
+#: gl/inquiry/profit_loss.php:235
msgid "Group/Account Name"
msgstr ""
-#: gl/inquiry/profit_loss.php:233 reporting/rep707.php:206
+#: gl/inquiry/profit_loss.php:238 reporting/rep707.php:210
msgid "Achieved %"
msgstr ""
msgid "Tax Inquiry"
msgstr ""
-#: gl/inquiry/tax_inquiry.php:82 reporting/rep709.php:172
-#: reporting/rep709.php:176
+#: gl/inquiry/tax_inquiry.php:82 reporting/rep709.php:183
msgid "Outputs"
msgstr ""
-#: gl/inquiry/tax_inquiry.php:82 reporting/rep709.php:172
-#: reporting/rep709.php:176
+#: gl/inquiry/tax_inquiry.php:82 reporting/rep709.php:183
msgid "Inputs"
msgstr ""
msgid "Charged on sales"
msgstr ""
-#: gl/inquiry/tax_inquiry.php:100 reporting/rep709.php:172
-#: reporting/rep709.php:176
+#: gl/inquiry/tax_inquiry.php:100 reporting/rep709.php:183
msgid "Output Tax"
msgstr ""
msgid "Paid on purchases"
msgstr ""
-#: gl/inquiry/tax_inquiry.php:106 reporting/rep709.php:172
-#: reporting/rep709.php:176
+#: gl/inquiry/tax_inquiry.php:106 reporting/rep709.php:183
msgid "Input Tax"
msgstr ""
msgid "Net payable or collectible"
msgstr ""
-#: gl/inquiry/tax_inquiry.php:119 reporting/rep709.php:203
-#: reporting/rep709.php:207
+#: gl/inquiry/tax_inquiry.php:119 reporting/rep709.php:214
msgid "Total payable or refund"
msgstr ""
-#: gl/manage/bank_accounts.php:16 gl/manage/bank_accounts.php.orig:16
-#: reporting/reports_main.php:238
+#: gl/manage/bank_accounts.php:16 reporting/reports_main.php:310
msgid "Bank Accounts"
msgstr ""
-#: gl/manage/bank_accounts.php:33 gl/manage/bank_accounts.php.orig:33
+#: gl/manage/bank_accounts.php:33
msgid "The bank account name cannot be empty."
msgstr ""
-#: gl/manage/bank_accounts.php:39 gl/manage/bank_accounts.php.orig:39
+#: gl/manage/bank_accounts.php:39
msgid "The GL account selected is already in use. Select another GL account."
msgstr ""
-#: gl/manage/bank_accounts.php:52 gl/manage/bank_accounts.php.orig:52
+#: gl/manage/bank_accounts.php:52
msgid "Bank account has been updated"
msgstr ""
-#: gl/manage/bank_accounts.php:61 gl/manage/bank_accounts.php.orig:61
+#: gl/manage/bank_accounts.php:61
msgid "New bank account has been added"
msgstr ""
-#: gl/manage/bank_accounts.php:76 gl/manage/bank_accounts.php.orig:76
+#: gl/manage/bank_accounts.php:76
msgid ""
"Cannot delete this bank account because transactions have been created using "
"this account."
msgstr ""
-#: gl/manage/bank_accounts.php:82 gl/manage/bank_accounts.php.orig:82
+#: gl/manage/bank_accounts.php:82
msgid ""
"Cannot delete this bank account because POS definitions have been created "
"using this account."
msgstr ""
-#: gl/manage/bank_accounts.php:87 gl/manage/bank_accounts.php.orig:87
+#: gl/manage/bank_accounts.php:87
msgid "Selected bank account has been deleted"
msgstr ""
-#: gl/manage/bank_accounts.php:106 gl/manage/bank_accounts.php.orig:106
-#: gl/view/bank_transfer_view.php:69 gl/view/bank_transfer_view.php:78
-#: gl/view/gl_deposit_view.php:66 gl/view/gl_payment_view.php:64
-#: inventory/prices.php:133 inventory/purchasing_data.php:129
-#: purchasing/view/view_supp_credit.php:49
+#: gl/manage/bank_accounts.php:106 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 purchasing/view/view_supp_credit.php:49
#: purchasing/view/view_supp_invoice.php:53
#: purchasing/inquiry/po_search_completed.php:127
#: purchasing/inquiry/po_search.php:136
#: purchasing/inquiry/supplier_inquiry.php:76
#: purchasing/inquiry/supplier_inquiry.php:175
#: purchasing/inquiry/supplier_inquiry.php:186
-#: purchasing/inquiry/supplier_inquiry.php.orig:72
-#: purchasing/inquiry/supplier_inquiry.php.orig:169
-#: purchasing/inquiry/supplier_inquiry.php.orig:180
#: purchasing/allocations/supplier_allocation_main.php:99
#: purchasing/allocations/supplier_allocation_main.php:107
-#: reporting/rep101.php:138 reporting/rep102.php:131 reporting/rep102.php:137
-#: reporting/rep104.php:114 reporting/rep201.php:126 reporting/rep202.php:136
-#: reporting/rep203.php:99 sales/customer_credit_invoice.php:239
-#: sales/customer_delivery.php:340 sales/customer_invoice.php:402
+#: reporting/rep101.php:128 reporting/rep102.php:133 reporting/rep102.php:139
+#: reporting/rep103.php:232 reporting/rep104.php:116 reporting/rep201.php:120
+#: reporting/rep202.php:138 reporting/rep203.php:101 reporting/rep205.php:150
+#: sales/customer_credit_invoice.php:237 sales/customer_delivery.php:340
+#: sales/customer_invoice.php:413
#: sales/allocations/customer_allocation_main.php:98
#: sales/allocations/customer_allocation_main.php:106
#: sales/view/view_credit.php:70 sales/view/view_dispatch.php:86
#: sales/inquiry/customer_allocation_inquiry.php:151
#: sales/inquiry/customer_allocation_inquiry.php:161
#: sales/inquiry/customer_inquiry.php:80
-#: sales/inquiry/customer_inquiry.php:232
-#: sales/inquiry/customer_inquiry.php:245
-#: sales/inquiry/customer_inquiry.php.orig:80
-#: sales/inquiry/customer_inquiry.php.orig:232
-#: sales/inquiry/customer_inquiry.php.orig:245
+#: sales/inquiry/customer_inquiry.php:225
+#: sales/inquiry/customer_inquiry.php:238
#: sales/inquiry/sales_deliveries_view.php:189
#: sales/inquiry/sales_orders_view.php:272
#: sales/inquiry/sales_orders_view.php:286
-#: sales/inquiry/sales_orders_view.php.orig:270
-#: sales/inquiry/sales_orders_view.php.orig:284
-#: sales/customer_credit_invoice.php:237 sales/customer_invoice.php:404
msgid "Currency"
msgstr ""
-#: gl/manage/bank_accounts.php:106 gl/manage/bank_accounts.php.orig:106
+#: gl/manage/bank_accounts.php:106
msgid "GL Account"
msgstr ""
-#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
-#: reporting/includes/doctext.inc:247
+#: gl/manage/bank_accounts.php:107 reporting/includes/doctext.inc:247
msgid "Bank"
msgstr ""
-#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
-#: includes/ui/ui_view.inc:488
+#: gl/manage/bank_accounts.php:107 includes/ui/ui_view.inc:547
msgid "Number"
msgstr ""
-#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
+#: gl/manage/bank_accounts.php:107
msgid "Bank Address"
msgstr ""
-#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
+#: gl/manage/bank_accounts.php:107
msgid "Dflt"
msgstr ""
-#: gl/manage/bank_accounts.php:163 gl/manage/bank_accounts.php.orig:163
+#: gl/manage/bank_accounts.php:163
msgid "Bank Account Name:"
msgstr ""
#: gl/manage/bank_accounts.php:167 gl/manage/bank_accounts.php:171
-#: gl/manage/bank_accounts.php.orig:167 gl/manage/bank_accounts.php.orig:171
msgid "Account Type:"
msgstr ""
#: gl/manage/bank_accounts.php:175 gl/manage/bank_accounts.php:179
-#: gl/manage/bank_accounts.php.orig:175 gl/manage/bank_accounts.php.orig:179
msgid "Bank Account Currency:"
msgstr ""
-#: gl/manage/bank_accounts.php:182 gl/manage/bank_accounts.php.orig:182
+#: gl/manage/bank_accounts.php:182
msgid "Default currency account:"
msgstr ""
#: gl/manage/bank_accounts.php:185 gl/manage/bank_accounts.php:187
-#: gl/manage/bank_accounts.php.orig:185 gl/manage/bank_accounts.php.orig:187
msgid "Bank Account GL Code:"
msgstr ""
-#: gl/manage/bank_accounts.php:189 gl/manage/bank_accounts.php.orig:189
+#: gl/manage/bank_accounts.php:189
msgid "Bank Name:"
msgstr ""
-#: gl/manage/bank_accounts.php:190 gl/manage/bank_accounts.php.orig:190
+#: gl/manage/bank_accounts.php:190
msgid "Bank Account Number:"
msgstr ""
-#: gl/manage/bank_accounts.php:191 gl/manage/bank_accounts.php.orig:191
+#: gl/manage/bank_accounts.php:191
msgid "Bank Address:"
msgstr ""
msgid "Exchange Rates"
msgstr ""
-#: gl/manage/exchange_rates.php:39
-msgid "The exchange rate cannot be zero or a negative number."
-msgstr ""
-
#: gl/manage/exchange_rates.php:45
msgid "The exchange rate for the date is already there."
msgstr ""
msgid "Date to Use From:"
msgstr ""
-#: gl/manage/exchange_rates.php:141 includes/ui/ui_view.inc:288
-#: includes/ui/ui_view.inc:290
+#: gl/manage/exchange_rates.php:141 includes/ui/ui_view.inc:325
msgid "Exchange Rate:"
msgstr ""
msgid "Class Name"
msgstr ""
-#: gl/manage/gl_account_classes.php:110 gl/manage/gl_account_types.php:128
+#: gl/manage/gl_account_classes.php:110
msgid "Class Type"
msgstr ""
#: gl/manage/gl_account_classes.php:112 gl/manage/gl_account_classes.php:169
-#: reporting/rep706.php:211
+#: reporting/rep706.php:215
msgid "Balance Sheet"
msgstr ""
msgid "Class Name:"
msgstr ""
-#: gl/manage/gl_account_classes.php:171 gl/manage/gl_account_types.php:192
+#: gl/manage/gl_account_classes.php:171
msgid "Class Type:"
msgstr ""
-#: gl/manage/gl_accounts.php:16 gl/manage/gl_accounts.php.orig:16
-#: reporting/rep701.php:115
+#: gl/manage/gl_accounts.php:16 reporting/rep701.php:117
msgid "Chart of Accounts"
msgstr ""
-#: gl/manage/gl_accounts.php:53 gl/manage/gl_accounts.php.orig:53
+#: gl/manage/gl_accounts.php:53
msgid "The account code must be entered."
msgstr ""
-#: gl/manage/gl_accounts.php:59 gl/manage/gl_accounts.php.orig:59
+#: gl/manage/gl_accounts.php:59
msgid "The account name cannot be empty."
msgstr ""
-#: gl/manage/gl_accounts.php:65 gl/manage/gl_accounts.php.orig:65
+#: gl/manage/gl_accounts.php:65
msgid "The account code must be numeric."
msgstr ""
-#: gl/manage/gl_accounts.php:81 gl/manage/gl_accounts.php.orig:81
#: gl/manage/gl_accounts.php:80
msgid "The account belongs to a bank account and cannot be inactivated."
msgstr ""
-#: gl/manage/gl_accounts.php:90 gl/manage/gl_accounts.php.orig:90
#: gl/manage/gl_accounts.php:89
msgid "Account data has been updated."
msgstr ""
-#: gl/manage/gl_accounts.php:99 gl/manage/gl_accounts.php.orig:99
#: gl/manage/gl_accounts.php:98
msgid "New account has been added."
msgstr ""
-#: gl/manage/gl_accounts.php:116 gl/manage/gl_accounts.php.orig:116
+#: gl/manage/gl_accounts.php:102
+msgid "Account not added, possible duplicate Account Code."
+msgstr ""
+
#: gl/manage/gl_accounts.php:117
msgid ""
"Cannot delete this account because transactions have been created using this "
"account."
msgstr ""
-#: gl/manage/gl_accounts.php:122 gl/manage/gl_accounts.php.orig:122
#: gl/manage/gl_accounts.php:123
msgid ""
"Cannot delete this account because it is used as one of the company default "
"GL accounts."
msgstr ""
-#: gl/manage/gl_accounts.php:128 gl/manage/gl_accounts.php.orig:128
#: gl/manage/gl_accounts.php:129
msgid "Cannot delete this account because it is used by a bank account."
msgstr ""
-#: gl/manage/gl_accounts.php:134 gl/manage/gl_accounts.php.orig:134
#: gl/manage/gl_accounts.php:135
msgid ""
"Cannot delete this account because it is used by one or more Item Categories."
msgstr ""
-#: gl/manage/gl_accounts.php:140 gl/manage/gl_accounts.php.orig:140
#: gl/manage/gl_accounts.php:141
msgid "Cannot delete this account because it is used by one or more Items."
msgstr ""
-#: gl/manage/gl_accounts.php:146 gl/manage/gl_accounts.php.orig:146
#: gl/manage/gl_accounts.php:147
msgid "Cannot delete this account because it is used by one or more Taxes."
msgstr ""
-#: gl/manage/gl_accounts.php:152 gl/manage/gl_accounts.php.orig:152
#: gl/manage/gl_accounts.php:153
msgid ""
"Cannot delete this account because it is used by one or more Customer "
"Branches."
msgstr ""
-#: gl/manage/gl_accounts.php:158 gl/manage/gl_accounts.php.orig:158
#: gl/manage/gl_accounts.php:159
msgid "Cannot delete this account because it is used by one or more suppliers."
msgstr ""
-#: gl/manage/gl_accounts.php:164 gl/manage/gl_accounts.php.orig:164
#: gl/manage/gl_accounts.php:165
msgid ""
"Cannot delete this account because it is used by one or more Quick Entry "
"Lines."
msgstr ""
-#: gl/manage/gl_accounts.php:182 gl/manage/gl_accounts.php.orig:182
#: gl/manage/gl_accounts.php:183
msgid "Selected account has been deleted"
msgstr ""
-#: gl/manage/gl_accounts.php:197 gl/manage/gl_accounts.php.orig:197
#: gl/manage/gl_accounts.php:198
msgid "New account"
msgstr ""
-#: gl/manage/gl_accounts.php:243 gl/manage/gl_accounts.php.orig:243
#: gl/manage/gl_accounts.php:244
msgid "Account Code 2:"
msgstr ""
-#: gl/manage/gl_accounts.php:245 gl/manage/gl_accounts.php.orig:245
#: gl/manage/gl_accounts.php:246
msgid "Account Name:"
msgstr ""
-#: gl/manage/gl_accounts.php:247 gl/manage/gl_accounts.php.orig:247
#: gl/manage/gl_accounts.php:248
msgid "Account Group:"
msgstr ""
-#: gl/manage/gl_accounts.php:249 gl/manage/gl_accounts.php.orig:249
#: gl/manage/gl_accounts.php:250
msgid "Account Tags:"
msgstr ""
-#: gl/manage/gl_accounts.php:251 gl/manage/gl_accounts.php.orig:251
#: gl/manage/gl_accounts.php:252
msgid "Account status:"
msgstr ""
-#: gl/manage/gl_accounts.php:256 gl/manage/gl_accounts.php.orig:256
#: gl/manage/gl_accounts.php:257
msgid "Add Account"
msgstr ""
-#: gl/manage/gl_accounts.php:260 gl/manage/gl_accounts.php.orig:260
#: gl/manage/gl_accounts.php:261
msgid "Update Account"
msgstr ""
-#: gl/manage/gl_accounts.php:261 gl/manage/gl_accounts.php.orig:261
#: gl/manage/gl_accounts.php:262
msgid "Delete account"
msgstr ""
msgid "Subgroup Of:"
msgstr ""
+#: gl/manage/gl_account_types.php:192
+msgid "Class:"
+msgstr ""
+
#: gl/manage/gl_quick_entries.php:16
msgid "Quick Entries"
msgstr ""
-#: gl/manage/gl_quick_entries.php:58 includes/ui/radio.ui_input.inc:204
-#: includes/ui/simple_crud_class.inc:221 includes/ui/ui_input.inc:204
+#: gl/manage/gl_quick_entries.php:58 includes/ui/simple_crud_class.inc:221
#: includes/ui/ui_input.inc:205
msgid "Add new"
msgstr ""
msgstr ""
#: gl/manage/gl_quick_entries.php:329 sales/customer_delivery.php:433
-#: sales/customer_invoice.php:468 sales/customer_invoice.php:470
+#: sales/customer_invoice.php:479
msgid "Tax Type"
msgstr ""
msgid "GL Deposit"
msgstr ""
-#: gl/view/gl_deposit_view.php:71 gl/includes/db/gl_db_banking.inc:212
-#: reporting/reports_main.php:88 reporting/reports_main.php:95
-#: reporting/reports_main.php:102 reporting/reports_main.php:114
-#: reporting/reports_main.php:121 reporting/reports_main.php:127
-#: reporting/reports_main.php:163 reporting/reports_main.php:169
-#: reporting/reports_main.php:219
+#: gl/view/gl_deposit_view.php:71 gl/includes/db/gl_db_banking.inc:213
+#: reporting/reports_main.php:96 reporting/reports_main.php:106
+#: reporting/reports_main.php:114 reporting/reports_main.php:128
+#: 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 ""
-#: gl/view/gl_deposit_view.php:72
+#: gl/view/gl_deposit_view.php:74 gl/view/gl_payment_view.php:72
+msgid "Settle currency"
+msgstr ""
+
+#: gl/view/gl_deposit_view.php:75 gl/view/gl_payment_view.php:73
+msgid "Settled amount"
+msgstr ""
+
+#: gl/view/gl_deposit_view.php:77
msgid "Deposit Type"
msgstr ""
-#: gl/view/gl_deposit_view.php:81
+#: gl/view/gl_deposit_view.php:86
msgid "This deposit has been voided."
msgstr ""
-#: gl/view/gl_deposit_view.php:87
+#: gl/view/gl_deposit_view.php:92
msgid "There are no items for this deposit."
msgstr ""
-#: gl/view/gl_deposit_view.php:92
+#: gl/view/gl_deposit_view.php:97
msgid "Items for this Deposit"
msgstr ""
-#: gl/view/gl_deposit_view.php:94 gl/view/gl_payment_view.php:92
-msgid "Item Amounts are Shown in :"
+#: gl/view/gl_deposit_view.php:99 gl/view/gl_payment_view.php:97
+msgid "Item Amounts are Shown in:"
msgstr ""
-#: gl/view/gl_deposit_view.php:99 gl/view/gl_deposit_view.php:102
-#: gl/view/gl_deposit_view.php:105 gl/view/gl_payment_view.php:98
-#: gl/view/gl_payment_view.php:101 gl/view/gl_payment_view.php:104
+#: gl/view/gl_deposit_view.php:104 gl/view/gl_deposit_view.php:107
+#: gl/view/gl_deposit_view.php:110 gl/view/gl_payment_view.php:103
+#: gl/view/gl_payment_view.php:106 gl/view/gl_payment_view.php:109
#: gl/view/gl_trans_view.php:63 gl/view/gl_trans_view.php:66
-#: gl/view/gl_trans_view.php:69 gl/includes/ui/gl_bank_ui.inc:150
-#: gl/includes/ui/gl_bank_ui.inc:153 gl/includes/ui/gl_bank_ui.inc:156
-#: gl/includes/ui/gl_bank_ui.inc.orig:132
-#: gl/includes/ui/gl_bank_ui.inc.orig:135
-#: gl/includes/ui/gl_bank_ui.inc.orig:138 gl/includes/ui/gl_journal_ui.inc:83
-#: gl/includes/ui/gl_journal_ui.inc:86 gl/includes/ui/gl_journal_ui.inc:89
-#: reporting/rep701.php:109
+#: gl/view/gl_trans_view.php:69 gl/includes/ui/gl_bank_ui.inc:152
+#: gl/includes/ui/gl_bank_ui.inc:155 gl/includes/ui/gl_bank_ui.inc:158
+#: gl/includes/ui/gl_journal_ui.inc:83 gl/includes/ui/gl_journal_ui.inc:86
+#: gl/includes/ui/gl_journal_ui.inc:89 reporting/rep701.php:111
msgid "Account Code"
msgstr ""
-#: gl/view/gl_deposit_view.php:99 gl/view/gl_deposit_view.php:102
-#: gl/view/gl_deposit_view.php:105 gl/view/gl_payment_view.php:98
-#: gl/view/gl_payment_view.php:101 gl/view/gl_payment_view.php:104
-#: gl/includes/ui/gl_bank_ui.inc:150 gl/includes/ui/gl_bank_ui.inc:153
-#: gl/includes/ui/gl_bank_ui.inc:156 gl/includes/ui/gl_bank_ui.inc.orig:132
-#: gl/includes/ui/gl_bank_ui.inc.orig:135
-#: gl/includes/ui/gl_bank_ui.inc.orig:138 gl/includes/ui/gl_journal_ui.inc:83
+#: gl/view/gl_deposit_view.php:104 gl/view/gl_deposit_view.php:107
+#: gl/view/gl_deposit_view.php:110 gl/view/gl_payment_view.php:103
+#: gl/view/gl_payment_view.php:106 gl/view/gl_payment_view.php:109
+#: gl/includes/ui/gl_bank_ui.inc:152 gl/includes/ui/gl_bank_ui.inc:155
+#: gl/includes/ui/gl_bank_ui.inc:158 gl/includes/ui/gl_journal_ui.inc:83
#: gl/includes/ui/gl_journal_ui.inc:86 gl/includes/ui/gl_journal_ui.inc:89
msgid "Account Description"
msgstr ""
msgid "Pay To"
msgstr ""
-#: gl/view/gl_payment_view.php:70 purchasing/view/view_supp_payment.php:64
-#: purchasing/view/view_supp_payment.php:78 sales/view/view_receipt.php:48
+#: gl/view/gl_payment_view.php:75 purchasing/view/view_supp_payment.php:64
+#: purchasing/view/view_supp_payment.php:78 sales/view/view_receipt.php:50
msgid "Payment Type"
msgstr ""
-#: gl/view/gl_payment_view.php:79 purchasing/view/view_supp_payment.php:85
+#: gl/view/gl_payment_view.php:84 purchasing/view/view_supp_payment.php:85
msgid "This payment has been voided."
msgstr ""
-#: gl/view/gl_payment_view.php:85
+#: gl/view/gl_payment_view.php:90
msgid "There are no items for this payment."
msgstr ""
-#: gl/view/gl_payment_view.php:90
+#: gl/view/gl_payment_view.php:95
msgid "Items for this Payment"
msgstr ""
msgstr ""
#: gl/includes/db/gl_db_banking.inc:44 gl/includes/db/gl_db_banking.inc:47
-#: gl/includes/db/gl_db_banking.inc:59 gl/includes/db/gl_db_banking.inc:62
+#: gl/includes/db/gl_db_banking.inc:60 gl/includes/db/gl_db_banking.inc:63
+#: gl/includes/db/gl_db_banking.inc:256
msgid "Exchange Variance"
msgstr ""
-#: gl/includes/db/gl_db_banking.inc:212 reporting/reports_main.php:89
-#: reporting/reports_main.php:96 reporting/reports_main.php:103
-#: reporting/reports_main.php:115 reporting/reports_main.php:122
-#: reporting/reports_main.php:128 reporting/reports_main.php:164
-#: reporting/reports_main.php:170 reporting/reports_main.php:220
+#: gl/includes/db/gl_db_banking.inc:213 reporting/reports_main.php:97
+#: reporting/reports_main.php:107 reporting/reports_main.php:115
+#: reporting/reports_main.php:129 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:428
+#: gl/includes/db/gl_db_banking.inc:445
msgid "Document reentered."
msgstr ""
-#: gl/includes/db/gl_db_rates.inc:130
+#: gl/includes/db/gl_db_trans.inc:93
#, php-format
-msgid ""
-"Cannot retrieve currency rate from %s page. Please set the rate manually."
+msgid "Rounding error %s encountered for trans_type:%s,trans_no:%s"
msgstr ""
-#: gl/includes/ui/gl_bank_ui.inc:24 gl/includes/ui/gl_bank_ui.inc.orig:23
-#: gl/includes/ui/gl_journal_ui.inc:27
+#: gl/includes/ui/gl_bank_ui.inc:24 gl/includes/ui/gl_journal_ui.inc:27
#: inventory/includes/item_adjustments_ui.inc:39
#: inventory/includes/stock_transfers_ui.inc:42
#: manufacturing/work_order_add_finished.php:208
#: manufacturing/work_order_costs.php:152
-#: purchasing/allocations/supplier_allocate.php:54
-#: sales/allocations/customer_allocate.php:53
+#: purchasing/allocations/supplier_allocate.php:56
+#: sales/allocations/customer_allocate.php:54
#: sales/includes/ui/sales_credit_ui.inc:121
msgid "Date:"
msgstr ""
-#: gl/includes/ui/gl_bank_ui.inc:51 gl/includes/ui/gl_bank_ui.inc.orig:50
+#: gl/includes/ui/gl_bank_ui.inc:52
msgid "Pay To:"
msgstr ""
-#: gl/includes/ui/gl_bank_ui.inc:56 gl/includes/ui/gl_bank_ui.inc.orig:55
+#: gl/includes/ui/gl_bank_ui.inc:57
msgid "To the Order of:"
msgstr ""
-#: gl/includes/ui/gl_bank_ui.inc:63 gl/includes/ui/gl_bank_ui.inc.orig:62
-#: inventory/purchasing_data.php:184 inventory/purchasing_data.php:188
-#: purchasing/includes/ui/invoice_ui.inc:73
-#: purchasing/includes/ui/invoice_ui.inc:80
-#: purchasing/includes/ui/po_ui.inc:120 purchasing/includes/ui/po_ui.inc:125
+#: gl/includes/ui/gl_bank_ui.inc:64 inventory/purchasing_data.php:208
+#: inventory/purchasing_data.php:212 purchasing/includes/ui/invoice_ui.inc:86
+#: purchasing/includes/ui/invoice_ui.inc:93
+#: purchasing/includes/ui/po_ui.inc:127 purchasing/includes/ui/po_ui.inc:132
msgid "Supplier:"
msgstr ""
-#: gl/includes/ui/gl_bank_ui.inc:66 gl/includes/ui/gl_bank_ui.inc.orig:65
-#: sales/manage/recurrent_invoices.php:169
+#: gl/includes/ui/gl_bank_ui.inc:67 sales/manage/recurrent_invoices.php:169
#: sales/includes/ui/sales_credit_ui.inc:29
-#: sales/includes/ui/sales_order_ui.inc:278
-#: sales/includes/ui/sales_order_ui.inc:282
+#: sales/includes/ui/sales_order_ui.inc:284
msgid "Customer:"
msgstr ""
-#: gl/includes/ui/gl_bank_ui.inc:70 gl/includes/ui/gl_bank_ui.inc.orig:69
-#: sales/customer_payments.php:360 sales/manage/recurrent_invoices.php:172
+#: gl/includes/ui/gl_bank_ui.inc:71 sales/customer_payments.php:345
+#: sales/manage/recurrent_invoices.php:172
#: sales/includes/ui/sales_credit_ui.inc:37
-#: sales/includes/ui/sales_order_ui.inc:285
-#: sales/includes/ui/sales_order_ui.inc:289 sales/customer_payments.php:363
-#: sales/customer_payments.php.orig:362
+#: sales/includes/ui/sales_order_ui.inc:291
msgid "Branch:"
msgstr ""
-#: gl/includes/ui/gl_bank_ui.inc:84 gl/includes/ui/gl_bank_ui.inc:87
-#: sales/customer_payments.php:369 sales/customer_payments.php:372
-#: sales/customer_payments.php.orig:371
+#: gl/includes/ui/gl_bank_ui.inc:85 gl/includes/ui/gl_bank_ui.inc:88
+#: sales/customer_payments.php:361
msgid "This customer account is on hold."
msgstr ""
-#: gl/includes/ui/gl_bank_ui.inc:99 gl/includes/ui/gl_bank_ui.inc.orig:87
-#: gl/includes/ui/gl_journal_ui.inc:58 gl/includes/ui/gl_journal_ui.inc:62
-#: purchasing/includes/ui/invoice_ui.inc:231
+#: 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:244
msgid "Go"
msgstr ""
-#: gl/includes/ui/gl_bank_ui.inc:185 gl/includes/ui/gl_bank_ui.inc.orig:167
-#: includes/ui/simple_crud_class.inc:52
+#: gl/includes/ui/gl_bank_ui.inc:120
+msgid "Into:"
+msgstr ""
+
+#: gl/includes/ui/gl_bank_ui.inc:187 includes/ui/simple_crud_class.inc:52
#: inventory/includes/item_adjustments_ui.inc:88
#: inventory/includes/stock_transfers_ui.inc:80
#: manufacturing/includes/work_order_issue_ui.inc:59
-#: purchasing/includes/ui/invoice_ui.inc:520
-#: purchasing/includes/ui/po_ui.inc:267
+#: purchasing/includes/ui/invoice_ui.inc:533
+#: purchasing/includes/ui/po_ui.inc:264
#: sales/includes/ui/sales_credit_ui.inc:198
-#: sales/includes/ui/sales_order_ui.inc:203
-#: sales/includes/ui/sales_order_ui.inc:207
+#: sales/includes/ui/sales_order_ui.inc:209
msgid "Edit document line"
msgstr ""
-#: gl/includes/ui/gl_bank_ui.inc:187 gl/includes/ui/gl_bank_ui.inc.orig:169
-#: includes/ui/simple_crud_class.inc:54
+#: gl/includes/ui/gl_bank_ui.inc:189 includes/ui/simple_crud_class.inc:54
#: inventory/includes/item_adjustments_ui.inc:90
#: inventory/includes/stock_transfers_ui.inc:82
#: manufacturing/includes/work_order_issue_ui.inc:61
-#: purchasing/includes/ui/invoice_ui.inc:285
-#: purchasing/includes/ui/po_ui.inc:269
+#: purchasing/includes/ui/invoice_ui.inc:298
+#: purchasing/includes/ui/po_ui.inc:266
#: sales/includes/ui/sales_credit_ui.inc:200
-#: sales/includes/ui/sales_order_ui.inc:205
-#: sales/includes/ui/sales_order_ui.inc:209
+#: sales/includes/ui/sales_order_ui.inc:211
msgid "Remove line from document"
msgstr ""
-#: gl/includes/ui/gl_bank_ui.inc:276 gl/includes/ui/gl_bank_ui.inc.orig:258
-#: gl/includes/ui/gl_journal_ui.inc:222 includes/ui/simple_crud_class.inc:56
+#: gl/includes/ui/gl_bank_ui.inc:278 gl/includes/ui/gl_journal_ui.inc:222
+#: includes/ui/simple_crud_class.inc:56
#: inventory/includes/item_adjustments_ui.inc:158
#: inventory/includes/stock_transfers_ui.inc:138
#: manufacturing/includes/work_order_issue_ui.inc:132
-#: purchasing/includes/ui/po_ui.inc:443
+#: purchasing/includes/ui/po_ui.inc:440
#: sales/includes/ui/sales_credit_ui.inc:294
-#: sales/includes/ui/sales_order_ui.inc:556
-#: sales/includes/ui/sales_order_ui.inc:560
+#: sales/includes/ui/sales_order_ui.inc:561
msgid "Confirm changes"
msgstr ""
-#: gl/includes/ui/gl_bank_ui.inc:278 gl/includes/ui/gl_bank_ui.inc.orig:260
-#: gl/includes/ui/gl_journal_ui.inc:224 includes/ui/simple_crud_class.inc:58
+#: gl/includes/ui/gl_bank_ui.inc:280 gl/includes/ui/gl_journal_ui.inc:224
+#: includes/ui/simple_crud_class.inc:58
#: inventory/includes/item_adjustments_ui.inc:160
#: inventory/includes/stock_transfers_ui.inc:140
#: manufacturing/includes/work_order_issue_ui.inc:134
-#: purchasing/includes/ui/po_ui.inc:445
+#: purchasing/includes/ui/po_ui.inc:442
#: sales/includes/ui/sales_credit_ui.inc:296
-#: sales/includes/ui/sales_order_ui.inc:558
-#: sales/includes/ui/sales_order_ui.inc:562
+#: sales/includes/ui/sales_order_ui.inc:563
msgid "Cancel changes"
msgstr ""
-#: gl/includes/ui/gl_bank_ui.inc:283 gl/includes/ui/gl_bank_ui.inc.orig:265
-#: gl/includes/ui/gl_journal_ui.inc:228
+#: gl/includes/ui/gl_bank_ui.inc:285 gl/includes/ui/gl_journal_ui.inc:228
#: 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:451
+#: purchasing/includes/ui/po_ui.inc:448
#: sales/includes/ui/sales_credit_ui.inc:302
-#: sales/includes/ui/sales_order_ui.inc:564
-#: sales/includes/ui/sales_order_ui.inc:568
+#: sales/includes/ui/sales_order_ui.inc:569
msgid "Add Item"
msgstr ""
-#: gl/includes/ui/gl_bank_ui.inc:284 gl/includes/ui/gl_bank_ui.inc.orig:266
+#: gl/includes/ui/gl_bank_ui.inc:286
#: inventory/includes/item_adjustments_ui.inc:167
#: inventory/includes/stock_transfers_ui.inc:147
#: manufacturing/includes/work_order_issue_ui.inc:141
-#: purchasing/includes/ui/po_ui.inc:452
+#: purchasing/includes/ui/po_ui.inc:449
#: sales/includes/ui/sales_credit_ui.inc:303
-#: sales/includes/ui/sales_order_ui.inc:565
-#: sales/includes/ui/sales_order_ui.inc:569
+#: sales/includes/ui/sales_order_ui.inc:570
msgid "Add new item to document"
msgstr ""
+#: gl/includes/ui/gl_bank_ui.inc:309
+msgid "Settled AR Amount:"
+msgstr ""
+
+#: gl/includes/ui/gl_bank_ui.inc:309
+msgid "Settled AP Amount:"
+msgstr ""
+
#: gl/includes/ui/gl_journal_ui.inc:38
msgid "Reverse Transaction:"
msgstr ""
msgstr ""
#: includes/access_levels.inc:72 inventory/manage/items.php:341
-#: reporting/reports_main.php:223
+#: reporting/reports_main.php:294
msgid "Dimensions"
msgstr ""
"rate manually on Exchange Rates page."
msgstr ""
-#: includes/errors.inc:123
+#: includes/current_user.inc:91
+msgid ""
+"Before software upgrade you have to include old $security_groups and "
+"$security_headings arrays from old config.php file to the new one."
+msgstr ""
+
+#: includes/current_user.inc:92 includes/ui/ui_controls.inc:190
+#: includes/ui/ui_view.inc:903
+msgid "Back"
+msgstr ""
+
+#: includes/current_user.inc:102
+msgid "System is available for site admin only until full database upgrade"
+msgstr ""
+
+#: includes/current_user.inc:523
+msgid "Requesting data..."
+msgstr ""
+
+#: includes/errors.inc:125
msgid "in file"
msgstr ""
-#: includes/errors.inc:123
+#: includes/errors.inc:125
msgid "at line "
msgstr ""
-#: includes/errors.inc:177
+#: includes/errors.inc:179
msgid "Debug mode database warning:"
msgstr ""
-#: includes/errors.inc:179
+#: includes/errors.inc:181
msgid "DATABASE ERROR :"
msgstr ""
-#: includes/errors.inc:210
+#: includes/errors.inc:212
msgid ""
"The entered information is a duplicate. Please go back and enter different "
"values."
msgstr ""
-#: includes/main.inc:41
+#: includes/main.inc:41 includes/main.inc.orig:41
msgid "This page is usable only with javascript enabled browsers."
msgstr ""
-#: includes/packages.inc:190
+#: includes/packages.inc:189
#, php-format
msgid "No key field '%s' in file '%s'"
msgstr ""
-#: includes/packages.inc:295 includes/packages.inc:329
+#: includes/packages.inc:294
+msgid "Cannot download repo index file."
+msgstr ""
+
+#: includes/packages.inc:306 includes/packages.inc:343
#, php-format
msgid "Cannot delete outdated '%s' file."
msgstr ""
-#: includes/packages.inc:299
+#: includes/packages.inc:310
msgid "Release file in repository is invalid, or public key is outdated."
msgstr ""
-#: includes/packages.inc:316
+#: includes/packages.inc:327
msgid "Repository version does not match application version."
msgstr ""
-#: includes/packages.inc:333
+#: includes/packages.inc:335 includes/packages.inc:377
+#, php-format
+msgid "Cannot download '%s' file."
+msgstr ""
+
+#: includes/packages.inc:347
#, php-format
msgid ""
"Security alert: broken index file in repository '%s'. Please inform "
"repository administrator about this issue."
msgstr ""
-#: includes/packages.inc:366
+#: includes/packages.inc:383
#, php-format
msgid ""
"Security alert: broken package '%s' in repository. Please inform repository "
"administrator about this issue."
msgstr ""
-#: includes/packages.inc:621 includes/packages.inc:672
+#: includes/packages.inc:638 includes/packages.inc:699
#, php-format
msgid "Package '%s' not found."
msgstr ""
+#: includes/session.inc:136
+msgid "Incorrect Password"
+msgstr ""
+
+#: includes/session.inc:137
+msgid "The user and password combination is not valid for the system."
+msgstr ""
+
+#: includes/session.inc:139
+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
+msgid "Try again"
+msgstr ""
+
+#: includes/session.inc:180
+#, php-format
+msgid ""
+"Brute force attack on account '%s' detected. Access for non-logged users "
+"temporarily blocked."
+msgstr ""
+
+#: includes/session.inc:211
+msgid "Security settings have not been defined for your user account."
+msgstr ""
+
+#: includes/session.inc:212
+msgid "Please contact your system administrator."
+msgstr ""
+
+#: includes/session.inc:213
+msgid ""
+"Please remove $security_groups and $security_headings arrays from config.php "
+"file!"
+msgstr ""
+
+#: includes/session.inc:215
+msgid ""
+"Access to application has been blocked until database upgrade is completed "
+"by system administrator."
+msgstr ""
+
+#: includes/session.inc:229
+msgid ""
+"The security settings on your account do not permit you to access this "
+"function"
+msgstr ""
+
+#: includes/session.inc:238
+msgid ""
+"System is blocked after source upgrade until database is updated on System/"
+"Software Upgrade page"
+msgstr ""
+
#: includes/sysnames.inc:23 includes/sysnames.inc:148
msgid "Bank Payment"
msgstr ""
msgid "Inventory Adjustment"
msgstr ""
-#: includes/sysnames.inc:32 purchasing/includes/ui/po_ui.inc:323
+#: includes/sysnames.inc:32 purchasing/includes/ui/po_ui.inc:320
#: purchasing/view/view_po.php:30
msgid "Purchase Order"
msgstr ""
#: includes/sysnames.inc:40 sales/inquiry/sales_orders_view.php:139
#: sales/inquiry/sales_orders_view.php:161
-#: sales/inquiry/sales_orders_view.php.orig:137
-#: sales/inquiry/sales_orders_view.php.orig:159
msgid "Sales Order"
msgstr ""
-#: includes/sysnames.inc:41 sales/sales_order_entry.php:614
-#: sales/sales_order_entry.php:618 sales/sales_order_entry.php:629
-#: sales/sales_order_entry.php.orig:628
+#: includes/sysnames.inc:41 sales/sales_order_entry.php:640
msgid "Sales Quotation"
msgstr ""
msgid "CP"
msgstr ""
-#: includes/sysnames.inc:54 sales/customer_invoice.php:471
-#: sales/customer_invoice.php:473
+#: includes/sysnames.inc:54 sales/customer_invoice.php:482
msgid "DN"
msgstr ""
msgid "SP"
msgstr ""
-#: includes/sysnames.inc:61 reporting/rep204.php:82 reporting/rep305.php:95
-#: reporting/rep305.php:98
+#: includes/sysnames.inc:61 reporting/rep204.php:84 reporting/rep305.php:101
msgid "GRN"
msgstr ""
msgid "Cash"
msgstr ""
-#: includes/sysnames.inc:96 reporting/rep101.php:137 reporting/rep102.php:123
-#: reporting/rep102.php:130 reporting/rep105.php:107 reporting/rep106.php:81
-#: reporting/rep114.php:93 reporting/rep304.php:112 reporting/rep304.php:122
+#: includes/sysnames.inc:96 reporting/rep101.php:127 reporting/rep102.php:125
+#: reporting/rep102.php:132 reporting/rep105.php:109 reporting/rep106.php:83
+#: reporting/rep114.php:95 reporting/rep304.php:114 reporting/rep304.php:124
#: reporting/reports_main.php:32 reporting/reports_main.php:36
-#: reporting/reports_main.php:43 reporting/reports_main.php:108
-#: reporting/reports_main.php:203 sales/create_recurrent_invoices.php:115
-#: sales/customer_credit_invoice.php:237 sales/customer_delivery.php:338
-#: sales/customer_invoice.php:378
+#: 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:338
+#: sales/customer_invoice.php:389
#: sales/allocations/customer_allocation_main.php:97
#: sales/allocations/customer_allocation_main.php:105
#: sales/manage/recurrent_invoices.php:102 sales/view/view_credit.php:47
#: sales/inquiry/customer_allocation_inquiry.php:150
#: sales/inquiry/customer_allocation_inquiry.php:160
-#: sales/inquiry/customer_inquiry.php:230
-#: sales/inquiry/customer_inquiry.php:244
-#: sales/inquiry/customer_inquiry.php.orig:230
-#: sales/inquiry/customer_inquiry.php.orig:244
+#: sales/inquiry/customer_inquiry.php:223
+#: sales/inquiry/customer_inquiry.php:237
#: sales/inquiry/sales_deliveries_view.php:180
#: sales/inquiry/sales_orders_view.php:264
#: sales/inquiry/sales_orders_view.php:278
-#: sales/inquiry/sales_orders_view.php.orig:262
-#: sales/inquiry/sales_orders_view.php.orig:276
-#: sales/create_recurrent_invoices.php:132
-#: sales/customer_credit_invoice.php:235 sales/customer_invoice.php:380
msgid "Customer"
msgstr ""
#: includes/sysnames.inc:97 includes/sysnames.inc:172
-#: inventory/purchasing_data.php:129 purchasing/includes/ui/grn_ui.inc:20
-#: purchasing/includes/ui/po_ui.inc:316
+#: inventory/purchasing_data.php:147 purchasing/includes/ui/grn_ui.inc:20
+#: purchasing/includes/ui/grn_ui.inc:52 purchasing/includes/ui/po_ui.inc:313
#: purchasing/view/view_supp_credit.php:42
#: purchasing/view/view_supp_invoice.php:45
#: purchasing/inquiry/po_search_completed.php:123
#: purchasing/inquiry/supplier_allocation_inquiry.php:142
#: purchasing/inquiry/supplier_inquiry.php:171
#: purchasing/inquiry/supplier_inquiry.php:185
-#: purchasing/inquiry/supplier_inquiry.php.orig:165
-#: purchasing/inquiry/supplier_inquiry.php.orig:179
#: purchasing/allocations/supplier_allocation_main.php:98
#: purchasing/allocations/supplier_allocation_main.php:106
-#: reporting/rep201.php:125 reporting/rep202.php:128 reporting/rep202.php:135
-#: reporting/rep203.php:98 reporting/rep204.php:88
-#: reporting/reports_main.php:132 reporting/reports_main.php:136
-#: reporting/reports_main.php:143 reporting/reports_main.php:153
-#: reporting/reports_main.php:159
+#: reporting/rep201.php:119 reporting/rep202.php:130 reporting/rep202.php:137
+#: reporting/rep203.php:100 reporting/rep204.php:90 reporting/rep306.php:141
+#: reporting/rep306.php:151 reporting/reports_main.php:149
+#: reporting/reports_main.php:153 reporting/reports_main.php:162
+#: reporting/reports_main.php:173 reporting/reports_main.php:180
+#: reporting/reports_main.php:252
msgid "Supplier"
msgstr ""
msgid "Day In Following Month"
msgstr ""
+#: includes/sysnames.inc:187
+msgid "Jan"
+msgstr ""
+
+#: includes/sysnames.inc:187
+msgid "Feb"
+msgstr ""
+
+#: includes/sysnames.inc:187
+msgid "Mar"
+msgstr ""
+
+#: includes/sysnames.inc:187
+msgid "Apr"
+msgstr ""
+
+#: includes/sysnames.inc:187 includes/ui/ui_view.inc:900
+msgid "May"
+msgstr ""
+
+#: includes/sysnames.inc:187
+msgid "Jun"
+msgstr ""
+
+#: includes/sysnames.inc:187
+msgid "Jul"
+msgstr ""
+
+#: includes/sysnames.inc:187
+msgid "Aug"
+msgstr ""
+
+#: includes/sysnames.inc:187
+msgid "Sep"
+msgstr ""
+
+#: includes/sysnames.inc:187
+msgid "Oct"
+msgstr ""
+
+#: includes/sysnames.inc:187
+msgid "Nov"
+msgstr ""
+
+#: includes/sysnames.inc:187
+msgid "Dec"
+msgstr ""
+
#: includes/system_tests.inc:15 includes/ui/ui_view.inc:210
-#: reporting/rep705.php:250 reporting/rep705.php:261 reporting/rep705.php:270
+#: reporting/rep705.php:254 reporting/rep705.php:265 reporting/rep705.php:274
msgid "Info"
msgstr ""
msgid "Extensions system"
msgstr ""
-#: includes/system_tests.inc:363 includes/system_tests.inc:371
+#: includes/system_tests.inc:371
msgid "Extensions configuration files and directories should be writeable"
msgstr ""
-#: includes/system_tests.inc:375 includes/system_tests.inc:384
+#: includes/system_tests.inc:384
#, php-format
msgid "Non-standard theme directory '%s' is not writable"
msgstr ""
-#: includes/system_tests.inc:385 includes/system_tests.inc:394
+#: includes/system_tests.inc:394
msgid ""
"OpenSSL PHP extension have to be enabled to use extension repository system."
msgstr ""
-#: includes/system_tests.inc:388 includes/system_tests.inc:397
+#: includes/system_tests.inc:397
msgid ""
"OpenSSL have to be available on your server to use extension repository "
"system."
msgstr ""
-#: includes/system_tests.inc:411 includes/system_tests.inc:420
+#: includes/system_tests.inc:420
msgid "Test"
msgstr ""
-#: includes/system_tests.inc:411 includes/system_tests.inc:420
+#: includes/system_tests.inc:420
msgid "Test type"
msgstr ""
-#: includes/system_tests.inc:411 includes/ui/view_package.php:37
-#: reporting/rep204.php:83 reporting/rep301.php:103
-#: includes/system_tests.inc:420
+#: includes/system_tests.inc:420 includes/ui/view_package.php:47
+#: reporting/rep204.php:85 reporting/rep301.php:105 reporting/rep308.php:150
msgid "Value"
msgstr ""
-#: includes/system_tests.inc:411 reporting/reports_main.php:39
-#: reporting/reports_main.php:49 reporting/reports_main.php:57
-#: reporting/reports_main.php:63 reporting/reports_main.php:71
-#: reporting/reports_main.php:79 reporting/reports_main.php:85
-#: reporting/reports_main.php:93 reporting/reports_main.php:100
-#: reporting/reports_main.php:106 reporting/reports_main.php:112
-#: reporting/reports_main.php:119 reporting/reports_main.php:125
-#: reporting/reports_main.php:130 reporting/reports_main.php:139
-#: reporting/reports_main.php:149 reporting/reports_main.php:156
-#: reporting/reports_main.php:160 reporting/reports_main.php:167
-#: reporting/reports_main.php:173 reporting/reports_main.php:182
-#: reporting/reports_main.php:187 reporting/reports_main.php:196
-#: reporting/reports_main.php:204 reporting/reports_main.php:209
-#: reporting/reports_main.php:216 reporting/reports_main.php:222
-#: reporting/reports_main.php:230 reporting/reports_main.php:241
-#: reporting/reports_main.php:247 reporting/reports_main.php:253
-#: reporting/reports_main.php:267 reporting/reports_main.php:274
-#: reporting/reports_main.php:284 reporting/reports_main.php:295
-#: reporting/reports_main.php:304 reporting/reports_main.php:315
-#: reporting/reports_main.php:321 reporting/reports_main.php:330
-#: reporting/reports_main.php:340 reporting/reports_main.php:348
-#: reporting/reports_main.php:358 reporting/reports_main.php:363
-#: reporting/reports_main.php:371 reporting/reports_main.php:380
-#: reporting/reports_main.php:387 reporting/reports_main.php:394
-#: reporting/reports_main.php:401 reporting/includes/excel_report.inc:295
+#: includes/system_tests.inc:420 reporting/reports_main.php:40
+#: reporting/reports_main.php:51 reporting/reports_main.php:60
+#: reporting/reports_main.php:67 reporting/reports_main.php:76
+#: reporting/reports_main.php:85 reporting/reports_main.php:92
+#: reporting/reports_main.php:101 reporting/reports_main.php:111
+#: reporting/reports_main.php:118 reporting/reports_main.php:125
+#: reporting/reports_main.php:133 reporting/reports_main.php:140
+#: reporting/reports_main.php:146 reporting/reports_main.php:157
+#: reporting/reports_main.php:168 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/reports_main.php:321
+#: reporting/reports_main.php:328 reporting/reports_main.php:343
+#: reporting/reports_main.php:351 reporting/reports_main.php:362
+#: reporting/reports_main.php:374 reporting/reports_main.php:384
+#: reporting/reports_main.php:396 reporting/reports_main.php:403
+#: reporting/reports_main.php:413 reporting/reports_main.php:424
+#: reporting/reports_main.php:433 reporting/reports_main.php:444
+#: reporting/reports_main.php:450 reporting/reports_main.php:459
+#: reporting/reports_main.php:469 reporting/reports_main.php:477
+#: reporting/reports_main.php:485 reporting/reports_main.php:493
+#: reporting/includes/excel_report.inc:295
#: reporting/includes/excel_report.inc:428
-#: reporting/includes/pdf_report.inc:346 reporting/includes/pdf_report.inc:618
-#: sales/view/view_sales_order.php:85 includes/system_tests.inc:420
-#: reporting/includes/pdf_report.inc:619
+#: reporting/includes/pdf_report.inc:346 reporting/includes/pdf_report.inc:619
+#: sales/view/view_sales_order.php:85
msgid "Comments"
msgstr ""
-#: includes/system_tests.inc:435 includes/system_tests.inc:444
+#: includes/system_tests.inc:444
msgid "Ok"
msgstr ""
"trail record."
msgstr ""
-#: includes/db/inventory_db.inc:252
-msgid "Cost was "
-msgstr ""
-
-#: includes/db/inventory_db.inc:252
-msgid " changed to "
+#: includes/db/inventory_db.inc:253
+#: inventory/includes/db/items_trans_db.inc:60
+#, php-format
+msgid "Cost was %s changed to %s x quantity on hand for item '%s'"
msgstr ""
-#: includes/db/inventory_db.inc:252
-msgid " for item "
+#: includes/db/inventory_db.inc:294
+msgid "Zero/negative inventory handling"
msgstr ""
-#: includes/db/inventory_db.inc:292
-msgid "Zero/negative inventory handling"
+#: includes/ui/allocation_cart.inc:286 includes/ui/mk.allocation_cart.inc:286
+#, php-format
+msgid "Allocated amounts in %s:"
msgstr ""
-#: includes/ui/allocation_cart.inc:263
+#: includes/ui/allocation_cart.inc:288 includes/ui/mk.allocation_cart.inc:288
#: purchasing/allocations/supplier_allocation_main.php:94
#: sales/allocations/customer_allocation_main.php:93
msgid "Transaction Type"
msgstr ""
-#: includes/ui/allocation_cart.inc:263 reporting/rep704.php:79
-#: reporting/rep704.php:82 reporting/rep704.php:85 reporting/rep709.php:109
-#: sales/view/view_credit.php:68 sales/view/view_sales_order.php:96
-#: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
-#: sales/inquiry/sales_orders_view.php:226
+#: includes/ui/allocation_cart.inc:288 includes/ui/mk.allocation_cart.inc:288
+msgid "Supplier Ref"
+msgstr ""
+
+#: includes/ui/allocation_cart.inc:288 includes/ui/mk.allocation_cart.inc:288
+#: reporting/rep704.php:83 reporting/rep704.php:86 reporting/rep704.php:89
+#: reporting/rep709.php:111 sales/view/view_credit.php:68
+#: sales/view/view_sales_order.php:96 sales/view/view_sales_order.php:129
+#: sales/view/view_sales_order.php:161 sales/inquiry/sales_orders_view.php:226
#: sales/inquiry/sales_orders_view.php:263
#: sales/inquiry/sales_orders_view.php:277
-#: sales/inquiry/sales_orders_view.php.orig:224
-#: sales/inquiry/sales_orders_view.php.orig:261
-#: sales/inquiry/sales_orders_view.php.orig:275
msgid "Ref"
msgstr ""
-#: includes/ui/allocation_cart.inc:264
+#: includes/ui/allocation_cart.inc:289 includes/ui/mk.allocation_cart.inc:289
msgid "Other Allocations"
msgstr ""
-#: includes/ui/allocation_cart.inc:264 includes/ui/ui_view.inc:489
-#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
-msgid "This Allocation"
-msgstr ""
-
-#: includes/ui/allocation_cart.inc:264 includes/ui/allocation_cart.inc:311
-#: includes/ui/ui_view.inc:489
+#: includes/ui/allocation_cart.inc:289 includes/ui/allocation_cart.inc:342
+#: includes/ui/mk.allocation_cart.inc:289
+#: includes/ui/mk.allocation_cart.inc:343 includes/ui/ui_view.inc:548
#: purchasing/allocations/supplier_allocation_main.php:101
-#: reporting/rep112.php:153 reporting/rep210.php:166
+#: reporting/rep112.php:157 reporting/rep210.php:164
#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
#: sales/allocations/customer_allocation_main.php:100
msgid "Left to Allocate"
msgstr ""
-#: includes/ui/allocation_cart.inc:294 reporting/rep112.php:150
-#: reporting/rep210.php:163
+#: includes/ui/allocation_cart.inc:289 includes/ui/mk.allocation_cart.inc:289
+#: includes/ui/ui_view.inc:548 reporting/includes/doctext.inc:145
+#: reporting/includes/doctext.inc:186
+msgid "This Allocation"
+msgstr ""
+
+#: includes/ui/allocation_cart.inc:322 includes/ui/mk.allocation_cart.inc:322
+#: reporting/rep112.php:154 reporting/rep210.php:161
msgid "Total Allocated"
msgstr ""
-#: includes/ui/allocation_cart.inc:331
+#: includes/ui/allocation_cart.inc:363 includes/ui/mk.allocation_cart.inc:364
msgid "The entry for one or more amounts is invalid or negative."
msgstr ""
-#: includes/ui/allocation_cart.inc:340
+#: includes/ui/allocation_cart.inc:374 includes/ui/mk.allocation_cart.inc:375
msgid "At least one transaction is overallocated."
msgstr ""
-#: includes/ui/allocation_cart.inc:358
+#: includes/ui/allocation_cart.inc:393 includes/ui/mk.allocation_cart.inc:395
msgid ""
"These allocations cannot be processed because the amount allocated is more "
"than the total amount left to allocate."
msgid "Sec Phone"
msgstr ""
-#: includes/ui/contacts_view.inc:41 reporting/rep103.php:223
-#: reporting/includes/header2.inc:104 sales/manage/sales_people.php:99
+#: includes/ui/contacts_view.inc:41 reporting/rep103.php:266
+#: reporting/rep205.php:184 reporting/includes/header2.inc:104
+#: sales/manage/sales_people.php:99
msgid "Fax"
msgstr ""
msgid "Contact active for:"
msgstr ""
-#: includes/ui/contacts_view.inc:102 sales/manage/customers.php:252
-#: sales/manage/customers.php.orig:249
+#: includes/ui/contacts_view.inc:102 sales/manage/customers.php:255
msgid "Phone:"
msgstr ""
#: includes/ui/contacts_view.inc:105 inventory/manage/locations.php:207
#: purchasing/manage/suppliers.php:160 sales/manage/customer_branches.php:263
-#: sales/manage/customers.php:255 sales/manage/customers.php.orig:252
-#: sales/manage/sales_people.php:158
+#: sales/manage/customers.php:258 sales/manage/sales_people.php:158
msgid "E-mail:"
msgstr ""
msgid "Notes:"
msgstr ""
-#: includes/ui/contacts_view.inc:132
+#: includes/ui/contacts_view.inc:131
msgid "The contact name cannot be empty."
msgstr ""
-#: includes/ui/contacts_view.inc:137
+#: includes/ui/contacts_view.inc:136
msgid "Contact reference cannot be empty."
msgstr ""
-#: includes/ui/contacts_view.inc:142
+#: includes/ui/contacts_view.inc:141
msgid "You have to select at least one category."
msgstr ""
-#: includes/ui/db_pager_view.inc:166 includes/ui/radio.ui_input.inc:899
-#: includes/ui/ui_input.inc:898 includes/ui/ui_input.inc:902
+#: includes/ui/db_pager_view.inc:166 includes/ui/ui_input.inc:903
msgid "Show also Inactive"
msgstr ""
msgid "No records"
msgstr ""
-#: includes/ui/radio.ui_input.inc:206 includes/ui/simple_crud_class.inc:227
-#: includes/ui/ui_input.inc:206 includes/ui/ui_input.inc:207
+#: includes/ui/simple_crud_class.inc:227 includes/ui/ui_input.inc:207
msgid "Submit changes"
msgstr ""
-#: includes/ui/radio.ui_input.inc:207 includes/ui/simple_crud_class.inc:229
-#: includes/ui/ui_input.inc:207 includes/ui/ui_input.inc:208
+#: includes/ui/simple_crud_class.inc:229 includes/ui/ui_input.inc:208
msgid "Clone"
msgstr ""
-#: includes/ui/radio.ui_input.inc:208 includes/ui/simple_crud_class.inc:229
-#: includes/ui/ui_input.inc:208 includes/ui/ui_input.inc:209
+#: includes/ui/simple_crud_class.inc:229 includes/ui/ui_input.inc:209
msgid "Edit new record with current data"
msgstr ""
-#: includes/ui/radio.ui_input.inc:209 includes/ui/simple_crud_class.inc:231
-#: includes/ui/ui_input.inc:209 includes/ui/ui_input.inc:210
+#: includes/ui/simple_crud_class.inc:231 includes/ui/ui_input.inc:210
msgid "Cancel edition"
msgstr ""
-#: includes/ui/radio.ui_input.inc:628 includes/ui/ui_input.inc:627
-#: reporting/includes/reports_classes.inc:216 includes/ui/ui_input.inc:631
-#: reporting/includes/reports_classes.inc:219
+#: includes/ui/ui_controls.inc:72
+msgid "Request from outside of this page is forbidden."
+msgstr ""
+
+#: includes/ui/ui_controls.inc:73
+msgid "CSRF attack detected from: "
+msgstr ""
+
+#: includes/ui/ui_controls.inc:139
+msgid "You should automatically be forwarded."
+msgstr ""
+
+#: includes/ui/ui_controls.inc:140
+msgid "If this does not happen"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:140
+msgid "click here"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:140
+msgid "to continue"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:190
+msgid "Close"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:452 sales/manage/customers.php:23
+msgid "Customers"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:454
+msgid "Branches"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:456 purchasing/manage/suppliers.php:22
+msgid "Suppliers"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:458 inventory/transfers.php:228
+#: inventory/manage/items.php:21 reporting/reports_main.php:253
+msgid "Items"
+msgstr ""
+
+#: includes/ui/ui_controls.inc:603
+msgid "Entered data has not been saved yet.\\nDo you want to abandon changes?"
+msgstr ""
+
+#: includes/ui/ui_input.inc:631 reporting/includes/reports_classes.inc:219
msgid "Click Here to Pick up the date"
msgstr ""
-#: includes/ui/radio.ui_input.inc:911 includes/ui/sav.ui_lists.inc:2131
-#: includes/ui/ui_input.inc:910 includes/ui/ui_lists.inc:2152
-#: reporting/rep301.php:152 reporting/rep302.php:166 reporting/rep303.php:170
-#: reporting/rep304.php:166 reporting/rep304.php:170
-#: sales/manage/customer_branches.php:302 includes/ui/ui_input.inc:914
+#: includes/ui/ui_input.inc:915 includes/ui/ui_lists.inc:2156
+#: reporting/rep301.php:155 reporting/rep302.php:170 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:302
msgid "Inactive"
msgstr ""
-#: includes/ui/radio.ui_input.inc:921 includes/ui/radio.ui_input.inc:933
-#: includes/ui/ui_input.inc:920 includes/ui/ui_input.inc:932
-#: includes/ui/ui_input.inc:924 includes/ui/ui_input.inc:936
+#: includes/ui/ui_input.inc:925 includes/ui/ui_input.inc:937
msgid "Current Credit:"
msgstr ""
-#: includes/ui/radio.ui_input.inc:947 includes/ui/ui_input.inc:946
-#: includes/ui/ui_input.inc:950
+#: includes/ui/ui_input.inc:951
msgid "Bank Balance:"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:17 includes/ui/ui_lists.inc:17
+#: includes/ui/ui_lists.inc:17
msgid "Set filter"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:100 includes/ui/ui_lists.inc:100
+#: includes/ui/ui_lists.inc:100
msgid "Press Space tab for search pattern entry"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:104 includes/ui/ui_lists.inc:104
+#: includes/ui/ui_lists.inc:104
msgid "Enter code fragment to search or * for all"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:105 includes/ui/ui_lists.inc:105
+#: includes/ui/ui_lists.inc:105
msgid "Enter description fragment to search or * for all"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:449 includes/ui/sav.ui_lists.inc:1367
-#: includes/ui/ui_lists.inc:453 includes/ui/ui_lists.inc:1388
+#: includes/ui/ui_lists.inc:453 includes/ui/ui_lists.inc:1391
msgid "All Suppliers"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:453 includes/ui/ui_lists.inc:457
+#: includes/ui/ui_lists.inc:457
msgid "Press Space tab to filter by name fragment"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:454 includes/ui/ui_lists.inc:458
+#: includes/ui/ui_lists.inc:458
msgid "Select supplier"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:498 includes/ui/ui_lists.inc:505
+#: includes/ui/ui_lists.inc:505
msgid "All Customers"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:502 includes/ui/ui_lists.inc:509
+#: includes/ui/ui_lists.inc:509
msgid "Press Space tab to filter by name fragment; F2 - entry new customer"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:503 includes/ui/ui_lists.inc:510
+#: includes/ui/ui_lists.inc:510
msgid "Select customer"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:546 includes/ui/ui_lists.inc:558
+#: includes/ui/ui_lists.inc:558
msgid "All branches"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:549 includes/ui/ui_lists.inc:561
+#: includes/ui/ui_lists.inc:561
msgid "Select customer branch"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:584 includes/ui/ui_lists.inc:601
+#: includes/ui/ui_lists.inc:601
msgid "All Locations"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:736 includes/ui/sav.ui_lists.inc:801
#: includes/ui/ui_lists.inc:753 includes/ui/ui_lists.inc:822
msgid "All Items"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:1274 includes/ui/ui_lists.inc:1295
+#: includes/ui/ui_lists.inc:1298
msgid "All Sales Types"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:1603 includes/ui/ui_lists.inc:1624
+#: includes/ui/ui_lists.inc:1629
msgid "Use Item Sales Accounts"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:1915 includes/ui/sav.ui_lists.inc:1932
-#: includes/ui/sav.ui_lists.inc:1949 includes/ui/ui_lists.inc:1936
-#: includes/ui/ui_lists.inc:1953 includes/ui/ui_lists.inc:1970
+#: includes/ui/ui_lists.inc:1940 includes/ui/ui_lists.inc:1957
+#: includes/ui/ui_lists.inc:1974
msgid "All Types"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:1916 includes/ui/ui_lists.inc:1937
-#: sales/view/view_sales_order.php:127
+#: includes/ui/ui_lists.inc:1941 sales/view/view_sales_order.php:127
msgid "Sales Invoices"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:1917 includes/ui/sav.ui_lists.inc:1934
-#: includes/ui/sav.ui_lists.inc:1952 includes/ui/ui_lists.inc:1938
-#: includes/ui/ui_lists.inc:1955 includes/ui/ui_lists.inc:1973
+#: includes/ui/ui_lists.inc:1942 includes/ui/ui_lists.inc:1959
+#: includes/ui/ui_lists.inc:1977
msgid "Overdue Invoices"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:1918 includes/ui/sav.ui_lists.inc:1935
-#: includes/ui/sav.ui_lists.inc:1953 includes/ui/ui_lists.inc:1939
-#: includes/ui/ui_lists.inc:1956 includes/ui/ui_lists.inc:1974
-#: includes/ui/ui_view.inc:484
+#: includes/ui/ui_lists.inc:1943 includes/ui/ui_lists.inc:1960
+#: includes/ui/ui_lists.inc:1978 includes/ui/ui_view.inc:543
msgid "Payments"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:1919 includes/ui/sav.ui_lists.inc:1936
-#: includes/ui/sav.ui_lists.inc:1954 includes/ui/ui_lists.inc:1940
-#: includes/ui/ui_lists.inc:1957 includes/ui/ui_lists.inc:1975
-#: sales/view/view_sales_order.php:158
+#: includes/ui/ui_lists.inc:1944 includes/ui/ui_lists.inc:1961
+#: includes/ui/ui_lists.inc:1979 sales/view/view_sales_order.php:158
msgid "Credit Notes"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:1920 includes/ui/ui_lists.inc:1941
-#: sales/view/view_sales_order.php:93
+#: includes/ui/ui_lists.inc:1945 sales/view/view_sales_order.php:93
msgid "Delivery Notes"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:1933 includes/ui/sav.ui_lists.inc:1951
-#: includes/ui/ui_lists.inc:1954 includes/ui/ui_lists.inc:1972
+#: includes/ui/ui_lists.inc:1958 includes/ui/ui_lists.inc:1976
msgid "Invoices"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:1937 includes/ui/sav.ui_lists.inc:1955
-#: includes/ui/ui_lists.inc:1958 includes/ui/ui_lists.inc:1976
+#: includes/ui/ui_lists.inc:1962 includes/ui/ui_lists.inc:1980
msgid "Overdue Credit Notes"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:1950 includes/ui/ui_lists.inc:1971
+#: includes/ui/ui_lists.inc:1975
msgid "GRNs"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:1968 includes/ui/ui_lists.inc:1989
+#: includes/ui/ui_lists.inc:1993
msgid "Automatically put balance on back order"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:1969 includes/ui/ui_lists.inc:1990
+#: includes/ui/ui_lists.inc:1994
msgid "Cancel any quantites not delivered"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:1986 includes/ui/ui_lists.inc:2007
+#: includes/ui/ui_lists.inc:2011
msgid "Items Returned to Inventory Location"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:1987 includes/ui/ui_lists.inc:2008
+#: includes/ui/ui_lists.inc:2012
msgid "Items Written Off"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:2157 includes/ui/ui_lists.inc:2178
+#: includes/ui/ui_lists.inc:2182
msgid "New role"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:2215 includes/ui/ui_lists.inc:2236
+#: includes/ui/ui_lists.inc:2234
msgid "No tags defined."
msgstr ""
-#: includes/ui/sav.ui_lists.inc:2215 includes/ui/ui_lists.inc:2236
+#: includes/ui/ui_lists.inc:2234
msgid "No active tags defined."
msgstr ""
-#: includes/ui/sav.ui_lists.inc:2253 includes/ui/ui_lists.inc:2274
+#: includes/ui/ui_lists.inc:2272
#, php-format
msgid "Activated for '%s'"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:2256 includes/ui/ui_lists.inc:2277
+#: includes/ui/ui_lists.inc:2275
msgid "Available and/or installed"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:2326 includes/ui/ui_lists.inc:2347
+#: includes/ui/ui_lists.inc:2345
msgid "Standard new company American COA (4 digit)"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:2328 includes/ui/ui_lists.inc:2349
+#: includes/ui/ui_lists.inc:2347
msgid "Standard American COA (4 digit) with demo data"
msgstr ""
-#: includes/ui/sav.ui_lists.inc:2349 includes/ui/ui_lists.inc:2370
+#: includes/ui/ui_lists.inc:2368
msgid "No payment Link"
msgstr ""
-#: includes/ui/ui_controls.inc:72
-msgid "Request from outside of this page is forbidden."
-msgstr ""
-
-#: includes/ui/ui_controls.inc:73
-msgid "CSRF attack detected from: "
-msgstr ""
-
-#: includes/ui/ui_controls.inc:139
-msgid "You should automatically be forwarded."
-msgstr ""
-
-#: includes/ui/ui_controls.inc:140
-msgid "If this does not happen"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:140
-msgid "click here"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:140
-msgid "to continue"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:187
-msgid "View Attachment"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:190
-msgid "Close"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:450 sales/manage/customers.php:23
-#: sales/manage/customers.php.orig:20
-msgid "Customers"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:452
-msgid "Branches"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:454 purchasing/manage/suppliers.php:22
-msgid "Suppliers"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:456 inventory/transfers.php:230
-#: inventory/manage/items.php:21
-msgid "Items"
-msgstr ""
-
-#: includes/ui/ui_controls.inc:601
-msgid "Entered data has not been saved yet.\\nDo you want to abandon changes?"
-msgstr ""
-
#: includes/ui/ui_msgs.inc:63
msgid "in units of : "
msgstr ""
-#: includes/ui/ui_view.inc:306
+#: includes/ui/ui_view.inc:301
+#, php-format
+msgid ""
+"Cannot retrieve exchange rate for currency %s. Please adjust approximate "
+"rate if needed."
+msgstr ""
+
+#: includes/ui/ui_view.inc:342
msgid "Date Voided:"
msgstr ""
-#: includes/ui/ui_view.inc:407 reporting/rep107.php:173
-#: reporting/rep109.php:182 reporting/rep110.php:186 reporting/rep111.php:169
-#: reporting/rep113.php:172 reporting/rep209.php:188
+#: includes/ui/ui_view.inc:443 reporting/rep107.php:175
+#: reporting/rep109.php:180 reporting/rep110.php:184 reporting/rep111.php:165
+#: reporting/rep113.php:169 reporting/rep209.php:183
msgid "Total Tax Excluded"
msgstr ""
-#: includes/ui/ui_view.inc:413 includes/ui/ui_view.inc:432
-#: includes/ui/ui_view.inc:451 reporting/rep107.php:182
-#: reporting/rep109.php:191 reporting/rep110.php:195 reporting/rep111.php:178
-#: reporting/rep113.php:181 reporting/rep209.php:197
+#: includes/ui/ui_view.inc:449 includes/ui/ui_view.inc:468
+#: includes/ui/ui_view.inc:492 includes/ui/ui_view.inc:509
+#: reporting/rep107.php:184 reporting/rep109.php:189 reporting/rep110.php:193
+#: reporting/rep111.php:174 reporting/rep113.php:178 reporting/rep209.php:192
msgid "Included"
msgstr ""
-#: includes/ui/ui_view.inc:484
+#: includes/ui/ui_view.inc:543
#: purchasing/inquiry/supplier_allocation_inquiry.php:100
msgid "Allocations"
msgstr ""
-#: includes/ui/ui_view.inc:488 reporting/includes/doctext.inc:145
+#: includes/ui/ui_view.inc:547 reporting/includes/doctext.inc:145
#: reporting/includes/doctext.inc:186
msgid "Total Amount"
msgstr ""
-#: includes/ui/ui_view.inc:512 includes/ui/ui_view.inc:513
+#: includes/ui/ui_view.inc:572
msgid "Total Allocated:"
msgstr ""
-#: includes/ui/ui_view.inc:516 includes/ui/ui_view.inc:517
+#: includes/ui/ui_view.inc:576
msgid "Left to Allocate:"
msgstr ""
-#: includes/ui/ui_view.inc:569 includes/ui/ui_view.inc:570
+#: includes/ui/ui_view.inc:629
msgid "No Quick Entries are defined."
msgstr ""
-#: includes/ui/ui_view.inc:597 includes/ui/ui_view.inc:598
+#: includes/ui/ui_view.inc:657
msgid "No Quick Entry lines are defined."
msgstr ""
-#: includes/ui/ui_view.inc:779 purchasing/includes/ui/invoice_ui.inc:452
-#: includes/ui/ui_view.inc:780
+#: includes/ui/ui_view.inc:839 purchasing/includes/ui/invoice_ui.inc:465
msgid "and"
msgstr ""
-#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
+#: includes/ui/ui_view.inc:900
msgid "January"
msgstr ""
-#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
+#: includes/ui/ui_view.inc:900
msgid "February"
msgstr ""
-#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
+#: includes/ui/ui_view.inc:900
msgid "March"
msgstr ""
-#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
+#: includes/ui/ui_view.inc:900
msgid "April"
msgstr ""
-#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
-msgid "May"
-msgstr ""
-
-#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
+#: includes/ui/ui_view.inc:900
msgid "June"
msgstr ""
-#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
+#: includes/ui/ui_view.inc:900
msgid "July"
msgstr ""
-#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
+#: includes/ui/ui_view.inc:900
msgid "August"
msgstr ""
-#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
+#: includes/ui/ui_view.inc:900
msgid "September"
msgstr ""
-#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
+#: includes/ui/ui_view.inc:900
msgid "October"
msgstr ""
-#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
+#: includes/ui/ui_view.inc:900
msgid "November"
msgstr ""
-#: includes/ui/ui_view.inc:840 includes/ui/ui_view.inc:841
+#: includes/ui/ui_view.inc:900
msgid "December"
msgstr ""
-#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842
+#: includes/ui/ui_view.inc:901
msgid "Su"
msgstr ""
-#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842
+#: includes/ui/ui_view.inc:901
msgid "Mo"
msgstr ""
-#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842
+#: includes/ui/ui_view.inc:901
msgid "Tu"
msgstr ""
-#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842
+#: includes/ui/ui_view.inc:901
msgid "We"
msgstr ""
-#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842
+#: includes/ui/ui_view.inc:901
msgid "Th"
msgstr ""
-#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842
+#: includes/ui/ui_view.inc:901
msgid "Fr"
msgstr ""
-#: includes/ui/ui_view.inc:841 includes/ui/ui_view.inc:842
+#: includes/ui/ui_view.inc:901
msgid "Sa"
msgstr ""
-#: includes/ui/ui_view.inc:842 includes/ui/ui_view.inc:843
+#: includes/ui/ui_view.inc:902
msgid "W"
msgstr ""
-#: includes/ui/view_package.php:7
+#: includes/ui/view_package.php:17
msgid "Package Details"
msgstr ""
-#: includes/ui/view_package.php:14
+#: includes/ui/view_package.php:24
msgid ""
"The script must be called with a valid package id to review the info for."
msgstr ""
-#: includes/ui/view_package.php:19
+#: includes/ui/view_package.php:29
msgid "Available version"
msgstr ""
-#: includes/ui/view_package.php:20
+#: includes/ui/view_package.php:30
msgid "Package type"
msgstr ""
-#: includes/ui/view_package.php:21
+#: includes/ui/view_package.php:31
msgid "Package content"
msgstr ""
-#: includes/ui/view_package.php:23
+#: includes/ui/view_package.php:33
msgid "Author"
msgstr ""
-#: includes/ui/view_package.php:24
+#: includes/ui/view_package.php:34
msgid "Home page"
msgstr ""
-#: includes/ui/view_package.php:25
+#: includes/ui/view_package.php:35
msgid "Package maintainer"
msgstr ""
-#: includes/ui/view_package.php:26
+#: includes/ui/view_package.php:36
msgid "Installation path"
msgstr ""
-#: includes/ui/view_package.php:27
+#: includes/ui/view_package.php:37
msgid "Minimal software versions"
msgstr ""
-#: includes/ui/view_package.php:28
+#: includes/ui/view_package.php:38
msgid "Right to left"
msgstr ""
-#: includes/ui/view_package.php:29
+#: includes/ui/view_package.php:39
msgid "Charset encoding"
msgstr ""
-#: includes/ui/view_package.php:34
+#: includes/ui/view_package.php:44
#, php-format
msgid "Content information for package '%s'"
msgstr ""
-#: includes/ui/view_package.php:37
+#: includes/ui/view_package.php:47
msgid "Property"
msgstr ""
msgid "Enter &Another Adjustment"
msgstr ""
-#: inventory/adjustments.php:90 inventory/transfers.php:87
-#: sales/sales_order_entry.php:350 sales/sales_order_entry.php:359
-#: sales/sales_order_entry.php.orig:358
+#: inventory/adjustments.php:88 inventory/transfers.php:85
+#: sales/sales_order_entry.php:363
msgid "You must enter at least one non empty item line."
msgstr ""
-#: inventory/adjustments.php:110 inventory/transfers.php:105
+#: inventory/adjustments.php:108
msgid "The entered date for the adjustment is invalid."
msgstr ""
-#: inventory/adjustments.php:124
+#: inventory/adjustments.php:122
msgid ""
"The adjustment cannot be processed because an adjustment item would cause a "
"negative inventory balance :"
msgstr ""
-#: inventory/adjustments.php:154 manufacturing/work_order_issue.php:141
+#: inventory/adjustments.php:152 manufacturing/work_order_issue.php:139
msgid "The quantity entered is negative or invalid."
msgstr ""
-#: inventory/adjustments.php:161 manufacturing/work_order_issue.php:148
+#: inventory/adjustments.php:159 manufacturing/work_order_issue.php:146
msgid "The entered standard cost is negative or invalid."
msgstr ""
-#: inventory/adjustments.php:230
+#: inventory/adjustments.php:228
msgid "Adjustment Items"
msgstr ""
-#: inventory/adjustments.php:236
+#: inventory/adjustments.php:234
msgid "Process Adjustment"
msgstr ""
-#: inventory/cost_update.php:26
+#: inventory/cost_update.php:31
msgid "Inventory Item Cost Update"
msgstr ""
-#: inventory/cost_update.php:30
+#: inventory/cost_update.php:36
msgid ""
"There are no costable inventory items defined in the system (Purchased or "
"manufactured items)."
msgstr ""
-#: inventory/cost_update.php:51
+#: inventory/cost_update.php:57
msgid "The entered cost is not numeric."
msgstr ""
-#: inventory/cost_update.php:57
+#: inventory/cost_update.php:63
msgid "The new cost is the same as the old cost. Cost was not updated."
msgstr ""
-#: inventory/cost_update.php:67
+#: inventory/cost_update.php:73
msgid "Cost has been updated."
msgstr ""
-#: inventory/cost_update.php:71
+#: inventory/cost_update.php:77
msgid "View the GL Journal Entries for this Cost Update"
msgstr ""
-#: inventory/cost_update.php:85 inventory/prices.php:56
-#: inventory/purchasing_data.php:101 inventory/reorder_level.php:43
+#: inventory/cost_update.php:95 inventory/prices.php:61
+#: inventory/purchasing_data.php:117 inventory/reorder_level.php:48
#: inventory/inquiry/stock_movements.php:53
#: inventory/inquiry/stock_status.php: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:241
-#: sales/inquiry/sales_orders_view.php.orig:239
msgid "Item:"
msgstr ""
-#: inventory/cost_update.php:102
+#: inventory/cost_update.php:116
msgid "Standard Material Cost Per Unit"
msgstr ""
-#: inventory/cost_update.php:105
+#: inventory/cost_update.php:125
msgid "Standard Labour Cost Per Unit"
msgstr ""
-#: inventory/cost_update.php:106
+#: inventory/cost_update.php:126
msgid "Standard Overhead Cost Per Unit"
msgstr ""
-#: inventory/prices.php:16
+#: inventory/prices.php:26
msgid "Inventory Item Sales prices"
msgstr ""
-#: inventory/prices.php:27 inventory/inquiry/stock_movements.php:32
+#: inventory/prices.php:30 inventory/inquiry/stock_movements.php:32
#: inventory/inquiry/stock_status.php:37 inventory/manage/sales_kits.php:24
#: manufacturing/inquiry/where_used_inquiry.php:21
#: sales/credit_note_entry.php:49
msgid "There are no items defined in the system."
msgstr ""
-#: inventory/prices.php:29
+#: inventory/prices.php:32
msgid ""
"There are no sales types in the system. Please set up sales types befor "
"entering pricing."
msgstr ""
-#: inventory/prices.php:70
+#: inventory/prices.php:77
msgid "The price entered must be numeric."
msgstr ""
#: inventory/prices.php:83
+msgid ""
+"The sales pricing for this item, sales type and currency has already been "
+"added."
+msgstr ""
+
+#: inventory/prices.php:96
msgid "This price has been updated."
msgstr ""
-#: inventory/prices.php:91
+#: inventory/prices.php:104
msgid "The new price has been added."
msgstr ""
-#: inventory/prices.php:105
+#: inventory/prices.php:118
msgid "The selected price has been deleted."
msgstr ""
-#: inventory/prices.php:133 reporting/rep104.php:116
-#: sales/customer_delivery.php:355 sales/customer_invoice.php:400
+#: inventory/prices.php:146 reporting/rep104.php:118
+#: sales/customer_delivery.php:355 sales/customer_invoice.php:411
#: sales/view/view_credit.php:73 sales/view/view_dispatch.php:93
#: sales/view/view_invoice.php:92 sales/includes/ui/sales_credit_ui.inc:102
-#: sales/customer_invoice.php:402
msgid "Sales Type"
msgstr ""
-#: inventory/prices.php:133 inventory/purchasing_data.php:129
-#: purchasing/includes/ui/invoice_ui.inc:484
+#: inventory/prices.php:146 inventory/purchasing_data.php:147
+#: purchasing/includes/ui/invoice_ui.inc:497
#: purchasing/po_receive_items.php:63 purchasing/view/view_grn.php:41
-#: purchasing/view/view_po.php:45 reporting/rep104.php:109
+#: purchasing/view/view_po.php:45 reporting/rep104.php:111
#: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:170
-#: sales/customer_credit_invoice.php:283 sales/customer_delivery.php:433
-#: sales/customer_invoice.php:468 sales/view/view_credit.php:91
+#: sales/customer_credit_invoice.php:281 sales/customer_delivery.php:433
+#: sales/customer_invoice.php:479 sales/view/view_credit.php:91
#: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:114
#: sales/view/view_sales_order.php:202
#: sales/includes/ui/sales_credit_ui.inc:168
-#: sales/customer_credit_invoice.php:281 sales/customer_invoice.php:470
msgid "Price"
msgstr ""
-#: inventory/prices.php:155
+#: inventory/prices.php:168
msgid "There are no prices set up for this part."
msgstr ""
-#: inventory/prices.php:174
+#: inventory/prices.php:192
msgid "Currency:"
msgstr ""
-#: inventory/prices.php:176
+#: inventory/prices.php:194
msgid "Sales Type:"
msgstr ""
-#: inventory/prices.php:184 inventory/purchasing_data.php:191
+#: inventory/prices.php:202 inventory/purchasing_data.php:215
msgid "Price:"
msgstr ""
-#: inventory/prices.php:184
+#: inventory/prices.php:202
msgid "per"
msgstr ""
-#: inventory/prices.php:188
+#: inventory/prices.php:206
msgid "The price is calculated."
msgstr ""
-#: inventory/purchasing_data.php:16
+#: inventory/purchasing_data.php:25
msgid "Supplier Purchasing Data"
msgstr ""
-#: inventory/purchasing_data.php:23 purchasing/po_entry_items.php:64
-#: purchasing/po_entry_items.php:67
+#: inventory/purchasing_data.php:27 purchasing/po_entry_items.php:67
msgid "There are no purchasable inventory items defined in the system."
msgstr ""
-#: inventory/purchasing_data.php:24 purchasing/po_entry_items.php:62
+#: inventory/purchasing_data.php:28 purchasing/po_entry_items.php:65
#: purchasing/supplier_credit.php:32 purchasing/supplier_invoice.php:32
-#: purchasing/supplier_payment.php:40 purchasing/po_entry_items.php:65
+#: purchasing/supplier_payment.php:40
msgid "There are no suppliers defined in the system."
msgstr ""
-#: inventory/purchasing_data.php:38 inventory/manage/item_codes.php:35
+#: inventory/purchasing_data.php:46 inventory/manage/item_codes.php:35
msgid "There is no item selected."
msgstr ""
-#: inventory/purchasing_data.php:44
+#: inventory/purchasing_data.php:52
msgid "The price entered was not numeric."
msgstr ""
-#: inventory/purchasing_data.php:50
+#: inventory/purchasing_data.php: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 "
"unit of measure."
msgstr ""
-#: inventory/purchasing_data.php:60
+#: inventory/purchasing_data.php:64
+msgid "The purchasing data for this supplier has already been added."
+msgstr ""
+
+#: inventory/purchasing_data.php:73
msgid "This supplier purchasing data has been added."
msgstr ""
-#: inventory/purchasing_data.php:66
+#: inventory/purchasing_data.php:79
msgid "Supplier purchasing data has been updated."
msgstr ""
-#: inventory/purchasing_data.php:77
+#: inventory/purchasing_data.php:90
msgid "The purchasing data item has been sucessfully deleted."
msgstr ""
-#: inventory/purchasing_data.php:114
+#: inventory/purchasing_data.php:132
msgid "Entered item is not defined. Please re-enter."
msgstr ""
-#: inventory/purchasing_data.php:123
+#: inventory/purchasing_data.php:141
msgid "There is no purchasing data set up for the part selected"
msgstr ""
-#: inventory/purchasing_data.php:130
+#: inventory/purchasing_data.php:148
msgid "Supplier's Unit"
msgstr ""
-#: inventory/purchasing_data.php:130
+#: inventory/purchasing_data.php:148
msgid "Conversion Factor"
msgstr ""
-#: inventory/purchasing_data.php:130
+#: inventory/purchasing_data.php:148
msgid "Supplier's Description"
msgstr ""
-#: inventory/purchasing_data.php:192
+#: inventory/purchasing_data.php:216
msgid "Suppliers Unit of Measure:"
msgstr ""
-#: inventory/purchasing_data.php:198
+#: inventory/purchasing_data.php:222
msgid "Conversion Factor (to our UOM):"
msgstr ""
-#: inventory/purchasing_data.php:200
+#: inventory/purchasing_data.php:224
msgid "Supplier's Code or Description:"
msgstr ""
-#: inventory/reorder_level.php:16
+#: inventory/reorder_level.php:25
msgid "Reorder Levels"
msgstr ""
-#: inventory/reorder_level.php:24 inventory/transfers.php:32
+#: inventory/reorder_level.php:27 inventory/transfers.php:32
msgid ""
"There are no inventory items defined in the system (Purchased or "
"manufactured items)."
msgstr ""
-#: inventory/reorder_level.php:57 inventory/inquiry/stock_status.php:72
-#: inventory/inquiry/stock_status.php:76
+#: inventory/reorder_level.php:65 inventory/inquiry/stock_movements.php:83
+#: inventory/inquiry/stock_status.php:72 inventory/inquiry/stock_status.php: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:124
#: purchasing/inquiry/po_search_completed.php:134
#: purchasing/inquiry/po_search.php:133 purchasing/inquiry/po_search.php:144
-#: reporting/rep105.php:118 reporting/rep301.php:110 reporting/rep302.php:130
-#: reporting/rep303.php:122 reporting/rep304.php:121
-#: reporting/reports_main.php:180 reporting/reports_main.php:186
-#: reporting/reports_main.php:191 reporting/reports_main.php:202
-#: sales/manage/sales_points.php:84
+#: reporting/rep105.php:120 reporting/rep301.php:112 reporting/rep302.php:132
+#: reporting/rep303.php:134 reporting/rep304.php:123 reporting/rep306.php:150
+#: reporting/rep307.php:124 reporting/rep308.php:157
+#: reporting/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:57 inventory/inquiry/stock_movements.php:82
+#: inventory/reorder_level.php:65 inventory/inquiry/stock_movements.php:84
#: inventory/inquiry/stock_status.php:76 purchasing/supplier_credit.php:203
-#: sales/sales_order_entry.php:492 sales/includes/ui/sales_order_ui.inc:175
-#: sales/sales_order_entry.php:496 sales/includes/ui/sales_order_ui.inc:179
-#: sales/sales_order_entry.php:507 sales/sales_order_entry.php.orig:506
+#: sales/sales_order_entry.php:518 sales/includes/ui/sales_order_ui.inc:181
msgid "Quantity On Hand"
msgstr ""
-#: inventory/reorder_level.php:57 inventory/inquiry/stock_status.php:76
+#: inventory/reorder_level.php:65 inventory/inquiry/stock_status.php:76
#: sales/includes/db/sales_order_db.inc:110
-#: sales/includes/db/sales_order_db.inc:263
-#: sales/includes/db/sales_order_db.inc.orig:110
-#: sales/includes/db/sales_order_db.inc.orig:263
+#: sales/includes/db/sales_order_db.inc:283
msgid "Re-Order Level"
msgstr ""
-#: inventory/reorder_level.php:75
+#: inventory/reorder_level.php:89
msgid "Reorder levels has been updated."
msgstr ""
msgid "Enter &Another Inventory Transfer"
msgstr ""
-#: inventory/transfers.php:117
+#: inventory/transfers.php:103
+msgid "The entered transfer date is invalid."
+msgstr ""
+
+#: inventory/transfers.php:115
msgid "The locations to transfer from and to must be different."
msgstr ""
-#: inventory/transfers.php:127
+#: inventory/transfers.php:125
msgid ""
"The quantity entered is greater than the available quantity for this item at "
"the source location :"
msgstr ""
-#: inventory/transfers.php:160
+#: inventory/transfers.php:158
msgid "The quantity entered must be a positive number."
msgstr ""
-#: inventory/transfers.php:237
+#: inventory/transfers.php:235
msgid "Process Transfer"
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:232
-#: sales/inquiry/sales_orders_view.php.orig:230
msgid "Location:"
msgstr ""
#: inventory/includes/item_adjustments_ui.inc:62
#: inventory/includes/stock_transfers_ui.inc:60
#: manufacturing/includes/work_order_issue_ui.inc:33
-#: purchasing/includes/ui/po_ui.inc:236 purchasing/po_receive_items.php:62
+#: purchasing/includes/ui/po_ui.inc:233 purchasing/po_receive_items.php:62
#: purchasing/view/view_grn.php:40 purchasing/view/view_po.php:45
#: reporting/includes/doctext.inc:29 reporting/includes/doctext.inc:169
-#: reporting/includes/doctext.inc:206 sales/customer_credit_invoice.php:282
-#: sales/customer_delivery.php:431 sales/customer_invoice.php:467
+#: reporting/includes/doctext.inc:206 sales/customer_credit_invoice.php:280
+#: sales/customer_delivery.php:431 sales/customer_invoice.php:478
#: sales/view/view_credit.php:90 sales/view/view_dispatch.php:112
#: sales/view/view_invoice.php:113 sales/view/view_sales_order.php:201
#: sales/includes/ui/sales_credit_ui.inc:167
-#: sales/includes/ui/sales_order_ui.inc:140
-#: sales/customer_credit_invoice.php:280 sales/customer_invoice.php:469
#: sales/includes/ui/sales_order_ui.inc:144
msgid "Item Code"
msgstr ""
#: inventory/includes/item_adjustments_ui.inc:62
#: inventory/includes/stock_transfers_ui.inc:60
#: manufacturing/includes/work_order_issue_ui.inc:33
-#: purchasing/includes/ui/po_ui.inc:236 purchasing/view/view_grn.php:40
+#: purchasing/includes/ui/po_ui.inc:233 purchasing/view/view_grn.php:40
#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:29
#: reporting/includes/doctext.inc:169 reporting/includes/doctext.inc:206
-#: sales/customer_credit_invoice.php:282 sales/customer_delivery.php:431
-#: sales/customer_invoice.php:467 sales/view/view_credit.php:90
+#: sales/customer_credit_invoice.php:280 sales/customer_delivery.php:431
+#: sales/customer_invoice.php:478 sales/view/view_credit.php:90
#: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:113
#: sales/view/view_sales_order.php:201
#: sales/includes/ui/sales_credit_ui.inc:167
-#: sales/includes/ui/sales_order_ui.inc:140
-#: sales/customer_credit_invoice.php:280 sales/customer_invoice.php:469
#: sales/includes/ui/sales_order_ui.inc:144
msgid "Item Description"
msgstr ""
#: manufacturing/includes/manufacturing_ui.inc:157
#: manufacturing/includes/manufacturing_ui.inc:332
#: manufacturing/includes/work_order_issue_ui.inc:33
-#: purchasing/includes/ui/invoice_ui.inc:484
-#: purchasing/includes/ui/po_ui.inc:236 purchasing/view/view_grn.php:40
-#: purchasing/view/view_po.php:45 reporting/rep301.php:103
-#: reporting/rep303.php:109 reporting/rep303.php:115 reporting/rep401.php:69
+#: purchasing/includes/ui/invoice_ui.inc:497
+#: purchasing/includes/ui/po_ui.inc:233 purchasing/view/view_grn.php:40
+#: purchasing/view/view_po.php:45 reporting/rep301.php:105
+#: reporting/rep303.php:121 reporting/rep303.php:127 reporting/rep401.php:71
#: reporting/includes/doctext.inc:29 reporting/includes/doctext.inc:170
#: reporting/includes/doctext.inc:203 sales/view/view_credit.php:90
#: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:113
#: sales/view/view_sales_order.php:201
#: sales/includes/ui/sales_credit_ui.inc:167
-#: sales/includes/ui/sales_order_ui.inc:140
#: sales/includes/ui/sales_order_ui.inc:144
msgid "Quantity"
msgstr ""
#: inventory/includes/stock_transfers_ui.inc:60
#: inventory/manage/item_units.php:94
#: manufacturing/includes/work_order_issue_ui.inc:34
-#: purchasing/includes/ui/po_ui.inc:237 purchasing/view/view_grn.php:41
+#: purchasing/includes/ui/po_ui.inc:234 purchasing/view/view_grn.php:41
#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:30
#: reporting/includes/doctext.inc:170 sales/view/view_credit.php:91
#: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:114
#: sales/view/view_sales_order.php:201
#: sales/includes/ui/sales_credit_ui.inc:167
-#: sales/includes/ui/sales_order_ui.inc:142
#: sales/includes/ui/sales_order_ui.inc:146
msgid "Unit"
msgstr ""
#: inventory/includes/item_adjustments_ui.inc:63
#: inventory/view/view_adjustment.php:57
#: manufacturing/includes/manufacturing_ui.inc:29
-#: manufacturing/includes/work_order_issue_ui.inc:34 reporting/rep301.php:103
+#: manufacturing/includes/work_order_issue_ui.inc:34 reporting/rep301.php:105
msgid "Unit Cost"
msgstr ""
msgstr ""
#: inventory/inquiry/stock_movements.php:65
-#: purchasing/includes/ui/invoice_ui.inc:453
+#: purchasing/includes/ui/invoice_ui.inc:466
#: purchasing/inquiry/supplier_allocation_inquiry.php:57
#: purchasing/inquiry/supplier_inquiry.php:58
-#: purchasing/inquiry/supplier_inquiry.php.orig:54
#: sales/inquiry/customer_allocation_inquiry.php:51
#: sales/inquiry/customer_inquiry.php:58
-#: sales/inquiry/customer_inquiry.php.orig:58
msgid "Refresh Inquiry"
msgstr ""
-#: inventory/inquiry/stock_movements.php:81
+#: inventory/inquiry/stock_movements.php:84
msgid "Detail"
msgstr ""
-#: inventory/inquiry/stock_movements.php:82
+#: inventory/inquiry/stock_movements.php:84 reporting/rep307.php:117
msgid "Quantity In"
msgstr ""
-#: inventory/inquiry/stock_movements.php:82
+#: inventory/inquiry/stock_movements.php:84 reporting/rep307.php:117
msgid "Quantity Out"
msgstr ""
-#: inventory/inquiry/stock_movements.php:97
+#: inventory/inquiry/stock_movements.php:101
msgid "Quantity on hand before"
msgstr ""
-#: inventory/inquiry/stock_movements.php:185
+#: inventory/inquiry/stock_movements.php:192
msgid "Quantity on hand after"
msgstr ""
msgstr ""
#: inventory/inquiry/stock_status.php:72 inventory/inquiry/stock_status.php:77
-#: reporting/rep303.php:109 reporting/rep303.php:115
+#: reporting/rep303.php:121 reporting/rep303.php:127
msgid "Demand"
msgstr ""
-#: inventory/inquiry/stock_status.php:77 reporting/rep303.php:109
-#: reporting/rep303.php:115
+#: inventory/inquiry/stock_status.php:77 reporting/rep303.php:121
+#: reporting/rep303.php:127
msgid "On Order"
msgstr ""
#: inventory/manage/sales_kits.php:40 inventory/view/view_adjustment.php:57
#: inventory/view/view_transfer.php:56 manufacturing/view/wo_issue_view.php:77
#: manufacturing/manage/bom_edit.php:71 purchasing/po_receive_items.php:62
-#: sales/customer_credit_invoice.php:282 sales/customer_delivery.php:432
-#: sales/customer_invoice.php:467 sales/customer_credit_invoice.php:280
-#: sales/customer_invoice.php:469
+#: sales/customer_credit_invoice.php:280 sales/customer_delivery.php:432
+#: sales/customer_invoice.php:478
msgid "Units"
msgstr ""
msgid "Foreign Item Codes"
msgstr ""
-#: inventory/manage/item_codes.php:23 sales/sales_order_entry.php:659
-#: sales/sales_order_entry.php:663 sales/sales_order_entry.php:674
-#: sales/sales_order_entry.php.orig:673
+#: inventory/manage/item_codes.php:23 sales/sales_order_entry.php:685
msgid "There are no inventory items defined in the system."
msgstr ""
msgid "EAN/UPC Code"
msgstr ""
-#: inventory/manage/item_codes.php:125 reporting/rep104.php:115
-#: reporting/rep105.php:117 reporting/rep301.php:103 reporting/rep301.php:109
-#: reporting/rep302.php:122 reporting/rep302.php:129 reporting/rep303.php:121
-#: reporting/rep304.php:112 reporting/rep304.php:120
+#: inventory/manage/item_codes.php:125 reporting/rep104.php:117
+#: reporting/rep105.php:119 reporting/rep301.php:105 reporting/rep301.php:111
+#: reporting/rep302.php:124 reporting/rep302.php:131 reporting/rep303.php:133
+#: reporting/rep304.php:114 reporting/rep304.php:122 reporting/rep306.php:141
+#: reporting/rep306.php:149 reporting/rep307.php:117 reporting/rep307.php:123
+#: reporting/rep308.php:149 reporting/rep308.php:156 reporting/rep309.php:104
msgid "Category"
msgstr ""
#: 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:471
-#: purchasing/includes/ui/invoice_ui.inc:483 reporting/rep204.php:82
+#: purchasing/includes/ui/invoice_ui.inc:484
+#: purchasing/includes/ui/invoice_ui.inc:496 reporting/rep204.php:84
+#: reporting/rep306.php:152
msgid "Item"
msgstr ""
msgstr ""
#: inventory/manage/items.php:454 purchasing/manage/suppliers.php:306
-#: sales/manage/customer_branches.php:322 sales/manage/customers.php:342
-#: sales/manage/customers.php.orig:339 sales/manage/customers.php:344
+#: sales/manage/customer_branches.php:322 sales/manage/customers.php:347
msgid "&General settings"
msgstr ""
-#: inventory/manage/items.php:455 purchasing/manage/suppliers.php:308
-#: sales/manage/customers.php:344 sales/manage/customers.php.orig:341
-#: sales/manage/customers.php:346
-msgid "&Transactions"
+#: inventory/manage/items.php:455
+msgid "S&ales Pricing"
msgstr ""
#: inventory/manage/items.php:456
+msgid "&Purchasing Pricing"
+msgstr ""
+
+#: inventory/manage/items.php:459 purchasing/manage/suppliers.php:308
+#: sales/manage/customers.php:349
+msgid "&Transactions"
+msgstr ""
+
+#: inventory/manage/items.php:460
msgid "&Status"
msgstr ""
#: purchasing/inquiry/po_search.php:76
#: sales/inquiry/sales_deliveries_view.php:116
#: sales/inquiry/sales_orders_view.php:247
-#: sales/inquiry/sales_orders_view.php.orig:245
msgid "Select documents"
msgstr ""
#: manufacturing/includes/manufacturing_ui.inc:277
#: manufacturing/includes/manufacturing_ui.inc:281
#: reporting/includes/doctext.inc:205 sales/inquiry/sales_orders_view.php:268
-#: sales/inquiry/sales_orders_view.php.orig:266
msgid "Required By"
msgstr ""
#: manufacturing/work_order_add_finished.php:46
#: manufacturing/work_order_costs.php:45 manufacturing/work_order_entry.php:56
#: manufacturing/work_order_issue.php:38
-#: manufacturing/work_order_release.php:72
+#: manufacturing/work_order_release.php:75
msgid "View this Work Order"
msgstr ""
#: manufacturing/work_order_add_finished.php:48
-#: manufacturing/work_order_costs.php:47 manufacturing/work_order_entry.php:65
+#: manufacturing/work_order_costs.php:47 manufacturing/work_order_entry.php:64
#: manufacturing/work_order_issue.php:40
msgid "View the GL Journal Entries for this Work Order"
msgstr ""
msgstr ""
#: manufacturing/work_order_add_finished.php:214
-#: purchasing/allocations/supplier_allocate.php:65
-#: sales/allocations/customer_allocate.php:64
+#: purchasing/allocations/supplier_allocate.php:74
+#: sales/allocations/customer_allocate.php:72
msgid "Process"
msgstr ""
msgstr ""
#: manufacturing/work_order_entry.php:62
-msgid "Print this Work Order"
+msgid "&Print This Work Order"
msgstr ""
-#: manufacturing/work_order_entry.php:64
-msgid "Email this Work Order"
+#: manufacturing/work_order_entry.php:63
+msgid "&Email This Work Order"
msgstr ""
#: manufacturing/work_order_entry.php:80
msgid "The work order issue has been entered."
msgstr ""
-#: manufacturing/work_order_issue.php:79
+#: manufacturing/work_order_issue.php:77
msgid "The entered date for the issue is invalid."
msgstr ""
-#: manufacturing/work_order_issue.php:106
+#: manufacturing/work_order_issue.php:104
msgid ""
"The issue cannot be processed because an entered item would cause a negative "
"inventory balance :"
msgstr ""
-#: manufacturing/work_order_issue.php:124
+#: manufacturing/work_order_issue.php:122
msgid ""
"The process cannot be completed because there is an insufficient total "
"quantity for a component."
msgstr ""
-#: manufacturing/work_order_issue.php:125
+#: manufacturing/work_order_issue.php:123
msgid "Component is :"
msgstr ""
-#: manufacturing/work_order_issue.php:126
+#: manufacturing/work_order_issue.php:124
msgid "From location :"
msgstr ""
-#: manufacturing/work_order_issue.php:219
+#: manufacturing/work_order_issue.php:217
msgid "Items to Issue"
msgstr ""
-#: manufacturing/work_order_issue.php:225
+#: manufacturing/work_order_issue.php:223
msgid "Process Issue"
msgstr ""
msgid "This work order has already been released."
msgstr ""
-#: manufacturing/work_order_release.php:57
+#: manufacturing/work_order_release.php:60
msgid ""
"This Work Order cannot be released. The selected item to manufacture does "
"not have a bom."
msgstr ""
-#: manufacturing/work_order_release.php:70
+#: manufacturing/work_order_release.php:73
msgid "The work order has been released to manufacturing."
msgstr ""
-#: manufacturing/work_order_release.php:74
+#: manufacturing/work_order_release.php:77
msgid "Select another &work order"
msgstr ""
-#: manufacturing/work_order_release.php:95
+#: manufacturing/work_order_release.php:98
msgid "Work Order #:"
msgstr ""
-#: manufacturing/work_order_release.php:96
+#: manufacturing/work_order_release.php:99
msgid "Work Order Reference:"
msgstr ""
-#: manufacturing/work_order_release.php:98
+#: manufacturing/work_order_release.php:101
#: manufacturing/includes/manufacturing_ui.inc:278
msgid "Released Date"
msgstr ""
-#: manufacturing/work_order_release.php:104
+#: manufacturing/work_order_release.php:107
msgid "Release Work Order"
msgstr ""
#: manufacturing/view/wo_issue_view.php:77
#: manufacturing/includes/manufacturing_ui.inc:28
-#: manufacturing/includes/manufacturing_ui.inc:83 reporting/rep401.php:69
-#: reporting/rep401.php:74
+#: manufacturing/includes/manufacturing_ui.inc:83 reporting/rep401.php:71
+#: reporting/rep401.php:76
msgid "Component"
msgstr ""
msgid "BOM for item:"
msgstr ""
-#: manufacturing/view/work_order_view.php:56 reporting/rep409.php:91
+#: manufacturing/view/work_order_view.php:56 reporting/rep409.php:88
msgid "Work Order Requirements"
msgstr ""
"work centre be defined."
msgstr ""
-#: manufacturing/manage/bom_edit.php:70 reporting/rep105.php:112
+#: manufacturing/manage/bom_edit.php:70 reporting/rep105.php:114
msgid "Code"
msgstr ""
#: manufacturing/includes/db/work_orders_db.inc:278
#: purchasing/includes/db/po_db.inc:116
#: sales/includes/db/cust_trans_db.inc:111
-#: sales/includes/db/sales_order_db.inc:249
-#: sales/includes/db/sales_order_db.inc.orig:249
-#: sales/includes/db/cust_trans_db.inc.orig:111
+#: sales/includes/db/sales_order_db.inc:267
msgid "Updated."
msgstr ""
msgid "Produced"
msgstr ""
-#: purchasing/includes/db/invoice_db.inc:284
+#: purchasing/includes/db/invoice_db.inc:311
msgid "Supplier invoice adjustment for zero inventory of "
msgstr ""
-#: purchasing/includes/db/invoice_db.inc:284 reporting/rep106.php:81
+#: purchasing/includes/db/invoice_db.inc:311 reporting/rep106.php:83
#: sales/inquiry/sales_deliveries_view.php:166
#: sales/inquiry/sales_orders_view.php:147
-#: sales/inquiry/sales_orders_view.php.orig:145
msgid "Invoice"
msgstr ""
-#: purchasing/includes/db/invoice_db.inc:690
-#: purchasing/includes/db/invoice_db.inc:692
+#: purchasing/includes/db/invoice_db.inc:659
+#: purchasing/includes/db/invoice_db.inc:661
msgid "GRN Removal"
msgstr ""
-#: purchasing/includes/ui/grn_ui.inc:23 purchasing/includes/ui/po_ui.inc:319
-#: sales/view/view_sales_order.php:74
+#: purchasing/includes/ui/grn_ui.inc:23 purchasing/includes/ui/grn_ui.inc:55
+#: purchasing/includes/ui/po_ui.inc:316 sales/view/view_sales_order.php:74
msgid "Order Currency"
msgstr ""
-#: purchasing/includes/ui/grn_ui.inc:25
+#: purchasing/includes/ui/grn_ui.inc:25 purchasing/includes/ui/grn_ui.inc:57
msgid "For Purchase Order"
msgstr ""
-#: purchasing/includes/ui/grn_ui.inc:28 sales/view/view_sales_order.php:67
+#: purchasing/includes/ui/grn_ui.inc:28 purchasing/includes/ui/grn_ui.inc:59
+#: sales/view/view_sales_order.php:67
msgid "Ordered On"
msgstr ""
-#: purchasing/includes/ui/grn_ui.inc:40 purchasing/includes/ui/grn_ui.inc:54
-#: purchasing/includes/ui/po_ui.inc:334 purchasing/includes/ui/po_ui.inc:339
+#: purchasing/includes/ui/grn_ui.inc:33 purchasing/includes/ui/grn_ui.inc:69
+#: purchasing/includes/ui/po_ui.inc:331 purchasing/includes/ui/po_ui.inc:336
msgid "Deliver Into Location"
msgstr ""
-#: purchasing/includes/ui/grn_ui.inc:46
-msgid "Date Items Received"
-msgstr ""
-
-#: purchasing/includes/ui/grn_ui.inc:49 purchasing/includes/ui/grn_ui.inc:55
-#: purchasing/includes/ui/po_ui.inc:344
+#: purchasing/includes/ui/grn_ui.inc:34 purchasing/includes/ui/grn_ui.inc:79
+#: purchasing/includes/ui/po_ui.inc:341
#: purchasing/view/view_supp_credit.php:44
#: purchasing/view/view_supp_invoice.php:47
#: purchasing/inquiry/po_search_completed.php:125
#: purchasing/inquiry/po_search.php:134
#: purchasing/inquiry/supplier_inquiry.php:172
-#: purchasing/inquiry/supplier_inquiry.php.orig:166
+#: reporting/includes/doctext.inc:142 reporting/includes/doctext.inc:165
msgid "Supplier's Reference"
msgstr ""
-#: purchasing/includes/ui/grn_ui.inc:62 purchasing/includes/ui/po_ui.inc:348
-#: sales/view/view_sales_order.php:79
+#: purchasing/includes/ui/grn_ui.inc:38 purchasing/includes/ui/grn_ui.inc:81
+#: purchasing/includes/ui/po_ui.inc:345 sales/view/view_sales_order.php:79
msgid "Delivery Address"
msgstr ""
-#: purchasing/includes/ui/grn_ui.inc:65 purchasing/includes/ui/po_ui.inc:352
+#: purchasing/includes/ui/grn_ui.inc:41 purchasing/includes/ui/grn_ui.inc:84
+#: purchasing/includes/ui/po_ui.inc:349
msgid "Order Comments"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:96
-#: purchasing/includes/ui/invoice_ui.inc:99
+#: purchasing/includes/ui/grn_ui.inc:74
+msgid "Date Items Received"
+msgstr ""
+
+#: purchasing/includes/ui/invoice_ui.inc:109
+#: purchasing/includes/ui/invoice_ui.inc:112
msgid "Supplier's Ref.:"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:114
+#: purchasing/includes/ui/invoice_ui.inc:127
msgid "Terms:"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:126
+#: purchasing/includes/ui/invoice_ui.inc:139
#: purchasing/manage/suppliers.php:98 purchasing/manage/suppliers.php:103
msgid "Supplier's Currency:"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:130
+#: purchasing/includes/ui/invoice_ui.inc:143
#: purchasing/manage/suppliers.php:105 sales/manage/customer_branches.php:246
-#: sales/manage/customers.php:292 sales/manage/customers.php.orig:289
-#: sales/manage/customers.php:294
+#: sales/manage/customers.php:297
msgid "Tax Group:"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:145
+#: purchasing/includes/ui/invoice_ui.inc:158
msgid "Sub-total:"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:153
+#: purchasing/includes/ui/invoice_ui.inc:166
msgid "Invoice Total:"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:156
-#: sales/customer_credit_invoice.php:332
-#: sales/includes/ui/sales_credit_ui.inc:233
+#: purchasing/includes/ui/invoice_ui.inc:169
#: 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:187
+#: purchasing/includes/ui/invoice_ui.inc:200
msgid "Add GL Line"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:188
+#: purchasing/includes/ui/invoice_ui.inc:201
msgid "Reset"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:189
-#: purchasing/po_receive_items.php:334
+#: purchasing/includes/ui/invoice_ui.inc:202
+#: purchasing/po_receive_items.php:335
msgid "Clear all GL entry fields"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:207
+#: purchasing/includes/ui/invoice_ui.inc:220
msgid "GL Items for this Invoice"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:209
+#: purchasing/includes/ui/invoice_ui.inc:222
msgid "GL Items for this Credit Note"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:219
+#: purchasing/includes/ui/invoice_ui.inc:232
msgid "Quick Entry:"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:392
+#: purchasing/includes/ui/invoice_ui.inc:405
msgid "Add to Invoice"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:394
+#: purchasing/includes/ui/invoice_ui.inc:407
msgid "Add to Credit Note"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:396 sales/customer_invoice.php:522
-#: sales/customer_invoice.php:524
+#: purchasing/includes/ui/invoice_ui.inc:409 sales/customer_invoice.php:533
msgid "Remove"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:396
-#: purchasing/includes/ui/invoice_ui.inc:431
+#: purchasing/includes/ui/invoice_ui.inc:409
+#: purchasing/includes/ui/invoice_ui.inc:444
msgid ""
"WARNING! Be careful with removal. The operation is executed immediately and "
"cannot be undone !!!"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:398
+#: purchasing/includes/ui/invoice_ui.inc:411
msgid ""
"You are about to remove all yet non-invoiced items from selected delivery "
"line. This operation also irreversibly changes related order line. Do you "
"want to continue ?"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:429
+#: purchasing/includes/ui/invoice_ui.inc:442
msgid "Items Received Yet to be Invoiced"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:434
+#: purchasing/includes/ui/invoice_ui.inc:447
msgid "Delivery Item Selected For Adding To A Supplier Credit Note"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:439
+#: purchasing/includes/ui/invoice_ui.inc:452
msgid "Received Items Charged on this Invoice"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:441
+#: purchasing/includes/ui/invoice_ui.inc:454
msgid "Received Items Credited on this Note"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:451
+#: purchasing/includes/ui/invoice_ui.inc:464
msgid "Received between"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:462
+#: purchasing/includes/ui/invoice_ui.inc:475
msgid "Add All Items"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:471
-#: purchasing/includes/ui/invoice_ui.inc:483
+#: purchasing/includes/ui/invoice_ui.inc:484
+#: purchasing/includes/ui/invoice_ui.inc:496 reporting/rep308.php:149
#: sales/inquiry/sales_orders_view.php:155
-#: sales/inquiry/sales_orders_view.php.orig:153
msgid "Delivery"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:471
+#: purchasing/includes/ui/invoice_ui.inc:484
msgid "P.O."
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:472
+#: purchasing/includes/ui/invoice_ui.inc:485
msgid "Received On"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:472 purchasing/view/view_po.php:46
+#: purchasing/includes/ui/invoice_ui.inc:485 purchasing/view/view_po.php:46
msgid "Quantity Received"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:472 purchasing/view/view_grn.php:41
+#: purchasing/includes/ui/invoice_ui.inc:485 purchasing/view/view_grn.php:41
#: purchasing/view/view_po.php:46
msgid "Quantity Invoiced"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:473
+#: purchasing/includes/ui/invoice_ui.inc:486
msgid "Qty Yet To Invoice"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:473
-#: purchasing/includes/ui/po_ui.inc:238
-#: sales/includes/ui/sales_order_ui.inc:142
+#: purchasing/includes/ui/invoice_ui.inc:486
+#: purchasing/includes/ui/po_ui.inc:235
#: sales/includes/ui/sales_order_ui.inc:146
msgid "Price after Tax"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:473
-#: purchasing/includes/ui/po_ui.inc:238
-#: sales/includes/ui/sales_order_ui.inc:142
+#: purchasing/includes/ui/invoice_ui.inc:486
+#: purchasing/includes/ui/po_ui.inc:235
#: sales/includes/ui/sales_order_ui.inc:146
msgid "Price before Tax"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:479
+#: purchasing/includes/ui/invoice_ui.inc:492
msgid "Qty Yet To Credit"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:484
+#: purchasing/includes/ui/invoice_ui.inc:497
msgid "Line Value"
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:551
+#: purchasing/includes/ui/invoice_ui.inc:564
msgid ""
"There are no outstanding items received from this supplier that have not "
"been invoiced by them."
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:554
+#: purchasing/includes/ui/invoice_ui.inc:567
msgid ""
"There are no received items for the selected supplier that have been "
"invoiced."
msgstr ""
-#: purchasing/includes/ui/invoice_ui.inc:555
+#: purchasing/includes/ui/invoice_ui.inc:568
msgid "Credits can only be applied to invoiced items."
msgstr ""
-#: purchasing/includes/ui/po_ui.inc:149
-msgid "Supplier Currency:"
-msgstr ""
-
-#: purchasing/includes/ui/po_ui.inc:178 sales/sales_order_entry.php:683
-#: sales/sales_order_entry.php:687 sales/sales_order_entry.php:698
-#: sales/sales_order_entry.php.orig:697
+#: purchasing/includes/ui/po_ui.inc:154 sales/sales_order_entry.php:709
msgid "Order Date:"
msgstr ""
-#: purchasing/includes/ui/po_ui.inc:179 sales/sales_order_entry.php:670
-#: sales/sales_order_entry.php:674 sales/sales_order_entry.php:685
-#: sales/sales_order_entry.php.orig:684
+#: purchasing/includes/ui/po_ui.inc:155 sales/sales_order_entry.php:696
msgid "Delivery Date:"
msgstr ""
-#: purchasing/includes/ui/po_ui.inc:179 sales/sales_order_entry.php:664
-#: sales/sales_order_entry.php:668 sales/sales_order_entry.php:679
-#: sales/sales_order_entry.php.orig:678
+#: purchasing/includes/ui/po_ui.inc:155 sales/sales_order_entry.php:690
msgid "Invoice Date:"
msgstr ""
-#: purchasing/includes/ui/po_ui.inc:190
+#: purchasing/includes/ui/po_ui.inc:168
+msgid "Supplier Currency:"
+msgstr ""
+
+#: purchasing/includes/ui/po_ui.inc:187
msgid "Due Date:"
msgstr ""
-#: purchasing/includes/ui/po_ui.inc:192
+#: purchasing/includes/ui/po_ui.inc:189
msgid "Supplier's Reference:"
msgstr ""
-#: purchasing/includes/ui/po_ui.inc:193
+#: purchasing/includes/ui/po_ui.inc:190
msgid "Receive Into:"
msgstr ""
-#: purchasing/includes/ui/po_ui.inc:218
+#: purchasing/includes/ui/po_ui.inc:215
msgid ""
"The default stock location set up for this user is not a currently defined "
"stock location. Your system administrator needs to amend your user record."
msgstr ""
-#: purchasing/includes/ui/po_ui.inc:222
+#: purchasing/includes/ui/po_ui.inc:219
msgid "Deliver to:"
msgstr ""
-#: purchasing/includes/ui/po_ui.inc:231
+#: purchasing/includes/ui/po_ui.inc:228
msgid "Order Items"
msgstr ""
-#: purchasing/includes/ui/po_ui.inc:237 purchasing/po_receive_items.php:62
+#: purchasing/includes/ui/po_ui.inc:234 purchasing/po_receive_items.php:62
msgid "Received"
msgstr ""
-#: purchasing/includes/ui/po_ui.inc:238
-#: sales/includes/ui/sales_order_ui.inc:611
-#: sales/includes/ui/sales_order_ui.inc:615
+#: purchasing/includes/ui/po_ui.inc:235
+#: sales/includes/ui/sales_order_ui.inc:616
msgid "Required Delivery Date"
msgstr ""
-#: purchasing/includes/ui/po_ui.inc:238 purchasing/view/view_grn.php:41
+#: purchasing/includes/ui/po_ui.inc:235 purchasing/view/view_grn.php:41
#: purchasing/view/view_po.php:46
msgid "Line Total"
msgstr ""
-#: purchasing/includes/ui/po_ui.inc:289 purchasing/po_receive_items.php:114
-#: reporting/rep107.php:148 reporting/rep109.php:151 reporting/rep110.php:161
-#: reporting/rep111.php:138 reporting/rep113.php:147 reporting/rep209.php:167
-#: sales/customer_credit_invoice.php:324 sales/customer_delivery.php:501
-#: sales/customer_invoice.php:563 sales/view/view_dispatch.php:146
+#: purchasing/includes/ui/po_ui.inc:286 purchasing/po_receive_items.php:114
+#: reporting/rep107.php:150 reporting/rep109.php:149 reporting/rep110.php:159
+#: reporting/rep111.php:134 reporting/rep113.php:144 reporting/rep209.php:162
+#: sales/customer_credit_invoice.php:322 sales/customer_delivery.php:511
+#: sales/customer_invoice.php:574 sales/view/view_dispatch.php:146
#: sales/view/view_invoice.php:148 sales/includes/ui/sales_credit_ui.inc:217
-#: sales/includes/ui/sales_order_ui.inc:229
-#: sales/customer_credit_invoice.php:322 sales/customer_invoice.php:565
-#: sales/includes/ui/sales_order_ui.inc:233
+#: sales/includes/ui/sales_order_ui.inc:235
msgid "Sub-total"
msgstr ""
-#: purchasing/includes/ui/po_ui.inc:298 purchasing/po_receive_items.php:122
+#: purchasing/includes/ui/po_ui.inc:295 purchasing/po_receive_items.php:122
#: purchasing/view/view_grn.php:79 purchasing/view/view_po.php:93
-#: sales/customer_delivery.php:508 sales/view/view_sales_order.php:244
-#: sales/includes/ui/sales_order_ui.inc:236
-#: sales/includes/ui/sales_order_ui.inc:240
+#: sales/customer_delivery.php:518 sales/view/view_sales_order.php:244
+#: sales/includes/ui/sales_order_ui.inc:242
msgid "Amount Total"
msgstr ""
-#: purchasing/includes/ui/po_ui.inc:299
-#: purchasing/allocations/supplier_allocate.php:64
-#: sales/allocations/customer_allocate.php:63
-#: sales/includes/ui/sales_order_ui.inc:237
-#: sales/includes/ui/sales_order_ui.inc:241
+#: purchasing/includes/ui/po_ui.inc:296
+#: purchasing/allocations/supplier_allocate.php:73
+#: sales/allocations/customer_allocate.php:71
+#: sales/includes/ui/sales_order_ui.inc:243
msgid "Refresh"
msgstr ""
-#: purchasing/po_entry_items.php:38 purchasing/po_entry_items.php:41
+#: purchasing/po_entry_items.php:41
msgid "Modify Purchase Order #"
msgstr ""
-#: purchasing/po_entry_items.php:43 purchasing/po_entry_items.php:46
+#: purchasing/po_entry_items.php:46
msgid "Purchase Order Entry"
msgstr ""
-#: purchasing/po_entry_items.php:48 purchasing/po_entry_items.php:51
+#: purchasing/po_entry_items.php:51
msgid "Direct GRN Entry"
msgstr ""
-#: purchasing/po_entry_items.php:53 purchasing/po_entry_items.php:56
+#: purchasing/po_entry_items.php:56
msgid "Direct Purchase Invoice Entry"
msgstr ""
-#: purchasing/po_entry_items.php:74 purchasing/po_entry_items.php:77
+#: purchasing/po_entry_items.php:77
msgid "Purchase Order has been entered"
msgstr ""
-#: purchasing/po_entry_items.php:76 purchasing/po_entry_items.php:79
+#: purchasing/po_entry_items.php:79
msgid "Purchase Order has been updated"
msgstr ""
-#: purchasing/po_entry_items.php:77 purchasing/po_entry_items.php:80
+#: purchasing/po_entry_items.php:80
msgid "&View this order"
msgstr ""
-#: purchasing/po_entry_items.php:79 sales/sales_order_entry.php:105
-#: sales/sales_order_entry.php:125 purchasing/po_entry_items.php:82
-#: sales/sales_order_entry.php:113 sales/sales_order_entry.php:133
-#: sales/sales_order_entry.php.orig:113 sales/sales_order_entry.php.orig:133
+#: purchasing/po_entry_items.php:82 sales/sales_order_entry.php:113
+#: sales/sales_order_entry.php:133
msgid "&Print This Order"
msgstr ""
-#: purchasing/po_entry_items.php:81 sales/sales_order_entry.php:106
-#: sales/sales_order_entry.php:126 purchasing/po_entry_items.php:84
-#: sales/sales_order_entry.php:114 sales/sales_order_entry.php:134
-#: sales/sales_order_entry.php.orig:114 sales/sales_order_entry.php.orig:134
+#: purchasing/po_entry_items.php:84 sales/sales_order_entry.php:114
+#: sales/sales_order_entry.php:134
msgid "&Email This Order"
msgstr ""
-#: purchasing/po_entry_items.php:83 purchasing/po_entry_items.php:86
+#: purchasing/po_entry_items.php:86
msgid "&Receive Items on this Purchase Order"
msgstr ""
-#: purchasing/po_entry_items.php:85 purchasing/po_entry_items.php:88
+#: purchasing/po_entry_items.php:88
msgid "Enter &Another Purchase Order"
msgstr ""
-#: purchasing/po_entry_items.php:87 purchasing/po_entry_items.php:90
+#: purchasing/po_entry_items.php:90
msgid "Select An &Outstanding Purchase Order"
msgstr ""
-#: purchasing/po_entry_items.php:96 purchasing/po_entry_items.php:99
+#: purchasing/po_entry_items.php:99
msgid "Direct GRN has been entered"
msgstr ""
-#: purchasing/po_entry_items.php:98 purchasing/po_entry_items.php:101
+#: purchasing/po_entry_items.php:101
msgid "&View this GRN"
msgstr ""
-#: purchasing/po_entry_items.php:102 purchasing/po_receive_items.php:40
-#: purchasing/po_entry_items.php:105
+#: purchasing/po_entry_items.php:105 purchasing/po_receive_items.php:40
msgid "View the GL Journal Entries for this Delivery"
msgstr ""
-#: purchasing/po_entry_items.php:107 purchasing/po_receive_items.php:42
-#: purchasing/po_entry_items.php:110
+#: purchasing/po_entry_items.php:110 purchasing/po_receive_items.php:42
msgid "Entry purchase &invoice for this receival"
msgstr ""
-#: purchasing/po_entry_items.php:112 purchasing/po_entry_items.php:115
+#: purchasing/po_entry_items.php:115
msgid "Enter &Another GRN"
msgstr ""
-#: purchasing/po_entry_items.php:121 purchasing/po_entry_items.php:124
+#: purchasing/po_entry_items.php:124
msgid "Direct Purchase Invoice has been entered"
msgstr ""
-#: purchasing/po_entry_items.php:123 purchasing/po_entry_items.php:126
+#: purchasing/po_entry_items.php:126
msgid "&View this Invoice"
msgstr ""
-#: purchasing/po_entry_items.php:128 purchasing/supplier_invoice.php:46
-#: purchasing/po_entry_items.php:131
+#: purchasing/po_entry_items.php:131 purchasing/supplier_invoice.php:46
msgid "View the GL Journal Entries for this Invoice"
msgstr ""
-#: purchasing/po_entry_items.php:130 purchasing/supplier_invoice.php:48
-#: purchasing/po_entry_items.php:133
+#: purchasing/po_entry_items.php:133 purchasing/supplier_invoice.php:48
msgid "Entry supplier &payment for this invoice"
msgstr ""
-#: purchasing/po_entry_items.php:136 purchasing/po_entry_items.php:139
+#: purchasing/po_entry_items.php:139
msgid "Enter &Another Direct Invoice"
msgstr ""
-#: purchasing/po_entry_items.php:168 purchasing/po_entry_items.php:171
+#: purchasing/po_entry_items.php:171
msgid ""
"This item cannot be deleted because some of it has already been received."
msgstr ""
-#: purchasing/po_entry_items.php:183 purchasing/po_entry_items.php:186
+#: purchasing/po_entry_items.php:186
msgid ""
"This order cannot be cancelled because some of it has already been received."
msgstr ""
-#: purchasing/po_entry_items.php:184 purchasing/po_entry_items.php:187
+#: purchasing/po_entry_items.php:187
msgid ""
"The line item quantities may be modified to quantities more than already "
"received. prices cannot be altered for lines that have already been received "
"and quantities cannot be reduced below the quantity already received."
msgstr ""
-#: purchasing/po_entry_items.php:199 purchasing/po_entry_items.php:202
+#: purchasing/po_entry_items.php:202
msgid "This purchase order has been cancelled."
msgstr ""
-#: purchasing/po_entry_items.php:201 purchasing/po_entry_items.php:204
+#: purchasing/po_entry_items.php:204
msgid "Enter a new purchase order"
msgstr ""
-#: purchasing/po_entry_items.php:213 sales/sales_order_entry.php:464
-#: sales/sales_order_entry.php:468 purchasing/po_entry_items.php:216
-#: sales/sales_order_entry.php:479 sales/sales_order_entry.php.orig:478
+#: purchasing/po_entry_items.php:216 sales/sales_order_entry.php:490
msgid "Item description cannot be empty."
msgstr ""
-#: purchasing/po_entry_items.php:223 purchasing/po_entry_items.php:226
+#: purchasing/po_entry_items.php:226
msgid "The quantity of the order item must be numeric and not less than "
msgstr ""
-#: purchasing/po_entry_items.php:230 purchasing/po_entry_items.php:233
+#: purchasing/po_entry_items.php:233
msgid "The price entered must be numeric and not less than zero."
msgstr ""
-#: purchasing/po_entry_items.php:254 purchasing/po_entry_items.php:257
+#: purchasing/po_entry_items.php:257
msgid ""
"You are attempting to make the quantity ordered a quantity less than has "
"already been invoiced or received. This is prohibited."
msgstr ""
-#: purchasing/po_entry_items.php:255 purchasing/po_entry_items.php:258
+#: purchasing/po_entry_items.php:258
msgid ""
"The quantity received can only be modified by entering a negative receipt "
"and the quantity invoiced can only be reduced by entering a credit note "
"against this item."
msgstr ""
-#: purchasing/po_entry_items.php:283 purchasing/po_entry_items.php:286
+#: purchasing/po_entry_items.php:286
msgid "The selected item is already on this order."
msgstr ""
-#: purchasing/po_entry_items.php:310 purchasing/po_entry_items.php:313
+#: purchasing/po_entry_items.php:313
msgid ""
"The selected item does not exist or it is a kit part and therefore cannot be "
"purchased."
msgstr ""
-#: purchasing/po_entry_items.php:326 purchasing/supplier_invoice.php:343
-#: purchasing/supplier_payment.php:118 purchasing/po_entry_items.php:329
-#: purchasing/supplier_payment.php:113
+#: purchasing/po_entry_items.php:329 purchasing/supplier_invoice.php:355
+#: purchasing/supplier_payment.php:123
msgid "There is no supplier selected."
msgstr ""
-#: purchasing/po_entry_items.php:333 purchasing/po_entry_items.php:336
+#: purchasing/po_entry_items.php:336
msgid "The entered order date is invalid."
msgstr ""
-#: purchasing/po_entry_items.php:340 purchasing/po_receive_items.php:181
-#: sales/sales_order_entry.php:345 purchasing/po_entry_items.php:343
-#: sales/sales_order_entry.php:354 sales/sales_order_entry.php.orig:353
+#: purchasing/po_entry_items.php:343 purchasing/po_receive_items.php:181
+#: sales/sales_order_entry.php:358
msgid "The entered date is not in fiscal year"
msgstr ""
-#: purchasing/po_entry_items.php:347 purchasing/po_entry_items.php:350
+#: purchasing/po_entry_items.php:350
msgid "The entered due date is invalid."
msgstr ""
-#: purchasing/po_entry_items.php:356 purchasing/po_entry_items.php:359
+#: purchasing/po_entry_items.php:359
msgid "There is no reference entered for this purchase order."
msgstr ""
-#: purchasing/po_entry_items.php:371 purchasing/supplier_invoice.php:161
-#: purchasing/po_entry_items.php:374
+#: purchasing/po_entry_items.php:374 purchasing/supplier_invoice.php:172
msgid "You must enter a supplier's invoice reference."
msgstr ""
-#: purchasing/po_entry_items.php:378 purchasing/supplier_invoice.php:187
-#: purchasing/po_entry_items.php:381
+#: purchasing/po_entry_items.php:381 purchasing/supplier_invoice.php:198
msgid ""
"This invoice number has already been entered. It cannot be entered again."
msgstr ""
-#: purchasing/po_entry_items.php:384 purchasing/po_entry_items.php:387
+#: purchasing/po_entry_items.php:387
msgid "There is no delivery address specified."
msgstr ""
-#: purchasing/po_entry_items.php:390 purchasing/po_entry_items.php:393
+#: purchasing/po_entry_items.php:393
msgid "There is no location specified to move any items into."
msgstr ""
-#: purchasing/po_entry_items.php:397 purchasing/po_entry_items.php:401
+#: purchasing/po_entry_items.php:401
msgid ""
"The order cannot be placed because there are no lines entered on this order."
msgstr ""
-#: purchasing/po_entry_items.php:523 sales/sales_order_entry.php:687
-#: sales/sales_order_entry.php:691 purchasing/po_entry_items.php:527
-#: sales/sales_order_entry.php:702 sales/sales_order_entry.php.orig:701
+#: purchasing/po_entry_items.php:534 sales/sales_order_entry.php:713
msgid "Place Order"
msgstr ""
-#: purchasing/po_entry_items.php:524 purchasing/po_entry_items.php:528
+#: purchasing/po_entry_items.php:535
msgid "Update Order"
msgstr ""
-#: purchasing/po_entry_items.php:525 sales/sales_order_entry.php:686
-#: sales/sales_order_entry.php:690 purchasing/po_entry_items.php:529
-#: sales/sales_order_entry.php:701 sales/sales_order_entry.php.orig:700
+#: purchasing/po_entry_items.php:536 sales/sales_order_entry.php:712
msgid "Cancel Order"
msgstr ""
-#: purchasing/po_entry_items.php:527 purchasing/po_entry_items.php:531
+#: purchasing/po_entry_items.php:538
msgid "Process GRN"
msgstr ""
-#: purchasing/po_entry_items.php:528 purchasing/po_entry_items.php:532
+#: purchasing/po_entry_items.php:539
msgid "Update GRN"
msgstr ""
-#: purchasing/po_entry_items.php:529 purchasing/po_entry_items.php:533
+#: purchasing/po_entry_items.php:540
msgid "Cancel GRN"
msgstr ""
-#: purchasing/po_entry_items.php:532 sales/customer_invoice.php:582
-#: sales/customer_invoice.php:584 purchasing/po_entry_items.php:536
+#: purchasing/po_entry_items.php:543 sales/customer_invoice.php:593
msgid "Process Invoice"
msgstr ""
-#: purchasing/po_entry_items.php:533 purchasing/po_entry_items.php:537
+#: purchasing/po_entry_items.php:544
msgid "Update Invoice"
msgstr ""
-#: purchasing/po_entry_items.php:534 sales/sales_order_entry.php:667
-#: sales/sales_order_entry.php:671 purchasing/po_entry_items.php:538
-#: sales/sales_order_entry.php:682 sales/sales_order_entry.php.orig:681
+#: purchasing/po_entry_items.php:545 sales/sales_order_entry.php:693
msgid "Cancel Invoice"
msgstr ""
"select a purchase order first."
msgstr ""
-#: purchasing/po_receive_items.php:62 reporting/rep105.php:112
+#: purchasing/po_receive_items.php:62 reporting/rep105.php:114
#: sales/customer_delivery.php:432
msgid "Ordered"
msgstr ""
-#: purchasing/po_receive_items.php:63 reporting/rep101.php:131
-#: reporting/rep105.php:113 reporting/rep105.php:162 reporting/rep201.php:119
+#: purchasing/po_receive_items.php:63 reporting/rep101.php:119
+#: reporting/rep105.php:115 reporting/rep105.php:166 reporting/rep201.php:111
#: reporting/includes/doctext.inc:225
msgid "Outstanding"
msgstr ""
msgid "Re-Read the updated purchase order for receiving goods against"
msgstr ""
-#: purchasing/po_receive_items.php:329
+#: purchasing/po_receive_items.php:330
msgid "Items to Receive"
msgstr ""
-#: purchasing/po_receive_items.php:334
+#: purchasing/po_receive_items.php:335
msgid "Process Receive Items"
msgstr ""
msgid "Enter Another Credit Note"
msgstr ""
-#: purchasing/supplier_credit.php:102 purchasing/supplier_invoice.php:102
+#: purchasing/supplier_credit.php:102 purchasing/supplier_invoice.php:112
msgid ""
"The account code entered is not a valid code, this line cannot be added to "
"the transaction."
msgstr ""
-#: purchasing/supplier_credit.php:112 purchasing/supplier_invoice.php:112
+#: purchasing/supplier_credit.php:112 purchasing/supplier_invoice.php:122
msgid ""
"The amount entered is not numeric. This line cannot be added to the "
"transaction."
"not valid."
msgstr ""
-#: purchasing/supplier_credit.php:182 purchasing/supplier_invoice.php:180
+#: purchasing/supplier_credit.php:182 purchasing/supplier_invoice.php:191
msgid ""
"The invoice as entered cannot be processed because the due date is in an "
"incorrect format."
"item:"
msgstr ""
-#: purchasing/supplier_credit.php:245
+#: purchasing/supplier_credit.php:244
msgid "The quantity to credit must be numeric and greater than zero."
msgstr ""
-#: purchasing/supplier_credit.php:252
+#: purchasing/supplier_credit.php:251
msgid "The price is either not numeric or negative."
msgstr ""
-#: purchasing/supplier_credit.php:354
+#: purchasing/supplier_credit.php:353
msgid "Enter Credit Note"
msgstr ""
msgid "View this Invoice"
msgstr ""
-#: purchasing/supplier_invoice.php:50
+#: purchasing/supplier_invoice.php:51
msgid "Enter Another Invoice"
msgstr ""
-#: purchasing/supplier_invoice.php:141
+#: purchasing/supplier_invoice.php:152
msgid ""
"The invoice cannot be processed because the there are no items or values on "
"the invoice. Invoices are expected to have a charge."
msgstr ""
-#: purchasing/supplier_invoice.php:147
+#: purchasing/supplier_invoice.php:158
msgid "You must enter an invoice reference."
msgstr ""
-#: purchasing/supplier_invoice.php:168
+#: purchasing/supplier_invoice.php:179
msgid ""
"The invoice as entered cannot be processed because the invoice date is in an "
"incorrect format."
msgstr ""
-#: purchasing/supplier_invoice.php:224
+#: purchasing/supplier_invoice.php:235
msgid "The quantity to invoice must be numeric and greater than zero."
msgstr ""
-#: purchasing/supplier_invoice.php:231
+#: purchasing/supplier_invoice.php:242
msgid "The price is not numeric."
msgstr ""
-#: purchasing/supplier_invoice.php:244
+#: purchasing/supplier_invoice.php:255
msgid ""
"The price being invoiced is more than the purchase order price by more than "
"the allowed over-charge percentage. The system is set up to prohibit this. "
"See the system administrator to modify the set up parameters if necessary."
msgstr ""
-#: purchasing/supplier_invoice.php:245 purchasing/supplier_invoice.php:258
+#: purchasing/supplier_invoice.php:256 purchasing/supplier_invoice.php:269
msgid "The over-charge percentage allowance is :"
msgstr ""
-#: purchasing/supplier_invoice.php:257
+#: purchasing/supplier_invoice.php:268
msgid ""
"The quantity being invoiced is more than the outstanding quantity by more "
"than the allowed over-charge percentage. The system is set up to prohibit "
"necessary."
msgstr ""
-#: purchasing/supplier_invoice.php:325
+#: purchasing/supplier_invoice.php:337
#, php-format
msgid "All yet non-invoiced items on delivery line # %d has been removed."
msgstr ""
-#: purchasing/supplier_invoice.php:367
+#: purchasing/supplier_invoice.php:379
msgid "Enter Invoice"
msgstr ""
msgid "Supplier Payment Entry"
msgstr ""
-#: purchasing/supplier_payment.php:90 purchasing/supplier_payment.php:85
+#: purchasing/supplier_payment.php:92
msgid "Invalid purchase invoice number."
msgstr ""
-#: purchasing/supplier_payment.php:96 purchasing/supplier_payment.php:91
+#: purchasing/supplier_payment.php:98
msgid "Payment has been sucessfully entered"
msgstr ""
-#: purchasing/supplier_payment.php:98 purchasing/supplier_payment.php:93
+#: purchasing/supplier_payment.php:100
msgid "&Print This Remittance"
msgstr ""
-#: purchasing/supplier_payment.php:99 purchasing/supplier_payment.php:94
+#: purchasing/supplier_payment.php:101
msgid "&Email This Remittance"
msgstr ""
-#: purchasing/supplier_payment.php:101 purchasing/supplier_payment.php:96
+#: purchasing/supplier_payment.php:103
+msgid "View this Payment"
+msgstr ""
+
+#: purchasing/supplier_payment.php:104
msgid "View the GL &Journal Entries for this Payment"
msgstr ""
-#: purchasing/supplier_payment.php:105 purchasing/supplier_payment.php:100
+#: purchasing/supplier_payment.php:106
msgid "Enter another supplier &payment"
msgstr ""
-#: purchasing/supplier_payment.php:152 sales/customer_payments.php:192
-#: purchasing/supplier_payment.php:147 sales/customer_payments.php.orig:192
-msgid "The exchange rate must be numeric and greater than zero."
+#: purchasing/supplier_payment.php:107 sales/customer_payments.php:106
+msgid "Enter Other &Payment"
+msgstr ""
+
+#: purchasing/supplier_payment.php:108
+msgid "Enter &Customer Payment"
msgstr ""
-#: purchasing/supplier_payment.php:164 purchasing/supplier_payment.php:159
+#: purchasing/supplier_payment.php:109 sales/customer_payments.php:104
+msgid "Enter Other &Deposit"
+msgstr ""
+
+#: purchasing/supplier_payment.php:110 sales/customer_payments.php:107
+msgid "Bank Account &Transfer"
+msgstr ""
+
+#: purchasing/supplier_payment.php:162
msgid "The entered discount is invalid or less than zero."
msgstr ""
-#: purchasing/supplier_payment.php:172 purchasing/supplier_payment.php:167
+#: purchasing/supplier_payment.php:170
msgid ""
"The total of the amount and the discount is zero or negative. Please enter "
"positive values."
msgstr ""
-#: purchasing/supplier_payment.php:273 purchasing/supplier_payment.php:270
+#: purchasing/supplier_payment.php:177
+msgid "The entered bank amount is zero or negative."
+msgstr ""
+
+#: purchasing/supplier_payment.php:191
+msgid ""
+"The entered date is out of fiscal year or is closed for further data entry."
+msgstr ""
+
+#: purchasing/supplier_payment.php:275
msgid "Payment To:"
msgstr ""
-#: purchasing/supplier_payment.php:280 purchasing/supplier_payment.php:283
+#: purchasing/supplier_payment.php:290
msgid "From Bank Account:"
msgstr ""
-#: purchasing/supplier_payment.php:288
+#: purchasing/supplier_payment.php:296
#: purchasing/view/view_supp_payment.php:55
-#: purchasing/supplier_payment.php:291
msgid "Date Paid"
msgstr ""
-#: purchasing/supplier_payment.php:311 sales/customer_payments.php:407
-#: purchasing/supplier_payment.php:314 sales/customer_payments.php:410
-#: sales/customer_payments.php.orig:409
-msgid "Amount of Discount:"
+#: purchasing/supplier_payment.php:310
+msgid "Bank Amount:"
msgstr ""
-#: purchasing/supplier_payment.php:312 purchasing/supplier_payment.php:315
-msgid "Amount of Payment:"
+#: purchasing/supplier_payment.php:323 sales/customer_payments.php:395
+msgid "Amount of Discount:"
msgstr ""
-#: purchasing/supplier_payment.php:318 purchasing/supplier_payment.php:321
-msgid "The amount and discount are in the bank account's currency."
+#: purchasing/supplier_payment.php:324
+msgid "Amount of Payment:"
msgstr ""
-#: purchasing/supplier_payment.php:321 purchasing/supplier_payment.php:324
+#: purchasing/supplier_payment.php:328
msgid "Enter Payment"
msgstr ""
#: purchasing/view/view_po.php:100
#: purchasing/inquiry/supplier_allocation_inquiry.php:148
#: purchasing/inquiry/supplier_inquiry.php:193
-#: purchasing/inquiry/supplier_inquiry.php.orig:187
#: sales/inquiry/customer_allocation_inquiry.php:165
-#: sales/inquiry/customer_inquiry.php:251
-#: sales/inquiry/customer_inquiry.php.orig:251
+#: sales/inquiry/customer_inquiry.php:244
#: sales/inquiry/sales_deliveries_view.php:206
#: sales/inquiry/sales_orders_view.php:318
-#: sales/inquiry/sales_orders_view.php.orig:316
msgid "Marked items are overdue."
msgstr ""
#: purchasing/view/view_supp_credit.php:47
#: purchasing/view/view_supp_invoice.php:50
-#: sales/customer_credit_invoice.php:270 sales/view/view_invoice.php:95
-#: sales/customer_credit_invoice.php:268
+#: sales/customer_credit_invoice.php:268 sales/view/view_invoice.php:95
msgid "Invoice Date"
msgstr ""
msgid "SUPPLIER INVOICE"
msgstr ""
-#: purchasing/view/view_supp_invoice.php:72 reporting/rep107.php:196
+#: purchasing/view/view_supp_invoice.php:72 reporting/rep107.php:198
#: sales/view/view_invoice.php:164
msgid "TOTAL INVOICE"
msgstr ""
msgid "To Supplier"
msgstr ""
-#: purchasing/view/view_supp_payment.php:59 sales/view/view_receipt.php:43
+#: purchasing/view/view_supp_payment.php:59
msgid "Payment Currency"
msgstr ""
-#: purchasing/view/view_supp_payment.php:62 sales/customer_delivery.php:433
-#: sales/customer_invoice.php:468 sales/view/view_receipt.php:45
-#: sales/view/view_sales_order.php:202 sales/customer_invoice.php:470
+#: purchasing/view/view_supp_payment.php:62 reporting/rep112.php:162
+#: reporting/rep210.php:171 sales/customer_delivery.php:433
+#: sales/customer_invoice.php:479 sales/view/view_receipt.php:45
+#: sales/view/view_sales_order.php:202
msgid "Discount"
msgstr ""
msgid "Bank Name/Account:"
msgstr ""
-#: purchasing/manage/suppliers.php:110 sales/manage/customers.php:263
-#: sales/manage/customers.php.orig:260 sales/manage/customers.php:264
+#: purchasing/manage/suppliers.php:110 sales/manage/customers.php:267
msgid "Credit Limit:"
msgstr ""
-#: purchasing/manage/suppliers.php:111 sales/manage/customers.php:265
-#: sales/manage/customers.php.orig:262 sales/manage/customers.php:266
+#: purchasing/manage/suppliers.php:111 sales/manage/customers.php:269
msgid "Payment Terms:"
msgstr ""
msgid "Prices contain tax included:"
msgstr ""
-#: purchasing/manage/suppliers.php:122 reporting/rep704.php:92
-#: reporting/rep704.php:102 reporting/rep704.php:110
+#: purchasing/manage/suppliers.php:122 reporting/rep704.php:96
+#: reporting/rep704.php:106 reporting/rep704.php:114
msgid "Accounts"
msgstr ""
msgid "Addresses"
msgstr ""
-#: purchasing/manage/suppliers.php:149 sales/manage/customer_branches.php:267
+#: purchasing/manage/suppliers.php:149 reporting/rep205.php:102
+#: sales/manage/customer_branches.php:267
msgid "Mailing Address:"
msgstr ""
msgstr ""
#: purchasing/manage/suppliers.php:153 sales/manage/customer_branches.php:269
-#: sales/manage/customers.php:286 sales/manage/customers.php.orig:283
-#: sales/manage/customers.php:287
+#: sales/manage/customers.php:290
msgid "General Notes:"
msgstr ""
msgstr ""
#: purchasing/manage/suppliers.php:307 sales/manage/customer_branches.php:323
-#: sales/manage/customers.php:343 sales/manage/customers.php.orig:340
-#: sales/manage/customers.php:345
+#: sales/manage/customers.php:348
msgid "&Contacts"
msgstr ""
#: purchasing/inquiry/po_search.php:62
#: sales/inquiry/sales_deliveries_view.php:103
#: sales/inquiry/sales_orders_view.php:225
-#: sales/inquiry/sales_orders_view.php.orig:223
msgid "#:"
msgstr ""
msgstr ""
#: purchasing/inquiry/po_search_completed.php:126
-#: purchasing/inquiry/po_search.php:135
+#: purchasing/inquiry/po_search.php:135 reporting/includes/doctext.inc:166
#: sales/inquiry/sales_orders_view.php:267
-#: sales/inquiry/sales_orders_view.php.orig:265
msgid "Order Date"
msgstr ""
#: purchasing/inquiry/po_search_completed.php:128
#: purchasing/inquiry/po_search.php:137
#: sales/inquiry/sales_orders_view.php:270
-#: sales/inquiry/sales_orders_view.php.orig:268
msgid "Order Total"
msgstr ""
msgstr ""
#: purchasing/inquiry/supplier_allocation_inquiry.php:136
-#: reporting/rep101.php:131 reporting/rep201.php:119
+#: reporting/rep101.php:119 reporting/rep201.php:111
#: reporting/includes/doctext.inc:225
#: sales/inquiry/customer_allocation_inquiry.php:154
msgid "Allocated"
msgstr ""
#: purchasing/inquiry/supplier_inquiry.php:27
-#: purchasing/inquiry/supplier_inquiry.php.orig:25
msgid "Supplier Inquiry"
msgstr ""
#: purchasing/inquiry/supplier_inquiry.php:51
-#: purchasing/inquiry/supplier_inquiry.php.orig:47
msgid "Select a supplier:"
msgstr ""
#: purchasing/inquiry/supplier_inquiry.php:70
#: purchasing/inquiry/supplier_inquiry.php:71
-#: purchasing/inquiry/supplier_inquiry.php:72
-#: purchasing/inquiry/supplier_inquiry.php.orig:66
-#: purchasing/inquiry/supplier_inquiry.php.orig:67
-#: purchasing/inquiry/supplier_inquiry.php.orig:68 reporting/rep102.php:118
-#: reporting/rep102.php:119 reporting/rep102.php:120 reporting/rep102.php:240
-#: reporting/rep108.php:150 reporting/rep108.php:151 reporting/rep108.php:152
-#: reporting/rep202.php:122 reporting/rep202.php:123 reporting/rep202.php:124
-#: reporting/rep202.php:154 reporting/rep202.php:155 reporting/rep202.php:156
-#: reporting/rep202.php:248 sales/create_recurrent_invoices.php:115
+#: purchasing/inquiry/supplier_inquiry.php:72 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
+#: reporting/rep202.php:158 reporting/rep202.php:159 reporting/rep202.php:160
+#: reporting/rep202.php:252 sales/create_recurrent_invoices.php:134
#: sales/manage/recurrent_invoices.php:102
#: sales/inquiry/customer_inquiry.php:75 sales/inquiry/customer_inquiry.php:76
#: sales/inquiry/customer_inquiry.php:77
-#: sales/inquiry/customer_inquiry.php.orig:75
-#: sales/inquiry/customer_inquiry.php.orig:76
-#: sales/inquiry/customer_inquiry.php.orig:77
-#: sales/create_recurrent_invoices.php:132
msgid "Days"
msgstr ""
-#: purchasing/inquiry/supplier_inquiry.php:72
-#: purchasing/inquiry/supplier_inquiry.php.orig:68 reporting/rep102.php:120
-#: reporting/rep108.php:152 reporting/rep202.php:124 reporting/rep202.php:156
+#: purchasing/inquiry/supplier_inquiry.php:72 reporting/rep102.php:122
+#: reporting/rep108.php:153 reporting/rep202.php:126 reporting/rep202.php:160
#: sales/inquiry/customer_inquiry.php:77
-#: sales/inquiry/customer_inquiry.php.orig:77
msgid "Over"
msgstr ""
#: purchasing/inquiry/supplier_inquiry.php:76
-#: purchasing/inquiry/supplier_inquiry.php.orig:72
#: sales/inquiry/customer_inquiry.php:80
-#: sales/inquiry/customer_inquiry.php.orig:80
msgid "Terms"
msgstr ""
-#: purchasing/inquiry/supplier_inquiry.php:76
-#: purchasing/inquiry/supplier_inquiry.php.orig:72 reporting/rep102.php:123
-#: reporting/rep102.php:238 reporting/rep108.php:154 reporting/rep202.php:128
-#: reporting/rep202.php:246 sales/inquiry/customer_inquiry.php:80
-#: sales/inquiry/customer_inquiry.php.orig:80
+#: purchasing/inquiry/supplier_inquiry.php:76 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:80
msgid "Current"
msgstr ""
-#: purchasing/inquiry/supplier_inquiry.php:77
-#: purchasing/inquiry/supplier_inquiry.php.orig:73 reporting/rep102.php:124
-#: reporting/rep108.php:154 reporting/rep202.php:129
+#: purchasing/inquiry/supplier_inquiry.php:77 reporting/rep102.php:126
+#: reporting/rep108.php:155 reporting/rep202.php:131
#: sales/inquiry/customer_inquiry.php:81
-#: sales/inquiry/customer_inquiry.php.orig:81
msgid "Total Balance"
msgstr ""
#: purchasing/inquiry/supplier_inquiry.php:133
-#: purchasing/inquiry/supplier_inquiry.php.orig:127
#: sales/inquiry/customer_inquiry.php:164
-#: sales/inquiry/customer_inquiry.php.orig:164
msgid "Credit This"
msgstr ""
#: purchasing/inquiry/supplier_inquiry.php:155
-#: purchasing/inquiry/supplier_inquiry.php.orig:149
msgid "Print Remittance"
msgstr ""
msgid "Allocate Supplier Payment or Credit Note"
msgstr ""
-#: purchasing/allocations/supplier_allocate.php:50
+#: purchasing/allocations/supplier_allocate.php:52
msgid "Allocation of"
msgstr ""
-#: purchasing/allocations/supplier_allocate.php:55
-#: sales/allocations/customer_allocate.php:54
+#: purchasing/allocations/supplier_allocate.php:58
+#: sales/allocations/customer_allocate.php:55
msgid "Total:"
msgstr ""
-#: purchasing/allocations/supplier_allocate.php:64
-#: sales/allocations/customer_allocate.php:63
+#: purchasing/allocations/supplier_allocate.php:62
+#: sales/allocations/customer_allocate.php:59
+msgid "Total in clearing currency:"
+msgstr ""
+
+#: purchasing/allocations/supplier_allocate.php:73
+#: sales/allocations/customer_allocate.php:71
msgid "Start again allocation of selected amount"
msgstr ""
-#: purchasing/allocations/supplier_allocate.php:65
-#: sales/allocations/customer_allocate.php:64
+#: purchasing/allocations/supplier_allocate.php:74
+#: sales/allocations/customer_allocate.php:72
msgid "Process allocations"
msgstr ""
-#: purchasing/allocations/supplier_allocate.php:66
-#: purchasing/allocations/supplier_allocate.php:72
-#: sales/allocations/customer_allocate.php:65
-#: sales/allocations/customer_allocate.php:71
+#: purchasing/allocations/supplier_allocate.php:75
+#: purchasing/allocations/supplier_allocate.php:81
+#: sales/allocations/customer_allocate.php:73
+#: sales/allocations/customer_allocate.php:79
msgid "Back to Allocations"
msgstr ""
-#: purchasing/allocations/supplier_allocate.php:67
-#: purchasing/allocations/supplier_allocate.php:73
-#: sales/allocations/customer_allocate.php:65
-#: sales/allocations/customer_allocate.php:72
+#: purchasing/allocations/supplier_allocate.php:76
+#: purchasing/allocations/supplier_allocate.php:82
+#: sales/allocations/customer_allocate.php:73
+#: sales/allocations/customer_allocate.php:80
msgid "Abandon allocations and return to selection of allocatable amounts"
msgstr ""
-#: purchasing/allocations/supplier_allocate.php:71
-#: sales/allocations/customer_allocate.php:69
+#: purchasing/allocations/supplier_allocate.php:80
+#: sales/allocations/customer_allocate.php:77
msgid "There are no unsettled transactions to allocate."
msgstr ""
msgid "Marked items are settled."
msgstr ""
-#: reporting/rep101.php:120 reporting/rep102.php:106 reporting/rep114.php:103
-#: reporting/rep202.php:110 reporting/rep203.php:81
+#: reporting/rep101.php:108 reporting/rep102.php:108 reporting/rep114.php:108
+#: reporting/rep202.php:112 reporting/rep203.php:83
msgid "Balances in Home Currency"
msgstr ""
-#: reporting/rep101.php:130 reporting/rep201.php:118 reporting/rep203.php:91
-#: reporting/rep709.php:109 reporting/includes/doctext.inc:145
+#: reporting/rep101.php:118 reporting/rep201.php:110 reporting/rep203.php:93
+#: reporting/rep709.php:111 reporting/includes/doctext.inc:145
#: reporting/includes/doctext.inc:186 reporting/includes/doctext.inc:224
msgid "Trans Type"
msgstr ""
-#: reporting/rep101.php:130 reporting/rep201.php:118
+#: reporting/rep101.php:118 reporting/rep201.php:110
#: reporting/includes/doctext.inc:224
msgid "Charges"
msgstr ""
-#: reporting/rep101.php:130 reporting/rep201.php:119
+#: reporting/rep101.php:118 reporting/rep201.php:111
#: reporting/includes/doctext.inc:225
msgid "Credits"
msgstr ""
-#: reporting/rep101.php:139 reporting/rep102.php:134 reporting/rep201.php:127
-#: reporting/rep202.php:139 reporting/rep203.php:100 reporting/rep303.php:124
-#: reporting/reports_main.php:38 reporting/reports_main.php:47
-#: reporting/reports_main.php:138 reporting/reports_main.php:147
-#: reporting/reports_main.php:155 reporting/reports_main.php:195
+#: reporting/rep101.php:129 reporting/rep102.php:136 reporting/rep201.php:121
+#: reporting/rep202.php:141 reporting/rep203.php:102 reporting/rep303.php:136
+#: reporting/reports_main.php:39 reporting/reports_main.php:49
+#: 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:141
+#: reporting/rep101.php:131
msgid "Customer Balances"
msgstr ""
-#: reporting/rep101.php:244 reporting/rep102.php:224 reporting/rep106.php:167
-#: reporting/rep201.php:231 reporting/rep202.php:231 reporting/rep203.php:177
-#: reporting/rep204.php:144 reporting/rep301.php:176 reporting/rep304.php:191
-#: reporting/rep305.php:181 reporting/rep305.php:183
+#: 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:100 reporting/rep106.php:91 reporting/rep202.php:104
-#: reporting/rep709.php:93 reporting/reports_main.php:46
-#: reporting/reports_main.php:84 reporting/reports_main.php:146
-#: reporting/reports_main.php:181 reporting/reports_main.php:393
+#: reporting/rep102.php:102 reporting/rep106.php:93 reporting/rep202.php:106
+#: reporting/rep709.php:95 reporting/reports_main.php:48
+#: reporting/reports_main.php:91 reporting/reports_main.php:165
+#: reporting/reports_main.php:211 reporting/reports_main.php:484
msgid "Summary Only"
msgstr ""
-#: reporting/rep102.php:102 reporting/rep202.php:106 reporting/rep709.php:95
+#: reporting/rep102.php:104 reporting/rep202.php:108 reporting/rep709.php:97
msgid "Detailed Report"
msgstr ""
-#: reporting/rep102.php:129 reporting/rep202.php:134 reporting/rep203.php:97
-#: reporting/rep301.php:108 reporting/reports_main.php:35
-#: reporting/reports_main.php:42 reporting/reports_main.php:61
-#: reporting/reports_main.php:75 reporting/reports_main.php:83
-#: reporting/reports_main.php:135 reporting/reports_main.php:142
-#: reporting/reports_main.php:152 reporting/reports_main.php:178
-#: reporting/reports_main.php:200 reporting/reports_main.php:208
-#: reporting/reports_main.php:240 reporting/reports_main.php:251
-#: reporting/reports_main.php:262 reporting/reports_main.php:278
-#: reporting/reports_main.php:288 reporting/reports_main.php:299
-#: reporting/reports_main.php:311 reporting/reports_main.php:325
-#: reporting/reports_main.php:334 reporting/reports_main.php:344
-#: reporting/reports_main.php:355 reporting/reports_main.php:367
-#: reporting/reports_main.php:375 reporting/reports_main.php:384
-#: reporting/reports_main.php:392 reporting/reports_main.php:398
+#: reporting/rep102.php:131 reporting/rep202.php:136 reporting/rep203.php:99
+#: reporting/rep301.php:110 reporting/reports_main.php:35
+#: reporting/reports_main.php:44 reporting/reports_main.php:65
+#: reporting/reports_main.php:81 reporting/reports_main.php:90
+#: 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 reporting/reports_main.php:326
+#: reporting/reports_main.php:338 reporting/reports_main.php:356
+#: reporting/reports_main.php:367 reporting/reports_main.php:379
+#: reporting/reports_main.php:392 reporting/reports_main.php:408
+#: reporting/reports_main.php:418 reporting/reports_main.php:429
+#: reporting/reports_main.php:441 reporting/reports_main.php:455
+#: reporting/reports_main.php:464 reporting/reports_main.php:474
+#: reporting/reports_main.php:483 reporting/reports_main.php:490
msgid "End Date"
msgstr ""
-#: reporting/rep102.php:133 reporting/rep202.php:138
-#: reporting/reports_main.php:45 reporting/reports_main.php:110
-#: reporting/reports_main.php:145
+#: reporting/rep102.php:135 reporting/rep202.php:140
+#: reporting/reports_main.php:47 reporting/reports_main.php:123
+#: reporting/reports_main.php:164
msgid "Show Also Allocated"
msgstr ""
-#: reporting/rep102.php:138
+#: reporting/rep102.php:140
msgid "Aged Customer Analysis"
msgstr ""
-#: reporting/rep103.php:115
+#: reporting/rep103.php:134
msgid "All Areas"
msgstr ""
-#: reporting/rep103.php:119
+#: reporting/rep103.php:138
msgid "All Sales Folk"
msgstr ""
-#: reporting/rep103.php:123
+#: reporting/rep103.php:142 reporting/rep205.php:89
msgid "Greater than "
msgstr ""
-#: reporting/rep103.php:127
+#: reporting/rep103.php:146 reporting/rep205.php:93
msgid "Less than "
msgstr ""
-#: reporting/rep103.php:136
+#: reporting/rep103.php:155
msgid "Customer Postal Address"
msgstr ""
-#: reporting/rep103.php:136
+#: reporting/rep103.php:155
msgid "Price/Turnover"
msgstr ""
-#: reporting/rep103.php:136
+#: reporting/rep103.php:155
msgid "Branch Contact Information"
msgstr ""
-#: reporting/rep103.php:137
+#: reporting/rep103.php:156
msgid "Branch Delivery Address"
msgstr ""
-#: reporting/rep103.php:142 reporting/reports_main.php:52
+#: reporting/rep103.php:161 reporting/rep205.php:108
+#: reporting/reports_main.php:55 reporting/reports_main.php:185
msgid "Activity Since"
msgstr ""
-#: reporting/rep103.php:143 reporting/reports_main.php:53
+#: reporting/rep103.php:162 reporting/reports_main.php:56
#: sales/manage/sales_areas.php:16
msgid "Sales Areas"
msgstr ""
-#: reporting/rep103.php:144 reporting/reports_main.php:54
+#: reporting/rep103.php:163 reporting/reports_main.php:57
msgid "Sales Folk"
msgstr ""
-#: reporting/rep103.php:145
+#: reporting/rep103.php:164 reporting/rep205.php:109
msgid "Activity"
msgstr ""
-#: reporting/rep103.php:147
+#: reporting/rep103.php:166
msgid "Customer Details Listing"
msgstr ""
-#: reporting/rep103.php:175
+#: reporting/rep103.php:197
msgid "Customers in"
msgstr ""
-#: reporting/rep103.php:196
+#: reporting/rep103.php:218
msgid "Price List"
msgstr ""
-#: reporting/rep103.php:207
+#: reporting/rep103.php:246 reporting/rep205.php:164
+msgid "Ph"
+msgstr ""
+
+#: reporting/rep103.php:261 reporting/rep205.php:179
+msgid "Gereral Notes:"
+msgstr ""
+
+#: reporting/rep103.php:270 reporting/rep205.php:102 reporting/rep205.php:188
msgid "Turnover"
msgstr ""
-#: reporting/rep103.php:216
-msgid "Ph"
+#: reporting/rep103.php:277 reporting/rep106.php:88 reporting/rep205.php:195
+#: reporting/includes/header2.inc:110 sales/manage/sales_people.php:99
+msgid "Email"
msgstr ""
-#: reporting/rep104.php:109
+#: reporting/rep104.php:111
msgid "Category/Items"
msgstr ""
-#: reporting/rep104.php:109 reporting/rep301.php:103 reporting/rep303.php:109
-#: reporting/rep303.php:115
+#: reporting/rep104.php:111 reporting/rep301.php:105 reporting/rep303.php:121
+#: reporting/rep303.php:127 reporting/rep307.php:117 reporting/rep308.php:149
msgid "UOM"
msgstr ""
-#: reporting/rep104.php:109
+#: reporting/rep104.php:111
msgid "GP %"
msgstr ""
-#: reporting/rep104.php:117 reporting/reports_main.php:70
+#: reporting/rep104.php:119 reporting/reports_main.php:75
msgid "Show GP %"
msgstr ""
-#: reporting/rep104.php:124
+#: reporting/rep104.php:126
msgid "Price Listing"
msgstr ""
-#: reporting/rep104.php:191
+#: reporting/rep104.php:195
msgid "Sales Kits"
msgstr ""
-#: reporting/rep105.php:101
+#: reporting/rep105.php:103
msgid "All Orders"
msgstr ""
-#: reporting/rep105.php:103 reporting/reports_main.php:78
+#: reporting/rep105.php:105 reporting/reports_main.php:84
msgid "Back Orders Only"
msgstr ""
-#: reporting/rep105.php:107 reporting/rep204.php:82
+#: reporting/rep105.php:109 reporting/rep204.php:84
#: sales/inquiry/customer_allocation_inquiry.php:147
-#: sales/inquiry/customer_inquiry.php:226
-#: sales/inquiry/customer_inquiry.php.orig:226
+#: sales/inquiry/customer_inquiry.php:219
msgid "Order"
msgstr ""
-#: reporting/rep105.php:107 reporting/rep106.php:81 reporting/rep112.php:176
-#: sales/create_recurrent_invoices.php:115
-#: sales/customer_credit_invoice.php:238 sales/customer_delivery.php:339
-#: sales/customer_invoice.php:379 sales/manage/customers.php:251
-#: sales/manage/customers.php:289 sales/manage/customers.php.orig:248
-#: sales/manage/customers.php.orig:286 sales/manage/recurrent_invoices.php:102
-#: sales/view/view_credit.php:58 sales/inquiry/customer_inquiry.php:231
-#: sales/inquiry/customer_inquiry.php.orig:231
+#: reporting/rep105.php:109 reporting/rep106.php:83 reporting/rep112.php:187
+#: sales/create_recurrent_invoices.php:134
+#: sales/customer_credit_invoice.php:236 sales/customer_delivery.php:339
+#: sales/customer_invoice.php:390 sales/manage/customers.php:254
+#: sales/manage/customers.php:293 sales/manage/recurrent_invoices.php:102
+#: sales/view/view_credit.php:58 sales/inquiry/customer_inquiry.php:224
#: sales/inquiry/sales_deliveries_view.php:182
#: sales/inquiry/sales_orders_view.php:265
#: sales/inquiry/sales_orders_view.php:279
-#: sales/inquiry/sales_orders_view.php.orig:263
-#: sales/inquiry/sales_orders_view.php.orig:277
-#: sales/create_recurrent_invoices.php:132
-#: sales/customer_credit_invoice.php:236 sales/customer_invoice.php:381
-#: sales/manage/customers.php:290
msgid "Branch"
msgstr ""
-#: reporting/rep105.php:107 reporting/rep106.php:81
+#: reporting/rep105.php:109 reporting/rep106.php:83
msgid "Customer Ref"
msgstr ""
-#: reporting/rep105.php:108
+#: reporting/rep105.php:110
msgid "Ord Date"
msgstr ""
-#: reporting/rep105.php:108
+#: reporting/rep105.php:110
msgid "Del Date"
msgstr ""
-#: reporting/rep105.php:108 reporting/rep401.php:69
+#: reporting/rep105.php:110 reporting/rep401.php:71
msgid "Loc"
msgstr ""
-#: reporting/rep105.php:112 sales/customer_delivery.php:432
-#: sales/customer_invoice.php:467 sales/customer_invoice.php:469
-msgid "Invoiced"
+#: reporting/rep105.php:114 sales/customer_delivery.php:432
+#: sales/customer_invoice.php:478 sales/includes/ui/sales_order_ui.inc:145
+msgid "Delivered"
msgstr ""
-#: reporting/rep105.php:119
+#: reporting/rep105.php:121
msgid "Selection"
msgstr ""
-#: reporting/rep105.php:124
+#: reporting/rep105.php:125
msgid "Order Status Listing"
msgstr ""
-#: reporting/rep106.php:82
+#: reporting/rep106.php:84
msgid "Inv Date"
msgstr ""
-#: reporting/rep106.php:82 reporting/rep106.php:86 reporting/rep106.php:87
+#: reporting/rep106.php:84 reporting/rep106.php:88 reporting/rep106.php:89
#: sales/manage/sales_people.php:99 sales/manage/sales_people.php:159
#: sales/manage/sales_people.php:161
msgid "Provision"
msgstr ""
-#: reporting/rep106.php:86
+#: reporting/rep106.php:88
msgid "Salesman"
msgstr ""
-#: reporting/rep106.php:86 reporting/includes/header2.inc:110
-#: sales/manage/sales_people.php:99
-msgid "Email"
-msgstr ""
-
-#: reporting/rep106.php:87 sales/manage/sales_people.php:99
+#: reporting/rep106.php:89 sales/manage/sales_people.php:99
msgid "Break Pt."
msgstr ""
-#: reporting/rep106.php:96
+#: reporting/rep106.php:97
msgid "Salesman Listing"
msgstr ""
-#: reporting/rep107.php:66 reporting/rep107.php:89 reporting/rep107.php:94
+#: reporting/rep107.php:68 reporting/rep107.php:89
#: reporting/includes/doctext.inc:105
msgid "INVOICE"
msgstr ""
-#: reporting/rep107.php:151 reporting/rep109.php:154 reporting/rep110.php:164
-#: reporting/rep111.php:141 reporting/rep113.php:150
+#: reporting/rep107.php:153 reporting/rep109.php:152 reporting/rep110.php:162
+#: reporting/rep111.php:137 reporting/rep113.php:147
#: sales/view/view_credit.php:138 sales/view/view_dispatch.php:155
#: sales/view/view_invoice.php:157 sales/view/view_sales_order.php:227
#: sales/includes/ui/sales_credit_ui.inc:222
msgid "Shipping"
msgstr ""
-#: reporting/rep108.php:84 reporting/rep108.php:115
+#: reporting/rep108.php:85 reporting/rep108.php:110
#: reporting/includes/doctext.inc:216
msgid "STATEMENT"
msgstr ""
-#: reporting/rep108.php:126
+#: reporting/rep108.php:127
msgid "Outstanding Transactions"
msgstr ""
-#: reporting/rep108.php:169
+#: reporting/rep108.php:170
msgid "Statement"
msgstr ""
-#: reporting/rep108.php:169
+#: reporting/rep108.php:170
msgid "as of"
msgstr ""
-#: reporting/rep109.php:65 reporting/rep109.php:93 reporting/rep109.php:99
+#: reporting/rep109.php:65 reporting/rep109.php:88 reporting/rep109.php:93
#: reporting/includes/doctext.inc:53
msgid "SALES ORDER"
msgstr ""
-#: reporting/rep109.php:67 reporting/rep109.php:88 reporting/rep109.php:99
+#: reporting/rep109.php:67 reporting/rep109.php:83 reporting/rep109.php:93
#: reporting/includes/doctext.inc:53
msgid "QUOTE"
msgstr ""
-#: reporting/rep109.php:160 reporting/rep111.php:147
+#: reporting/rep109.php:158 reporting/rep111.php:143
msgid "TOTAL ORDER EX VAT"
msgstr ""
-#: reporting/rep109.php:206 reporting/rep111.php:193
+#: reporting/rep109.php:204 reporting/rep111.php:189
msgid "TOTAL ORDER VAT INCL."
msgstr ""
-#: reporting/rep110.php:68
+#: reporting/rep110.php:70
msgid "DELIVERY"
msgstr ""
-#: reporting/rep110.php:70 reporting/rep110.php:97
+#: reporting/rep110.php:72 reporting/rep110.php:93
#: reporting/includes/doctext.inc:70
msgid "PACKING SLIP"
msgstr ""
-#: reporting/rep110.php:92 reporting/rep110.php:103
-#: reporting/includes/doctext.inc:70
+#: reporting/rep110.php:88 reporting/includes/doctext.inc:70
msgid "DELIVERY NOTE"
msgstr ""
-#: reporting/rep110.php:208
+#: reporting/rep110.php:206
msgid "TOTAL DELIVERY INCL. VAT"
msgstr ""
-#: reporting/rep111.php:61 reporting/rep111.php:86
-#: reporting/includes/doctext.inc:38
+#: reporting/rep111.php:60 reporting/includes/doctext.inc:38
msgid "SALES QUOTATION"
msgstr ""
-#: reporting/rep112.php:92 reporting/rep112.php:113
-#: reporting/includes/doctext.inc:176
+#: reporting/rep112.php:95 reporting/includes/doctext.inc:176
msgid "RECEIPT"
msgstr ""
-#: reporting/rep112.php:122 reporting/rep210.php:136
+#: reporting/rep112.php:126 reporting/rep210.php:134
msgid "As advance / full / part / payment towards:"
msgstr ""
-#: reporting/rep112.php:157
+#: reporting/rep112.php:167
msgid "TOTAL RECEIPT"
msgstr ""
-#: reporting/rep112.php:167
+#: reporting/rep112.php:178
msgid "Received / Sign"
msgstr ""
-#: reporting/rep112.php:169
+#: reporting/rep112.php:180
msgid "By Cash / Cheque* / Draft No."
msgstr ""
-#: reporting/rep112.php:171
+#: reporting/rep112.php:182
msgid "Dated"
msgstr ""
-#: reporting/rep112.php:174
+#: reporting/rep112.php:185
msgid "Drawn on Bank"
msgstr ""
-#: reporting/rep113.php:66 reporting/rep113.php:91 reporting/rep113.php:96
+#: reporting/rep113.php:67 reporting/rep113.php:86
#: reporting/includes/doctext.inc:91
msgid "CREDIT NOTE"
msgstr ""
-#: reporting/rep113.php:194 sales/view/view_credit.php:143
+#: reporting/rep113.php:191 sales/view/view_credit.php:143
msgid "TOTAL CREDIT"
msgstr ""
-#: reporting/rep114.php:85
+#: reporting/rep114.php:87
msgid "Sales Summary Report"
msgstr ""
-#: reporting/rep114.php:89 reporting/reports_main.php:62
+#: reporting/rep114.php:91 reporting/reports_main.php:66
msgid "Tax Id Only"
msgstr ""
-#: reporting/rep114.php:93
+#: reporting/rep114.php:95
msgid "Tax Id"
msgstr ""
-#: reporting/rep114.php:93
+#: reporting/rep114.php:95
msgid "Total ex. Tax"
msgstr ""
-#: reporting/rep114.php:93 reporting/rep709.php:110 taxes/tax_groups.php:177
+#: reporting/rep114.php:95 reporting/rep709.php:112 taxes/tax_groups.php:177
msgid "Tax"
msgstr ""
-#: reporting/rep201.php:108
+#: reporting/rep201.php:100
msgid "Balances in Home currency"
msgstr ""
-#: reporting/rep201.php:129
+#: reporting/rep201.php:123
msgid "Supplier Balances"
msgstr ""
-#: reporting/rep202.php:142
+#: reporting/rep202.php:144
msgid "currency"
msgstr ""
-#: reporting/rep202.php:143
+#: reporting/rep202.php:145
msgid "Aged Supplier Analysis"
msgstr ""
-#: reporting/rep203.php:102
+#: reporting/rep203.php:104
msgid "Payment Report"
msgstr ""
-#: reporting/rep204.php:82
+#: reporting/rep204.php:84
msgid "Qty Recd"
msgstr ""
-#: reporting/rep204.php:82
+#: reporting/rep204.php:84
msgid "qty Inv"
msgstr ""
-#: reporting/rep204.php:83
+#: reporting/rep204.php:85
msgid "Act Price"
msgstr ""
-#: reporting/rep204.php:90
+#: reporting/rep204.php:92
msgid "Outstanding GRNs Report"
msgstr ""
-#: reporting/rep209.php:88 reporting/rep209.php:107 reporting/rep209.php:112
+#: reporting/rep205.php:102
+msgid "Contact Information"
+msgstr ""
+
+#: reporting/rep205.php:103
+msgid "Physical Address"
+msgstr ""
+
+#: reporting/rep205.php:111
+msgid "Supplier Details Listing"
+msgstr ""
+
+#: reporting/rep205.php:139
+msgid "Tax_Id"
+msgstr ""
+
+#: reporting/rep209.php:87 reporting/rep209.php:100
#: reporting/includes/doctext.inc:149
msgid "PURCHASE ORDER"
msgstr ""
-#: reporting/rep209.php:211
+#: reporting/rep209.php:206
msgid "TOTAL PO"
msgstr ""
-#: reporting/rep210.php:94 reporting/rep210.php:122 reporting/rep210.php:127
+#: reporting/rep210.php:96 reporting/rep210.php:118
#: reporting/includes/doctext.inc:129
msgid "REMITTANCE"
msgstr ""
-#: reporting/rep210.php:171
+#: reporting/rep210.php:177
msgid "TOTAL REMITTANCE"
msgstr ""
-#: reporting/rep301.php:112
+#: reporting/rep301.php:114
msgid "Inventory Valuation Report"
msgstr ""
-#: reporting/rep302.php:123
+#: reporting/rep302.php:125
msgid "QOH"
msgstr ""
-#: reporting/rep302.php:123
+#: reporting/rep302.php:125
msgid "Cust Ord"
msgstr ""
-#: reporting/rep302.php:123
+#: reporting/rep302.php:125
msgid "Supp Ord"
msgstr ""
-#: reporting/rep302.php:123
+#: reporting/rep302.php:125
msgid "Sugg Ord"
msgstr ""
-#: reporting/rep302.php:132
+#: reporting/rep302.php:134
msgid "Inventory Planning Report"
msgstr ""
-#: reporting/rep303.php:97
+#: reporting/rep303.php:109
msgid "Shortage"
msgstr ""
-#: reporting/rep303.php:109 reporting/rep303.php:115 reporting/rep305.php:95
-#: reporting/rep305.php:98
+#: reporting/rep303.php:121 reporting/rep303.php:127 reporting/rep305.php:101
msgid "Stock ID"
msgstr ""
-#: reporting/rep303.php:109
+#: reporting/rep303.php:121
msgid "Check"
msgstr ""
-#: reporting/rep303.php:123
+#: reporting/rep303.php:135
msgid "Only Shortage"
msgstr ""
-#: reporting/rep303.php:131
+#: reporting/rep303.php:143
msgid "Stock Check Sheets"
msgstr ""
-#: reporting/rep304.php:112 reporting/rep305.php:95 reporting/rep305.php:98
+#: reporting/rep304.php:114 reporting/rep305.php:101 reporting/rep306.php:141
+#: reporting/rep309.php:98
msgid "Qty"
msgstr ""
-#: reporting/rep304.php:112 sales/manage/customer_branches.php:240
-#: sales/manage/customers.php:259 sales/manage/customers.php.orig:256
-#: sales/manage/customers.php:260
+#: reporting/rep304.php:114 reporting/rep309.php:98
+#: sales/manage/customer_branches.php:240 sales/manage/customers.php:263
msgid "Sales"
msgstr ""
-#: reporting/rep304.php:112
+#: reporting/rep304.php:114
msgid "Cost"
msgstr ""
-#: reporting/rep304.php:112
+#: reporting/rep304.php:114
msgid "Contribution"
msgstr ""
-#: reporting/rep304.php:124
+#: reporting/rep304.php:126
msgid "Inventory Sales Report"
msgstr ""
-#: reporting/rep305.php:95 reporting/rep305.php:98
+#: reporting/rep305.php:101
msgid "PO No"
msgstr ""
-#: reporting/rep305.php:95 reporting/rep305.php:98
+#: reporting/rep305.php:101
msgid "Inv"
msgstr ""
-#: reporting/rep305.php:95 reporting/rep305.php:98
+#: reporting/rep305.php:101
msgid "Inv Price"
msgstr ""
-#: reporting/rep305.php:95 reporting/rep305.php:98
+#: reporting/rep305.php:101
msgid "PO Price"
msgstr ""
-#: reporting/rep305.php:102 reporting/rep305.php:105
+#: reporting/rep305.php:108
msgid "GRN Valuation Report"
msgstr ""
-#: reporting/rep401.php:69
+#: reporting/rep306.php:141 reporting/rep309.php:98
+msgid "Unit Price"
+msgstr ""
+
+#: reporting/rep306.php:154
+msgid "Inventory Purchasing Report"
+msgstr ""
+
+#: reporting/rep307.php:117
+msgid "Opening"
+msgstr ""
+
+#: reporting/rep307.php:126
+msgid "Inventory Movements"
+msgstr ""
+
+#: reporting/rep308.php:149
+msgid "OpeningStock"
+msgstr ""
+
+#: reporting/rep308.php:149
+msgid "StockIn"
+msgstr ""
+
+#: reporting/rep308.php:149
+msgid "ClosingStock"
+msgstr ""
+
+#: reporting/rep308.php:150
+msgid "QTY"
+msgstr ""
+
+#: reporting/rep308.php:150 reporting/rep709.php:112
+#: taxes/item_tax_types.php:185
+msgid "Rate"
+msgstr ""
+
+#: reporting/rep308.php:159
+msgid "Costed Inventory Movements"
+msgstr ""
+
+#: reporting/rep309.php:98
+msgid "Item/Category"
+msgstr ""
+
+#: reporting/rep309.php:98
+msgid "Remark"
+msgstr ""
+
+#: reporting/rep309.php:106
+msgid "Item Sales Summary Report"
+msgstr ""
+
+#: reporting/rep309.php:147
+msgid "Gift"
+msgstr ""
+
+#: reporting/rep401.php:71
msgid "Wrk Ctr"
msgstr ""
-#: reporting/rep401.php:76
+#: reporting/rep401.php:78
msgid "Bill of Material Listing"
msgstr ""
-#: reporting/rep409.php:58 reporting/rep409.php:77 reporting/rep409.php:82
+#: reporting/rep409.php:60 reporting/rep409.php:73
#: reporting/includes/doctext.inc:192
msgid "WORK ORDER"
msgstr ""
-#: reporting/rep409.php:132
+#: reporting/rep409.php:129
msgid "Insufficient stock"
msgstr ""
-#: reporting/rep501.php:85
+#: reporting/rep501.php:87
msgid "YTD"
msgstr ""
-#: reporting/rep501.php:92
+#: reporting/rep501.php:94
msgid "Dimension Summary"
msgstr ""
-#: reporting/rep601.php:83 reporting/includes/doctext.inc:247
+#: reporting/rep601.php:86 reporting/includes/doctext.inc:247
msgid "Bank Account"
msgstr ""
-#: reporting/rep601.php:144
+#: reporting/rep601.php:151
msgid "Total Debit / Credit"
msgstr ""
-#: reporting/rep601.php:161
+#: reporting/rep601.php:168
msgid "Net Change"
msgstr ""
-#: reporting/rep702.php:51
+#: reporting/rep702.php:53
msgid "Type/Account"
msgstr ""
-#: reporting/rep702.php:51
+#: reporting/rep702.php:53
msgid "Date/Dim."
msgstr ""
-#: reporting/rep702.php:52
+#: reporting/rep702.php:54
msgid "Person/Item/Memo"
msgstr ""
-#: reporting/rep702.php:62
+#: reporting/rep702.php:64
msgid "List of Journal Entries"
msgstr ""
-#: reporting/rep704.php:67
+#: reporting/rep704.php:71
msgid "GL Account Transactions"
msgstr ""
-#: reporting/rep705.php:243 reporting/rep705.php:256 reporting/rep705.php:267
-#: reporting/reports_main.php:270 reporting/reports_main.php:318
-#: reporting/reports_main.php:361
+#: reporting/rep705.php:247 reporting/rep705.php:260 reporting/rep705.php:271
+#: reporting/reports_main.php:347 reporting/reports_main.php:400
+#: reporting/reports_main.php:448
msgid "Year"
msgstr ""
-#: reporting/rep705.php:249 reporting/rep705.php:260 reporting/rep705.php:269
-#: reporting/rep706.php:194 reporting/rep706.php:202 reporting/rep706.php:208
-#: reporting/rep707.php:218 reporting/rep707.php:226 reporting/rep707.php:232
+#: reporting/rep705.php:253 reporting/rep705.php:264 reporting/rep705.php:273
+#: reporting/rep706.php:198 reporting/rep706.php:206 reporting/rep706.php:212
+#: reporting/rep707.php:222 reporting/rep707.php:230 reporting/rep707.php:236
msgid "Tags"
msgstr ""
-#: reporting/rep705.php:250 reporting/rep705.php:261 reporting/rep705.php:270
+#: reporting/rep705.php:254 reporting/rep705.php:265 reporting/rep705.php:274
msgid "Amounts in thousands"
msgstr ""
-#: reporting/rep705.php:274
+#: reporting/rep705.php:278
msgid "Annual Expense Breakdown"
msgstr ""
-#: reporting/rep706.php:182
+#: reporting/rep706.php:186
msgid "Close Balance"
msgstr ""
-#: reporting/rep707.php:254
+#: reporting/rep707.php:258
msgid "Profit and Loss Statement"
msgstr ""
-#: reporting/rep709.php:91
+#: reporting/rep709.php:93
msgid "Tax Report"
msgstr ""
-#: reporting/rep709.php:109
+#: reporting/rep709.php:111
msgid "Branch Name"
msgstr ""
-#: reporting/rep709.php:110
+#: reporting/rep709.php:112
msgid "Net"
msgstr ""
-#: reporting/rep709.php:110 taxes/item_tax_types.php:185
-msgid "Rate"
-msgstr ""
-
-#: reporting/rep709.php:172 reporting/rep709.php:176
+#: reporting/rep709.php:183
msgid "Tax Rate"
msgstr ""
-#: reporting/rep709.php:172 reporting/rep709.php:176
+#: reporting/rep709.php:183
msgid "Net Tax"
msgstr ""
-#: reporting/rep710.php:75
+#: reporting/rep710.php:77
msgid "Time"
msgstr ""
-#: reporting/rep710.php:75
+#: reporting/rep710.php:77
msgid "Trans Date"
msgstr ""
-#: reporting/rep710.php:76
+#: reporting/rep710.php:78
msgid "Action"
msgstr ""
-#: reporting/rep710.php:87 reporting/reports_main.php:396
+#: reporting/rep710.php:89 reporting/reports_main.php:488
msgid "Audit Trail"
msgstr ""
-#: reporting/rep710.php:107
+#: reporting/rep710.php:111
msgid "Changed"
msgstr ""
msgid "Customer &Balances"
msgstr ""
-#: reporting/reports_main.php:37 reporting/reports_main.php:44
-#: reporting/reports_main.php:66 reporting/reports_main.php:90
-#: reporting/reports_main.php:97 reporting/reports_main.php:109
-#: reporting/reports_main.php:116 reporting/reports_main.php:123
-#: reporting/reports_main.php:129 reporting/reports_main.php:137
-#: reporting/reports_main.php:144 reporting/reports_main.php:154
-#: reporting/reports_main.php:165 reporting/reports_main.php:171
+#: reporting/reports_main.php:37 reporting/reports_main.php:154
+#: reporting/reports_main.php:300
+msgid "Show Balance"
+msgstr ""
+
+#: reporting/reports_main.php:38 reporting/reports_main.php:46
+#: reporting/reports_main.php:71 reporting/reports_main.php:98
+#: reporting/reports_main.php:108 reporting/reports_main.php:122
+#: reporting/reports_main.php:130 reporting/reports_main.php:138
+#: reporting/reports_main.php:145 reporting/reports_main.php:155
+#: 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:40 reporting/reports_main.php:50
-#: reporting/reports_main.php:58 reporting/reports_main.php:64
-#: reporting/reports_main.php:72 reporting/reports_main.php:80
-#: reporting/reports_main.php:86 reporting/reports_main.php:140
-#: reporting/reports_main.php:150 reporting/reports_main.php:157
-#: reporting/reports_main.php:161 reporting/reports_main.php:183
-#: reporting/reports_main.php:188 reporting/reports_main.php:197
-#: reporting/reports_main.php:205 reporting/reports_main.php:210
-#: reporting/reports_main.php:217 reporting/reports_main.php:231
-#: reporting/reports_main.php:242 reporting/reports_main.php:248
-#: reporting/reports_main.php:254 reporting/reports_main.php:268
-#: reporting/reports_main.php:275 reporting/reports_main.php:285
-#: reporting/reports_main.php:296 reporting/reports_main.php:305
-#: reporting/reports_main.php:316 reporting/reports_main.php:322
-#: reporting/reports_main.php:331 reporting/reports_main.php:341
-#: reporting/reports_main.php:349 reporting/reports_main.php:359
-#: reporting/reports_main.php:364 reporting/reports_main.php:372
-#: reporting/reports_main.php:381 reporting/reports_main.php:388
-#: reporting/reports_main.php:395 reporting/reports_main.php:402
+#: reporting/reports_main.php:41 reporting/reports_main.php:52
+#: reporting/reports_main.php:61 reporting/reports_main.php:68
+#: reporting/reports_main.php:77 reporting/reports_main.php:86
+#: reporting/reports_main.php:93 reporting/reports_main.php:103
+#: reporting/reports_main.php:112 reporting/reports_main.php:119
+#: reporting/reports_main.php:126 reporting/reports_main.php:134
+#: reporting/reports_main.php:141 reporting/reports_main.php:147
+#: reporting/reports_main.php:158 reporting/reports_main.php:169
+#: 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
+#: reporting/reports_main.php:322 reporting/reports_main.php:329
+#: reporting/reports_main.php:344 reporting/reports_main.php:352
+#: reporting/reports_main.php:363 reporting/reports_main.php:375
+#: reporting/reports_main.php:385 reporting/reports_main.php:397
+#: reporting/reports_main.php:404 reporting/reports_main.php:414
+#: reporting/reports_main.php:425 reporting/reports_main.php:434
+#: reporting/reports_main.php:445 reporting/reports_main.php:451
+#: reporting/reports_main.php:460 reporting/reports_main.php:470
+#: reporting/reports_main.php:478 reporting/reports_main.php:486
+#: reporting/reports_main.php:494
+msgid "Orientation"
+msgstr ""
+
+#: reporting/reports_main.php:42 reporting/reports_main.php:53
+#: reporting/reports_main.php:62 reporting/reports_main.php:69
+#: reporting/reports_main.php:78 reporting/reports_main.php:87
+#: reporting/reports_main.php:94 reporting/reports_main.php:159
+#: reporting/reports_main.php:170 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 reporting/reports_main.php:316
+#: reporting/reports_main.php:323 reporting/reports_main.php:330
+#: reporting/reports_main.php:345 reporting/reports_main.php:353
+#: reporting/reports_main.php:364 reporting/reports_main.php:376
+#: reporting/reports_main.php:386 reporting/reports_main.php:398
+#: reporting/reports_main.php:405 reporting/reports_main.php:415
+#: reporting/reports_main.php:426 reporting/reports_main.php:435
+#: reporting/reports_main.php:446 reporting/reports_main.php:452
+#: reporting/reports_main.php:461 reporting/reports_main.php:471
+#: reporting/reports_main.php:479 reporting/reports_main.php:487
+#: reporting/reports_main.php:495
msgid "Destination"
msgstr ""
-#: reporting/reports_main.php:41
+#: reporting/reports_main.php:43
msgid "&Aged Customer Analysis"
msgstr ""
-#: reporting/reports_main.php:48 reporting/reports_main.php:148
-#: reporting/reports_main.php:283 reporting/reports_main.php:294
-#: reporting/reports_main.php:329 reporting/reports_main.php:339
-#: reporting/reports_main.php:370 reporting/reports_main.php:379
+#: reporting/reports_main.php:50 reporting/reports_main.php:167
+#: reporting/reports_main.php:361 reporting/reports_main.php:373
+#: reporting/reports_main.php:412 reporting/reports_main.php:423
+#: reporting/reports_main.php:458 reporting/reports_main.php:468
msgid "Graphics"
msgstr ""
-#: reporting/reports_main.php:51
+#: reporting/reports_main.php:54
msgid "Customer &Detail Listing"
msgstr ""
-#: reporting/reports_main.php:55
+#: reporting/reports_main.php:58 reporting/reports_main.php:186
msgid "Activity Greater Than"
msgstr ""
-#: reporting/reports_main.php:56
+#: reporting/reports_main.php:59 reporting/reports_main.php:187
msgid "Activity Less Than"
msgstr ""
-#: reporting/reports_main.php:59
+#: reporting/reports_main.php:63
msgid "Sales &Summary Report"
msgstr ""
-#: reporting/reports_main.php:65
+#: reporting/reports_main.php:70
msgid "&Price Listing"
msgstr ""
-#: reporting/reports_main.php:67 reporting/reports_main.php:76
-#: reporting/reports_main.php:179 reporting/reports_main.php:185
-#: reporting/reports_main.php:190 reporting/reports_main.php:201
+#: 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 ""
-#: reporting/reports_main.php:68 sales/manage/sales_types.php:16
+#: reporting/reports_main.php:73 sales/manage/sales_types.php:16
msgid "Sales Types"
msgstr ""
-#: reporting/reports_main.php:69 reporting/reports_main.php:192
+#: reporting/reports_main.php:74 reporting/reports_main.php:224
msgid "Show Pictures"
msgstr ""
-#: reporting/reports_main.php:73
+#: reporting/reports_main.php:79
msgid "&Order Status Listing"
msgstr ""
-#: reporting/reports_main.php:77
+#: reporting/reports_main.php:83
msgid "Stock Location"
msgstr ""
-#: reporting/reports_main.php:81
+#: reporting/reports_main.php:88
msgid "&Salesman Listing"
msgstr ""
-#: reporting/reports_main.php:87
+#: reporting/reports_main.php:95
msgid "Print &Invoices"
msgstr ""
-#: reporting/reports_main.php:91 reporting/reports_main.php:98
-#: reporting/reports_main.php:104
+#: reporting/reports_main.php:99 reporting/reports_main.php:109
+#: reporting/reports_main.php:116
msgid "email Customers"
msgstr ""
-#: reporting/reports_main.php:92 reporting/reports_main.php:99
+#: reporting/reports_main.php:100 reporting/reports_main.php:110
msgid "Payment Link"
msgstr ""
-#: reporting/reports_main.php:94
+#: reporting/reports_main.php:105
msgid "Print &Credit Notes"
msgstr ""
-#: reporting/reports_main.php:101
+#: reporting/reports_main.php:113
msgid "Print &Deliveries"
msgstr ""
-#: reporting/reports_main.php:105
+#: reporting/reports_main.php:117
msgid "Print as Packing Slip"
msgstr ""
-#: reporting/reports_main.php:107
+#: reporting/reports_main.php:120
msgid "Print &Statements"
msgstr ""
-#: reporting/reports_main.php:111 reporting/reports_main.php:117
-#: reporting/reports_main.php:124 reporting/reports_main.php:166
-#: reporting/reports_main.php:172
+#: reporting/reports_main.php:124 reporting/reports_main.php:131
+#: reporting/reports_main.php:139 reporting/reports_main.php:195
+#: reporting/reports_main.php:202
msgid "Email Customers"
msgstr ""
-#: reporting/reports_main.php:113
+#: reporting/reports_main.php:127
msgid "&Print Sales Orders"
msgstr ""
-#: reporting/reports_main.php:118
+#: reporting/reports_main.php:132
msgid "Print as Quote"
msgstr ""
-#: reporting/reports_main.php:120
+#: reporting/reports_main.php:135
msgid "&Print Sales Quotations"
msgstr ""
-#: reporting/reports_main.php:126
+#: reporting/reports_main.php:142
msgid "Print Receipts"
msgstr ""
-#: reporting/reports_main.php:133
+#: reporting/reports_main.php:150
msgid "Supplier &Balances"
msgstr ""
-#: reporting/reports_main.php:141
+#: reporting/reports_main.php:160
msgid "&Aged Supplier Analyses"
msgstr ""
-#: reporting/reports_main.php:151
+#: reporting/reports_main.php:171
msgid "&Payment Report"
msgstr ""
-#: reporting/reports_main.php:158
+#: reporting/reports_main.php:179
msgid "Outstanding &GRNs Report"
msgstr ""
-#: reporting/reports_main.php:162
+#: reporting/reports_main.php:184
+msgid "Supplier &Detail Listing"
+msgstr ""
+
+#: reporting/reports_main.php:191
msgid "Print Purchase &Orders"
msgstr ""
-#: reporting/reports_main.php:168
+#: reporting/reports_main.php:198
msgid "Print Remittances"
msgstr ""
-#: reporting/reports_main.php:177
+#: reporting/reports_main.php:207
msgid "Inventory &Valuation Report"
msgstr ""
-#: reporting/reports_main.php:184
+#: reporting/reports_main.php:215
msgid "Inventory &Planning Report"
msgstr ""
-#: reporting/reports_main.php:189
+#: reporting/reports_main.php:221
msgid "Stock &Check Sheets"
msgstr ""
-#: reporting/reports_main.php:193
+#: reporting/reports_main.php:225
msgid "Inventory Column"
msgstr ""
-#: reporting/reports_main.php:194
+#: reporting/reports_main.php:226
msgid "Show Shortage"
msgstr ""
-#: reporting/reports_main.php:198
+#: reporting/reports_main.php:228
+msgid "Item Like"
+msgstr ""
+
+#: reporting/reports_main.php:232
msgid "Inventory &Sales Report"
msgstr ""
-#: reporting/reports_main.php:206
+#: reporting/reports_main.php:241
msgid "&GRN Valuation Report"
msgstr ""
-#: reporting/reports_main.php:212
+#: 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:213
+#: reporting/reports_main.php:282
msgid "&Bill of Material Listing"
msgstr ""
-#: reporting/reports_main.php:214
+#: reporting/reports_main.php:283
msgid "From product"
msgstr ""
-#: reporting/reports_main.php:215
+#: reporting/reports_main.php:284
msgid "To product"
msgstr ""
-#: reporting/reports_main.php:218
+#: reporting/reports_main.php:288
msgid "Print &Work Orders"
msgstr ""
-#: reporting/reports_main.php:221
+#: reporting/reports_main.php:291
msgid "Email Locations"
msgstr ""
-#: reporting/reports_main.php:226
+#: reporting/reports_main.php:297
msgid "Dimension &Summary"
msgstr ""
-#: reporting/reports_main.php:227
+#: reporting/reports_main.php:298
msgid "From Dimension"
msgstr ""
-#: reporting/reports_main.php:228
+#: reporting/reports_main.php:299
msgid "To Dimension"
msgstr ""
-#: reporting/reports_main.php:229
-msgid "Show Balance"
-msgstr ""
-
-#: reporting/reports_main.php:236
+#: reporting/reports_main.php:308
msgid "Banking"
msgstr ""
-#: reporting/reports_main.php:237
+#: reporting/reports_main.php:309
msgid "Bank &Statement"
msgstr ""
-#: reporting/reports_main.php:244
+#: reporting/reports_main.php:313 reporting/reports_main.php:380
+#: reporting/reports_main.php:430 reporting/reports_main.php:475
+msgid "Zero values"
+msgstr ""
+
+#: reporting/reports_main.php:318
msgid "General Ledger"
msgstr ""
-#: reporting/reports_main.php:245
+#: reporting/reports_main.php:319
msgid "Chart of &Accounts"
msgstr ""
-#: reporting/reports_main.php:246
+#: reporting/reports_main.php:320
msgid "Show Balances"
msgstr ""
-#: reporting/reports_main.php:249
+#: reporting/reports_main.php:324
msgid "List of &Journal Entries"
msgstr ""
-#: reporting/reports_main.php:260 reporting/reports_main.php:309
-#: reporting/reports_main.php:353
+#: reporting/reports_main.php:336 reporting/reports_main.php:390
+#: reporting/reports_main.php:439
msgid "GL Account &Transactions"
msgstr ""
-#: reporting/reports_main.php:263 reporting/reports_main.php:312
-#: reporting/reports_main.php:356
+#: reporting/reports_main.php:339 reporting/reports_main.php:393
+#: reporting/reports_main.php:442
msgid "From Account"
msgstr ""
-#: reporting/reports_main.php:264 reporting/reports_main.php:313
-#: reporting/reports_main.php:357
+#: reporting/reports_main.php:340 reporting/reports_main.php:394
+#: reporting/reports_main.php:443
msgid "To Account"
msgstr ""
-#: reporting/reports_main.php:269 reporting/reports_main.php:317
-#: reporting/reports_main.php:360
+#: reporting/reports_main.php:346 reporting/reports_main.php:399
+#: reporting/reports_main.php:447
msgid "Annual &Expense Breakdown"
msgstr ""
-#: reporting/reports_main.php:276 reporting/reports_main.php:323
-#: reporting/reports_main.php:365
+#: reporting/reports_main.php:354 reporting/reports_main.php:406
+#: reporting/reports_main.php:453
msgid "&Balance Sheet"
msgstr ""
-#: reporting/reports_main.php:282 reporting/reports_main.php:293
-#: reporting/reports_main.php:328 reporting/reports_main.php:338
-#: reporting/reports_main.php:369 reporting/reports_main.php:378
+#: reporting/reports_main.php:360 reporting/reports_main.php:372
+#: reporting/reports_main.php:411 reporting/reports_main.php:422
+#: reporting/reports_main.php:457 reporting/reports_main.php:467
msgid "Decimal values"
msgstr ""
-#: reporting/reports_main.php:286 reporting/reports_main.php:332
-#: reporting/reports_main.php:373
+#: reporting/reports_main.php:365 reporting/reports_main.php:416
+#: reporting/reports_main.php:462
msgid "&Profit and Loss Statement"
msgstr ""
-#: reporting/reports_main.php:300 reporting/reports_main.php:345
-#: reporting/reports_main.php:385
-msgid "Zero values"
-msgstr ""
-
-#: reporting/reports_main.php:390
+#: reporting/reports_main.php:481
msgid "Ta&x Report"
msgstr ""
msgid "Delivered To"
msgstr ""
-#: reporting/includes/doctext.inc:30 sales/customer_credit_invoice.php:283
+#: reporting/includes/doctext.inc:30 sales/customer_credit_invoice.php:281
#: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
#: sales/view/view_invoice.php:114 sales/includes/ui/sales_credit_ui.inc:168
-#: sales/includes/ui/sales_order_ui.inc:142
-#: sales/customer_credit_invoice.php:281
#: sales/includes/ui/sales_order_ui.inc:146
msgid "Discount %"
msgstr ""
#: reporting/includes/doctext.inc:118 reporting/includes/doctext.inc:139
#: reporting/includes/doctext.inc:162 reporting/includes/doctext.inc:180
#: reporting/includes/doctext.inc:218
-msgid "Customers Reference"
+msgid "Customer's Reference"
msgstr ""
#: reporting/includes/doctext.inc:45 reporting/includes/doctext.inc:62
#: reporting/includes/doctext.inc:48 sales/view/view_sales_order.php:69
#: sales/inquiry/sales_orders_view.php:282
-#: sales/inquiry/sales_orders_view.php.orig:280
-#: sales/includes/ui/sales_order_ui.inc:606
-#: sales/includes/ui/sales_order_ui.inc:610
+#: sales/includes/ui/sales_order_ui.inc:611
msgid "Valid until"
msgstr ""
msgstr ""
#: reporting/includes/doctext.inc:64 reporting/includes/doctext.inc:85
-#: reporting/includes/doctext.inc:99 reporting/includes/doctext.inc:142
-#: reporting/includes/doctext.inc:165 reporting/includes/doctext.inc:183
+#: reporting/includes/doctext.inc:99 reporting/includes/doctext.inc:183
#: reporting/includes/doctext.inc:221 sales/view/view_dispatch.php:87
#: sales/view/view_invoice.php:86
msgid "Our Order No"
msgid "DueDate"
msgstr ""
-#: reporting/includes/doctext.inc:259 reporting/includes/pdf_report.inc:1013
-#: reporting/includes/pdf_report.inc:1014
+#: reporting/includes/doctext.inc:259 reporting/includes/pdf_report.inc:1020
msgid "You can pay through"
msgstr ""
msgstr ""
#: reporting/includes/excel_report.inc:413
-#: reporting/includes/pdf_report.inc:600 reporting/includes/pdf_report.inc:601
+#: reporting/includes/pdf_report.inc:601
msgid "Generated At"
msgstr ""
#: reporting/includes/excel_report.inc:419
-#: reporting/includes/pdf_report.inc:609 reporting/includes/pdf_report.inc:610
+#: reporting/includes/pdf_report.inc:610
msgid "Generated By"
msgstr ""
msgstr ""
#: reporting/includes/header2.inc:143 reporting/includes/pdf_report.inc:352
-#: reporting/includes/pdf_report.inc:500 reporting/includes/pdf_report.inc:628
#: reporting/includes/pdf_report.inc:501 reporting/includes/pdf_report.inc:629
msgid "Page"
msgstr ""
-#: reporting/includes/pdf_report.inc:583 reporting/includes/pdf_report.inc:584
+#: reporting/includes/pdf_report.inc:584
msgid "Report Period"
msgstr ""
-#: reporting/includes/pdf_report.inc:980 reporting/includes/pdf_report.inc:981
-msgid "You have no email contact defined for this type of document"
+#: reporting/includes/pdf_report.inc:987
+#: reporting/includes/pdf_report.inc:1035
+#, php-format
+msgid "You have no email contact defined for this type of document for '%s'."
msgstr ""
-#: reporting/includes/pdf_report.inc:999
-#: reporting/includes/pdf_report.inc:1000
+#: reporting/includes/pdf_report.inc:1006
msgid "Dear"
msgstr ""
-#: reporting/includes/pdf_report.inc:1000
-#: reporting/includes/pdf_report.inc:1001
+#: reporting/includes/pdf_report.inc:1007
msgid "Attached you will find "
msgstr ""
-#: reporting/includes/pdf_report.inc:1016
-#: reporting/includes/pdf_report.inc:1017
+#: reporting/includes/pdf_report.inc:1023
msgid "Kindest regards"
msgstr ""
-#: reporting/includes/pdf_report.inc:1028
-#: reporting/includes/pdf_report.inc:1029
-msgid "There is no contact email set for this document type."
-msgstr ""
-
-#: reporting/includes/pdf_report.inc:1031
-#: reporting/includes/pdf_report.inc:1032
+#: reporting/includes/pdf_report.inc:1038
msgid "Sending document by email failed"
msgstr ""
-#: reporting/includes/pdf_report.inc:1031
-#: reporting/includes/pdf_report.inc:1034
-#: reporting/includes/pdf_report.inc:1032
-#: reporting/includes/pdf_report.inc:1035
+#: reporting/includes/pdf_report.inc:1038
+#: reporting/includes/pdf_report.inc:1041
msgid "Email:"
msgstr ""
-#: reporting/includes/pdf_report.inc:1034
-#: reporting/includes/pdf_report.inc:1035
+#: reporting/includes/pdf_report.inc:1041
msgid "has been sent by email to destination."
msgstr ""
-#: reporting/includes/pdf_report.inc:1064
-#: reporting/includes/pdf_report.inc:1065
+#: reporting/includes/pdf_report.inc:1071
msgid "Report has been sent to network printer "
msgstr ""
msgid "No Currency Filter"
msgstr ""
-#: reporting/includes/reports_classes.inc:227
#: reporting/includes/reports_classes.inc:231
msgid "PDF/Printer"
msgstr ""
#: reporting/includes/reports_classes.inc:238
-#: reporting/includes/reports_classes.inc:242
-msgid "No Graphics"
+msgid "Portrait"
msgstr ""
#: reporting/includes/reports_classes.inc:238
-#: reporting/includes/reports_classes.inc:242
+msgid "Landscape"
+msgstr ""
+
+#: reporting/includes/reports_classes.inc:249
+msgid "No Graphics"
+msgstr ""
+
+#: reporting/includes/reports_classes.inc:249
msgid "Vertical bars"
msgstr ""
-#: reporting/includes/reports_classes.inc:238
-#: reporting/includes/reports_classes.inc:242
+#: reporting/includes/reports_classes.inc:249
msgid "Horizontal bars"
msgstr ""
-#: reporting/includes/reports_classes.inc:239
-#: reporting/includes/reports_classes.inc:243
+#: reporting/includes/reports_classes.inc:250
msgid "Dots"
msgstr ""
-#: reporting/includes/reports_classes.inc:239
-#: reporting/includes/reports_classes.inc:243
+#: reporting/includes/reports_classes.inc:250
msgid "Lines"
msgstr ""
-#: reporting/includes/reports_classes.inc:239
-#: reporting/includes/reports_classes.inc:243
+#: reporting/includes/reports_classes.inc:250
msgid "Pie"
msgstr ""
-#: reporting/includes/reports_classes.inc:239
-#: reporting/includes/reports_classes.inc:243
+#: reporting/includes/reports_classes.inc:250
msgid "Donut"
msgstr ""
-#: reporting/includes/reports_classes.inc:243
-#: reporting/includes/reports_classes.inc:246
-#: reporting/includes/reports_classes.inc:247
-#: reporting/includes/reports_classes.inc:250
+#: reporting/includes/reports_classes.inc:254
+#: reporting/includes/reports_classes.inc:257
msgid "No Type Filter"
msgstr ""
-#: reporting/includes/reports_classes.inc:256
-#: reporting/includes/reports_classes.inc:260
+#: reporting/includes/reports_classes.inc:267
msgid "No Account Group Filter"
msgstr ""
-#: reporting/includes/reports_classes.inc:271
-#: reporting/includes/reports_classes.inc:277
-#: reporting/includes/reports_classes.inc:283
-#: reporting/includes/reports_classes.inc:275
-#: reporting/includes/reports_classes.inc:281
-#: reporting/includes/reports_classes.inc:287
+#: reporting/includes/reports_classes.inc:282
+#: reporting/includes/reports_classes.inc:288
+#: reporting/includes/reports_classes.inc:294
msgid "No Dimension Filter"
msgstr ""
-#: reporting/includes/reports_classes.inc:289
-#: reporting/includes/reports_classes.inc:293
+#: reporting/includes/reports_classes.inc:300
msgid "No Customer Filter"
msgstr ""
-#: reporting/includes/reports_classes.inc:297
-#: reporting/includes/reports_classes.inc:301
+#: reporting/includes/reports_classes.inc:308
msgid "No Supplier Filter"
msgstr ""
-#: reporting/includes/reports_classes.inc:379
-#: reporting/includes/reports_classes.inc:383
+#: reporting/includes/reports_classes.inc:393
msgid "No Location Filter"
msgstr ""
-#: reporting/includes/reports_classes.inc:382
-#: reporting/includes/reports_classes.inc:386
+#: reporting/includes/reports_classes.inc:396
msgid "No Category Filter"
msgstr ""
-#: reporting/includes/reports_classes.inc:391
-#: reporting/includes/reports_classes.inc:395
+#: reporting/includes/reports_classes.inc:405
msgid "No Sales Folk Filter"
msgstr ""
-#: reporting/includes/reports_classes.inc:398
-#: reporting/includes/reports_classes.inc:402
+#: reporting/includes/reports_classes.inc:412
msgid "No Users Filter"
msgstr ""
-#: sales/create_recurrent_invoices.php:24
#: sales/create_recurrent_invoices.php:26
msgid "Create and Print Recurrent Invoices"
msgstr ""
-#: sales/create_recurrent_invoices.php:40
-#: sales/create_recurrent_invoices.php:42
+#: sales/create_recurrent_invoices.php:44
#, php-format
msgid "Recurrent Invoice covers period %s - %s."
msgstr ""
-#: sales/create_recurrent_invoices.php:97
-#: sales/create_recurrent_invoices.php:108
+#: sales/create_recurrent_invoices.php:110
#, php-format
msgid "%s recurrent invoice(s) created, # %s - # %s."
msgstr ""
-#: sales/create_recurrent_invoices.php:102
-#: sales/create_recurrent_invoices.php:113
+#: sales/create_recurrent_invoices.php:115
#, php-format
msgid "&Print Recurrent Invoices # %s - # %s"
msgstr ""
-#: sales/create_recurrent_invoices.php:104
-#: sales/create_recurrent_invoices.php:115
+#: sales/create_recurrent_invoices.php:117
#, php-format
msgid "&Email Recurrent Invoices # %s - # %s"
msgstr ""
-#: sales/create_recurrent_invoices.php:115
+#: sales/create_recurrent_invoices.php:129
+msgid "Invoice date:"
+msgstr ""
+
+#: sales/create_recurrent_invoices.php:134
#: sales/manage/recurrent_invoices.php:102
-#: sales/create_recurrent_invoices.php:132
msgid "Template No"
msgstr ""
-#: sales/create_recurrent_invoices.php:115
+#: sales/create_recurrent_invoices.php:134
#: sales/manage/recurrent_invoices.php:102
-#: sales/create_recurrent_invoices.php:132
msgid "Begin"
msgstr ""
-#: sales/create_recurrent_invoices.php:115
+#: sales/create_recurrent_invoices.php:134
#: sales/manage/recurrent_invoices.php:102
-#: sales/create_recurrent_invoices.php:132
msgid "End"
msgstr ""
-#: sales/create_recurrent_invoices.php:115
+#: sales/create_recurrent_invoices.php:134
#: sales/manage/recurrent_invoices.php:102
#: sales/manage/recurrent_invoices.php:185
-#: sales/create_recurrent_invoices.php:132
msgid "Last Created"
msgstr ""
-#: sales/create_recurrent_invoices.php:156
-#: sales/create_recurrent_invoices.php:173
+#: sales/create_recurrent_invoices.php:175
msgid "Create Invoices"
msgstr ""
-#: sales/create_recurrent_invoices.php:164
-#: sales/create_recurrent_invoices.php:181
+#: sales/create_recurrent_invoices.php:183
msgid "Marked items are due."
msgstr ""
-#: sales/create_recurrent_invoices.php:166
-#: sales/create_recurrent_invoices.php:183
+#: sales/create_recurrent_invoices.php:185
msgid "No recurrent invoices are due."
msgstr ""
msgid "Modifying Customer Credit Note #%d"
msgstr ""
-#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:661
-#: sales/sales_order_entry.php:665 sales/sales_order_entry.php:676
-#: sales/sales_order_entry.php.orig:675
+#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:687
msgid ""
"There are no customers, or there are no customers with branches. Please "
"define customers and customer branches."
msgid "Enter Another &Credit Note"
msgstr ""
-#: sales/credit_note_entry.php:157 sales/credit_note_entry.php:153
+#: sales/credit_note_entry.php:153
msgid "The entered date for the credit note is invalid."
msgstr ""
-#: sales/credit_note_entry.php:174 sales/credit_note_entry.php:170
+#: sales/credit_note_entry.php:170
msgid ""
"For credit notes created to write off the stock, a general ledger account is "
"required to be selected."
msgstr ""
-#: sales/credit_note_entry.php:175 sales/credit_note_entry.php:171
+#: sales/credit_note_entry.php:171
msgid ""
"Please select an account to write the cost of the stock off to, then click "
"on Process again."
msgstr ""
-#: sales/credit_note_entry.php:195 sales/credit_note_entry.php:197
+#: sales/credit_note_entry.php:197
msgid "The quantity must be greater than zero."
msgstr ""
-#: sales/credit_note_entry.php:200 sales/credit_note_entry.php:202
+#: sales/credit_note_entry.php:202
msgid "The entered price is negative or invalid."
msgstr ""
-#: sales/credit_note_entry.php:205 sales/credit_note_entry.php:207
+#: sales/credit_note_entry.php:207
msgid "The entered discount percent is negative, greater than 100 or invalid."
msgstr ""
-#: sales/credit_note_entry.php:273 sales/credit_note_entry.php:275
+#: sales/credit_note_entry.php:275
msgid "Credit Note Items"
msgstr ""
-#: sales/credit_note_entry.php:283 sales/customer_credit_invoice.php:384
#: sales/credit_note_entry.php:285 sales/customer_credit_invoice.php:382
msgid "Process Credit Note"
msgstr ""
msgid "Credit Note has been updated"
msgstr ""
-#: sales/customer_credit_invoice.php:114 sales/customer_credit_invoice.php:109
+#: sales/customer_credit_invoice.php:109
msgid "The entered shipping cost is invalid or less than zero."
msgstr ""
-#: sales/customer_credit_invoice.php:119 sales/customer_credit_invoice.php:141
#: sales/customer_credit_invoice.php:114 sales/customer_credit_invoice.php:136
msgid ""
"Selected quantity cannot be less than zero nor more than quantity not "
"credited yet."
msgstr ""
-#: sales/customer_credit_invoice.php:139 sales/customer_credit_invoice.php:134
+#: sales/customer_credit_invoice.php:134
msgid ""
"This page can only be opened if an invoice has been selected for crediting."
msgstr ""
-#: sales/customer_credit_invoice.php:251 sales/customer_credit_invoice.php:249
+#: sales/customer_credit_invoice.php:249
msgid "Crediting Invoice"
msgstr ""
-#: sales/customer_credit_invoice.php:272 sales/customer_credit_invoice.php:270
+#: sales/customer_credit_invoice.php:270
msgid "Credit Note Date"
msgstr ""
-#: sales/customer_credit_invoice.php:282 sales/customer_credit_invoice.php:280
+#: sales/customer_credit_invoice.php:280
msgid "Invoiced Quantity"
msgstr ""
-#: sales/customer_credit_invoice.php:283 sales/customer_credit_invoice.php:281
+#: sales/customer_credit_invoice.php:281
msgid "Credit Quantity"
msgstr ""
-#: sales/customer_credit_invoice.php:317 sales/customer_credit_invoice.php:315
+#: sales/customer_credit_invoice.php:315
msgid "Credit Shipping Cost"
msgstr ""
-#: sales/customer_credit_invoice.php:350
-#: sales/includes/ui/sales_credit_ui.inc:323
#: sales/customer_credit_invoice.php:348
+#: sales/includes/ui/sales_credit_ui.inc:323
msgid "Credit Note Type"
msgstr ""
-#: sales/customer_credit_invoice.php:358
-#: sales/includes/ui/sales_credit_ui.inc:331
#: sales/customer_credit_invoice.php:356
+#: sales/includes/ui/sales_credit_ui.inc:331
msgid "Items Returned to Location"
msgstr ""
-#: sales/customer_credit_invoice.php:363
-#: sales/includes/ui/sales_credit_ui.inc:336
#: sales/customer_credit_invoice.php:361
+#: sales/includes/ui/sales_credit_ui.inc:336
msgid "Write off the cost of the items to"
msgstr ""
-#: sales/customer_credit_invoice.php:382 sales/customer_credit_invoice.php:380
+#: sales/customer_credit_invoice.php:380
msgid "Update credit value for quantities entered"
msgstr ""
msgid "Deliver Items for a Sales Order"
msgstr ""
-#: sales/customer_delivery.php:50 sales/sales_order_entry.php:175
-#: sales/sales_order_entry.php:183 sales/sales_order_entry.php.orig:183
+#: sales/customer_delivery.php:50 sales/sales_order_entry.php:183
#, php-format
msgid "Delivery # %d has been entered."
msgstr ""
-#: sales/customer_delivery.php:52 sales/sales_order_entry.php:177
-#: sales/sales_order_entry.php:185 sales/sales_order_entry.php.orig:185
+#: sales/customer_delivery.php:52 sales/sales_order_entry.php:185
msgid "&View This Delivery"
msgstr ""
#: sales/customer_delivery.php:54 sales/customer_delivery.php:75
-#: sales/sales_order_entry.php:179 sales/sales_order_entry.php:187
-#: sales/sales_order_entry.php.orig:187
+#: sales/sales_order_entry.php:187
msgid "&Print Delivery Note"
msgstr ""
#: sales/customer_delivery.php:55 sales/customer_delivery.php:76
-#: sales/sales_order_entry.php:180 sales/sales_order_entry.php:188
-#: sales/sales_order_entry.php.orig:188
+#: sales/sales_order_entry.php:188
msgid "&Email Delivery Note"
msgstr ""
#: sales/customer_delivery.php:56 sales/customer_delivery.php:77
-#: sales/sales_order_entry.php:181 sales/sales_order_entry.php:189
-#: sales/sales_order_entry.php.orig:189
+#: sales/sales_order_entry.php:189
msgid "P&rint as Packing Slip"
msgstr ""
#: sales/customer_delivery.php:57 sales/customer_delivery.php:78
-#: sales/sales_order_entry.php:182 sales/sales_order_entry.php:190
-#: sales/sales_order_entry.php.orig:190
+#: sales/sales_order_entry.php:190
msgid "E&mail as Packing Slip"
msgstr ""
-#: sales/customer_delivery.php:59 sales/sales_order_entry.php:185
-#: sales/sales_order_entry.php:193 sales/sales_order_entry.php.orig:193
+#: sales/customer_delivery.php:59 sales/sales_order_entry.php:193
msgid "View the GL Journal Entries for this Dispatch"
msgstr ""
msgid "The entered dead-line for invoice is invalid."
msgstr ""
-#: sales/customer_delivery.php:182 sales/customer_invoice.php:297
-#: sales/customer_delivery.php:176 sales/customer_invoice.php:291
+#: sales/customer_delivery.php:176 sales/customer_invoice.php:300
msgid "The entered shipping value is not numeric."
msgstr ""
-#: sales/customer_delivery.php:188 sales/customer_delivery.php:182
+#: sales/customer_delivery.php:182
msgid "There are no item quantities on this delivery note."
msgstr ""
-#: sales/customer_delivery.php:291 sales/sales_order_entry.php:490
-#: sales/includes/ui/sales_order_ui.inc:244 sales/customer_delivery.php:285
-#: sales/sales_order_entry.php:494 sales/includes/ui/sales_order_ui.inc:248
-#: sales/sales_order_entry.php:505 sales/sales_order_entry.php.orig:504
+#: sales/customer_delivery.php:285 sales/sales_order_entry.php:516
+#: sales/includes/ui/sales_order_ui.inc:250
msgid ""
"The delivery cannot be processed because there is an insufficient quantity "
"for item:"
msgid "Invoice Dead-line"
msgstr ""
-#: sales/customer_delivery.php:421 sales/customer_invoice.php:457
-#: sales/includes/ui/sales_order_ui.inc:82
-#: sales/includes/ui/sales_order_ui.inc:368 sales/customer_invoice.php:459
+#: sales/customer_delivery.php:421 sales/customer_invoice.php:468
#: sales/includes/ui/sales_order_ui.inc:84
-#: sales/includes/ui/sales_order_ui.inc:372
+#: sales/includes/ui/sales_order_ui.inc:374
msgid ""
"The selected customer account is currently on hold. Please contact the "
"credit control personnel to discuss."
msgid "Max. delivery"
msgstr ""
-#: sales/customer_delivery.php:432 sales/customer_invoice.php:467
-#: sales/includes/ui/sales_order_ui.inc:141 sales/customer_invoice.php:469
-#: sales/includes/ui/sales_order_ui.inc:145
-msgid "Delivered"
+#: sales/customer_delivery.php:432 sales/customer_invoice.php:478
+msgid "Invoiced"
msgstr ""
-#: sales/customer_delivery.php:493 sales/customer_invoice.php:552
-#: sales/customer_invoice.php:554
+#: sales/customer_delivery.php:503 sales/customer_invoice.php:563
msgid "Shipping Cost"
msgstr ""
-#: sales/customer_delivery.php:513 sales/includes/ui/sales_order_ui.inc:242
-#: sales/includes/ui/sales_order_ui.inc:246
+#: sales/customer_delivery.php:523 sales/includes/ui/sales_order_ui.inc:248
msgid ""
"Marked items have insufficient quantities in stock as on day of delivery."
msgstr ""
-#: sales/customer_delivery.php:517
+#: sales/customer_delivery.php:527
msgid "Action For Balance"
msgstr ""
-#: sales/customer_delivery.php:524 sales/customer_invoice.php:581
-#: sales/customer_invoice.php:583
+#: sales/customer_delivery.php:534 sales/customer_delivery.php:536
+#: sales/customer_delivery.php:539 sales/customer_invoice.php:592
msgid "Refresh document page"
msgstr ""
-#: sales/customer_delivery.php:525
+#: sales/customer_delivery.php:536
+msgid "Reset quantity"
+msgstr ""
+
+#: sales/customer_delivery.php:539
+msgid "Clear quantity"
+msgstr ""
+
+#: sales/customer_delivery.php:541
msgid "Process Dispatch"
msgstr ""
-#: sales/customer_delivery.php:526 sales/customer_invoice.php:583
-#: sales/sales_order_entry.php:709 sales/customer_invoice.php:585
-#: sales/sales_order_entry.php:713 sales/sales_order_entry.php:724
-#: sales/sales_order_entry.php.orig:723
+#: sales/customer_delivery.php:542 sales/customer_invoice.php:594
+#: sales/sales_order_entry.php:735
msgid "Check entered data and save document"
msgstr ""
msgid "Selected deliveries has been processed"
msgstr ""
-#: sales/customer_invoice.php:57 sales/customer_invoice.php:77
-#: sales/sales_order_entry.php:204 sales/sales_order_entry.php:212
-#: sales/sales_order_entry.php.orig:212
+#: sales/customer_invoice.php:57 sales/customer_invoice.php:86
+#: sales/sales_order_entry.php:212
msgid "&View This Invoice"
msgstr ""
-#: sales/customer_invoice.php:59 sales/customer_invoice.php:79
+#: sales/customer_invoice.php:59 sales/customer_invoice.php:88
msgid "&Print This Invoice"
msgstr ""
-#: sales/customer_invoice.php:60 sales/customer_invoice.php:80
+#: sales/customer_invoice.php:60 sales/customer_invoice.php:89
msgid "&Email This Invoice"
msgstr ""
-#: sales/customer_invoice.php:62 sales/sales_order_entry.php:217
-#: sales/sales_order_entry.php:225 sales/sales_order_entry.php.orig:225
+#: sales/customer_invoice.php:62 sales/sales_order_entry.php:225
msgid "View the GL &Journal Entries for this Invoice"
msgstr ""
msgid "Select Another &Delivery For Invoicing"
msgstr ""
-#: sales/customer_invoice.php:75
+#: sales/customer_invoice.php:72 sales/sales_order_entry.php:235
+msgid "Entry &customer payment for this invoice"
+msgstr ""
+
+#: sales/customer_invoice.php:84
#, php-format
msgid "Sales Invoice # %d has been updated."
msgstr ""
-#: sales/customer_invoice.php:82
+#: sales/customer_invoice.php:91
msgid "Select Another &Invoice to Modify"
msgstr ""
-#: sales/customer_invoice.php:121
+#: sales/customer_invoice.php:130
msgid "Select a different delivery to invoice"
msgstr ""
-#: sales/customer_invoice.php:122
+#: sales/customer_invoice.php:131
msgid ""
"There are no delivered items with a quantity left to invoice. There is "
"nothing left to invoice."
msgstr ""
-#: sales/customer_invoice.php:131
+#: sales/customer_invoice.php:140
msgid ""
"There are no delivery notes for this invoice.<br>\n"
"\t\tMost likely this invoice was created in Front Accounting version prior "
"\t\tand therefore can not be modified."
msgstr ""
-#: sales/customer_invoice.php:140
+#: sales/customer_invoice.php:149
msgid ""
"All quantities on this invoice has been credited. There is nothing to modify "
"on this invoice"
msgstr ""
-#: sales/customer_invoice.php:146
+#: sales/customer_invoice.php:155
msgid ""
"This page can only be opened after delivery selection. Please select "
"delivery to invoicing first."
msgstr ""
-#: sales/customer_invoice.php:148
+#: sales/customer_invoice.php:157
msgid "Select Delivery to Invoice"
msgstr ""
-#: sales/customer_invoice.php:153 sales/customer_invoice.php:308
-#: sales/customer_invoice.php:302
+#: sales/customer_invoice.php:162 sales/customer_invoice.php:311
msgid ""
"Selected quantity cannot be less than quantity credited nor more than "
"quantity not invoiced yet."
msgstr ""
-#: sales/customer_invoice.php:261
+#: sales/customer_invoice.php:270
msgid "The entered invoice date is invalid."
msgstr ""
-#: sales/customer_invoice.php:267
+#: sales/customer_invoice.php:276
msgid "The entered invoice date is not in fiscal year."
msgstr ""
-#: sales/customer_invoice.php:273
+#: sales/customer_invoice.php:282
msgid "The entered invoice due date is invalid."
msgstr ""
-#: sales/customer_invoice.php:303 sales/customer_invoice.php:297
+#: sales/customer_invoice.php:306
msgid "There are no item quantities on this invoice."
msgstr ""
-#: sales/customer_invoice.php:383 sales/customer_invoice.php:385
+#: sales/customer_invoice.php:394
msgid "Payment terms:"
msgstr ""
-#: sales/customer_invoice.php:386 sales/includes/ui/sales_order_ui.inc:405
-#: sales/includes/ui/sales_order_ui.inc:409 sales/customer_invoice.php:388
-#: sales/includes/ui/sales_order_ui.inc:413
+#: sales/customer_invoice.php:397 sales/includes/ui/sales_order_ui.inc:410
+#: sales/includes/ui/sales_order_ui.inc:414
msgid "Payment:"
msgstr ""
-#: sales/customer_invoice.php:463 sales/customer_invoice.php:465
+#: sales/customer_invoice.php:474
msgid "Invoice Items"
msgstr ""
-#: sales/customer_invoice.php:468 sales/customer_invoice.php:470
+#: sales/customer_invoice.php:479
msgid "This Invoice"
msgstr ""
-#: sales/customer_invoice.php:476 sales/customer_invoice.php:478
+#: sales/customer_invoice.php:487
msgid "Credited"
msgstr ""
-#: sales/customer_invoice.php:570 sales/customer_invoice.php:572
+#: sales/customer_invoice.php:581
msgid "Invoice Total"
msgstr ""
-#: sales/customer_payments.php:33 sales/customer_payments.php.orig:33
+#: sales/customer_payments.php:32
msgid "Customer Payment Entry"
msgstr ""
-#: sales/customer_payments.php:37 sales/customer_payments.php.orig:37
+#: sales/customer_payments.php:36
msgid "There are no customers defined in the system."
msgstr ""
-#: sales/customer_payments.php:68 sales/customer_payments.php.orig:68
+#: sales/customer_payments.php:70
msgid "Invalid sales invoice number."
msgstr ""
-#: sales/customer_payments.php:92 sales/customer_payments.php.orig:92
+#: sales/customer_payments.php:97
msgid "The customer payment has been successfully entered."
msgstr ""
-#: sales/customer_payments.php:94 sales/customer_payments.php:109
-#: sales/customer_payments.php.orig:94 sales/customer_payments.php.orig:109
+#: sales/customer_payments.php:99 sales/customer_payments.php:118
msgid "&Print This Receipt"
msgstr ""
-#: sales/customer_payments.php:96 sales/customer_payments.php:111
-#: sales/customer_payments.php.orig:96 sales/customer_payments.php.orig:111
-msgid "&View the GL Journal Entries for this Customer Payment"
+#: sales/customer_payments.php:101
+msgid "&View this Customer Payment"
msgstr ""
-#: sales/customer_payments.php:100 sales/customer_payments.php:115
-#: sales/customer_payments.php.orig:100 sales/customer_payments.php.orig:115
+#: sales/customer_payments.php:103 sales/customer_payments.php:126
msgid "Enter Another &Customer Payment"
msgstr ""
-#: sales/customer_payments.php:107 sales/customer_payments.php.orig:107
+#: sales/customer_payments.php:105
+msgid "Enter Payment to &Supplier"
+msgstr ""
+
+#: sales/customer_payments.php:109 sales/customer_payments.php:120
+msgid "&View the GL Journal Entries for this Customer Payment"
+msgstr ""
+
+#: sales/customer_payments.php:116
msgid "The customer payment has been successfully updated."
msgstr ""
-#: sales/customer_payments.php:128 sales/sales_order_entry.php:327
-#: sales/customer_payments.php.orig:128 sales/sales_order_entry.php:336
-#: sales/sales_order_entry.php.orig:335
+#: sales/customer_payments.php:124
+msgid "Select Another Customer Payment for &Edition"
+msgstr ""
+
+#: sales/customer_payments.php:139 sales/sales_order_entry.php:340
msgid "There is no customer selected."
msgstr ""
-#: sales/customer_payments.php:135 sales/sales_order_entry.php:334
-#: sales/customer_payments.php.orig:135 sales/sales_order_entry.php:343
-#: sales/sales_order_entry.php.orig:342
+#: sales/customer_payments.php:146 sales/sales_order_entry.php:347
msgid "This customer has no branch defined."
msgstr ""
-#: sales/customer_payments.php:141 sales/customer_payments.php.orig:141
+#: sales/customer_payments.php:152
msgid "The entered date is invalid. Please enter a valid date for the payment."
msgstr ""
-#: sales/customer_payments.php:171 sales/customer_payments.php:177
-#: sales/customer_payments.php.orig:171 sales/customer_payments.php.orig:177
+#: sales/customer_payments.php:182 sales/customer_payments.php:188
msgid "The entered amount is invalid or negative and cannot be processed."
msgstr ""
-#: sales/customer_payments.php:203 sales/customer_payments.php.orig:203
+#: sales/customer_payments.php:214
msgid "The entered discount is not a valid number."
msgstr ""
-#: sales/customer_payments.php:210 sales/customer_payments.php.orig:210
+#: sales/customer_payments.php:221
msgid ""
-"The balance of the amount and discout is zero or negative. Please enter "
+"The balance of the amount and discount is zero or negative. Please enter "
"valid amounts."
msgstr ""
-#: sales/customer_payments.php:341 sales/customer_payments.php:343
-#: sales/customer_payments.php:338 sales/customer_payments.php:340
-#: sales/customer_payments.php.orig:343 sales/customer_payments.php.orig:345
-msgid "From Customer:"
+#: sales/customer_payments.php:228
+msgid "The entered payment amount is zero or negative."
msgstr ""
-#: sales/customer_payments.php:378 sales/customer_payments.php:381
-#: sales/customer_payments.php.orig:380
+#: sales/customer_payments.php:335
msgid "Into Bank Account:"
msgstr ""
-#: sales/customer_payments.php:384 sales/customer_payments.php:387
-#: sales/customer_payments.php.orig:386
-msgid "Date of Deposit:"
+#: sales/customer_payments.php:338 sales/customer_payments.php:340
+msgid "From Customer:"
msgstr ""
-#: sales/customer_payments.php:406 sales/customer_payments.php:409
-#: sales/customer_payments.php.orig:408
-msgid "Customer prompt payment discount :"
+#: sales/customer_payments.php:366
+msgid "Date of Deposit:"
msgstr ""
-#: sales/customer_payments.php:415 sales/customer_payments.php:418
-#: sales/customer_payments.php.orig:417
-msgid "Amount and discount are in customer's currency."
+#: sales/customer_payments.php:380
+msgid "Payment Amount:"
msgstr ""
-#: sales/customer_payments.php:420 sales/customer_payments.php:423
-#: sales/customer_payments.php.orig:422
-msgid "Update Payment"
+#: sales/customer_payments.php:393
+msgid "Customer prompt payment discount :"
msgstr ""
-#: sales/customer_payments.php:422 sales/customer_payments.php:425
-#: sales/customer_payments.php.orig:424
+#: sales/customer_payments.php:403
msgid "Add Payment"
msgstr ""
-#: sales/sales_order_entry.php:56 sales/sales_order_entry.php:64
-#: sales/sales_order_entry.php.orig:64
+#: sales/customer_payments.php:405
+msgid "Update Payment"
+msgstr ""
+
+#: sales/sales_order_entry.php:64
msgid "Direct Sales Delivery"
msgstr ""
-#: sales/sales_order_entry.php:61 sales/sales_order_entry.php:69
-#: sales/sales_order_entry.php.orig:69
+#: sales/sales_order_entry.php:69
msgid "Direct Sales Invoice"
msgstr ""
-#: sales/sales_order_entry.php:67 sales/sales_order_entry.php:75
-#: sales/sales_order_entry.php.orig:75
+#: sales/sales_order_entry.php:75
#, php-format
msgid "Modifying Sales Order # %d"
msgstr ""
-#: sales/sales_order_entry.php:73 sales/sales_order_entry.php:81
-#: sales/sales_order_entry.php.orig:81
+#: sales/sales_order_entry.php:81
#, php-format
msgid "Modifying Sales Quotation # %d"
msgstr ""
-#: sales/sales_order_entry.php:78 sales/sales_order_entry.php:86
-#: sales/sales_order_entry.php.orig:86
+#: sales/sales_order_entry.php:86
msgid "New Sales Order Entry"
msgstr ""
-#: sales/sales_order_entry.php:82 sales/sales_order_entry.php:90
-#: sales/sales_order_entry.php.orig:90
+#: sales/sales_order_entry.php:90
msgid "New Sales Quotation Entry"
msgstr ""
-#: sales/sales_order_entry.php:85 sales/sales_order_entry.php:93
-#: sales/sales_order_entry.php.orig:93
+#: sales/sales_order_entry.php:93
msgid "Sales Order Entry"
msgstr ""
-#: sales/sales_order_entry.php:101 sales/sales_order_entry.php:109
-#: sales/sales_order_entry.php.orig:109
+#: sales/sales_order_entry.php:109
#, php-format
msgid "Order # %d has been entered."
msgstr ""
-#: sales/sales_order_entry.php:103 sales/sales_order_entry.php:123
#: sales/sales_order_entry.php:111 sales/sales_order_entry.php:131
-#: sales/sales_order_entry.php.orig:111 sales/sales_order_entry.php.orig:131
msgid "&View This Order"
msgstr ""
-#: sales/sales_order_entry.php:109 sales/sales_order_entry.php:117
-#: sales/sales_order_entry.php.orig:117
+#: sales/sales_order_entry.php:117
msgid "Make &Delivery Against This Order"
msgstr ""
-#: sales/sales_order_entry.php:114 sales/sales_order_entry.php:122
-#: sales/sales_order_entry.php.orig:122
+#: sales/sales_order_entry.php:122
msgid "Enter a &New Order"
msgstr ""
-#: sales/sales_order_entry.php:121 sales/sales_order_entry.php:129
-#: sales/sales_order_entry.php.orig:129
+#: sales/sales_order_entry.php:129
#, php-format
msgid "Order # %d has been updated."
msgstr ""
-#: sales/sales_order_entry.php:129 sales/sales_order_entry.php:137
-#: sales/sales_order_entry.php.orig:137
+#: sales/sales_order_entry.php:137
msgid "Confirm Order Quantities and Make &Delivery"
msgstr ""
-#: sales/sales_order_entry.php:132 sales/sales_order_entry.php:140
-#: sales/sales_order_entry.php.orig:140
+#: sales/sales_order_entry.php:140
msgid "Select A Different &Order"
msgstr ""
-#: sales/sales_order_entry.php:139 sales/sales_order_entry.php:147
-#: sales/sales_order_entry.php.orig:147
+#: sales/sales_order_entry.php:147
#, php-format
msgid "Quotation # %d has been entered."
msgstr ""
-#: sales/sales_order_entry.php:141 sales/sales_order_entry.php:159
#: sales/sales_order_entry.php:149 sales/sales_order_entry.php:167
-#: sales/sales_order_entry.php.orig:149 sales/sales_order_entry.php.orig:167
msgid "&View This Quotation"
msgstr ""
-#: sales/sales_order_entry.php:143 sales/sales_order_entry.php:161
#: sales/sales_order_entry.php:151 sales/sales_order_entry.php:169
-#: sales/sales_order_entry.php.orig:151 sales/sales_order_entry.php.orig:169
msgid "&Print This Quotation"
msgstr ""
-#: sales/sales_order_entry.php:144 sales/sales_order_entry.php:162
#: sales/sales_order_entry.php:152 sales/sales_order_entry.php:170
-#: sales/sales_order_entry.php.orig:152 sales/sales_order_entry.php.orig:170
msgid "&Email This Quotation"
msgstr ""
-#: sales/sales_order_entry.php:147 sales/sales_order_entry.php:165
#: sales/sales_order_entry.php:155 sales/sales_order_entry.php:173
-#: sales/sales_order_entry.php.orig:155 sales/sales_order_entry.php.orig:173
msgid "Make &Sales Order Against This Quotation"
msgstr ""
-#: sales/sales_order_entry.php:150 sales/sales_order_entry.php:158
-#: sales/sales_order_entry.php.orig:158
+#: sales/sales_order_entry.php:158
msgid "Enter a New &Quotation"
msgstr ""
-#: sales/sales_order_entry.php:157 sales/sales_order_entry.php:165
-#: sales/sales_order_entry.php.orig:165
+#: sales/sales_order_entry.php:165
#, php-format
msgid "Quotation # %d has been updated."
msgstr ""
-#: sales/sales_order_entry.php:168 sales/sales_order_entry.php:176
-#: sales/sales_order_entry.php.orig:176
+#: sales/sales_order_entry.php:176
msgid "Select A Different &Quotation"
msgstr ""
-#: sales/sales_order_entry.php:187 sales/sales_order_entry.php:195
-#: sales/sales_order_entry.php.orig:195
+#: sales/sales_order_entry.php:195
msgid "Make &Invoice Against This Delivery"
msgstr ""
-#: sales/sales_order_entry.php:191 sales/sales_order_entry.php:199
-#: sales/sales_order_entry.php.orig:199
+#: sales/sales_order_entry.php:199
msgid "Enter a New Template &Delivery"
msgstr ""
-#: sales/sales_order_entry.php:194 sales/sales_order_entry.php:202
-#: sales/sales_order_entry.php.orig:202
+#: sales/sales_order_entry.php:202
msgid "Enter a &New Delivery"
msgstr ""
-#: sales/sales_order_entry.php:202 sales/sales_order_entry.php:210
-#: sales/sales_order_entry.php.orig:210
+#: sales/sales_order_entry.php:210
#, php-format
msgid "Invoice # %d has been entered."
msgstr ""
-#: sales/sales_order_entry.php:206 sales/sales_order_entry.php:214
-#: sales/sales_order_entry.php.orig:214
+#: sales/sales_order_entry.php:214
msgid "&Print Sales Invoice"
msgstr ""
-#: sales/sales_order_entry.php:207 sales/sales_order_entry.php:215
-#: sales/sales_order_entry.php.orig:215
+#: sales/sales_order_entry.php:215
msgid "&Email Sales Invoice"
msgstr ""
-#: sales/sales_order_entry.php:215 sales/sales_order_entry.php:223
-#: sales/sales_order_entry.php.orig:223
+#: sales/sales_order_entry.php:223
msgid "Print &Receipt"
msgstr ""
-#: sales/sales_order_entry.php:220 sales/sales_order_entry.php:228
-#: sales/sales_order_entry.php.orig:228
+#: sales/sales_order_entry.php:228
msgid "Enter a &New Template Invoice"
msgstr ""
-#: sales/sales_order_entry.php:223 sales/sales_order_entry.php:231
-#: sales/sales_order_entry.php.orig:231
+#: sales/sales_order_entry.php:231
msgid "Enter a &New Direct Invoice"
msgstr ""
-#: sales/sales_order_entry.php:356 sales/sales_order_entry.php:365
-#: sales/sales_order_entry.php.orig:364
+#: sales/sales_order_entry.php:369
msgid ""
"You must enter the person or company to whom delivery should be made to."
msgstr ""
-#: sales/sales_order_entry.php:363 sales/sales_order_entry.php:372
-#: sales/sales_order_entry.php.orig:371
+#: sales/sales_order_entry.php:376
msgid ""
"You should enter the street address in the box provided. Orders cannot be "
"accepted without a valid street address."
msgstr ""
-#: sales/sales_order_entry.php:372 sales/sales_order_entry.php:381
-#: sales/sales_order_entry.php.orig:380
+#: sales/sales_order_entry.php:385
msgid "The shipping cost entered is expected to be numeric."
msgstr ""
-#: sales/sales_order_entry.php:378 sales/sales_order_entry.php:387
-#: sales/sales_order_entry.php.orig:386
+#: sales/sales_order_entry.php:391
msgid "The Valid date is invalid."
msgstr ""
-#: sales/sales_order_entry.php:380 sales/sales_order_entry.php:389
-#: sales/sales_order_entry.php.orig:388
+#: sales/sales_order_entry.php:393
msgid "The delivery date is invalid."
msgstr ""
-#: sales/sales_order_entry.php:387 sales/sales_order_entry.php:396
-#: sales/sales_order_entry.php.orig:395
+#: sales/sales_order_entry.php:400
msgid "The requested valid date is before the date of the quotation."
msgstr ""
-#: sales/sales_order_entry.php:389 sales/sales_order_entry.php:398
-#: sales/sales_order_entry.php.orig:397
+#: sales/sales_order_entry.php:402
msgid "The requested delivery date is before the date of the order."
msgstr ""
-#: sales/sales_order_entry.php:398 sales/sales_order_entry.php:407
-#: sales/sales_order_entry.php.orig:406
+#: sales/sales_order_entry.php:411
msgid "You need to define a cash account for your Sales Point."
msgstr ""
-#: sales/sales_order_entry.php:469 sales/sales_order_entry.php:473
-#: sales/sales_order_entry.php:484 sales/sales_order_entry.php.orig:483
+#: sales/sales_order_entry.php:449
+msgid ""
+"The reference number field has been increased. Please save the document "
+"again."
+msgstr ""
+
+#: sales/sales_order_entry.php:495
msgid ""
"The item could not be updated because you are attempting to set the quantity "
"ordered to less than 0, or the discount percent to more than 100."
msgstr ""
-#: sales/sales_order_entry.php:473 sales/sales_order_entry.php:477
-#: sales/sales_order_entry.php:488 sales/sales_order_entry.php.orig:487
+#: sales/sales_order_entry.php:499
msgid "Price for inventory item must be entered and can not be less than 0"
msgstr ""
-#: sales/sales_order_entry.php:480 sales/sales_order_entry.php:484
-#: sales/sales_order_entry.php:495 sales/sales_order_entry.php.orig:494
+#: sales/sales_order_entry.php:506
msgid ""
"You attempting to make the quantity ordered a quantity less than has already "
"been delivered. The quantity delivered cannot be modified retrospectively."
msgstr ""
-#: sales/sales_order_entry.php:511 sales/sales_order_entry.php:515
-#: sales/sales_order_entry.php:526 sales/sales_order_entry.php.orig:525
+#: sales/sales_order_entry.php:537
#, php-format
msgid "Price %s is below Standard Cost %s"
msgstr ""
-#: sales/sales_order_entry.php:536 sales/sales_order_entry.php:540
-#: sales/sales_order_entry.php:551 sales/sales_order_entry.php.orig:550
+#: sales/sales_order_entry.php:562
msgid ""
"This item cannot be deleted because some of it has already been delivered."
msgstr ""
-#: sales/sales_order_entry.php:565 sales/sales_order_entry.php:569
-#: sales/sales_order_entry.php:580 sales/sales_order_entry.php.orig:579
+#: sales/sales_order_entry.php:591
msgid "Direct delivery entry has been cancelled as requested."
msgstr ""
-#: sales/sales_order_entry.php:566 sales/sales_order_entry.php:570
-#: sales/sales_order_entry.php:581 sales/sales_order_entry.php.orig:580
+#: sales/sales_order_entry.php:592
msgid "Enter a New Sales Delivery"
msgstr ""
-#: sales/sales_order_entry.php:569 sales/sales_order_entry.php:573
-#: sales/sales_order_entry.php:584 sales/sales_order_entry.php.orig:583
+#: sales/sales_order_entry.php:594
msgid "Direct invoice entry has been cancelled as requested."
msgstr ""
-#: sales/sales_order_entry.php:570 sales/sales_order_entry.php:574
-#: sales/sales_order_entry.php:585 sales/sales_order_entry.php.orig:584
+#: sales/sales_order_entry.php:595
msgid "Enter a New Sales Invoice"
msgstr ""
-#: sales/sales_order_entry.php:575 sales/sales_order_entry.php:579
-#: sales/sales_order_entry.php:590 sales/sales_order_entry.php.orig:589
-msgid ""
-"This order cannot be cancelled because some of it has already been invoiced "
-"or dispatched. However, the line item quantities may be modified."
-msgstr ""
-
-#: sales/sales_order_entry.php:580 sales/sales_order_entry.php:584
-#: sales/sales_order_entry.php:595 sales/sales_order_entry.php.orig:594
+#: sales/sales_order_entry.php:599
msgid "This sales quotation has been cancelled as requested."
msgstr ""
-#: sales/sales_order_entry.php:581 sales/sales_order_entry.php:585
-#: sales/sales_order_entry.php:596 sales/sales_order_entry.php.orig:595
+#: sales/sales_order_entry.php:600
msgid "Enter a New Sales Quotation"
msgstr ""
-#: sales/sales_order_entry.php:585 sales/sales_order_entry.php:589
-#: sales/sales_order_entry.php:600 sales/sales_order_entry.php.orig:599
+#: sales/sales_order_entry.php:607
+msgid "Undelivered part of order has been cancelled as requested."
+msgstr ""
+
+#: sales/sales_order_entry.php:608
+msgid "Select Another Sales Order for Edition"
+msgstr ""
+
+#: sales/sales_order_entry.php:612
msgid "This sales order has been cancelled as requested."
msgstr ""
-#: sales/sales_order_entry.php:586 sales/sales_order_entry.php:590
-#: sales/sales_order_entry.php:601 sales/sales_order_entry.php.orig:600
+#: sales/sales_order_entry.php:613
msgid "Enter a New Sales Order"
msgstr ""
-#: sales/sales_order_entry.php:665 sales/sales_order_entry.php:669
-#: sales/sales_order_entry.php:680 sales/sales_order_entry.php.orig:679
+#: sales/sales_order_entry.php:691
msgid "Sales Invoice Items"
msgstr ""
-#: sales/sales_order_entry.php:666 sales/sales_order_entry.php:670
-#: sales/sales_order_entry.php:681 sales/sales_order_entry.php.orig:680
+#: sales/sales_order_entry.php:692
msgid "Enter Delivery Details and Confirm Invoice"
msgstr ""
-#: sales/sales_order_entry.php:668 sales/sales_order_entry.php:672
-#: sales/sales_order_entry.php:683 sales/sales_order_entry.php.orig:682
+#: sales/sales_order_entry.php:694
msgid "Place Invoice"
msgstr ""
-#: sales/sales_order_entry.php:671 sales/sales_order_entry.php:675
-#: sales/sales_order_entry.php:686 sales/sales_order_entry.php.orig:685
+#: sales/sales_order_entry.php:697
msgid "Delivery Note Items"
msgstr ""
-#: sales/sales_order_entry.php:672 sales/sales_order_entry.php:676
-#: sales/sales_order_entry.php:687 sales/sales_order_entry.php.orig:686
+#: sales/sales_order_entry.php:698
msgid "Enter Delivery Details and Confirm Dispatch"
msgstr ""
-#: sales/sales_order_entry.php:673 sales/sales_order_entry.php:677
-#: sales/sales_order_entry.php:688 sales/sales_order_entry.php.orig:687
+#: sales/sales_order_entry.php:699
msgid "Cancel Delivery"
msgstr ""
-#: sales/sales_order_entry.php:674 sales/sales_order_entry.php:678
-#: sales/sales_order_entry.php:689 sales/sales_order_entry.php.orig:688
+#: sales/sales_order_entry.php:700
msgid "Place Delivery"
msgstr ""
-#: sales/sales_order_entry.php:676 sales/sales_order_entry.php:680
-#: sales/sales_order_entry.php:691 sales/sales_order_entry.php.orig:690
+#: sales/sales_order_entry.php:702
msgid "Quotation Date:"
msgstr ""
-#: sales/sales_order_entry.php:677 sales/sales_order_entry.php:681
-#: sales/sales_order_entry.php:692 sales/sales_order_entry.php.orig:691
+#: sales/sales_order_entry.php:703
msgid "Sales Quotation Items"
msgstr ""
-#: sales/sales_order_entry.php:678 sales/sales_order_entry.php:682
-#: sales/sales_order_entry.php:693 sales/sales_order_entry.php.orig:692
+#: sales/sales_order_entry.php:704
msgid "Enter Delivery Details and Confirm Quotation"
msgstr ""
-#: sales/sales_order_entry.php:679 sales/sales_order_entry.php:683
-#: sales/sales_order_entry.php:694 sales/sales_order_entry.php.orig:693
+#: sales/sales_order_entry.php:705
msgid "Cancel Quotation"
msgstr ""
-#: sales/sales_order_entry.php:680 sales/sales_order_entry.php:684
-#: sales/sales_order_entry.php:695 sales/sales_order_entry.php.orig:694
+#: sales/sales_order_entry.php:706
msgid "Place Quotation"
msgstr ""
-#: sales/sales_order_entry.php:681 sales/sales_order_entry.php:685
-#: sales/sales_order_entry.php:696 sales/sales_order_entry.php.orig:695
+#: sales/sales_order_entry.php:707
msgid "Commit Quotations Changes"
msgstr ""
-#: sales/sales_order_entry.php:684 sales/sales_order_entry.php:688
-#: sales/sales_order_entry.php:699 sales/sales_order_entry.php.orig:698
+#: sales/sales_order_entry.php:710
msgid "Sales Order Items"
msgstr ""
-#: sales/sales_order_entry.php:685 sales/sales_order_entry.php:689
-#: sales/sales_order_entry.php:700 sales/sales_order_entry.php.orig:699
+#: sales/sales_order_entry.php:711
msgid "Enter Delivery Details and Confirm Order"
msgstr ""
-#: sales/sales_order_entry.php:688 sales/sales_order_entry.php:692
-#: sales/sales_order_entry.php:703 sales/sales_order_entry.php.orig:702
+#: sales/sales_order_entry.php:714
msgid "Commit Order Changes"
msgstr ""
-#: sales/sales_order_entry.php:710 sales/sales_order_entry.php:714
-#: sales/sales_order_entry.php:725 sales/sales_order_entry.php.orig:724
+#: sales/sales_order_entry.php:736
msgid "You are about to void this Document.\\nDo you want to continue?"
msgstr ""
-#: sales/sales_order_entry.php:713 sales/sales_order_entry.php:717
-#: sales/sales_order_entry.php:728 sales/sales_order_entry.php.orig:727
+#: sales/sales_order_entry.php:739
+msgid ""
+"You are about to cancel undelivered part of this order.\\nDo you want to "
+"continue?"
+msgstr ""
+
+#: sales/sales_order_entry.php:741
msgid "Validate changes and update document"
msgstr ""
-#: sales/sales_order_entry.php:717 sales/sales_order_entry.php:721
-#: sales/sales_order_entry.php:732 sales/sales_order_entry.php.orig:731
+#: sales/sales_order_entry.php:745
msgid ""
"Cancels document entry or removes sales order when editing an old document"
msgstr ""
msgid "Allocate Customer Payment or Credit Note"
msgstr ""
-#: sales/allocations/customer_allocate.php:48
+#: sales/allocations/customer_allocate.php:50
#, php-format
msgid "Allocation of %s # %d"
msgstr ""
msgstr ""
#: sales/allocations/customer_allocation_main.php:32
-#: sales/manage/customer_branches.php:280 sales/manage/customers.php:322
-#: sales/manage/customers.php.orig:319
+#: sales/manage/customer_branches.php:280 sales/manage/customers.php:327
#: sales/inquiry/customer_allocation_inquiry.php:42
#: sales/inquiry/customer_inquiry.php:48
-#: sales/inquiry/customer_inquiry.php.orig:48
#: sales/inquiry/sales_orders_view.php:243
-#: sales/inquiry/sales_orders_view.php.orig:241 sales/manage/customers.php:324
msgid "Select a customer: "
msgstr ""
msgid "Branch Short Name:"
msgstr ""
-#: sales/manage/customer_branches.php:241 sales/manage/customers.php:290
-#: sales/manage/customers.php.orig:287 sales/manage/customers.php:256
+#: sales/manage/customer_branches.php:241 sales/manage/customers.php:259
msgid "Sales Person:"
msgstr ""
-#: sales/manage/customer_branches.php:242 sales/manage/customers.php:291
-#: sales/manage/customers.php.orig:288 sales/manage/customers.php:293
+#: sales/manage/customer_branches.php:242 sales/manage/customers.php:296
msgid "Sales Area:"
msgstr ""
msgid "Sales Group:"
msgstr ""
-#: sales/manage/customer_branches.php:244 sales/manage/customers.php:291
+#: sales/manage/customer_branches.php:244 sales/manage/customers.php:294
msgid "Default Inventory Location:"
msgstr ""
-#: sales/manage/customer_branches.php:245 sales/manage/customers.php:292
+#: sales/manage/customer_branches.php:245 sales/manage/customers.php:295
msgid "Default Shipping Company:"
msgstr ""
msgstr ""
#: sales/manage/customer_branches.php:319
-#: sales/includes/ui/sales_order_ui.inc:299
-#: sales/includes/ui/sales_order_ui.inc:303
+#: sales/includes/ui/sales_order_ui.inc:305
msgid ""
"The selected customer does not have any branches. Please create at least one "
"branch."
msgstr ""
-#: sales/manage/customers.php:42 sales/manage/customers.php.orig:39
+#: sales/manage/customers.php:42
msgid "The customer name cannot be empty."
msgstr ""
-#: sales/manage/customers.php:49 sales/manage/customers.php.orig:46
+#: sales/manage/customers.php:49
msgid "The customer short name cannot be empty."
msgstr ""
-#: sales/manage/customers.php:56 sales/manage/customers.php.orig:53
+#: sales/manage/customers.php:56
msgid "The credit limit must be numeric and not less than zero."
msgstr ""
-#: sales/manage/customers.php:63 sales/manage/customers.php.orig:60
+#: sales/manage/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/customers.php.orig:67
+#: sales/manage/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/customers.php.orig:95
+#: sales/manage/customers.php:98
msgid "Customer has been updated."
msgstr ""
-#: sales/manage/customers.php:127 sales/manage/customers.php.orig:124
+#: sales/manage/customers.php:130
msgid "A new customer has been added."
msgstr ""
-#: sales/manage/customers.php:130 sales/manage/customers.php.orig:127
+#: sales/manage/customers.php:133
msgid ""
"A default Branch has been automatically created, please check default Branch "
"values by using link below."
msgstr ""
-#: sales/manage/customers.php:153 sales/manage/customers.php.orig:150
+#: sales/manage/customers.php:156
msgid ""
"This customer cannot be deleted because there are transactions that refer to "
"it."
msgstr ""
-#: sales/manage/customers.php:160 sales/manage/customers.php.orig:157
+#: sales/manage/customers.php:163
msgid ""
"Cannot delete the customer record because orders have been created against "
"it."
msgstr ""
-#: sales/manage/customers.php:167 sales/manage/customers.php.orig:164
+#: sales/manage/customers.php:170
msgid ""
"Cannot delete this customer because there are branch records set up against "
"it."
msgstr ""
-#: sales/manage/customers.php:178 sales/manage/customers.php.orig:175
+#: sales/manage/customers.php:181
msgid "Selected customer has been deleted."
msgstr ""
-#: sales/manage/customers.php:227 sales/manage/customers.php.orig:224
+#: sales/manage/customers.php:230
msgid "Name and Address"
msgstr ""
-#: sales/manage/customers.php:229 sales/manage/customers.php.orig:226
+#: sales/manage/customers.php:232
msgid "Customer Name:"
msgstr ""
-#: sales/manage/customers.php:230 sales/manage/customers.php.orig:227
+#: sales/manage/customers.php:233
msgid "Customer Short Name:"
msgstr ""
-#: sales/manage/customers.php:238 sales/manage/customers.php:242
-#: sales/manage/customers.php.orig:235 sales/manage/customers.php.orig:239
+#: sales/manage/customers.php:241 sales/manage/customers.php:245
msgid "Customer's Currency:"
msgstr ""
-#: sales/manage/customers.php:245 sales/manage/customers.php.orig:242
+#: sales/manage/customers.php:248
msgid "Sales Type/Price List:"
msgstr ""
-#: sales/manage/customers.php:248 sales/manage/customers.php.orig:245
+#: sales/manage/customers.php:251
msgid "Customer status:"
msgstr ""
-#: sales/manage/customers.php:261 sales/manage/customers.php.orig:258
-#: sales/manage/customers.php:262
+#: sales/manage/customers.php:265
msgid "Discount Percent:"
msgstr ""
-#: sales/manage/customers.php:262 sales/manage/customers.php.orig:259
-#: sales/manage/customers.php:263
+#: sales/manage/customers.php:266
msgid "Prompt Payment Discount Percent:"
msgstr ""
-#: sales/manage/customers.php:266 sales/manage/customers.php.orig:263
-#: sales/manage/customers.php:267
+#: sales/manage/customers.php:270
msgid "Credit Status:"
msgstr ""
-#: sales/manage/customers.php:279 sales/manage/customers.php.orig:276
-#: sales/manage/customers.php:280
+#: sales/manage/customers.php:283
msgid "Customer branches"
msgstr ""
-#: sales/manage/customers.php:281 sales/manage/customers.php.orig:278
-#: sales/manage/customers.php:282
+#: sales/manage/customers.php:285
msgid "Select or &Add"
msgstr ""
-#: sales/manage/customers.php:281 sales/manage/customers.php.orig:278
-#: sales/manage/customers.php:282
+#: sales/manage/customers.php:285
msgid "&Add or Edit "
msgstr ""
-#: sales/manage/customers.php:299 sales/manage/customers.php.orig:296
-#: sales/manage/customers.php:301
+#: sales/manage/customers.php:304
msgid "Add New Customer"
msgstr ""
-#: sales/manage/customers.php:303 sales/manage/customers.php.orig:300
-#: sales/manage/customers.php:305
+#: sales/manage/customers.php:308
msgid "Update Customer"
msgstr ""
-#: sales/manage/customers.php:304 sales/manage/customers.php.orig:301
-#: sales/manage/customers.php:306
+#: sales/manage/customers.php:309
msgid "Update customer data"
msgstr ""
-#: sales/manage/customers.php:305 sales/manage/customers.php.orig:302
-#: sales/manage/customers.php:307
+#: sales/manage/customers.php:310
msgid "Select this customer and return to document entry."
msgstr ""
-#: sales/manage/customers.php:306 sales/manage/customers.php.orig:303
-#: sales/manage/customers.php:308
+#: sales/manage/customers.php:311
msgid "Delete Customer"
msgstr ""
-#: sales/manage/customers.php:307 sales/manage/customers.php.orig:304
-#: sales/manage/customers.php:309
+#: sales/manage/customers.php:312
msgid "Delete customer data if have been never used"
msgstr ""
-#: sales/manage/customers.php:314 sales/manage/customers.php.orig:311
-#: sales/manage/customers.php:316
+#: sales/manage/customers.php:319
msgid ""
"There are no sales types defined. Please define at least one sales type "
"before adding a customer."
msgstr ""
-#: sales/manage/customers.php:323 sales/manage/customers.php.orig:320
-#: sales/manage/customers.php:325
+#: sales/manage/customers.php:328
msgid "New customer"
msgstr ""
-#: sales/manage/customers.php:345 sales/manage/customers.php.orig:342
-#: sales/manage/customers.php:347
+#: sales/manage/customers.php:350
msgid "Sales &Orders"
msgstr ""
msgid "Recurrent Invoices"
msgstr ""
-#: sales/manage/recurrent_invoices.php:36 sales/manage/sales_areas.php:30
-#: sales/manage/sales_groups.php:30
-msgid "The area description cannot be empty."
+#: sales/manage/recurrent_invoices.php:36
+msgid "The invoice description cannot be empty."
msgstr ""
#: sales/manage/recurrent_invoices.php:63
msgid "End:"
msgstr ""
+#: sales/manage/sales_areas.php:30
+msgid "The area description cannot be empty."
+msgstr ""
+
#: sales/manage/sales_areas.php:39
msgid "Selected sales area has been updated"
msgstr ""
msgid "Sales Groups"
msgstr ""
+#: sales/manage/sales_groups.php:30
+msgid "The sales group description cannot be empty."
+msgstr ""
+
#: sales/manage/sales_groups.php:39
msgid "Selected sales group has been updated"
msgstr ""
msgid "From Customer"
msgstr ""
-#: sales/view/view_receipt.php:39
+#: sales/view/view_receipt.php:40
+msgid "Date of Deposit"
+msgstr ""
+
+#: sales/view/view_receipt.php:43
+msgid "Customer Currency"
+msgstr ""
+
+#: sales/view/view_receipt.php:48
msgid "Into Bank Account"
msgstr ""
-#: sales/view/view_receipt.php:40
-msgid "Date of Deposit"
+#: sales/view/view_receipt.php:49
+msgid "Bank Amount"
msgstr ""
#: sales/view/view_receipt.php:56
msgstr ""
#: sales/inquiry/customer_inquiry.php:28
-#: sales/inquiry/customer_inquiry.php.orig:28
msgid "Customer Transactions"
msgstr ""
#: sales/inquiry/customer_inquiry.php:72
-#: sales/inquiry/customer_inquiry.php.orig:72
msgid "CUSTOMER ACCOUNT IS ON HOLD"
msgstr ""
-#: sales/inquiry/customer_inquiry.php:205
-#: sales/inquiry/customer_inquiry.php.orig:205
+#: sales/inquiry/customer_inquiry.php:198
msgid "Print Receipt"
msgstr ""
-#: sales/inquiry/customer_inquiry.php:235
-#: sales/inquiry/customer_inquiry.php:248
-#: sales/inquiry/customer_inquiry.php.orig:235
-#: sales/inquiry/customer_inquiry.php.orig:248
+#: sales/inquiry/customer_inquiry.php:228
+#: sales/inquiry/customer_inquiry.php:241
msgid "RB"
msgstr ""
msgstr ""
#: sales/inquiry/sales_orders_view.php:40
-#: sales/inquiry/sales_orders_view.php.orig:48
msgid "Search Outstanding Sales Orders"
msgstr ""
#: sales/inquiry/sales_orders_view.php:45
-#: sales/inquiry/sales_orders_view.php.orig:53
msgid "Search Template for Invoicing"
msgstr ""
#: sales/inquiry/sales_orders_view.php:50
-#: sales/inquiry/sales_orders_view.php.orig:58
msgid "Select Template for Delivery"
msgstr ""
#: sales/inquiry/sales_orders_view.php:55
-#: sales/inquiry/sales_orders_view.php.orig:63
msgid "Search All Sales Orders"
msgstr ""
#: sales/inquiry/sales_orders_view.php:61
-#: sales/inquiry/sales_orders_view.php.orig:69
msgid "Search All Sales Quotations"
msgstr ""
#: sales/inquiry/sales_orders_view.php:136
-#: sales/inquiry/sales_orders_view.php.orig:134
msgid "Dispatch"
msgstr ""
#: sales/inquiry/sales_orders_view.php:178
-#: sales/inquiry/sales_orders_view.php.orig:176
msgid "Set this order as a template for direct deliveries/invoices"
msgstr ""
#: sales/inquiry/sales_orders_view.php:245
-#: sales/inquiry/sales_orders_view.php.orig:243
msgid "Show All:"
msgstr ""
#: sales/inquiry/sales_orders_view.php:262
-#: sales/inquiry/sales_orders_view.php.orig:260
msgid "Order #"
msgstr ""
#: sales/inquiry/sales_orders_view.php:266
#: sales/inquiry/sales_orders_view.php:280
-#: sales/inquiry/sales_orders_view.php.orig:264
-#: sales/inquiry/sales_orders_view.php.orig:278
msgid "Cust Order Ref"
msgstr ""
#: sales/inquiry/sales_orders_view.php:269
#: sales/inquiry/sales_orders_view.php:283
-#: sales/inquiry/sales_orders_view.php.orig:267
-#: sales/inquiry/sales_orders_view.php.orig:281
msgid "Delivery To"
msgstr ""
#: sales/inquiry/sales_orders_view.php:276
-#: sales/inquiry/sales_orders_view.php.orig:274
msgid "Quote #"
msgstr ""
#: sales/inquiry/sales_orders_view.php:281
-#: sales/inquiry/sales_orders_view.php.orig:279
msgid "Quote Date"
msgstr ""
#: sales/inquiry/sales_orders_view.php:284
-#: sales/inquiry/sales_orders_view.php.orig:282
msgid "Quote Total"
msgstr ""
#: sales/inquiry/sales_orders_view.php:311
-#: sales/inquiry/sales_orders_view.php.orig:309
msgid "Tmpl"
msgstr ""
-#: sales/includes/cart_class.inc:347 sales/includes/cart_class.inc:352
+#: sales/includes/cart_class.inc:378
msgid "You have to enter valid stock code or nonempty description"
msgstr ""
"browser tab. You cannot edit more than one sales document at once."
msgstr ""
-#: sales/includes/db/custalloc_db.inc:292
+#: sales/includes/db/custalloc_db.inc:305
msgid ""
"Unsuspected overallocation happened due to sparse credit notes exists for "
"this invoice.\n"
"charges."
msgstr ""
-#: sales/includes/db/sales_invoice_db.inc:173
-#: sales/includes/db/sales_invoice_db.inc.orig:176
-#: sales/includes/db/sales_invoice_db.inc:174
+#: sales/includes/db/sales_invoice_db.inc:176
msgid "Cash invoice"
msgstr ""
#: sales/includes/db/sales_order_db.inc:107
-#: sales/includes/db/sales_order_db.inc:259
-#: sales/includes/db/sales_order_db.inc.orig:107
-#: sales/includes/db/sales_order_db.inc.orig:259
+#: sales/includes/db/sales_order_db.inc:279
msgid "Stocks below Re-Order Level at "
msgstr ""
#: sales/includes/db/sales_order_db.inc:110
-#: sales/includes/db/sales_order_db.inc:264
-#: sales/includes/db/sales_order_db.inc.orig:110
-#: sales/includes/db/sales_order_db.inc.orig:264
+#: sales/includes/db/sales_order_db.inc:284
msgid "Below"
msgstr ""
#: sales/includes/db/sales_order_db.inc:111
-#: sales/includes/db/sales_order_db.inc:265
-#: sales/includes/db/sales_order_db.inc.orig:111
-#: sales/includes/db/sales_order_db.inc.orig:265
+#: sales/includes/db/sales_order_db.inc:285
msgid "Please reorder"
msgstr ""
#: sales/includes/db/sales_order_db.inc:139
-#: sales/includes/db/sales_order_db.inc.orig:139
msgid "Deleted."
msgstr ""
#: sales/includes/ui/sales_credit_ui.inc:94
-#: sales/includes/ui/sales_order_ui.inc:379
-#: sales/includes/ui/sales_order_ui.inc:383
+#: sales/includes/ui/sales_order_ui.inc:384
msgid "Customer Currency:"
msgstr ""
#: sales/includes/ui/sales_credit_ui.inc:112
-#: sales/includes/ui/sales_order_ui.inc:639
-#: sales/includes/ui/sales_order_ui.inc:643
+#: sales/includes/ui/sales_order_ui.inc:644
msgid "Shipping Company:"
msgstr ""
#: sales/includes/ui/sales_credit_ui.inc:114
-#: sales/includes/ui/sales_order_ui.inc:386
-#: sales/includes/ui/sales_order_ui.inc:390
+#: sales/includes/ui/sales_order_ui.inc:391
msgid "Customer Discount:"
msgstr ""
msgid "This item is already on this document. You have been warned."
msgstr ""
-#: sales/includes/ui/sales_order_ui.inc:104
#: sales/includes/ui/sales_order_ui.inc:106
msgid ""
"The selected customer and branch are not valid, or the customer does not "
"have any branches."
msgstr ""
-#: sales/includes/ui/sales_order_ui.inc:224
-#: sales/includes/ui/sales_order_ui.inc:228
+#: sales/includes/ui/sales_order_ui.inc:230
msgid "Shipping Charge"
msgstr ""
-#: sales/includes/ui/sales_order_ui.inc:297
-#: sales/includes/ui/sales_order_ui.inc:301
+#: sales/includes/ui/sales_order_ui.inc:303
msgid "No customer found for entered text."
msgstr ""
-#: sales/includes/ui/sales_order_ui.inc:323
-#: sales/includes/ui/sales_order_ui.inc:327
+#: sales/includes/ui/sales_order_ui.inc:329
#, php-format
msgid "Customer's payment terms '%s' cannot be selected on this POS"
msgstr ""
-#: sales/includes/ui/sales_order_ui.inc:373
-#: sales/includes/ui/sales_order_ui.inc:377
+#: sales/includes/ui/sales_order_ui.inc:378
msgid "Reference number unique for this document type"
msgstr ""
-#: sales/includes/ui/sales_order_ui.inc:413
-#: sales/includes/ui/sales_order_ui.inc:415
-#: sales/includes/ui/sales_order_ui.inc:417
-#: sales/includes/ui/sales_order_ui.inc:419
+#: sales/includes/ui/sales_order_ui.inc:418
+#: sales/includes/ui/sales_order_ui.inc:420
msgid "Price List:"
msgstr ""
-#: sales/includes/ui/sales_order_ui.inc:432
-#: sales/includes/ui/sales_order_ui.inc:436
+#: sales/includes/ui/sales_order_ui.inc:437
msgid "Date of order receive"
msgstr ""
-#: sales/includes/ui/sales_order_ui.inc:582
-#: sales/includes/ui/sales_order_ui.inc:586
+#: sales/includes/ui/sales_order_ui.inc:587
msgid "Cash payment"
msgstr ""
-#: sales/includes/ui/sales_order_ui.inc:585
-#: sales/includes/ui/sales_order_ui.inc:617
-#: sales/includes/ui/sales_order_ui.inc:589
-#: sales/includes/ui/sales_order_ui.inc:621
+#: sales/includes/ui/sales_order_ui.inc:590
+#: sales/includes/ui/sales_order_ui.inc:622
msgid "Deliver from Location:"
msgstr ""
-#: sales/includes/ui/sales_order_ui.inc:588
-#: sales/includes/ui/sales_order_ui.inc:592
+#: sales/includes/ui/sales_order_ui.inc:593
msgid "Cash account:"
msgstr ""
-#: sales/includes/ui/sales_order_ui.inc:595
-#: sales/includes/ui/sales_order_ui.inc:599
+#: sales/includes/ui/sales_order_ui.inc:600
msgid "Delivery Details"
msgstr ""
-#: sales/includes/ui/sales_order_ui.inc:600
-#: sales/includes/ui/sales_order_ui.inc:604
+#: sales/includes/ui/sales_order_ui.inc:605
msgid "Invoice Delivery Details"
msgstr ""
-#: sales/includes/ui/sales_order_ui.inc:601
-#: sales/includes/ui/sales_order_ui.inc:605
+#: sales/includes/ui/sales_order_ui.inc:606
msgid "Invoice before"
msgstr ""
-#: sales/includes/ui/sales_order_ui.inc:605
-#: sales/includes/ui/sales_order_ui.inc:609
+#: sales/includes/ui/sales_order_ui.inc:610
msgid "Quotation Delivery Details"
msgstr ""
-#: sales/includes/ui/sales_order_ui.inc:610
-#: sales/includes/ui/sales_order_ui.inc:614
+#: sales/includes/ui/sales_order_ui.inc:615
msgid "Order Delivery Details"
msgstr ""
-#: sales/includes/ui/sales_order_ui.inc:623
-#: sales/includes/ui/sales_order_ui.inc:627
+#: sales/includes/ui/sales_order_ui.inc:628
msgid "Enter requested day of delivery"
msgstr ""
-#: sales/includes/ui/sales_order_ui.inc:624
-#: sales/includes/ui/sales_order_ui.inc:628
+#: sales/includes/ui/sales_order_ui.inc:629
msgid "Enter Valid until Date"
msgstr ""
-#: sales/includes/ui/sales_order_ui.inc:625
-#: sales/includes/ui/sales_order_ui.inc:629
+#: sales/includes/ui/sales_order_ui.inc:630
msgid "Deliver To:"
msgstr ""
-#: sales/includes/ui/sales_order_ui.inc:626
-#: sales/includes/ui/sales_order_ui.inc:630
+#: sales/includes/ui/sales_order_ui.inc:631
msgid "Additional identifier for delivery e.g. name of receiving person"
msgstr ""
-#: sales/includes/ui/sales_order_ui.inc:629
-#: sales/includes/ui/sales_order_ui.inc:633
+#: sales/includes/ui/sales_order_ui.inc:634
msgid "Delivery address. Default is address of customer branch"
msgstr ""
-#: sales/includes/ui/sales_order_ui.inc:633
-#: sales/includes/ui/sales_order_ui.inc:637
+#: sales/includes/ui/sales_order_ui.inc:638
msgid "Contact Phone Number:"
msgstr ""
-#: sales/includes/ui/sales_order_ui.inc:634
-#: sales/includes/ui/sales_order_ui.inc:638
+#: sales/includes/ui/sales_order_ui.inc:639
msgid "Phone number of ordering person. Defaults to branch phone number"
msgstr ""
-#: sales/includes/ui/sales_order_ui.inc:635
-#: sales/includes/ui/sales_order_ui.inc:639
+#: sales/includes/ui/sales_order_ui.inc:640
msgid "Customer Reference:"
msgstr ""
-#: sales/includes/ui/sales_order_ui.inc:636
-#: sales/includes/ui/sales_order_ui.inc:640
+#: sales/includes/ui/sales_order_ui.inc:641
msgid "Customer reference number for this order (if any)"
msgstr ""
msgid "Purchasing GL Account:"
msgstr ""
-#: themes/default/renderer.php:27 themes/default/renderer.php:28
+#: themes/default/renderer.php:28
msgid "Main Menu"
msgstr ""
-#: themes/default/renderer.php:53 themes/default/renderer.php:76
-#: themes/default/renderer.php:54 themes/default/renderer.php:80
+#: themes/default/renderer.php:71 themes/default/renderer.php:81
msgid "Help"
msgstr ""
-#: themes/default/renderer.php:71 themes/default/renderer.php:75
+#: themes/default/renderer.php:76
msgid "Preferences"
msgstr ""
#: sql/alter2.3.php:20
msgid "Upgrade from version 2.2 to 2.3"
msgstr ""
-
-#: admin/attachments.php:84
-msgid "No transaction has been selected."
-msgstr ""
-
-#: admin/attachments.php:86
-msgid "Select attachment file."
-msgstr ""
-
-#: sales/create_recurrent_invoices.php:127
-msgid "Invoice date:"
-msgstr ""
-
-#: access/login.php:36
-msgid "Too many failed login attempts.<br>Please wait a while or try later."
-msgstr ""
-
-#: admin/create_coy.php:293
-msgid ""
-"If no Admin Password is entered, the new Admin Password will be "
-"'<b>password</b>' by default "
-msgstr ""
-
-#: gl/manage/gl_accounts.php:102
-msgid "Account not added, possible duplicate Account Code."
-msgstr ""
-
-#: includes/session.inc:185
-#, php-format
-msgid ""
-"Brute force attack on account '%s' detected. Access for non-logged users "
-"temporarily blocked."
-msgstr ""
projects / fa-stable.git / blobdiff