projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixup commit for tag 'version_2_3_1'
[fa-stable.git]
/
lang
/
new_language_template
/
LC_MESSAGES
/
empty.po
diff --git
a/lang/new_language_template/LC_MESSAGES/empty.po
b/lang/new_language_template/LC_MESSAGES/empty.po
index 5c383df1b8651087fb72b790193c66a98234a45e..a0af14daaf505828ec3a6f43be0c912a3de59094 100644
(file)
--- a/
lang/new_language_template/LC_MESSAGES/empty.po
+++ b/
lang/new_language_template/LC_MESSAGES/empty.po
@@
-8,13
+8,13
@@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 201
0-12-09 11:41
+0100\n"
+"POT-Creation-Date: 201
1-01-04 17:00
+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"
"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
"Content-Transfer-Encoding: 8bit\n"
#: ../frontaccounting.php:73
@@
-24,41
+24,54
@@
msgstr ""
#: ../frontaccounting.php:75
#: ../access/logout.php:17
#: ../frontaccounting.php:75
#: ../access/logout.php:17
-#: ../themes/default/renderer.php:
4
2
-#: ../themes/default/renderer.php:
6
8
+#: ../themes/default/renderer.php:
5
2
+#: ../themes/default/renderer.php:
7
8
#: ../themes/exclusive/renderer.php:42
#: ../themes/exclusive/renderer.php:51
msgid "Logout"
msgstr ""
#: ../themes/exclusive/renderer.php:42
#: ../themes/exclusive/renderer.php:51
msgid "Logout"
msgstr ""
+#: ../link_test.php:38
+msgid "Trans Link Test"
+msgstr ""
+
#: ../access/login.php:13
#: ../access/login.php:13
+#: ../access/sav.login.php:13
msgid "Restricted access"
msgstr ""
#: ../access/login.php:33
msgid "Restricted access"
msgstr ""
#: ../access/login.php:33
+#: ../access/sav.login.php:33
msgid "Login as user: demouser and password: password"
msgstr ""
#: ../access/login.php:37
msgid "Login as user: demouser and password: password"
msgstr ""
#: ../access/login.php:37
+#: ../access/sav.login.php:37
msgid "Please login here"
msgstr ""
#: ../access/login.php:45
#: ../access/login.php:75
msgid "Please login here"
msgstr ""
#: ../access/login.php:45
#: ../access/login.php:75
+#: ../access/sav.login.php:45
+#: ../access/sav.login.php:75
msgid "Authorization timeout"
msgstr ""
#: ../access/login.php:45
#: ../access/login.php:82
msgid "Authorization timeout"
msgstr ""
#: ../access/login.php:45
#: ../access/login.php:82
+#: ../access/sav.login.php:45
+#: ../access/sav.login.php:82
msgid "Login"
msgstr ""
#: ../access/login.php:82
msgid "Login"
msgstr ""
#: ../access/login.php:82
+#: ../access/sav.login.php:82
#: ../admin/inst_upgrade.php:137
msgid "Version"
msgstr ""
#: ../access/login.php:85
#: ../admin/inst_upgrade.php:137
msgid "Version"
msgstr ""
#: ../access/login.php:85
+#: ../access/sav.login.php:85
msgid "User name"
msgstr ""
msgid "User name"
msgstr ""
@@
-69,18
+82,21
@@
msgid "Password:"
msgstr ""
#: ../access/login.php:98
msgstr ""
#: ../access/login.php:98
+#: ../access/sav.login.php:98
#: ../admin/create_coy.php:237
#: ../admin/create_coy.php:313
msgid "Company"
msgstr ""
#: ../access/login.php:107
#: ../admin/create_coy.php:237
#: ../admin/create_coy.php:313
msgid "Company"
msgstr ""
#: ../access/login.php:107
+#: ../access/sav.login.php:107
msgid "Login -->"
msgstr ""
#: ../access/login.php:136
msgid "Login -->"
msgstr ""
#: ../access/login.php:136
+#: ../access/sav.login.php:137
#: ../admin/display_prefs.php:111
#: ../admin/display_prefs.php:111
-#: ../themes/default/renderer.php:1
1
3
+#: ../themes/default/renderer.php:1
2
3
#: ../themes/exclusive/renderer.php:154
msgid "Theme:"
msgstr ""
#: ../themes/exclusive/renderer.php:154
msgid "Theme:"
msgstr ""
@@
-93,6
+109,10
@@
msgstr ""
msgid "Click here to Login Again."
msgstr ""
msgid "Click here to Login Again."
msgstr ""
+#: ../access/sav.login.php:89
+msgid "Password"
+msgstr ""
+
#: ../admin/attachments.php:72
msgid "Attach Documents"
msgstr ""
#: ../admin/attachments.php:72
msgid "Attach Documents"
msgstr ""
@@
-124,7
+144,7
@@
msgstr ""
#: ../admin/attachments.php:167
#: ../admin/view_print_transaction.php:126
#: ../admin/attachments.php:167
#: ../admin/view_print_transaction.php:126
-#: ../admin/void_transaction.php:16
0
+#: ../admin/void_transaction.php:16
4
#: ../dimensions/inquiry/search_dimensions.php:127
#: ../dimensions/view/view_dimension.php:54
#: ../gl/bank_account_reconcile.php:234
#: ../dimensions/inquiry/search_dimensions.php:127
#: ../dimensions/view/view_dimension.php:54
#: ../gl/bank_account_reconcile.php:234
@@
-186,9
+206,9
@@
msgstr ""
#: ../inventory/view/view_transfer.php:56
#: ../manufacturing/manage/bom_edit.php:70
#: ../manufacturing/includes/manufacturing_ui.inc:28
#: ../inventory/view/view_transfer.php:56
#: ../manufacturing/manage/bom_edit.php:70
#: ../manufacturing/includes/manufacturing_ui.inc:28
-#: ../purchasing/includes/ui/invoice_ui.inc:4
65
-#: ../purchasing/includes/ui/invoice_ui.inc:4
77
-#: ../purchasing/po_receive_items.php:
58
+#: ../purchasing/includes/ui/invoice_ui.inc:4
70
+#: ../purchasing/includes/ui/invoice_ui.inc:4
82
+#: ../purchasing/po_receive_items.php:
62
#: ../reporting/rep104.php:109
#: ../reporting/rep105.php:112
#: ../reporting/rep204.php:82
#: ../reporting/rep104.php:109
#: ../reporting/rep105.php:112
#: ../reporting/rep204.php:82
@@
-243,11
+263,12
@@
msgstr ""
#: ../gl/manage/gl_account_classes.php:132
#: ../gl/manage/gl_account_types.php:148
#: ../gl/manage/gl_quick_entries.php:196
#: ../gl/manage/gl_account_classes.php:132
#: ../gl/manage/gl_account_types.php:148
#: ../gl/manage/gl_quick_entries.php:196
-#: ../gl/manage/gl_quick_entries.php:29
6
+#: ../gl/manage/gl_quick_entries.php:29
5
#: ../gl/includes/ui/gl_bank_ui.inc:155
#: ../gl/includes/ui/gl_journal_ui.inc:122
#: ../includes/ui/contacts_view.inc:64
#: ../includes/ui/simple_crud_class.inc:52
#: ../gl/includes/ui/gl_bank_ui.inc:155
#: ../gl/includes/ui/gl_journal_ui.inc:122
#: ../includes/ui/contacts_view.inc:64
#: ../includes/ui/simple_crud_class.inc:52
+#: ../includes/ui/ui_input.inc:972
#: ../inventory/prices.php:145
#: ../inventory/purchasing_data.php:144
#: ../inventory/includes/item_adjustments_ui.inc:87
#: ../inventory/prices.php:145
#: ../inventory/purchasing_data.php:144
#: ../inventory/includes/item_adjustments_ui.inc:87
@@
-262,7
+283,7
@@
msgstr ""
#: ../manufacturing/manage/bom_edit.php:86
#: ../manufacturing/manage/work_centres.php:114
#: ../manufacturing/includes/work_order_issue_ui.inc:58
#: ../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:51
4
+#: ../purchasing/includes/ui/invoice_ui.inc:51
9
#: ../purchasing/includes/ui/po_ui.inc:266
#: ../purchasing/inquiry/po_search_completed.php:101
#: ../purchasing/inquiry/po_search.php:87
#: ../purchasing/includes/ui/po_ui.inc:266
#: ../purchasing/inquiry/po_search_completed.php:101
#: ../purchasing/inquiry/po_search.php:87
@@
-314,7
+335,7
@@
msgstr ""
#: ../gl/manage/gl_account_classes.php:133
#: ../gl/manage/gl_account_types.php:149
#: ../gl/manage/gl_quick_entries.php:197
#: ../gl/manage/gl_account_classes.php:133
#: ../gl/manage/gl_account_types.php:149
#: ../gl/manage/gl_quick_entries.php:197
-#: ../gl/manage/gl_quick_entries.php:29
7
+#: ../gl/manage/gl_quick_entries.php:29
6
#: ../gl/includes/ui/gl_bank_ui.inc:157
#: ../gl/includes/ui/gl_journal_ui.inc:124
#: ../includes/ui/contacts_view.inc:67
#: ../gl/includes/ui/gl_bank_ui.inc:157
#: ../gl/includes/ui/gl_journal_ui.inc:124
#: ../includes/ui/contacts_view.inc:67
@@
-447,8
+468,8
@@
msgid "Create backup"
msgstr ""
#: ../admin/backups.php:168
msgstr ""
#: ../admin/backups.php:168
-#: ../sales/includes/ui/sales_order_ui.inc:59
0
-#: ../sales/includes/ui/sales_order_ui.inc:6
37
+#: ../sales/includes/ui/sales_order_ui.inc:59
4
+#: ../sales/includes/ui/sales_order_ui.inc:6
41
msgid "Comments:"
msgstr ""
msgid "Comments:"
msgstr ""
@@
-499,7
+520,7
@@
msgstr ""
#: ../admin/change_current_user_password.php:16
#: ../admin/change_current_user_password.php:85
#: ../admin/change_current_user_password.php:16
#: ../admin/change_current_user_password.php:85
-#: ../themes/default/renderer.php:
6
2
+#: ../themes/default/renderer.php:
7
2
#: ../themes/exclusive/renderer.php:47
msgid "Change password"
msgstr ""
#: ../themes/exclusive/renderer.php:47
msgid "Change password"
msgstr ""
@@
-592,7
+613,7
@@
msgstr ""
#: ../includes/ui/contacts_view.inc:109
#: ../inventory/manage/locations.php:202
#: ../sales/manage/customers.php:203
#: ../includes/ui/contacts_view.inc:109
#: ../inventory/manage/locations.php:202
#: ../sales/manage/customers.php:203
-#: ../sales/includes/ui/sales_order_ui.inc:6
28
+#: ../sales/includes/ui/sales_order_ui.inc:6
32
msgid "Address:"
msgstr ""
msgid "Address:"
msgstr ""
@@
-721,7
+742,7
@@
msgstr ""
#: ../admin/company_preferences.php:202
#: ../admin/display_prefs.php:142
#: ../admin/forms_setup.php:61
#: ../admin/company_preferences.php:202
#: ../admin/display_prefs.php:142
#: ../admin/forms_setup.php:61
-#: ../admin/gl_setup.php:2
03
+#: ../admin/gl_setup.php:2
21
#: ../admin/inst_chart.php:74
#: ../admin/inst_lang.php:103
#: ../admin/inst_module.php:138
#: ../admin/inst_chart.php:74
#: ../admin/inst_lang.php:103
#: ../admin/inst_module.php:138
@@
-729,7
+750,7
@@
msgstr ""
#: ../admin/inst_module.php:200
#: ../admin/inst_theme.php:96
#: ../dimensions/dimension_entry.php:293
#: ../admin/inst_module.php:200
#: ../admin/inst_theme.php:96
#: ../dimensions/dimension_entry.php:293
-#: ../gl/gl_bank.php:3
81
+#: ../gl/gl_bank.php:3
90
#: ../gl/gl_budget.php:135
#: ../gl/manage/gl_quick_entries.php:60
#: ../gl/includes/ui/gl_bank_ui.inc:246
#: ../gl/gl_budget.php:135
#: ../gl/manage/gl_quick_entries.php:60
#: ../gl/includes/ui/gl_bank_ui.inc:246
@@
-750,7
+771,7
@@
msgstr ""
#: ../manufacturing/includes/work_order_issue_ui.inc:127
#: ../purchasing/includes/ui/po_ui.inc:299
#: ../purchasing/includes/ui/po_ui.inc:434
#: ../manufacturing/includes/work_order_issue_ui.inc:127
#: ../purchasing/includes/ui/po_ui.inc:299
#: ../purchasing/includes/ui/po_ui.inc:434
-#: ../purchasing/po_receive_items.php:32
2
+#: ../purchasing/po_receive_items.php:32
6
#: ../sales/credit_note_entry.php:280
#: ../sales/customer_credit_invoice.php:391
#: ../sales/customer_delivery.php:521
#: ../sales/credit_note_entry.php:280
#: ../sales/customer_credit_invoice.php:391
#: ../sales/customer_delivery.php:521
@@
-758,7
+779,7
@@
msgstr ""
#: ../sales/inquiry/sales_orders_view.php:317
#: ../sales/includes/ui/sales_credit_ui.inc:293
#: ../sales/includes/ui/sales_order_ui.inc:238
#: ../sales/inquiry/sales_orders_view.php:317
#: ../sales/includes/ui/sales_credit_ui.inc:293
#: ../sales/includes/ui/sales_order_ui.inc:238
-#: ../sales/includes/ui/sales_order_ui.inc:5
58
+#: ../sales/includes/ui/sales_order_ui.inc:5
62
msgid "Update"
msgstr ""
msgid "Update"
msgstr ""
@@
-937,7
+958,7
@@
msgstr ""
#: ../admin/inst_upgrade.php:149
#: ../gl/manage/gl_account_types.php:184
#: ../includes/ui/allocation_cart.inc:286
#: ../admin/inst_upgrade.php:149
#: ../gl/manage/gl_account_types.php:184
#: ../includes/ui/allocation_cart.inc:286
-#: ../taxes/tax_groups.php:22
0
+#: ../taxes/tax_groups.php:22
1
msgid "None"
msgstr ""
msgid "None"
msgstr ""
@@
-1277,149
+1298,161
@@
msgstr ""
msgid "The past due days interval allowance must be between 0 and 100."
msgstr ""
msgid "The past due days interval allowance must be between 0 and 100."
msgstr ""
-#: ../admin/gl_setup.php:66
+#: ../admin/gl_setup.php:52
+msgid "Before GRN Clearing Account can be changed all GRNs have to be invoiced"
+msgstr ""
+
+#: ../admin/gl_setup.php:75
msgid "The general GL setup has been updated."
msgstr ""
msgid "The general GL setup has been updated."
msgstr ""
-#: ../admin/gl_setup.php:1
16
+#: ../admin/gl_setup.php:1
32
msgid "General GL"
msgstr ""
msgid "General GL"
msgstr ""
-#: ../admin/gl_setup.php:1
18
+#: ../admin/gl_setup.php:1
34
msgid "Past Due Days Interval:"
msgstr ""
msgid "Past Due Days Interval:"
msgstr ""
-#: ../admin/gl_setup.php:1
18
-#: ../admin/gl_setup.php:1
53
-#: ../admin/gl_setup.php:1
61
-#: ../admin/gl_setup.php:
196
+#: ../admin/gl_setup.php:1
34
+#: ../admin/gl_setup.php:1
69
+#: ../admin/gl_setup.php:1
77
+#: ../admin/gl_setup.php:
214
#: ../admin/payment_terms.php:140
msgid "days"
msgstr ""
#: ../admin/payment_terms.php:140
msgid "days"
msgstr ""
-#: ../admin/gl_setup.php:1
20
+#: ../admin/gl_setup.php:1
36
msgid "Retained Earnings:"
msgstr ""
msgid "Retained Earnings:"
msgstr ""
-#: ../admin/gl_setup.php:1
22
+#: ../admin/gl_setup.php:1
38
msgid "Profit/Loss Year:"
msgstr ""
msgid "Profit/Loss Year:"
msgstr ""
-#: ../admin/gl_setup.php:1
24
+#: ../admin/gl_setup.php:1
40
msgid "Exchange Variances Account:"
msgstr ""
msgid "Exchange Variances Account:"
msgstr ""
-#: ../admin/gl_setup.php:1
26
+#: ../admin/gl_setup.php:1
42
msgid "Bank Charges Account:"
msgstr ""
msgid "Bank Charges Account:"
msgstr ""
-#: ../admin/gl_setup.php:1
30
+#: ../admin/gl_setup.php:1
46
msgid "Customers and Sales"
msgstr ""
msgid "Customers and Sales"
msgstr ""
-#: ../admin/gl_setup.php:1
32
+#: ../admin/gl_setup.php:1
48
msgid "Default Credit Limit:"
msgstr ""
msgid "Default Credit Limit:"
msgstr ""
-#: ../admin/gl_setup.php:1
34
+#: ../admin/gl_setup.php:1
50
msgid "Accumulate batch shipping:"
msgstr ""
msgid "Accumulate batch shipping:"
msgstr ""
-#: ../admin/gl_setup.php:1
36
+#: ../admin/gl_setup.php:1
52
msgid "Legal Text on Invoice:"
msgstr ""
msgid "Legal Text on Invoice:"
msgstr ""
-#: ../admin/gl_setup.php:1
38
+#: ../admin/gl_setup.php:1
54
msgid "Shipping Charged Account:"
msgstr ""
msgid "Shipping Charged Account:"
msgstr ""
-#: ../admin/gl_setup.php:1
42
+#: ../admin/gl_setup.php:1
58
msgid "Customers and Sales Defaults"
msgstr ""
msgid "Customers and Sales Defaults"
msgstr ""
-#: ../admin/gl_setup.php:1
44
+#: ../admin/gl_setup.php:1
60
msgid "Receivable Account:"
msgstr ""
msgid "Receivable Account:"
msgstr ""
-#: ../admin/gl_setup.php:1
46
-#: ../admin/gl_setup.php:
182
+#: ../admin/gl_setup.php:1
62
+#: ../admin/gl_setup.php:
200
#: ../inventory/manage/item_categories.php:192
#: ../inventory/manage/items.php:364
#: ../sales/manage/customer_branches.php:250
msgid "Sales Account:"
msgstr ""
#: ../inventory/manage/item_categories.php:192
#: ../inventory/manage/items.php:364
#: ../sales/manage/customer_branches.php:250
msgid "Sales Account:"
msgstr ""
-#: ../admin/gl_setup.php:1
49
+#: ../admin/gl_setup.php:1
65
#: ../sales/manage/customer_branches.php:251
msgid "Sales Discount Account:"
msgstr ""
#: ../sales/manage/customer_branches.php:251
msgid "Sales Discount Account:"
msgstr ""
-#: ../admin/gl_setup.php:1
51
+#: ../admin/gl_setup.php:1
67
#: ../sales/manage/customer_branches.php:253
msgid "Prompt Payment Discount Account:"
msgstr ""
#: ../sales/manage/customer_branches.php:253
msgid "Prompt Payment Discount Account:"
msgstr ""
-#: ../admin/gl_setup.php:1
53
+#: ../admin/gl_setup.php:1
69
msgid "Delivery Required By:"
msgstr ""
msgid "Delivery Required By:"
msgstr ""
-#: ../admin/gl_setup.php:1
59
+#: ../admin/gl_setup.php:1
75
msgid "Dimension Defaults"
msgstr ""
msgid "Dimension Defaults"
msgstr ""
-#: ../admin/gl_setup.php:1
61
+#: ../admin/gl_setup.php:1
77
msgid "Dimension Required By After:"
msgstr ""
msgid "Dimension Required By After:"
msgstr ""
-#: ../admin/gl_setup.php:1
64
+#: ../admin/gl_setup.php:1
80
msgid "Suppliers and Purchasing"
msgstr ""
msgid "Suppliers and Purchasing"
msgstr ""
-#: ../admin/gl_setup.php:1
66
+#: ../admin/gl_setup.php:1
82
msgid "Delivery Over-Receive Allowance:"
msgstr ""
msgid "Delivery Over-Receive Allowance:"
msgstr ""
-#: ../admin/gl_setup.php:1
68
+#: ../admin/gl_setup.php:1
84
msgid "Invoice Over-Charge Allowance:"
msgstr ""
msgid "Invoice Over-Charge Allowance:"
msgstr ""
-#: ../admin/gl_setup.php:1
70
+#: ../admin/gl_setup.php:1
86
msgid "Suppliers and Purchasing Defaults"
msgstr ""
msgid "Suppliers and Purchasing Defaults"
msgstr ""
-#: ../admin/gl_setup.php:1
72
+#: ../admin/gl_setup.php:1
88
msgid "Payable Account:"
msgstr ""
msgid "Payable Account:"
msgstr ""
-#: ../admin/gl_setup.php:1
74
+#: ../admin/gl_setup.php:1
90
#: ../purchasing/manage/suppliers.php:129
msgid "Purchase Discount Account:"
msgstr ""
#: ../purchasing/manage/suppliers.php:129
msgid "Purchase Discount Account:"
msgstr ""
-#: ../admin/gl_setup.php:176
+#: ../admin/gl_setup.php:192
+msgid "GRN Clearing Account:"
+msgstr ""
+
+#: ../admin/gl_setup.php:192
+msgid "No postings on GRN"
+msgstr ""
+
+#: ../admin/gl_setup.php:194
#: ../reporting/reports_main.php:166
msgid "Inventory"
msgstr ""
#: ../reporting/reports_main.php:166
msgid "Inventory"
msgstr ""
-#: ../admin/gl_setup.php:1
78
+#: ../admin/gl_setup.php:1
96
msgid "Allow Negative Inventory:"
msgstr ""
msgid "Allow Negative Inventory:"
msgstr ""
-#: ../admin/gl_setup.php:1
79
+#: ../admin/gl_setup.php:1
97
msgid "Warning: This may cause a delay in GL postings"
msgstr ""
msgid "Warning: This may cause a delay in GL postings"
msgstr ""
-#: ../admin/gl_setup.php:1
81
+#: ../admin/gl_setup.php:1
99
msgid "Items Defaults"
msgstr ""
msgid "Items Defaults"
msgstr ""
-#: ../admin/gl_setup.php:
184
+#: ../admin/gl_setup.php:
202
#: ../inventory/manage/item_categories.php:202
#: ../inventory/manage/items.php:368
msgid "Inventory Account:"
msgstr ""
#: ../inventory/manage/item_categories.php:202
#: ../inventory/manage/items.php:368
msgid "Inventory Account:"
msgstr ""
-#: ../admin/gl_setup.php:
186
+#: ../admin/gl_setup.php:
204
#: ../inventory/manage/item_categories.php:196
#: ../inventory/manage/item_categories.php:204
#: ../inventory/manage/items.php:369
#: ../inventory/manage/item_categories.php:196
#: ../inventory/manage/item_categories.php:204
#: ../inventory/manage/items.php:369
@@
-1427,23
+1460,23
@@
msgstr ""
msgid "C.O.G.S. Account:"
msgstr ""
msgid "C.O.G.S. Account:"
msgstr ""
-#: ../admin/gl_setup.php:
188
+#: ../admin/gl_setup.php:
206
#: ../inventory/manage/item_categories.php:205
#: ../inventory/manage/items.php:370
msgid "Inventory Adjustments Account:"
msgstr ""
#: ../inventory/manage/item_categories.php:205
#: ../inventory/manage/items.php:370
msgid "Inventory Adjustments Account:"
msgstr ""
-#: ../admin/gl_setup.php:
190
+#: ../admin/gl_setup.php:
208
#: ../inventory/manage/item_categories.php:209
#: ../inventory/manage/items.php:381
msgid "Item Assembly Costs Account:"
msgstr ""
#: ../inventory/manage/item_categories.php:209
#: ../inventory/manage/items.php:381
msgid "Item Assembly Costs Account:"
msgstr ""
-#: ../admin/gl_setup.php:
194
+#: ../admin/gl_setup.php:
212
msgid "Manufacturing Defaults"
msgstr ""
msgid "Manufacturing Defaults"
msgstr ""
-#: ../admin/gl_setup.php:
196
+#: ../admin/gl_setup.php:
214
msgid "Work Order Required By After:"
msgstr ""
msgid "Work Order Required By After:"
msgstr ""
@@
-1642,7
+1675,7
@@
msgstr ""
#: ../admin/inst_module.php:170
#: ../includes/ui/ui_lists.inc:648
#: ../admin/inst_module.php:170
#: ../includes/ui/ui_lists.inc:648
-#: ../includes/ui/ui_lists.inc:21
18
+#: ../includes/ui/ui_lists.inc:21
20
#: ../reporting/includes/excel_report.inc:232
#: ../reporting/includes/pdf_report.inc:264
msgid "Active"
#: ../reporting/includes/excel_report.inc:232
#: ../reporting/includes/pdf_report.inc:264
msgid "Active"
@@
-2056,7
+2089,7
@@
msgid "Delete This Role"
msgstr ""
#: ../admin/security_roles.php:249
msgstr ""
#: ../admin/security_roles.php:249
-#: ../admin/void_transaction.php:2
08
+#: ../admin/void_transaction.php:2
12
#: ../gl/manage/gl_quick_entries.php:61
#: ../gl/includes/ui/gl_bank_ui.inc:248
#: ../gl/includes/ui/gl_journal_ui.inc:223
#: ../gl/manage/gl_quick_entries.php:61
#: ../gl/includes/ui/gl_bank_ui.inc:248
#: ../gl/includes/ui/gl_journal_ui.inc:223
@@
-2070,7
+2103,7
@@
msgstr ""
#: ../manufacturing/includes/work_order_issue_ui.inc:129
#: ../purchasing/includes/ui/po_ui.inc:436
#: ../sales/includes/ui/sales_credit_ui.inc:295
#: ../manufacturing/includes/work_order_issue_ui.inc:129
#: ../purchasing/includes/ui/po_ui.inc:436
#: ../sales/includes/ui/sales_credit_ui.inc:295
-#: ../sales/includes/ui/sales_order_ui.inc:56
0
+#: ../sales/includes/ui/sales_order_ui.inc:56
4
msgid "Cancel"
msgstr ""
msgid "Cancel"
msgstr ""
@@
-2330,7
+2363,7
@@
msgstr ""
#: ../dimensions/inquiry/search_dimensions.php:88
#: ../gl/inquiry/journal_inquiry.php:53
#: ../manufacturing/search_work_orders.php:78
#: ../dimensions/inquiry/search_dimensions.php:88
#: ../gl/inquiry/journal_inquiry.php:53
#: ../manufacturing/search_work_orders.php:78
-#: ../purchasing/includes/ui/invoice_ui.inc:4
47
+#: ../purchasing/includes/ui/invoice_ui.inc:4
52
#: ../purchasing/inquiry/po_search_completed.php:74
#: ../purchasing/inquiry/po_search.php:76
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:57
#: ../purchasing/inquiry/po_search_completed.php:74
#: ../purchasing/inquiry/po_search.php:76
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:57
@@
-2355,7
+2388,7
@@
msgid ""
msgstr ""
#: ../admin/view_print_transaction.php:127
msgstr ""
#: ../admin/view_print_transaction.php:127
-#: ../admin/void_transaction.php:16
1
+#: ../admin/void_transaction.php:16
5
#: ../dimensions/inquiry/search_dimensions.php:128
#: ../dimensions/view/view_dimension.php:54
#: ../gl/bank_account_reconcile.php:235
#: ../dimensions/inquiry/search_dimensions.php:128
#: ../dimensions/view/view_dimension.php:54
#: ../gl/bank_account_reconcile.php:235
@@
-2414,7
+2447,7
@@
msgid "Reference"
msgstr ""
#: ../admin/view_print_transaction.php:128
msgstr ""
#: ../admin/view_print_transaction.php:128
-#: ../admin/void_transaction.php:16
2
+#: ../admin/void_transaction.php:16
6
#: ../dimensions/inquiry/search_dimensions.php:131
#: ../dimensions/view/view_dimension.php:54
#: ../gl/accruals.php:87
#: ../dimensions/inquiry/search_dimensions.php:131
#: ../dimensions/view/view_dimension.php:54
#: ../gl/accruals.php:87
@@
-2476,7
+2509,7
@@
msgid "Date"
msgstr ""
#: ../admin/view_print_transaction.php:130
msgstr ""
#: ../admin/view_print_transaction.php:130
-#: ../admin/void_transaction.php:16
3
+#: ../admin/void_transaction.php:16
7
#: ../includes/ui/ui_view.inc:51
msgid "GL"
msgstr ""
#: ../includes/ui/ui_view.inc:51
msgid "GL"
msgstr ""
@@
-2486,26
+2519,26
@@
msgid "Void a Transaction"
msgstr ""
#: ../admin/void_transaction.php:119
msgstr ""
#: ../admin/void_transaction.php:119
-#: ../admin/void_transaction.php:16
4
+#: ../admin/void_transaction.php:16
8
#: ../includes/ui/ui_input.inc:136
#: ../includes/ui/ui_input.inc:277
#: ../includes/ui/ui_lists.inc:20
msgid "Select"
msgstr ""
#: ../includes/ui/ui_input.inc:136
#: ../includes/ui/ui_input.inc:277
#: ../includes/ui/ui_lists.inc:20
msgid "Select"
msgstr ""
-#: ../admin/void_transaction.php:1
47
+#: ../admin/void_transaction.php:1
51
msgid "Transaction Type:"
msgstr ""
msgid "Transaction Type:"
msgstr ""
-#: ../admin/void_transaction.php:18
3
+#: ../admin/void_transaction.php:18
7
msgid "Transaction #:"
msgstr ""
msgid "Transaction #:"
msgstr ""
-#: ../admin/void_transaction.php:18
5
+#: ../admin/void_transaction.php:18
9
msgid "Voiding Date:"
msgstr ""
msgid "Voiding Date:"
msgstr ""
-#: ../admin/void_transaction.php:1
87
+#: ../admin/void_transaction.php:1
91
#: ../dimensions/dimension_entry.php:283
#: ../gl/bank_transfer.php:91
#: ../gl/inquiry/journal_inquiry.php:56
#: ../dimensions/dimension_entry.php:283
#: ../gl/bank_transfer.php:91
#: ../gl/inquiry/journal_inquiry.php:56
@@
-2515,38
+2548,38
@@
msgstr ""
#: ../manufacturing/work_order_entry.php:449
#: ../manufacturing/work_order_release.php:100
#: ../purchasing/includes/ui/invoice_ui.inc:161
#: ../manufacturing/work_order_entry.php:449
#: ../manufacturing/work_order_release.php:100
#: ../purchasing/includes/ui/invoice_ui.inc:161
-#: ../purchasing/po_entry_items.php:50
1
-#: ../purchasing/supplier_payment.php:
29
8
+#: ../purchasing/po_entry_items.php:50
4
+#: ../purchasing/supplier_payment.php:
30
8
#: ../sales/customer_payments.php:291
msgid "Memo:"
msgstr ""
#: ../sales/customer_payments.php:291
msgid "Memo:"
msgstr ""
-#: ../admin/void_transaction.php:19
2
-#: ../admin/void_transaction.php:20
1
+#: ../admin/void_transaction.php:19
6
+#: ../admin/void_transaction.php:20
5
msgid "Void Transaction"
msgstr ""
msgid "Void Transaction"
msgstr ""
-#: ../admin/void_transaction.php:
197
-#: ../admin/void_transaction.php:2
76
+#: ../admin/void_transaction.php:
201
+#: ../admin/void_transaction.php:2
80
msgid "The entered transaction does not exist or cannot be voided."
msgstr ""
msgid "The entered transaction does not exist or cannot be voided."
msgstr ""
-#: ../admin/void_transaction.php:20
5
+#: ../admin/void_transaction.php:20
9
msgid ""
"Are you sure you want to void this transaction ? This action cannot be "
"undone."
msgstr ""
msgid ""
"Are you sure you want to void this transaction ? This action cannot be "
"undone."
msgstr ""
-#: ../admin/void_transaction.php:2
07
+#: ../admin/void_transaction.php:2
11
#: ../includes/ui/ui_controls.inc:560
msgid "Proceed"
msgstr ""
#: ../includes/ui/ui_controls.inc:560
msgid "Proceed"
msgstr ""
-#: ../admin/void_transaction.php:22
1
+#: ../admin/void_transaction.php:22
5
msgid "The selected transaction was closed for edition and cannot be voided."
msgstr ""
msgid "The selected transaction was closed for edition and cannot be voided."
msgstr ""
-#: ../admin/void_transaction.php:2
27
+#: ../admin/void_transaction.php:2
31
#: ../gl/accruals.php:32
#: ../gl/bank_transfer.php:108
#: ../gl/gl_journal.php:154
#: ../gl/accruals.php:32
#: ../gl/bank_transfer.php:108
#: ../gl/gl_journal.php:154
@@
-2554,17
+2587,17
@@
msgstr ""
#: ../gl/manage/revaluate_currencies.php:50
#: ../manufacturing/work_order_add_finished.php:98
#: ../manufacturing/work_order_costs.php:83
#: ../gl/manage/revaluate_currencies.php:50
#: ../manufacturing/work_order_add_finished.php:98
#: ../manufacturing/work_order_costs.php:83
-#: ../purchasing/po_receive_items.php:17
0
+#: ../purchasing/po_receive_items.php:17
4
#: ../purchasing/supplier_payment.php:179
#: ../sales/customer_credit_invoice.php:89
#: ../sales/sales_order_entry.php:335
msgid "The entered date is invalid."
msgstr ""
#: ../purchasing/supplier_payment.php:179
#: ../sales/customer_credit_invoice.php:89
#: ../sales/sales_order_entry.php:335
msgid "The entered date is invalid."
msgstr ""
-#: ../admin/void_transaction.php:23
3
+#: ../admin/void_transaction.php:23
7
#: ../gl/accruals.php:38
#: ../gl/bank_transfer.php:114
#: ../gl/accruals.php:38
#: ../gl/bank_transfer.php:114
-#: ../gl/gl_bank.php:2
47
+#: ../gl/gl_bank.php:2
56
#: ../gl/gl_journal.php:160
#: ../gl/manage/revaluate_currencies.php:56
#: ../inventory/adjustments.php:114
#: ../gl/gl_journal.php:160
#: ../gl/manage/revaluate_currencies.php:56
#: ../inventory/adjustments.php:114
@@
-2583,15
+2616,15
@@
msgstr ""
msgid "The entered date is not in fiscal year."
msgstr ""
msgid "The entered date is not in fiscal year."
msgstr ""
-#: ../admin/void_transaction.php:24
0
+#: ../admin/void_transaction.php:24
4
msgid "The transaction number is expected to be numeric and greater than zero."
msgstr ""
msgid "The transaction number is expected to be numeric and greater than zero."
msgstr ""
-#: ../admin/void_transaction.php:2
57
+#: ../admin/void_transaction.php:2
61
msgid "The selected transaction has already been voided."
msgstr ""
msgid "The selected transaction has already been voided."
msgstr ""
-#: ../admin/void_transaction.php:27
0
+#: ../admin/void_transaction.php:27
4
msgid "Selected transaction has been voided."
msgstr ""
msgid "Selected transaction has been voided."
msgstr ""
@@
-3244,8
+3277,8
@@
msgid "The dimension reference must be entered."
msgstr ""
#: ../dimensions/dimension_entry.php:123
msgstr ""
#: ../dimensions/dimension_entry.php:123
-#: ../gl/bank_transfer.php:1
46
-#: ../gl/gl_bank.php:2
35
+#: ../gl/bank_transfer.php:1
55
+#: ../gl/gl_bank.php:2
44
#: ../gl/gl_journal.php:174
#: ../gl/manage/revaluate_currencies.php:69
#: ../inventory/adjustments.php:101
#: ../gl/gl_journal.php:174
#: ../gl/manage/revaluate_currencies.php:69
#: ../inventory/adjustments.php:101
@@
-3253,11
+3286,11
@@
msgstr ""
#: ../manufacturing/work_order_add_finished.php:84
#: ../manufacturing/work_order_entry.php:138
#: ../manufacturing/work_order_issue.php:98
#: ../manufacturing/work_order_add_finished.php:84
#: ../manufacturing/work_order_entry.php:138
#: ../manufacturing/work_order_issue.php:98
-#: ../purchasing/po_entry_items.php:35
3
-#: ../purchasing/po_receive_items.php:18
4
+#: ../purchasing/po_entry_items.php:35
6
+#: ../purchasing/po_receive_items.php:18
8
#: ../purchasing/supplier_credit.php:156
#: ../purchasing/supplier_invoice.php:154
#: ../purchasing/supplier_credit.php:156
#: ../purchasing/supplier_invoice.php:154
-#: ../purchasing/supplier_payment.php:
19
8
+#: ../purchasing/supplier_payment.php:
20
8
#: ../sales/credit_note_entry.php:149
#: ../sales/customer_credit_invoice.php:106
#: ../sales/customer_delivery.php:181
#: ../sales/credit_note_entry.php:149
#: ../sales/customer_credit_invoice.php:106
#: ../sales/customer_delivery.php:181
@@
-3274,7
+3307,7
@@
msgstr ""
#: ../dimensions/dimension_entry.php:138
#: ../manufacturing/work_order_entry.php:153
#: ../manufacturing/work_order_entry.php:233
#: ../dimensions/dimension_entry.php:138
#: ../manufacturing/work_order_entry.php:153
#: ../manufacturing/work_order_entry.php:233
-#: ../purchasing/po_entry_items.php:23
2
+#: ../purchasing/po_entry_items.php:23
5
msgid "The date entered is in an invalid format."
msgstr ""
msgid "The date entered is in an invalid format."
msgstr ""
@@
-3365,8
+3398,8
@@
msgstr ""
#: ../dimensions/dimension_entry.php:302
#: ../includes/ui/simple_crud_class.inc:225
#: ../purchasing/includes/ui/invoice_ui.inc:186
#: ../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:3
86
-#: ../purchasing/includes/ui/invoice_ui.inc:3
88
+#: ../purchasing/includes/ui/invoice_ui.inc:3
91
+#: ../purchasing/includes/ui/invoice_ui.inc:3
93
msgid "Add"
msgstr ""
msgid "Add"
msgstr ""
@@
-3383,7
+3416,7
@@
msgstr ""
#: ../gl/inquiry/gl_account_inquiry.php:128
#: ../gl/inquiry/gl_trial_balance.php:83
#: ../gl/manage/gl_quick_entries.php:241
#: ../gl/inquiry/gl_account_inquiry.php:128
#: ../gl/inquiry/gl_trial_balance.php:83
#: ../gl/manage/gl_quick_entries.php:241
-#: ../gl/manage/gl_quick_entries.php:33
4
+#: ../gl/manage/gl_quick_entries.php:33
3
#: ../includes/sysnames.inc:164
#: ../purchasing/includes/ui/invoice_ui.inc:245
#: ../purchasing/includes/ui/invoice_ui.inc:247
#: ../includes/sysnames.inc:164
#: ../purchasing/includes/ui/invoice_ui.inc:245
#: ../purchasing/includes/ui/invoice_ui.inc:247
@@
-3500,14
+3533,14
@@
msgstr ""
#: ../purchasing/includes/ui/invoice_ui.inc:92
#: ../purchasing/includes/ui/po_ui.inc:159
#: ../purchasing/includes/ui/po_ui.inc:164
#: ../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:2
7
1
+#: ../purchasing/supplier_payment.php:2
8
1
#: ../sales/customer_payments.php:258
msgid "Reference:"
msgstr ""
#: ../dimensions/inquiry/search_dimensions.php:75
#: ../includes/ui/allocation_cart.inc:284
#: ../sales/customer_payments.php:258
msgid "Reference:"
msgstr ""
#: ../dimensions/inquiry/search_dimensions.php:75
#: ../includes/ui/allocation_cart.inc:284
-#: ../includes/ui/ui_lists.inc:188
5
+#: ../includes/ui/ui_lists.inc:188
7
#: ../reporting/rep101.php:112
#: ../reporting/rep102.php:88
#: ../reporting/rep104.php:95
#: ../reporting/rep101.php:112
#: ../reporting/rep102.php:88
#: ../reporting/rep104.php:95
@@
-3589,7
+3622,7
@@
msgstr ""
#: ../sales/view/view_invoice.php:96
#: ../sales/inquiry/customer_allocation_inquiry.php:146
#: ../sales/inquiry/customer_inquiry.php:217
#: ../sales/view/view_invoice.php:96
#: ../sales/inquiry/customer_allocation_inquiry.php:146
#: ../sales/inquiry/customer_inquiry.php:217
-#: ../sales/includes/ui/sales_order_ui.inc:
596
+#: ../sales/includes/ui/sales_order_ui.inc:
600
#: ../themes/exclusive/renderer.php:289
#: ../themes/exclusive/renderer.php:383
msgid "Due Date"
#: ../themes/exclusive/renderer.php:289
#: ../themes/exclusive/renderer.php:383
msgid "Due Date"
@@
-3679,10
+3712,10
@@
msgstr ""
#: ../gl/inquiry/gl_trial_balance.php:51
#: ../gl/inquiry/profit_loss.php:174
#: ../gl/inquiry/profit_loss.php:176
#: ../gl/inquiry/gl_trial_balance.php:51
#: ../gl/inquiry/profit_loss.php:174
#: ../gl/inquiry/profit_loss.php:176
-#: ../gl/manage/gl_quick_entries.php:26
2
-#: ../gl/manage/gl_quick_entries.php:26
4
-#: ../gl/manage/gl_quick_entries.php:34
4
-#: ../gl/manage/gl_quick_entries.php:34
6
+#: ../gl/manage/gl_quick_entries.php:26
1
+#: ../gl/manage/gl_quick_entries.php:26
3
+#: ../gl/manage/gl_quick_entries.php:34
3
+#: ../gl/manage/gl_quick_entries.php:34
5
#: ../gl/view/accrual_trans.php:54
#: ../gl/view/accrual_trans.php:56
#: ../gl/view/gl_deposit_view.php:99
#: ../gl/view/accrual_trans.php:54
#: ../gl/view/accrual_trans.php:56
#: ../gl/view/gl_deposit_view.php:99
@@
-3837,10
+3870,10
@@
msgstr ""
#: ../gl/gl_budget.php:93
#: ../gl/inquiry/journal_inquiry.php:125
#: ../gl/inquiry/tax_inquiry.php:82
#: ../gl/gl_budget.php:93
#: ../gl/inquiry/journal_inquiry.php:125
#: ../gl/inquiry/tax_inquiry.php:82
-#: ../gl/manage/gl_quick_entries.php:26
2
-#: ../gl/manage/gl_quick_entries.php:26
4
-#: ../gl/manage/gl_quick_entries.php:26
6
-#: ../gl/manage/gl_quick_entries.php:3
40
+#: ../gl/manage/gl_quick_entries.php:26
1
+#: ../gl/manage/gl_quick_entries.php:26
3
+#: ../gl/manage/gl_quick_entries.php:26
5
+#: ../gl/manage/gl_quick_entries.php:3
39
#: ../gl/view/bank_transfer_view.php:70
#: ../gl/view/bank_transfer_view.php:80
#: ../gl/view/gl_deposit_view.php:67
#: ../gl/view/bank_transfer_view.php:70
#: ../gl/view/bank_transfer_view.php:80
#: ../gl/view/gl_deposit_view.php:67
@@
-4024,7
+4057,7
@@
msgstr ""
#: ../gl/bank_transfer.php:77
#: ../gl/bank_transfer.php:84
#: ../gl/bank_transfer.php:77
#: ../gl/bank_transfer.php:84
-#: ../purchasing/supplier_payment.php:2
8
4
+#: ../purchasing/supplier_payment.php:2
9
4
#: ../sales/customer_payments.php:274
msgid "Bank Charge:"
msgstr ""
#: ../sales/customer_payments.php:274
msgid "Bank Charge:"
msgstr ""
@@
-4034,21
+4067,26
@@
msgid "Enter Transfer"
msgstr ""
#: ../gl/bank_transfer.php:121
msgstr ""
#: ../gl/bank_transfer.php:121
-#: ../gl/bank_transfer.php:1
28
+#: ../gl/bank_transfer.php:1
37
#: ../purchasing/supplier_payment.php:130
#: ../purchasing/supplier_payment.php:136
msgid "The entered amount is invalid or less than zero."
msgstr ""
#: ../purchasing/supplier_payment.php:130
#: ../purchasing/supplier_payment.php:136
msgid "The entered amount is invalid or less than zero."
msgstr ""
-#: ../gl/bank_transfer.php:133
+#: ../gl/bank_transfer.php:130
+#, php-format
+msgid "The total bank amount exceeds allowed limit (%s) for source account."
+msgstr ""
+
+#: ../gl/bank_transfer.php:142
#: ../purchasing/supplier_payment.php:144
#: ../sales/customer_payments.php:131
msgid ""
"The Bank Charge Account has not been set in System and General GL Setup."
msgstr ""
#: ../purchasing/supplier_payment.php:144
#: ../sales/customer_payments.php:131
msgid ""
"The Bank Charge Account has not been set in System and General GL Setup."
msgstr ""
-#: ../gl/bank_transfer.php:1
39
-#: ../gl/gl_bank.php:2
29
+#: ../gl/bank_transfer.php:1
48
+#: ../gl/gl_bank.php:2
38
#: ../gl/gl_journal.php:166
#: ../gl/manage/revaluate_currencies.php:62
#: ../inventory/adjustments.php:94
#: ../gl/gl_journal.php:166
#: ../gl/manage/revaluate_currencies.php:62
#: ../inventory/adjustments.php:94
@@
-4056,8
+4094,8
@@
msgstr ""
#: ../manufacturing/work_order_add_finished.php:77
#: ../manufacturing/work_order_entry.php:131
#: ../manufacturing/work_order_issue.php:91
#: ../manufacturing/work_order_add_finished.php:77
#: ../manufacturing/work_order_entry.php:131
#: ../manufacturing/work_order_issue.php:91
-#: ../purchasing/po_receive_items.php:1
77
-#: ../purchasing/supplier_payment.php:
19
1
+#: ../purchasing/po_receive_items.php:1
81
+#: ../purchasing/supplier_payment.php:
20
1
#: ../sales/credit_note_entry.php:145
#: ../sales/customer_credit_invoice.php:100
#: ../sales/customer_delivery.php:175
#: ../sales/credit_note_entry.php:145
#: ../sales/customer_credit_invoice.php:100
#: ../sales/customer_delivery.php:175
@@
-4067,7
+4105,7
@@
msgstr ""
msgid "You must enter a reference."
msgstr ""
msgid "You must enter a reference."
msgstr ""
-#: ../gl/bank_transfer.php:1
53
+#: ../gl/bank_transfer.php:1
62
msgid "The source and destination bank accouts cannot be the same."
msgstr ""
msgid "The source and destination bank accouts cannot be the same."
msgstr ""
@@
-4134,35
+4172,41
@@
msgstr ""
msgid "The total bank amount cannot be 0."
msgstr ""
msgid "The total bank amount cannot be 0."
msgstr ""
-#: ../gl/gl_bank.php:241
+#: ../gl/gl_bank.php:231
+#: ../purchasing/supplier_payment.php:194
+#, php-format
+msgid "The total bank amount exceeds allowed limit (%s)."
+msgstr ""
+
+#: ../gl/gl_bank.php:250
msgid "The entered date for the payment is invalid."
msgstr ""
msgid "The entered date for the payment is invalid."
msgstr ""
-#: ../gl/gl_bank.php:2
53
+#: ../gl/gl_bank.php:2
62
msgid "You have to select customer and customer branch."
msgstr ""
msgid "You have to select customer and customer branch."
msgstr ""
-#: ../gl/gl_bank.php:2
57
+#: ../gl/gl_bank.php:2
66
msgid "You have to select supplier."
msgstr ""
msgid "You have to select supplier."
msgstr ""
-#: ../gl/gl_bank.php:3
03
+#: ../gl/gl_bank.php:3
12
msgid "The amount entered is not a valid number or is less than zero."
msgstr ""
msgid "The amount entered is not a valid number or is less than zero."
msgstr ""
-#: ../gl/gl_bank.php:3
75
+#: ../gl/gl_bank.php:3
84
msgid "Payment Items"
msgstr ""
msgid "Payment Items"
msgstr ""
-#: ../gl/gl_bank.php:3
75
+#: ../gl/gl_bank.php:3
84
msgid "Deposit Items"
msgstr ""
msgid "Deposit Items"
msgstr ""
-#: ../gl/gl_bank.php:3
83
+#: ../gl/gl_bank.php:3
92
msgid "Process Payment"
msgstr ""
msgid "Process Payment"
msgstr ""
-#: ../gl/gl_bank.php:3
83
+#: ../gl/gl_bank.php:3
92
msgid "Process Deposit"
msgstr ""
msgid "Process Deposit"
msgstr ""
@@
-4252,9
+4296,9
@@
msgstr ""
#: ../inventory/includes/item_adjustments_ui.inc:102
#: ../manufacturing/includes/manufacturing_ui.inc:178
#: ../purchasing/includes/ui/invoice_ui.inc:309
#: ../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:4
68
-#: ../purchasing/includes/ui/invoice_ui.inc:5
38
-#: ../purchasing/po_receive_items.php:
59
+#: ../purchasing/includes/ui/invoice_ui.inc:4
73
+#: ../purchasing/includes/ui/invoice_ui.inc:5
43
+#: ../purchasing/po_receive_items.php:
63
#: ../purchasing/view/view_po.php:140
#: ../purchasing/allocations/supplier_allocation_main.php:100
#: ../reporting/rep101.php:237
#: ../purchasing/view/view_po.php:140
#: ../purchasing/allocations/supplier_allocation_main.php:100
#: ../reporting/rep101.php:237
@@
-5213,8
+5257,6
@@
msgid "Selected quick entry line has been deleted"
msgstr ""
#: ../gl/manage/gl_quick_entries.php:171
msgstr ""
#: ../gl/manage/gl_quick_entries.php:171
-#: ../gl/manage/gl_quick_entries.php:245
-#: ../gl/manage/gl_quick_entries.php:246
msgid "Base Amount"
msgstr ""
msgid "Base Amount"
msgstr ""
@@
-5231,41
+5273,41
@@
msgstr ""
msgid "Yearly"
msgstr ""
msgid "Yearly"
msgstr ""
-#: ../gl/manage/gl_quick_entries.php:24
6
+#: ../gl/manage/gl_quick_entries.php:24
5
msgid "Base Amount Description"
msgstr ""
msgid "Base Amount Description"
msgstr ""
-#: ../gl/manage/gl_quick_entries.php:24
7
+#: ../gl/manage/gl_quick_entries.php:24
6
msgid "Default Base Amount"
msgstr ""
msgid "Default Base Amount"
msgstr ""
-#: ../gl/manage/gl_quick_entries.php:25
6
+#: ../gl/manage/gl_quick_entries.php:25
5
msgid "Quick Entry Lines"
msgstr ""
msgid "Quick Entry Lines"
msgstr ""
-#: ../gl/manage/gl_quick_entries.php:26
2
-#: ../gl/manage/gl_quick_entries.php:26
4
-#: ../gl/manage/gl_quick_entries.php:26
6
+#: ../gl/manage/gl_quick_entries.php:26
1
+#: ../gl/manage/gl_quick_entries.php:26
3
+#: ../gl/manage/gl_quick_entries.php:26
5
msgid "Post"
msgstr ""
msgid "Post"
msgstr ""
-#: ../gl/manage/gl_quick_entries.php:26
2
-#: ../gl/manage/gl_quick_entries.php:26
4
-#: ../gl/manage/gl_quick_entries.php:26
6
+#: ../gl/manage/gl_quick_entries.php:26
1
+#: ../gl/manage/gl_quick_entries.php:26
3
+#: ../gl/manage/gl_quick_entries.php:26
5
msgid "Account/Tax Type"
msgstr ""
msgid "Account/Tax Type"
msgstr ""
-#: ../gl/manage/gl_quick_entries.php:32
1
+#: ../gl/manage/gl_quick_entries.php:32
0
msgid "Posted"
msgstr ""
msgid "Posted"
msgstr ""
-#: ../gl/manage/gl_quick_entries.php:3
30
+#: ../gl/manage/gl_quick_entries.php:3
29
#: ../sales/customer_delivery.php:431
#: ../sales/customer_invoice.php:443
msgid "Tax Type"
msgstr ""
#: ../sales/customer_delivery.php:431
#: ../sales/customer_invoice.php:443
msgid "Tax Type"
msgstr ""
-#: ../gl/manage/gl_quick_entries.php:33
8
+#: ../gl/manage/gl_quick_entries.php:33
7
msgid "Part"
msgstr ""
msgid "Part"
msgstr ""
@@
-5520,7
+5562,7
@@
msgstr ""
#: ../inventory/includes/item_adjustments_ui.inc:88
#: ../inventory/includes/stock_transfers_ui.inc:80
#: ../manufacturing/includes/work_order_issue_ui.inc:59
#: ../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:51
4
+#: ../purchasing/includes/ui/invoice_ui.inc:51
9
#: ../purchasing/includes/ui/po_ui.inc:267
#: ../sales/includes/ui/sales_credit_ui.inc:198
#: ../sales/includes/ui/sales_order_ui.inc:204
#: ../purchasing/includes/ui/po_ui.inc:267
#: ../sales/includes/ui/sales_credit_ui.inc:198
#: ../sales/includes/ui/sales_order_ui.inc:204
@@
-5547,7
+5589,7
@@
msgstr ""
#: ../manufacturing/includes/work_order_issue_ui.inc:128
#: ../purchasing/includes/ui/po_ui.inc:435
#: ../sales/includes/ui/sales_credit_ui.inc:294
#: ../manufacturing/includes/work_order_issue_ui.inc:128
#: ../purchasing/includes/ui/po_ui.inc:435
#: ../sales/includes/ui/sales_credit_ui.inc:294
-#: ../sales/includes/ui/sales_order_ui.inc:5
59
+#: ../sales/includes/ui/sales_order_ui.inc:5
63
msgid "Confirm changes"
msgstr ""
msgid "Confirm changes"
msgstr ""
@@
-5559,7
+5601,7
@@
msgstr ""
#: ../manufacturing/includes/work_order_issue_ui.inc:130
#: ../purchasing/includes/ui/po_ui.inc:437
#: ../sales/includes/ui/sales_credit_ui.inc:296
#: ../manufacturing/includes/work_order_issue_ui.inc:130
#: ../purchasing/includes/ui/po_ui.inc:437
#: ../sales/includes/ui/sales_credit_ui.inc:296
-#: ../sales/includes/ui/sales_order_ui.inc:56
1
+#: ../sales/includes/ui/sales_order_ui.inc:56
5
msgid "Cancel changes"
msgstr ""
msgid "Cancel changes"
msgstr ""
@@
-5570,7
+5612,7
@@
msgstr ""
#: ../manufacturing/includes/work_order_issue_ui.inc:136
#: ../purchasing/includes/ui/po_ui.inc:443
#: ../sales/includes/ui/sales_credit_ui.inc:302
#: ../manufacturing/includes/work_order_issue_ui.inc:136
#: ../purchasing/includes/ui/po_ui.inc:443
#: ../sales/includes/ui/sales_credit_ui.inc:302
-#: ../sales/includes/ui/sales_order_ui.inc:5
67
+#: ../sales/includes/ui/sales_order_ui.inc:5
71
msgid "Add Item"
msgstr ""
msgid "Add Item"
msgstr ""
@@
-5580,7
+5622,7
@@
msgstr ""
#: ../manufacturing/includes/work_order_issue_ui.inc:137
#: ../purchasing/includes/ui/po_ui.inc:444
#: ../sales/includes/ui/sales_credit_ui.inc:303
#: ../manufacturing/includes/work_order_issue_ui.inc:137
#: ../purchasing/includes/ui/po_ui.inc:444
#: ../sales/includes/ui/sales_credit_ui.inc:303
-#: ../sales/includes/ui/sales_order_ui.inc:5
68
+#: ../sales/includes/ui/sales_order_ui.inc:5
72
msgid "Add new item to document"
msgstr ""
msgid "Add new item to document"
msgstr ""
@@
-6174,23
+6216,23
@@
msgstr ""
msgid "Requesting data..."
msgstr ""
msgid "Requesting data..."
msgstr ""
-#: ../includes/errors.inc:7
3
+#: ../includes/errors.inc:7
6
msgid "in file"
msgstr ""
msgid "in file"
msgstr ""
-#: ../includes/errors.inc:7
3
+#: ../includes/errors.inc:7
6
msgid "at line "
msgstr ""
msgid "at line "
msgstr ""
-#: ../includes/errors.inc:12
0
+#: ../includes/errors.inc:12
3
msgid "Debug mode database warning:"
msgstr ""
msgid "Debug mode database warning:"
msgstr ""
-#: ../includes/errors.inc:12
2
+#: ../includes/errors.inc:12
5
msgid "DATABASE ERROR :"
msgstr ""
msgid "DATABASE ERROR :"
msgstr ""
-#: ../includes/errors.inc:15
3
+#: ../includes/errors.inc:15
6
msgid ""
"The entered information is a duplicate. Please go back and enter different "
"values."
msgid ""
"The entered information is a duplicate. Please go back and enter different "
"values."
@@
-6200,78
+6242,86
@@
msgstr ""
msgid "This page is usable only with javascript enabled browsers."
msgstr ""
msgid "This page is usable only with javascript enabled browsers."
msgstr ""
-#: ../includes/packages.inc:29
4
+#: ../includes/packages.inc:29
5
msgid "Release file in repository is invalid, or public key is outdated."
msgstr ""
msgid "Release file in repository is invalid, or public key is outdated."
msgstr ""
-#: ../includes/packages.inc:31
0
+#: ../includes/packages.inc:31
1
msgid "Repository version does not match application version."
msgstr ""
msgid "Repository version does not match application version."
msgstr ""
-#: ../includes/packages.inc:32
4
+#: ../includes/packages.inc:32
5
#, php-format
msgid ""
"Security alert: broken index file in repository '%s'. Please inform "
"repository administrator about this issue."
msgstr ""
#, php-format
msgid ""
"Security alert: broken index file in repository '%s'. Please inform "
"repository administrator about this issue."
msgstr ""
-#: ../includes/packages.inc:35
7
+#: ../includes/packages.inc:35
8
#, php-format
msgid ""
"Security alert: broken package '%s' in repository. Please inform repository "
"administrator about this issue."
msgstr ""
#, php-format
msgid ""
"Security alert: broken package '%s' in repository. Please inform repository "
"administrator about this issue."
msgstr ""
-#: ../includes/packages.inc:61
2
-#: ../includes/packages.inc:66
3
+#: ../includes/packages.inc:61
3
+#: ../includes/packages.inc:66
4
#, php-format
msgid "Package '%s' not found."
msgstr ""
#, php-format
msgid "Package '%s' not found."
msgstr ""
+#: ../includes/sav.session.inc:39
#: ../includes/session.inc:39
msgid "Incorrect Password"
msgstr ""
#: ../includes/session.inc:39
msgid "Incorrect Password"
msgstr ""
+#: ../includes/sav.session.inc:40
#: ../includes/session.inc:40
msgid "The user and password combination is not valid for the system."
msgstr ""
#: ../includes/session.inc:40
msgid "The user and password combination is not valid for the system."
msgstr ""
+#: ../includes/sav.session.inc:42
#: ../includes/session.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 ""
#: ../includes/session.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 ""
+#: ../includes/sav.session.inc:43
#: ../includes/session.inc:43
msgid "Try again"
msgstr ""
#: ../includes/session.inc:43
msgid "Try again"
msgstr ""
+#: ../includes/sav.session.inc:58
#: ../includes/session.inc:62
msgid "Security settings have not been defined for your user account."
msgstr ""
#: ../includes/session.inc:62
msgid "Security settings have not been defined for your user account."
msgstr ""
+#: ../includes/sav.session.inc:59
#: ../includes/session.inc:63
msgid "Please contact your system administrator."
msgstr ""
#: ../includes/session.inc:63
msgid "Please contact your system administrator."
msgstr ""
+#: ../includes/sav.session.inc:60
#: ../includes/session.inc:64
msgid ""
"Please remove $security_groups and $security_headings arrays from config.php "
"file!"
msgstr ""
#: ../includes/session.inc:64
msgid ""
"Please remove $security_groups and $security_headings arrays from config.php "
"file!"
msgstr ""
-#: ../includes/session.inc:66
-msgid ""
-"Access to application has been blocked until database upgrade is completed "
-"by system administrator."
-msgstr ""
-
+#: ../includes/sav.session.inc:72
#: ../includes/session.inc:80
msgid ""
"The security settings on your account do not permit you to access this "
"function"
msgstr ""
#: ../includes/session.inc:80
msgid ""
"The security settings on your account do not permit you to access this "
"function"
msgstr ""
+#: ../includes/session.inc:66
+msgid ""
+"Access to application has been blocked until database upgrade is completed "
+"by system administrator."
+msgstr ""
+
#: ../includes/session.inc:89
msgid ""
"System is blocked after source upgrade until database is updated on System/"
#: ../includes/session.inc:89
msgid ""
"System is blocked after source upgrade until database is updated on System/"
@@
-6361,7
+6411,7
@@
msgid "Sales Order"
msgstr ""
#: ../includes/sysnames.inc:41
msgstr ""
#: ../includes/sysnames.inc:41
-#: ../sales/sales_order_entry.php:59
2
+#: ../sales/sales_order_entry.php:59
5
msgid "Sales Quotation"
msgstr ""
msgid "Sales Quotation"
msgstr ""
@@
-6983,23
+7033,26
@@
msgid ""
"trail record."
msgstr ""
"trail record."
msgstr ""
-#: ../includes/db/inventory_db.inc:227
-#, php-format
-msgid "Cost was %s changed to %s for item '%s'"
-msgstr ""
-
-#: ../includes/db/inventory_db.inc:285
+#: ../includes/db/inventory_db.inc:280
+#: ../includes/db/inventory_db.inc.old:285
msgid "Cost was "
msgstr ""
msgid "Cost was "
msgstr ""
-#: ../includes/db/inventory_db.inc:285
+#: ../includes/db/inventory_db.inc:280
+#: ../includes/db/inventory_db.inc.old:285
msgid " changed to "
msgstr ""
msgid " changed to "
msgstr ""
-#: ../includes/db/inventory_db.inc:285
+#: ../includes/db/inventory_db.inc:280
+#: ../includes/db/inventory_db.inc.old:285
msgid " for item "
msgstr ""
msgid " for item "
msgstr ""
+#: ../includes/db/inventory_db.inc.old:227
+#, php-format
+msgid "Cost was %s changed to %s for item '%s'"
+msgstr ""
+
#: ../includes/ui/allocation_cart.inc:263
#: ../purchasing/allocations/supplier_allocation_main.php:94
#: ../sales/allocations/customer_allocation_main.php:93
#: ../includes/ui/allocation_cart.inc:263
#: ../purchasing/allocations/supplier_allocation_main.php:94
#: ../sales/allocations/customer_allocation_main.php:93
@@
-7238,7
+7291,7
@@
msgid "Click Here to Pick up the date"
msgstr ""
#: ../includes/ui/ui_input.inc:904
msgstr ""
#: ../includes/ui/ui_input.inc:904
-#: ../includes/ui/ui_lists.inc:21
18
+#: ../includes/ui/ui_lists.inc:21
20
#: ../reporting/rep301.php:147
#: ../reporting/rep302.php:166
#: ../reporting/rep303.php:170
#: ../reporting/rep301.php:147
#: ../reporting/rep302.php:166
#: ../reporting/rep303.php:170
@@
-7320,97
+7373,97
@@
msgstr ""
msgid "Use Item Sales Accounts"
msgstr ""
msgid "Use Item Sales Accounts"
msgstr ""
-#: ../includes/ui/ui_lists.inc:190
2
-#: ../includes/ui/ui_lists.inc:19
19
-#: ../includes/ui/ui_lists.inc:193
6
+#: ../includes/ui/ui_lists.inc:190
4
+#: ../includes/ui/ui_lists.inc:19
21
+#: ../includes/ui/ui_lists.inc:193
8
msgid "All Types"
msgstr ""
msgid "All Types"
msgstr ""
-#: ../includes/ui/ui_lists.inc:190
3
+#: ../includes/ui/ui_lists.inc:190
5
#: ../sales/view/view_sales_order.php:126
msgid "Sales Invoices"
msgstr ""
#: ../sales/view/view_sales_order.php:126
msgid "Sales Invoices"
msgstr ""
-#: ../includes/ui/ui_lists.inc:190
4
-#: ../includes/ui/ui_lists.inc:192
1
-#: ../includes/ui/ui_lists.inc:19
39
+#: ../includes/ui/ui_lists.inc:190
6
+#: ../includes/ui/ui_lists.inc:192
3
+#: ../includes/ui/ui_lists.inc:19
41
msgid "Overdue Invoices"
msgstr ""
msgid "Overdue Invoices"
msgstr ""
-#: ../includes/ui/ui_lists.inc:190
5
-#: ../includes/ui/ui_lists.inc:192
2
-#: ../includes/ui/ui_lists.inc:194
0
+#: ../includes/ui/ui_lists.inc:190
7
+#: ../includes/ui/ui_lists.inc:192
4
+#: ../includes/ui/ui_lists.inc:194
2
msgid "Payments"
msgstr ""
msgid "Payments"
msgstr ""
-#: ../includes/ui/ui_lists.inc:190
6
-#: ../includes/ui/ui_lists.inc:192
3
-#: ../includes/ui/ui_lists.inc:194
1
+#: ../includes/ui/ui_lists.inc:190
8
+#: ../includes/ui/ui_lists.inc:192
5
+#: ../includes/ui/ui_lists.inc:194
3
#: ../sales/view/view_sales_order.php:157
msgid "Credit Notes"
msgstr ""
#: ../sales/view/view_sales_order.php:157
msgid "Credit Notes"
msgstr ""
-#: ../includes/ui/ui_lists.inc:190
7
+#: ../includes/ui/ui_lists.inc:190
9
#: ../sales/view/view_sales_order.php:92
msgid "Delivery Notes"
msgstr ""
#: ../sales/view/view_sales_order.php:92
msgid "Delivery Notes"
msgstr ""
-#: ../includes/ui/ui_lists.inc:192
0
-#: ../includes/ui/ui_lists.inc:19
38
+#: ../includes/ui/ui_lists.inc:192
2
+#: ../includes/ui/ui_lists.inc:19
40
msgid "Invoices"
msgstr ""
msgid "Invoices"
msgstr ""
-#: ../includes/ui/ui_lists.inc:192
4
-#: ../includes/ui/ui_lists.inc:194
2
+#: ../includes/ui/ui_lists.inc:192
6
+#: ../includes/ui/ui_lists.inc:194
4
msgid "Overdue Credit Notes"
msgstr ""
msgid "Overdue Credit Notes"
msgstr ""
-#: ../includes/ui/ui_lists.inc:193
7
+#: ../includes/ui/ui_lists.inc:193
9
msgid "GRNs"
msgstr ""
msgid "GRNs"
msgstr ""
-#: ../includes/ui/ui_lists.inc:195
5
+#: ../includes/ui/ui_lists.inc:195
7
msgid "Automatically put balance on back order"
msgstr ""
msgid "Automatically put balance on back order"
msgstr ""
-#: ../includes/ui/ui_lists.inc:195
6
+#: ../includes/ui/ui_lists.inc:195
8
msgid "Cancel any quantites not delivered"
msgstr ""
msgid "Cancel any quantites not delivered"
msgstr ""
-#: ../includes/ui/ui_lists.inc:197
3
+#: ../includes/ui/ui_lists.inc:197
5
msgid "Items Returned to Inventory Location"
msgstr ""
msgid "Items Returned to Inventory Location"
msgstr ""
-#: ../includes/ui/ui_lists.inc:197
4
+#: ../includes/ui/ui_lists.inc:197
6
msgid "Items Written Off"
msgstr ""
msgid "Items Written Off"
msgstr ""
-#: ../includes/ui/ui_lists.inc:214
4
+#: ../includes/ui/ui_lists.inc:214
6
msgid "New role"
msgstr ""
msgid "New role"
msgstr ""
-#: ../includes/ui/ui_lists.inc:220
2
+#: ../includes/ui/ui_lists.inc:220
4
msgid "No tags defined."
msgstr ""
msgid "No tags defined."
msgstr ""
-#: ../includes/ui/ui_lists.inc:220
2
+#: ../includes/ui/ui_lists.inc:220
4
msgid "No active tags defined."
msgstr ""
msgid "No active tags defined."
msgstr ""
-#: ../includes/ui/ui_lists.inc:224
0
+#: ../includes/ui/ui_lists.inc:224
2
#, php-format
msgid "Activated for '%s'"
msgstr ""
#, php-format
msgid "Activated for '%s'"
msgstr ""
-#: ../includes/ui/ui_lists.inc:224
3
+#: ../includes/ui/ui_lists.inc:224
5
msgid "Available and/or installed"
msgstr ""
msgid "Available and/or installed"
msgstr ""
-#: ../includes/ui/ui_lists.inc:231
3
+#: ../includes/ui/ui_lists.inc:231
5
msgid "Standard new company American COA (4 digit)"
msgstr ""
msgid "Standard new company American COA (4 digit)"
msgstr ""
-#: ../includes/ui/ui_lists.inc:231
5
+#: ../includes/ui/ui_lists.inc:231
7
msgid "Standard American COA (4 digit) with demo data"
msgstr ""
msgid "Standard American COA (4 digit) with demo data"
msgstr ""
@@
-7464,7
+7517,7
@@
msgid "No Quick Entry lines are defined."
msgstr ""
#: ../includes/ui/ui_view.inc:753
msgstr ""
#: ../includes/ui/ui_view.inc:753
-#: ../purchasing/includes/ui/invoice_ui.inc:4
46
+#: ../purchasing/includes/ui/invoice_ui.inc:4
51
msgid "and"
msgstr ""
msgid "and"
msgstr ""
@@
-7775,8
+7828,8
@@
msgstr ""
#: ../inventory/prices.php:133
#: ../inventory/purchasing_data.php:127
#: ../inventory/prices.php:133
#: ../inventory/purchasing_data.php:127
-#: ../purchasing/includes/ui/invoice_ui.inc:4
78
-#: ../purchasing/po_receive_items.php:
59
+#: ../purchasing/includes/ui/invoice_ui.inc:4
83
+#: ../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_grn.php:41
#: ../purchasing/view/view_po.php:45
#: ../reporting/rep104.php:109
@@
-7932,7
+7985,7
@@
msgstr ""
#: ../inventory/reorder_level.php:57
#: ../inventory/inquiry/stock_movements.php:77
#: ../inventory/inquiry/stock_status.php:69
#: ../inventory/reorder_level.php:57
#: ../inventory/inquiry/stock_movements.php:77
#: ../inventory/inquiry/stock_status.php:69
-#: ../sales/sales_order_entry.php:48
2
+#: ../sales/sales_order_entry.php:48
5
#: ../sales/includes/ui/sales_order_ui.inc:176
msgid "Quantity On Hand"
msgstr ""
#: ../sales/includes/ui/sales_order_ui.inc:176
msgid "Quantity On Hand"
msgstr ""
@@
-8013,7
+8066,7
@@
msgstr ""
#: ../inventory/includes/stock_transfers_ui.inc:60
#: ../manufacturing/includes/work_order_issue_ui.inc:33
#: ../purchasing/includes/ui/po_ui.inc:236
#: ../inventory/includes/stock_transfers_ui.inc:60
#: ../manufacturing/includes/work_order_issue_ui.inc:33
#: ../purchasing/includes/ui/po_ui.inc:236
-#: ../purchasing/po_receive_items.php:
58
+#: ../purchasing/po_receive_items.php:
62
#: ../purchasing/view/view_grn.php:40
#: ../purchasing/view/view_po.php:45
#: ../reporting/includes/doctext.inc:102
#: ../purchasing/view/view_grn.php:40
#: ../purchasing/view/view_po.php:45
#: ../reporting/includes/doctext.inc:102
@@
-8064,7
+8117,7
@@
msgstr ""
#: ../manufacturing/includes/manufacturing_ui.inc:157
#: ../manufacturing/includes/manufacturing_ui.inc:332
#: ../manufacturing/includes/work_order_issue_ui.inc:33
#: ../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:4
78
+#: ../purchasing/includes/ui/invoice_ui.inc:4
83
#: ../purchasing/includes/ui/po_ui.inc:236
#: ../purchasing/view/view_grn.php:40
#: ../purchasing/view/view_po.php:45
#: ../purchasing/includes/ui/po_ui.inc:236
#: ../purchasing/view/view_grn.php:40
#: ../purchasing/view/view_po.php:45
@@
-8160,7
+8213,7
@@
msgid "Show Movements"
msgstr ""
#: ../inventory/inquiry/stock_movements.php:61
msgstr ""
#: ../inventory/inquiry/stock_movements.php:61
-#: ../purchasing/includes/ui/invoice_ui.inc:4
47
+#: ../purchasing/includes/ui/invoice_ui.inc:4
52
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:57
#: ../purchasing/inquiry/supplier_inquiry.php:54
#: ../sales/inquiry/customer_allocation_inquiry.php:51
#: ../purchasing/inquiry/supplier_allocation_inquiry.php:57
#: ../purchasing/inquiry/supplier_inquiry.php:54
#: ../sales/inquiry/customer_allocation_inquiry.php:51
@@
-8249,7
+8302,7
@@
msgstr ""
#: ../inventory/view/view_transfer.php:56
#: ../manufacturing/view/wo_issue_view.php:77
#: ../manufacturing/manage/bom_edit.php:71
#: ../inventory/view/view_transfer.php:56
#: ../manufacturing/view/wo_issue_view.php:77
#: ../manufacturing/manage/bom_edit.php:71
-#: ../purchasing/po_receive_items.php:
58
+#: ../purchasing/po_receive_items.php:
62
#: ../sales/customer_credit_invoice.php:291
#: ../sales/customer_delivery.php:430
#: ../sales/customer_invoice.php:442
#: ../sales/customer_credit_invoice.php:291
#: ../sales/customer_delivery.php:430
#: ../sales/customer_invoice.php:442
@@
-8309,7
+8362,7
@@
msgid "Foreign Item Codes"
msgstr ""
#: ../inventory/manage/item_codes.php:23
msgstr ""
#: ../inventory/manage/item_codes.php:23
-#: ../sales/sales_order_entry.php:6
37
+#: ../sales/sales_order_entry.php:6
40
msgid "There are no inventory items defined in the system."
msgstr ""
msgid "There are no inventory items defined in the system."
msgstr ""
@@
-8378,7
+8431,7
@@
msgstr ""
#: ../sales/manage/credit_status.php:145
#: ../sales/manage/recurrent_invoices.php:147
#: ../taxes/item_tax_types.php:168
#: ../sales/manage/credit_status.php:145
#: ../sales/manage/recurrent_invoices.php:147
#: ../taxes/item_tax_types.php:168
-#: ../taxes/tax_groups.php:20
3
+#: ../taxes/tax_groups.php:20
4
#: ../taxes/tax_types.php:158
msgid "Description:"
msgstr ""
#: ../taxes/tax_types.php:158
msgid "Description:"
msgstr ""
@@
-8447,8
+8500,8
@@
msgstr ""
#: ../manufacturing/search_work_orders.php:163
#: ../manufacturing/view/wo_issue_view.php:44
#: ../manufacturing/view/wo_production_view.php:45
#: ../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:4
65
-#: ../purchasing/includes/ui/invoice_ui.inc:4
77
+#: ../purchasing/includes/ui/invoice_ui.inc:4
70
+#: ../purchasing/includes/ui/invoice_ui.inc:4
82
#: ../reporting/rep204.php:82
#: ../themes/exclusive/renderer.php:433
#: ../themes/exclusive/renderer.php:452
#: ../reporting/rep204.php:82
#: ../themes/exclusive/renderer.php:433
#: ../themes/exclusive/renderer.php:452
@@
-9500,6
+9553,11
@@
msgstr ""
msgid "Produced"
msgstr ""
msgid "Produced"
msgstr ""
+#: ../purchasing/includes/db/invoice_db.inc:593
+#: ../purchasing/includes/db/invoice_db.inc:595
+msgid "GRN Removal"
+msgstr ""
+
#: ../purchasing/includes/ui/grn_ui.inc:23
#: ../purchasing/includes/ui/po_ui.inc:319
#: ../sales/view/view_sales_order.php:73
#: ../purchasing/includes/ui/grn_ui.inc:23
#: ../purchasing/includes/ui/po_ui.inc:319
#: ../sales/view/view_sales_order.php:73
@@
-9592,7
+9650,7
@@
msgid "Reset"
msgstr ""
#: ../purchasing/includes/ui/invoice_ui.inc:189
msgstr ""
#: ../purchasing/includes/ui/invoice_ui.inc:189
-#: ../purchasing/po_receive_items.php:32
3
+#: ../purchasing/po_receive_items.php:32
7
msgid "Clear all GL entry fields"
msgstr ""
msgid "Clear all GL entry fields"
msgstr ""
@@
-9608,27
+9666,27
@@
msgstr ""
msgid "Quick Entry:"
msgstr ""
msgid "Quick Entry:"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:3
86
+#: ../purchasing/includes/ui/invoice_ui.inc:3
91
msgid "Add to Invoice"
msgstr ""
msgid "Add to Invoice"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:3
88
+#: ../purchasing/includes/ui/invoice_ui.inc:3
93
msgid "Add to Credit Note"
msgstr ""
msgid "Add to Credit Note"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:39
0
+#: ../purchasing/includes/ui/invoice_ui.inc:39
5
#: ../sales/customer_invoice.php:497
msgid "Remove"
msgstr ""
#: ../sales/customer_invoice.php:497
msgid "Remove"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:39
0
-#: ../purchasing/includes/ui/invoice_ui.inc:4
25
+#: ../purchasing/includes/ui/invoice_ui.inc:39
5
+#: ../purchasing/includes/ui/invoice_ui.inc:4
30
msgid ""
"WARNING! Be careful with removal. The operation is executed immediately and "
"cannot be undone !!!"
msgstr ""
msgid ""
"WARNING! Be careful with removal. The operation is executed immediately and "
"cannot be undone !!!"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:39
2
+#: ../purchasing/includes/ui/invoice_ui.inc:39
7
#, php-format
msgid ""
"You are about to remove all yet non-invoiced items from delivery line #%d. "
#, php-format
msgid ""
"You are about to remove all yet non-invoiced items from delivery line #%d. "
@@
-9636,96
+9694,96
@@
msgid ""
"continue ?"
msgstr ""
"continue ?"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:42
3
+#: ../purchasing/includes/ui/invoice_ui.inc:42
8
msgid "Items Received Yet to be Invoiced"
msgstr ""
msgid "Items Received Yet to be Invoiced"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:4
28
+#: ../purchasing/includes/ui/invoice_ui.inc:4
33
msgid "Delivery Item Selected For Adding To A Supplier Credit Note"
msgstr ""
msgid "Delivery Item Selected For Adding To A Supplier Credit Note"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:43
3
+#: ../purchasing/includes/ui/invoice_ui.inc:43
8
msgid "Received Items Charged on this Invoice"
msgstr ""
msgid "Received Items Charged on this Invoice"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:4
35
+#: ../purchasing/includes/ui/invoice_ui.inc:4
40
msgid "Received Items Credited on this Note"
msgstr ""
msgid "Received Items Credited on this Note"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:4
45
+#: ../purchasing/includes/ui/invoice_ui.inc:4
50
msgid "Received between"
msgstr ""
msgid "Received between"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:4
56
+#: ../purchasing/includes/ui/invoice_ui.inc:4
61
msgid "Add All Items"
msgstr ""
msgid "Add All Items"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:4
65
-#: ../purchasing/includes/ui/invoice_ui.inc:4
77
+#: ../purchasing/includes/ui/invoice_ui.inc:4
70
+#: ../purchasing/includes/ui/invoice_ui.inc:4
82
#: ../sales/inquiry/sales_orders_view.php:150
msgid "Delivery"
msgstr ""
#: ../sales/inquiry/sales_orders_view.php:150
msgid "Delivery"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:4
65
+#: ../purchasing/includes/ui/invoice_ui.inc:4
70
msgid "Sequence #"
msgstr ""
msgid "Sequence #"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:4
65
+#: ../purchasing/includes/ui/invoice_ui.inc:4
70
msgid "P.O."
msgstr ""
msgid "P.O."
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:4
66
+#: ../purchasing/includes/ui/invoice_ui.inc:4
71
msgid "Received On"
msgstr ""
msgid "Received On"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:4
66
+#: ../purchasing/includes/ui/invoice_ui.inc:4
71
#: ../purchasing/view/view_po.php:46
msgid "Quantity Received"
msgstr ""
#: ../purchasing/view/view_po.php:46
msgid "Quantity Received"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:4
66
+#: ../purchasing/includes/ui/invoice_ui.inc:4
71
#: ../purchasing/view/view_grn.php:41
#: ../purchasing/view/view_po.php:46
msgid "Quantity Invoiced"
msgstr ""
#: ../purchasing/view/view_grn.php:41
#: ../purchasing/view/view_po.php:46
msgid "Quantity Invoiced"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:4
67
+#: ../purchasing/includes/ui/invoice_ui.inc:4
72
msgid "Qty Yet To Invoice"
msgstr ""
msgid "Qty Yet To Invoice"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:4
67
+#: ../purchasing/includes/ui/invoice_ui.inc:4
72
#: ../purchasing/includes/ui/po_ui.inc:238
#: ../sales/includes/ui/sales_order_ui.inc:143
msgid "Price after Tax"
msgstr ""
#: ../purchasing/includes/ui/po_ui.inc:238
#: ../sales/includes/ui/sales_order_ui.inc:143
msgid "Price after Tax"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:4
67
+#: ../purchasing/includes/ui/invoice_ui.inc:4
72
#: ../purchasing/includes/ui/po_ui.inc:238
#: ../sales/includes/ui/sales_order_ui.inc:143
msgid "Price before Tax"
msgstr ""
#: ../purchasing/includes/ui/po_ui.inc:238
#: ../sales/includes/ui/sales_order_ui.inc:143
msgid "Price before Tax"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:47
3
+#: ../purchasing/includes/ui/invoice_ui.inc:47
8
msgid "Qty Yet To Credit"
msgstr ""
msgid "Qty Yet To Credit"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:4
78
+#: ../purchasing/includes/ui/invoice_ui.inc:4
83
msgid "Line Value"
msgstr ""
msgid "Line Value"
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:5
45
+#: ../purchasing/includes/ui/invoice_ui.inc:5
50
msgid ""
"There are no outstanding items received from this supplier that have not "
"been invoiced by them."
msgstr ""
msgid ""
"There are no outstanding items received from this supplier that have not "
"been invoiced by them."
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:5
48
+#: ../purchasing/includes/ui/invoice_ui.inc:5
53
msgid ""
"There are no received items for the selected supplier that have been "
"invoiced."
msgstr ""
msgid ""
"There are no received items for the selected supplier that have been "
"invoiced."
msgstr ""
-#: ../purchasing/includes/ui/invoice_ui.inc:5
49
+#: ../purchasing/includes/ui/invoice_ui.inc:5
54
msgid "Credits can only be applied to invoiced items."
msgstr ""
msgid "Credits can only be applied to invoiced items."
msgstr ""
@@
-9734,17
+9792,17
@@
msgid "Supplier Currency:"
msgstr ""
#: ../purchasing/includes/ui/po_ui.inc:178
msgstr ""
#: ../purchasing/includes/ui/po_ui.inc:178
-#: ../sales/sales_order_entry.php:66
1
+#: ../sales/sales_order_entry.php:66
4
msgid "Order Date:"
msgstr ""
#: ../purchasing/includes/ui/po_ui.inc:179
msgid "Order Date:"
msgstr ""
#: ../purchasing/includes/ui/po_ui.inc:179
-#: ../sales/sales_order_entry.php:6
48
+#: ../sales/sales_order_entry.php:6
51
msgid "Delivery Date:"
msgstr ""
#: ../purchasing/includes/ui/po_ui.inc:179
msgid "Delivery Date:"
msgstr ""
#: ../purchasing/includes/ui/po_ui.inc:179
-#: ../sales/sales_order_entry.php:64
2
+#: ../sales/sales_order_entry.php:64
5
msgid "Invoice Date:"
msgstr ""
msgid "Invoice Date:"
msgstr ""
@@
-9775,12
+9833,12
@@
msgid "Order Items"
msgstr ""
#: ../purchasing/includes/ui/po_ui.inc:237
msgstr ""
#: ../purchasing/includes/ui/po_ui.inc:237
-#: ../purchasing/po_receive_items.php:
58
+#: ../purchasing/po_receive_items.php:
62
msgid "Received"
msgstr ""
#: ../purchasing/includes/ui/po_ui.inc:238
msgid "Received"
msgstr ""
#: ../purchasing/includes/ui/po_ui.inc:238
-#: ../sales/includes/ui/sales_order_ui.inc:61
1
+#: ../sales/includes/ui/sales_order_ui.inc:61
5
msgid "Required Delivery Date"
msgstr ""
msgid "Required Delivery Date"
msgstr ""
@@
-9791,7
+9849,7
@@
msgid "Line Total"
msgstr ""
#: ../purchasing/includes/ui/po_ui.inc:289
msgstr ""
#: ../purchasing/includes/ui/po_ui.inc:289
-#: ../purchasing/po_receive_items.php:11
0
+#: ../purchasing/po_receive_items.php:11
4
#: ../reporting/includes/doctext.inc:147
#: ../sales/customer_credit_invoice.php:333
#: ../sales/customer_delivery.php:499
#: ../reporting/includes/doctext.inc:147
#: ../sales/customer_credit_invoice.php:333
#: ../sales/customer_delivery.php:499
@@
-9804,7
+9862,7
@@
msgid "Sub-total"
msgstr ""
#: ../purchasing/includes/ui/po_ui.inc:298
msgstr ""
#: ../purchasing/includes/ui/po_ui.inc:298
-#: ../purchasing/po_receive_items.php:1
18
+#: ../purchasing/po_receive_items.php:1
22
#: ../purchasing/view/view_grn.php:79
#: ../purchasing/view/view_po.php:93
#: ../sales/customer_delivery.php:506
#: ../purchasing/view/view_grn.php:79
#: ../purchasing/view/view_po.php:93
#: ../sales/customer_delivery.php:506
@@
-9880,178
+9938,183
@@
msgstr ""
msgid "&View this GRN"
msgstr ""
msgid "&View this GRN"
msgstr ""
-#: ../purchasing/po_entry_items.php:104
-#: ../purchasing/po_receive_items.php:38
+#: ../purchasing/po_entry_items.php:102
+#: ../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
msgid "Entry purchase &invoice for this receival"
msgstr ""
msgid "Entry purchase &invoice for this receival"
msgstr ""
-#: ../purchasing/po_entry_items.php:10
6
-#: ../purchasing/po_entry_items.php:13
0
+#: ../purchasing/po_entry_items.php:10
9
+#: ../purchasing/po_entry_items.php:13
3
#: ../purchasing/supplier_credit.php:49
#: ../purchasing/supplier_invoice.php:52
msgid "Add an Attachment"
msgstr ""
#: ../purchasing/supplier_credit.php:49
#: ../purchasing/supplier_invoice.php:52
msgid "Add an Attachment"
msgstr ""
-#: ../purchasing/po_entry_items.php:1
09
+#: ../purchasing/po_entry_items.php:1
12
msgid "Enter &Another GRN"
msgstr ""
msgid "Enter &Another GRN"
msgstr ""
-#: ../purchasing/po_entry_items.php:1
18
+#: ../purchasing/po_entry_items.php:1
21
msgid "Direct Purchase Invoice has been entered"
msgstr ""
msgid "Direct Purchase Invoice has been entered"
msgstr ""
-#: ../purchasing/po_entry_items.php:12
0
+#: ../purchasing/po_entry_items.php:12
3
msgid "&View this Invoice"
msgstr ""
msgid "&View this Invoice"
msgstr ""
-#: ../purchasing/po_entry_items.php:12
5
+#: ../purchasing/po_entry_items.php:12
8
#: ../purchasing/supplier_invoice.php:46
msgid "View the GL Journal Entries for this Invoice"
msgstr ""
#: ../purchasing/supplier_invoice.php:46
msgid "View the GL Journal Entries for this Invoice"
msgstr ""
-#: ../purchasing/po_entry_items.php:1
27
+#: ../purchasing/po_entry_items.php:1
30
#: ../purchasing/supplier_invoice.php:48
msgid "Entry supplier &payment for this invoice"
msgstr ""
#: ../purchasing/supplier_invoice.php:48
msgid "Entry supplier &payment for this invoice"
msgstr ""
-#: ../purchasing/po_entry_items.php:13
3
+#: ../purchasing/po_entry_items.php:13
6
msgid "Enter &Another Direct Invoice"
msgstr ""
msgid "Enter &Another Direct Invoice"
msgstr ""
-#: ../purchasing/po_entry_items.php:16
5
+#: ../purchasing/po_entry_items.php:16
8
msgid ""
"This item cannot be deleted because some of it has already been received."
msgstr ""
msgid ""
"This item cannot be deleted because some of it has already been received."
msgstr ""
-#: ../purchasing/po_entry_items.php:18
0
+#: ../purchasing/po_entry_items.php:18
3
msgid ""
"This order cannot be cancelled because some of it has already been received."
msgstr ""
msgid ""
"This order cannot be cancelled because some of it has already been received."
msgstr ""
-#: ../purchasing/po_entry_items.php:18
1
+#: ../purchasing/po_entry_items.php:18
4
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 ""
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:19
6
+#: ../purchasing/po_entry_items.php:19
9
msgid "This purchase order has been cancelled."
msgstr ""
msgid "This purchase order has been cancelled."
msgstr ""
-#: ../purchasing/po_entry_items.php:
198
+#: ../purchasing/po_entry_items.php:
201
msgid "Enter a new purchase order"
msgstr ""
msgid "Enter a new purchase order"
msgstr ""
-#: ../purchasing/po_entry_items.php:21
0
-#: ../sales/sales_order_entry.php:45
4
+#: ../purchasing/po_entry_items.php:21
3
+#: ../sales/sales_order_entry.php:45
7
msgid "Item description cannot be empty."
msgstr ""
msgid "Item description cannot be empty."
msgstr ""
-#: ../purchasing/po_entry_items.php:22
0
+#: ../purchasing/po_entry_items.php:22
3
msgid "The quantity of the order item must be numeric and not less than "
msgstr ""
msgid "The quantity of the order item must be numeric and not less than "
msgstr ""
-#: ../purchasing/po_entry_items.php:2
27
+#: ../purchasing/po_entry_items.php:2
30
msgid "The price entered must be numeric and not less than zero."
msgstr ""
msgid "The price entered must be numeric and not less than zero."
msgstr ""
-#: ../purchasing/po_entry_items.php:25
1
+#: ../purchasing/po_entry_items.php:25
4
msgid ""
"You are attempting to make the quantity ordered a quantity less than has "
"already been invoiced or received. This is prohibited."
msgstr ""
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:25
2
+#: ../purchasing/po_entry_items.php:25
5
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 ""
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:28
0
+#: ../purchasing/po_entry_items.php:28
3
msgid "The selected item is already on this order."
msgstr ""
msgid "The selected item is already on this order."
msgstr ""
-#: ../purchasing/po_entry_items.php:3
07
+#: ../purchasing/po_entry_items.php:3
10
msgid ""
"The selected item does not exist or it is a kit part and therefore cannot be "
"purchased."
msgstr ""
msgid ""
"The selected item does not exist or it is a kit part and therefore cannot be "
"purchased."
msgstr ""
-#: ../purchasing/po_entry_items.php:32
3
+#: ../purchasing/po_entry_items.php:32
6
#: ../purchasing/supplier_invoice.php:352
#: ../purchasing/supplier_payment.php:118
msgid "There is no supplier selected."
msgstr ""
#: ../purchasing/supplier_invoice.php:352
#: ../purchasing/supplier_payment.php:118
msgid "There is no supplier selected."
msgstr ""
-#: ../purchasing/po_entry_items.php:33
0
+#: ../purchasing/po_entry_items.php:33
3
msgid "The entered order date is invalid."
msgstr ""
msgid "The entered order date is invalid."
msgstr ""
-#: ../purchasing/po_entry_items.php:3
37
+#: ../purchasing/po_entry_items.php:3
40
msgid "The entered due date is invalid."
msgstr ""
msgid "The entered due date is invalid."
msgstr ""
-#: ../purchasing/po_entry_items.php:34
6
+#: ../purchasing/po_entry_items.php:34
9
msgid "There is no reference entered for this purchase order."
msgstr ""
msgid "There is no reference entered for this purchase order."
msgstr ""
-#: ../purchasing/po_entry_items.php:36
1
+#: ../purchasing/po_entry_items.php:36
4
#: ../purchasing/supplier_invoice.php:161
msgid "You must enter a supplier's invoice reference."
msgstr ""
#: ../purchasing/supplier_invoice.php:161
msgid "You must enter a supplier's invoice reference."
msgstr ""
-#: ../purchasing/po_entry_items.php:3
67
+#: ../purchasing/po_entry_items.php:3
70
msgid "There is no delivery address specified."
msgstr ""
msgid "There is no delivery address specified."
msgstr ""
-#: ../purchasing/po_entry_items.php:37
3
+#: ../purchasing/po_entry_items.php:37
6
msgid "There is no location specified to move any items into."
msgstr ""
msgid "There is no location specified to move any items into."
msgstr ""
-#: ../purchasing/po_entry_items.php:38
0
+#: ../purchasing/po_entry_items.php:38
3
msgid ""
"The order cannot be placed because there are no lines entered on this order."
msgstr ""
msgid ""
"The order cannot be placed because there are no lines entered on this order."
msgstr ""
-#: ../purchasing/po_entry_items.php:50
6
-#: ../sales/sales_order_entry.php:66
5
+#: ../purchasing/po_entry_items.php:50
9
+#: ../sales/sales_order_entry.php:66
8
msgid "Place Order"
msgstr ""
msgid "Place Order"
msgstr ""
-#: ../purchasing/po_entry_items.php:5
07
+#: ../purchasing/po_entry_items.php:5
10
msgid "Update Order"
msgstr ""
msgid "Update Order"
msgstr ""
-#: ../purchasing/po_entry_items.php:5
08
-#: ../sales/sales_order_entry.php:66
4
+#: ../purchasing/po_entry_items.php:5
11
+#: ../sales/sales_order_entry.php:66
7
msgid "Cancel Order"
msgstr ""
msgid "Cancel Order"
msgstr ""
-#: ../purchasing/po_entry_items.php:51
0
+#: ../purchasing/po_entry_items.php:51
3
msgid "Process GRN"
msgstr ""
msgid "Process GRN"
msgstr ""
-#: ../purchasing/po_entry_items.php:51
1
+#: ../purchasing/po_entry_items.php:51
4
msgid "Update GRN"
msgstr ""
msgid "Update GRN"
msgstr ""
-#: ../purchasing/po_entry_items.php:51
2
+#: ../purchasing/po_entry_items.php:51
5
msgid "Cancel GRN"
msgstr ""
msgid "Cancel GRN"
msgstr ""
-#: ../purchasing/po_entry_items.php:51
5
+#: ../purchasing/po_entry_items.php:51
8
#: ../sales/customer_invoice.php:557
msgid "Process Invoice"
msgstr ""
#: ../sales/customer_invoice.php:557
msgid "Process Invoice"
msgstr ""
-#: ../purchasing/po_entry_items.php:51
6
+#: ../purchasing/po_entry_items.php:51
9
msgid "Update Invoice"
msgstr ""
msgid "Update Invoice"
msgstr ""
-#: ../purchasing/po_entry_items.php:5
17
-#: ../sales/sales_order_entry.php:64
5
+#: ../purchasing/po_entry_items.php:5
20
+#: ../sales/sales_order_entry.php:64
8
msgid "Cancel Invoice"
msgstr ""
msgid "Cancel Invoice"
msgstr ""
@@
-10067,23
+10130,23
@@
msgstr ""
msgid "&View this Delivery"
msgstr ""
msgid "&View this Delivery"
msgstr ""
-#: ../purchasing/po_receive_items.php:4
0
+#: ../purchasing/po_receive_items.php:4
4
msgid "Select a different &purchase order for receiving items against"
msgstr ""
msgid "Select a different &purchase order for receiving items against"
msgstr ""
-#: ../purchasing/po_receive_items.php:
49
+#: ../purchasing/po_receive_items.php:
53
msgid ""
"This page can only be opened if a purchase order has been selected. Please "
"select a purchase order first."
msgstr ""
msgid ""
"This page can only be opened if a purchase order has been selected. Please "
"select a purchase order first."
msgstr ""
-#: ../purchasing/po_receive_items.php:
58
+#: ../purchasing/po_receive_items.php:
62
#: ../reporting/rep105.php:112
#: ../sales/customer_delivery.php:430
msgid "Ordered"
msgstr ""
#: ../reporting/rep105.php:112
#: ../sales/customer_delivery.php:430
msgid "Ordered"
msgstr ""
-#: ../purchasing/po_receive_items.php:
59
+#: ../purchasing/po_receive_items.php:
63
#: ../reporting/rep101.php:131
#: ../reporting/rep105.php:113
#: ../reporting/rep105.php:167
#: ../reporting/rep101.php:131
#: ../reporting/rep105.php:113
#: ../reporting/rep105.php:167
@@
-10092,30
+10155,30
@@
msgstr ""
msgid "Outstanding"
msgstr ""
msgid "Outstanding"
msgstr ""
-#: ../purchasing/po_receive_items.php:
59
+#: ../purchasing/po_receive_items.php:
63
#: ../sales/customer_delivery.php:431
msgid "This Delivery"
msgstr ""
#: ../sales/customer_delivery.php:431
msgid "This Delivery"
msgstr ""
-#: ../purchasing/po_receive_items.php:16
4
-#: ../purchasing/po_receive_items.php:21
3
+#: ../purchasing/po_receive_items.php:16
8
+#: ../purchasing/po_receive_items.php:21
7
msgid ""
"There is nothing to process. Please enter valid quantities greater than zero."
msgstr ""
msgid ""
"There is nothing to process. Please enter valid quantities greater than zero."
msgstr ""
-#: ../purchasing/po_receive_items.php:2
18
+#: ../purchasing/po_receive_items.php:2
22
msgid ""
"Entered quantities cannot be greater than the quantity entered on the "
"purchase order including the allowed over-receive percentage"
msgstr ""
msgid ""
"Entered quantities cannot be greater than the quantity entered on the "
"purchase order including the allowed over-receive percentage"
msgstr ""
-#: ../purchasing/po_receive_items.php:22
0
+#: ../purchasing/po_receive_items.php:22
4
msgid ""
"Modify the ordered items on the purchase order if you wish to increase the "
"quantities."
msgstr ""
msgid ""
"Modify the ordered items on the purchase order if you wish to increase the "
"quantities."
msgstr ""
-#: ../purchasing/po_receive_items.php:2
38
+#: ../purchasing/po_receive_items.php:2
42
msgid ""
"This order has been changed or invoiced since this delivery was started to "
"be actioned. Processing halted. To enter a delivery against this purchase "
msgid ""
"This order has been changed or invoiced since this delivery was started to "
"be actioned. Processing halted. To enter a delivery against this purchase "
@@
-10123,19
+10186,19
@@
msgid ""
"by the other user."
msgstr ""
"by the other user."
msgstr ""
-#: ../purchasing/po_receive_items.php:24
1
+#: ../purchasing/po_receive_items.php:24
5
msgid "Select a different purchase order for receiving goods against"
msgstr ""
msgid "Select a different purchase order for receiving goods against"
msgstr ""
-#: ../purchasing/po_receive_items.php:24
4
+#: ../purchasing/po_receive_items.php:24
8
msgid "Re-Read the updated purchase order for receiving goods against"
msgstr ""
msgid "Re-Read the updated purchase order for receiving goods against"
msgstr ""
-#: ../purchasing/po_receive_items.php:3
18
+#: ../purchasing/po_receive_items.php:3
22
msgid "Items to Receive"
msgstr ""
msgid "Items to Receive"
msgstr ""
-#: ../purchasing/po_receive_items.php:32
3
+#: ../purchasing/po_receive_items.php:32
7
msgid "Process Receive Items"
msgstr ""
msgid "Process Receive Items"
msgstr ""
@@
-10332,33
+10395,33
@@
msgid ""
"positive values."
msgstr ""
"positive values."
msgstr ""
-#: ../purchasing/supplier_payment.php:2
6
3
+#: ../purchasing/supplier_payment.php:2
7
3
msgid "Payment To:"
msgstr ""
msgid "Payment To:"
msgstr ""
-#: ../purchasing/supplier_payment.php:2
6
7
+#: ../purchasing/supplier_payment.php:2
7
7
msgid "From Bank Account:"
msgstr ""
msgid "From Bank Account:"
msgstr ""
-#: ../purchasing/supplier_payment.php:2
7
3
+#: ../purchasing/supplier_payment.php:2
8
3
#: ../purchasing/view/view_supp_payment.php:55
msgid "Date Paid"
msgstr ""
#: ../purchasing/view/view_supp_payment.php:55
msgid "Date Paid"
msgstr ""
-#: ../purchasing/supplier_payment.php:
29
6
+#: ../purchasing/supplier_payment.php:
30
6
#: ../sales/customer_payments.php:287
msgid "Amount of Discount:"
msgstr ""
#: ../sales/customer_payments.php:287
msgid "Amount of Discount:"
msgstr ""
-#: ../purchasing/supplier_payment.php:
29
7
+#: ../purchasing/supplier_payment.php:
30
7
msgid "Amount of Payment:"
msgstr ""
msgid "Amount of Payment:"
msgstr ""
-#: ../purchasing/supplier_payment.php:3
0
3
+#: ../purchasing/supplier_payment.php:3
1
3
msgid "The amount and discount are in the bank account's currency."
msgstr ""
msgid "The amount and discount are in the bank account's currency."
msgstr ""
-#: ../purchasing/supplier_payment.php:3
0
6
+#: ../purchasing/supplier_payment.php:3
1
6
msgid "Enter Payment"
msgstr ""
msgid "Enter Payment"
msgstr ""
@@
-11520,7
+11583,7
@@
msgid "Rate"
msgstr ""
#: ../reporting/rep709.php:108
msgstr ""
#: ../reporting/rep709.php:108
-#: ../taxes/tax_groups.php:21
3
+#: ../taxes/tax_groups.php:21
4
msgid "Tax"
msgstr ""
msgid "Tax"
msgstr ""
@@
-11937,7
+12000,7
@@
msgstr ""
#: ../reporting/includes/doctext.inc:34
#: ../sales/view/view_sales_order.php:68
#: ../sales/inquiry/sales_orders_view.php:278
#: ../reporting/includes/doctext.inc:34
#: ../sales/view/view_sales_order.php:68
#: ../sales/inquiry/sales_orders_view.php:278
-#: ../sales/includes/ui/sales_order_ui.inc:6
06
+#: ../sales/includes/ui/sales_order_ui.inc:6
10
msgid "Valid until"
msgstr ""
msgid "Valid until"
msgstr ""
@@
-12168,19
+12231,19
@@
msgstr ""
msgid "Report Period"
msgstr ""
msgid "Report Period"
msgstr ""
-#: ../reporting/includes/pdf_report.inc:9
77
+#: ../reporting/includes/pdf_report.inc:9
80
msgid "You have no email contact defined for this type of document"
msgstr ""
msgid "You have no email contact defined for this type of document"
msgstr ""
-#: ../reporting/includes/pdf_report.inc:10
19
+#: ../reporting/includes/pdf_report.inc:10
22
msgid "Sending document by email failed"
msgstr ""
msgid "Sending document by email failed"
msgstr ""
-#: ../reporting/includes/pdf_report.inc:102
2
+#: ../reporting/includes/pdf_report.inc:102
5
msgid "has been sent by email to destination."
msgstr ""
msgid "has been sent by email to destination."
msgstr ""
-#: ../reporting/includes/pdf_report.inc:105
2
+#: ../reporting/includes/pdf_report.inc:105
5
msgid "Report has been sent to network printer "
msgstr ""
msgid "Report has been sent to network printer "
msgstr ""
@@
-12349,7
+12412,7
@@
msgid "Modifying Customer Credit Note #%d"
msgstr ""
#: ../sales/credit_note_entry.php:51
msgstr ""
#: ../sales/credit_note_entry.php:51
-#: ../sales/sales_order_entry.php:6
39
+#: ../sales/sales_order_entry.php:6
42
msgid ""
"There are no customers, or there are no customers with branches. Please "
"define customers and customer branches."
msgid ""
"There are no customers, or there are no customers with branches. Please "
"define customers and customer branches."
@@
-12638,7
+12701,7
@@
msgid "There are no item quantities on this delivery note."
msgstr ""
#: ../sales/customer_delivery.php:290
msgstr ""
#: ../sales/customer_delivery.php:290
-#: ../sales/sales_order_entry.php:48
0
+#: ../sales/sales_order_entry.php:48
3
#: ../sales/includes/ui/sales_order_ui.inc:245
msgid ""
"The delivery cannot be processed because there is an insufficient quantity "
#: ../sales/includes/ui/sales_order_ui.inc:245
msgid ""
"The delivery cannot be processed because there is an insufficient quantity "
@@
-12713,7
+12776,7
@@
msgstr ""
#: ../sales/customer_delivery.php:524
#: ../sales/customer_invoice.php:558
#: ../sales/customer_delivery.php:524
#: ../sales/customer_invoice.php:558
-#: ../sales/sales_order_entry.php:6
87
+#: ../sales/sales_order_entry.php:6
90
msgid "Check entered data and save document"
msgstr ""
msgid "Check entered data and save document"
msgstr ""
@@
-13107,138
+13170,138
@@
msgstr ""
msgid "You need to define a cash account for your Sales Point."
msgstr ""
msgid "You need to define a cash account for your Sales Point."
msgstr ""
-#: ../sales/sales_order_entry.php:4
59
+#: ../sales/sales_order_entry.php:4
62
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 ""
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:46
3
-msgid "Price for item must be entered and can not be less than 0"
+#: ../sales/sales_order_entry.php:46
6
+msgid "Price for i
nventory i
tem must be entered and can not be less than 0"
msgstr ""
msgstr ""
-#: ../sales/sales_order_entry.php:47
0
+#: ../sales/sales_order_entry.php:47
3
msgid ""
"You attempting to make the quantity ordered a quantity less than has already "
"been delivered. The quantity delivered cannot be modified retrospectively."
msgstr ""
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:51
0
+#: ../sales/sales_order_entry.php:51
3
msgid ""
"This item cannot be deleted because some of it has already been delivered."
msgstr ""
msgid ""
"This item cannot be deleted because some of it has already been delivered."
msgstr ""
-#: ../sales/sales_order_entry.php:5
39
+#: ../sales/sales_order_entry.php:5
42
msgid "Direct delivery entry has been cancelled as requested."
msgstr ""
msgid "Direct delivery entry has been cancelled as requested."
msgstr ""
-#: ../sales/sales_order_entry.php:54
0
+#: ../sales/sales_order_entry.php:54
3
msgid "Enter a New Sales Delivery"
msgstr ""
msgid "Enter a New Sales Delivery"
msgstr ""
-#: ../sales/sales_order_entry.php:54
3
+#: ../sales/sales_order_entry.php:54
6
msgid "Direct invoice entry has been cancelled as requested."
msgstr ""
msgid "Direct invoice entry has been cancelled as requested."
msgstr ""
-#: ../sales/sales_order_entry.php:54
4
+#: ../sales/sales_order_entry.php:54
7
msgid "Enter a New Sales Invoice"
msgstr ""
msgid "Enter a New Sales Invoice"
msgstr ""
-#: ../sales/sales_order_entry.php:5
49
+#: ../sales/sales_order_entry.php:5
52
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 ""
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:55
4
+#: ../sales/sales_order_entry.php:55
7
msgid "This sales quotation has been cancelled as requested."
msgstr ""
msgid "This sales quotation has been cancelled as requested."
msgstr ""
-#: ../sales/sales_order_entry.php:55
5
+#: ../sales/sales_order_entry.php:55
8
msgid "Enter a New Sales Quotation"
msgstr ""
msgid "Enter a New Sales Quotation"
msgstr ""
-#: ../sales/sales_order_entry.php:5
59
+#: ../sales/sales_order_entry.php:5
62
msgid "This sales order has been cancelled as requested."
msgstr ""
msgid "This sales order has been cancelled as requested."
msgstr ""
-#: ../sales/sales_order_entry.php:56
0
+#: ../sales/sales_order_entry.php:56
3
msgid "Enter a New Sales Order"
msgstr ""
msgid "Enter a New Sales Order"
msgstr ""
-#: ../sales/sales_order_entry.php:64
3
+#: ../sales/sales_order_entry.php:64
6
msgid "Sales Invoice Items"
msgstr ""
msgid "Sales Invoice Items"
msgstr ""
-#: ../sales/sales_order_entry.php:64
4
+#: ../sales/sales_order_entry.php:64
7
msgid "Enter Delivery Details and Confirm Invoice"
msgstr ""
msgid "Enter Delivery Details and Confirm Invoice"
msgstr ""
-#: ../sales/sales_order_entry.php:64
6
+#: ../sales/sales_order_entry.php:64
9
msgid "Place Invoice"
msgstr ""
msgid "Place Invoice"
msgstr ""
-#: ../sales/sales_order_entry.php:6
49
+#: ../sales/sales_order_entry.php:6
52
msgid "Delivery Note Items"
msgstr ""
msgid "Delivery Note Items"
msgstr ""
-#: ../sales/sales_order_entry.php:65
0
+#: ../sales/sales_order_entry.php:65
3
msgid "Enter Delivery Details and Confirm Dispatch"
msgstr ""
msgid "Enter Delivery Details and Confirm Dispatch"
msgstr ""
-#: ../sales/sales_order_entry.php:65
1
+#: ../sales/sales_order_entry.php:65
4
msgid "Cancel Delivery"
msgstr ""
msgid "Cancel Delivery"
msgstr ""
-#: ../sales/sales_order_entry.php:65
2
+#: ../sales/sales_order_entry.php:65
5
msgid "Place Delivery"
msgstr ""
msgid "Place Delivery"
msgstr ""
-#: ../sales/sales_order_entry.php:65
4
+#: ../sales/sales_order_entry.php:65
7
msgid "Quotation Date:"
msgstr ""
msgid "Quotation Date:"
msgstr ""
-#: ../sales/sales_order_entry.php:65
5
+#: ../sales/sales_order_entry.php:65
8
msgid "Sales Quotation Items"
msgstr ""
msgid "Sales Quotation Items"
msgstr ""
-#: ../sales/sales_order_entry.php:65
6
+#: ../sales/sales_order_entry.php:65
9
msgid "Enter Delivery Details and Confirm Quotation"
msgstr ""
msgid "Enter Delivery Details and Confirm Quotation"
msgstr ""
-#: ../sales/sales_order_entry.php:6
57
+#: ../sales/sales_order_entry.php:6
60
msgid "Cancel Quotation"
msgstr ""
msgid "Cancel Quotation"
msgstr ""
-#: ../sales/sales_order_entry.php:6
58
+#: ../sales/sales_order_entry.php:6
61
msgid "Place Quotation"
msgstr ""
msgid "Place Quotation"
msgstr ""
-#: ../sales/sales_order_entry.php:6
59
+#: ../sales/sales_order_entry.php:6
62
msgid "Commit Quotations Changes"
msgstr ""
msgid "Commit Quotations Changes"
msgstr ""
-#: ../sales/sales_order_entry.php:66
2
+#: ../sales/sales_order_entry.php:66
5
msgid "Sales Order Items"
msgstr ""
msgid "Sales Order Items"
msgstr ""
-#: ../sales/sales_order_entry.php:66
3
+#: ../sales/sales_order_entry.php:66
6
msgid "Enter Delivery Details and Confirm Order"
msgstr ""
msgid "Enter Delivery Details and Confirm Order"
msgstr ""
-#: ../sales/sales_order_entry.php:66
6
+#: ../sales/sales_order_entry.php:66
9
msgid "Commit Order Changes"
msgstr ""
msgid "Commit Order Changes"
msgstr ""
-#: ../sales/sales_order_entry.php:6
88
+#: ../sales/sales_order_entry.php:6
91
msgid "You are about to void this Document.\\nDo you want to continue?"
msgstr ""
msgid "You are about to void this Document.\\nDo you want to continue?"
msgstr ""
-#: ../sales/sales_order_entry.php:69
1
+#: ../sales/sales_order_entry.php:69
4
msgid "Validate changes and update document"
msgstr ""
msgid "Validate changes and update document"
msgstr ""
-#: ../sales/sales_order_entry.php:69
5
+#: ../sales/sales_order_entry.php:69
8
msgid ""
"Cancels document entry or removes sales order when editing an old document"
msgstr ""
msgid ""
"Cancels document entry or removes sales order when editing an old document"
msgstr ""
@@
-14166,7
+14229,7
@@
msgid "Customer Currency:"
msgstr ""
#: ../sales/includes/ui/sales_credit_ui.inc:112
msgstr ""
#: ../sales/includes/ui/sales_credit_ui.inc:112
-#: ../sales/includes/ui/sales_order_ui.inc:6
39
+#: ../sales/includes/ui/sales_order_ui.inc:6
43
msgid "Shipping Company:"
msgstr ""
msgid "Shipping Company:"
msgstr ""
@@
-14210,72
+14273,72
@@
msgstr ""
msgid "Date of order receive"
msgstr ""
msgid "Date of order receive"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:58
5
+#: ../sales/includes/ui/sales_order_ui.inc:58
9
msgid "Cash payment"
msgstr ""
msgid "Cash payment"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:5
88
-#: ../sales/includes/ui/sales_order_ui.inc:6
17
+#: ../sales/includes/ui/sales_order_ui.inc:5
92
+#: ../sales/includes/ui/sales_order_ui.inc:6
21
msgid "Deliver from Location:"
msgstr ""
msgid "Deliver from Location:"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:5
89
+#: ../sales/includes/ui/sales_order_ui.inc:5
93
msgid "Cash account:"
msgstr ""
msgid "Cash account:"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:59
5
+#: ../sales/includes/ui/sales_order_ui.inc:59
9
msgid "Delivery Details"
msgstr ""
msgid "Delivery Details"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:60
0
+#: ../sales/includes/ui/sales_order_ui.inc:60
4
msgid "Invoice Delivery Details"
msgstr ""
msgid "Invoice Delivery Details"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:60
1
+#: ../sales/includes/ui/sales_order_ui.inc:60
5
msgid "Invoice before"
msgstr ""
msgid "Invoice before"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:60
5
+#: ../sales/includes/ui/sales_order_ui.inc:60
9
msgid "Quotation Delivery Details"
msgstr ""
msgid "Quotation Delivery Details"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:61
0
+#: ../sales/includes/ui/sales_order_ui.inc:61
4
msgid "Order Delivery Details"
msgstr ""
msgid "Order Delivery Details"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:62
3
+#: ../sales/includes/ui/sales_order_ui.inc:62
7
msgid "Enter requested day of delivery"
msgstr ""
msgid "Enter requested day of delivery"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:62
4
+#: ../sales/includes/ui/sales_order_ui.inc:62
8
msgid "Enter Valid until Date"
msgstr ""
msgid "Enter Valid until Date"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:62
5
+#: ../sales/includes/ui/sales_order_ui.inc:62
9
msgid "Deliver To:"
msgstr ""
msgid "Deliver To:"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:6
26
+#: ../sales/includes/ui/sales_order_ui.inc:6
30
msgid "Additional identifier for delivery e.g. name of receiving person"
msgstr ""
msgid "Additional identifier for delivery e.g. name of receiving person"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:6
29
+#: ../sales/includes/ui/sales_order_ui.inc:6
33
msgid "Delivery address. Default is address of customer branch"
msgstr ""
msgid "Delivery address. Default is address of customer branch"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:63
3
+#: ../sales/includes/ui/sales_order_ui.inc:63
7
msgid "Contact Phone Number:"
msgstr ""
msgid "Contact Phone Number:"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:63
4
+#: ../sales/includes/ui/sales_order_ui.inc:63
8
msgid "Phone number of ordering person. Defaults to branch phone number"
msgstr ""
msgid "Phone number of ordering person. Defaults to branch phone number"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:63
5
+#: ../sales/includes/ui/sales_order_ui.inc:63
9
msgid "Customer Reference:"
msgstr ""
msgid "Customer Reference:"
msgstr ""
-#: ../sales/includes/ui/sales_order_ui.inc:6
36
+#: ../sales/includes/ui/sales_order_ui.inc:6
40
msgid "Customer reference number for this order (if any)"
msgstr ""
msgid "Customer reference number for this order (if any)"
msgstr ""
@@
-14365,15
+14428,15
@@
msgstr ""
msgid "Shipping Tax"
msgstr ""
msgid "Shipping Tax"
msgstr ""
-#: ../taxes/tax_groups.php:20
4
+#: ../taxes/tax_groups.php:20
5
msgid "Tax applied to Shipping:"
msgstr ""
msgid "Tax applied to Shipping:"
msgstr ""
-#: ../taxes/tax_groups.php:20
8
+#: ../taxes/tax_groups.php:20
9
msgid "Select the taxes that are included in this group."
msgstr ""
msgid "Select the taxes that are included in this group."
msgstr ""
-#: ../taxes/tax_groups.php:21
3
+#: ../taxes/tax_groups.php:21
4
msgid "Rate (%)"
msgstr ""
msgid "Rate (%)"
msgstr ""
@@
-14440,19
+14503,19
@@
msgstr ""
msgid "Purchasing GL Account:"
msgstr ""
msgid "Purchasing GL Account:"
msgstr ""
-#: ../themes/default/renderer.php:
1
7
+#: ../themes/default/renderer.php:
2
7
#: ../themes/exclusive/renderer.php:19
msgid "Main Menu"
msgstr ""
#: ../themes/exclusive/renderer.php:19
msgid "Main Menu"
msgstr ""
-#: ../themes/default/renderer.php:
4
3
-#: ../themes/default/renderer.php:
6
6
+#: ../themes/default/renderer.php:
5
3
+#: ../themes/default/renderer.php:
7
6
#: ../themes/exclusive/renderer.php:43
#: ../themes/exclusive/renderer.php:50
msgid "Help"
msgstr ""
#: ../themes/exclusive/renderer.php:43
#: ../themes/exclusive/renderer.php:50
msgid "Help"
msgstr ""
-#: ../themes/default/renderer.php:
6
1
+#: ../themes/default/renderer.php:
7
1
#: ../themes/exclusive/renderer.php:46
msgid "Preferences"
msgstr ""
#: ../themes/exclusive/renderer.php:46
msgid "Preferences"
msgstr ""
projects / fa-stable.git / blobdiff