X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=lang%2Fnew_language_template%2FLC_MESSAGES%2Fempty.po;h=2d37b0bf6d4c1c09c3843baaf63c26132a1cc464;hb=47ec8984593ac1d72e3eb6300a8475b012044e21;hp=464084e2c62e7ec9a8f2e408e533cc4ec959158a;hpb=da0be927fc95cb45856769b1c86de79d9435980c;p=fa-stable.git diff --git a/lang/new_language_template/LC_MESSAGES/empty.po b/lang/new_language_template/LC_MESSAGES/empty.po index 464084e2..2d37b0bf 100644 --- a/lang/new_language_template/LC_MESSAGES/empty.po +++ b/lang/new_language_template/LC_MESSAGES/empty.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-05 14:17+0200\n" +"POT-Creation-Date: 2014-06-07 23:23+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,12 +21,12 @@ msgstr "" msgid "Main Menu" msgstr "" -#: frontaccounting.php:75 access/logout.php:18 themes/default/renderer.php:70 +#: frontaccounting.php:75 access/logout.php:21 themes/default/renderer.php:70 #: themes/default/renderer.php:83 msgid "Logout" msgstr "" -#: access/login.php:13 +#: access/login.php:13 access/password_reset.php:13 msgid "Restricted access" msgstr "" @@ -38,52 +38,75 @@ msgstr "" msgid "Please login here" msgstr "" -#: access/login.php:36 +#: access/login.php:33 +msgid "or" +msgstr "" + +#: access/login.php:33 +msgid "request new password" +msgstr "" + +#: access/login.php:39 msgid "Too many failed login attempts.
Please wait a while or try later." msgstr "" -#: access/login.php:49 access/login.php:80 +#: access/login.php:52 access/login.php:83 msgid "Authorization timeout" msgstr "" -#: access/login.php:49 access/login.php:87 +#: access/login.php:52 access/login.php:90 msgid "Login" msgstr "" -#: access/login.php:87 admin/inst_upgrade.php:137 +#: access/login.php:90 access/password_reset.php:61 admin/inst_upgrade.php:137 msgid "Version" msgstr "" -#: access/login.php:90 +#: access/login.php:93 msgid "User name" msgstr "" -#: access/login.php:94 admin/users.php:191 +#: access/login.php:97 admin/users.php:191 msgid "Password:" msgstr "" -#: access/login.php:104 access/login.php:111 admin/create_coy.php:253 +#: access/login.php:107 access/login.php:114 access/password_reset.php:70 +#: access/password_reset.php:77 admin/create_coy.php:253 #: admin/create_coy.php:336 msgid "Company" msgstr "" -#: access/login.php:118 +#: access/login.php:121 msgid "Login -->" msgstr "" -#: access/login.php:149 admin/display_prefs.php:112 -#: themes/default/renderer.php:129 +#: access/login.php:152 access/password_reset.php:108 +#: admin/display_prefs.php:112 themes/default/renderer.php:129 msgid "Theme:" msgstr "" -#: access/logout.php:29 +#: access/logout.php:32 msgid "Thank you for using" msgstr "" -#: access/logout.php:40 +#: access/logout.php:43 msgid "Click here to Login Again." msgstr "" +#: access/password_reset.php:31 access/password_reset.php:61 +msgid "Password reset" +msgstr "" + +#: access/password_reset.php:63 reporting/rep103.php:277 +#: reporting/rep106.php:88 reporting/rep205.php:195 +#: reporting/includes/header2.inc:110 sales/manage/sales_people.php:99 +msgid "Email" +msgstr "" + +#: access/password_reset.php:83 +msgid "Send password -->" +msgstr "" + #: admin/attachments.php:74 msgid "Attach Documents" msgstr "" @@ -96,19 +119,19 @@ msgstr "" msgid "Select attachment file." msgstr "" -#: admin/attachments.php:125 +#: admin/attachments.php:128 msgid "Attachment has been inserted." msgstr "" -#: admin/attachments.php:131 +#: admin/attachments.php:134 msgid "Attachment has been updated." msgstr "" -#: admin/attachments.php:146 +#: admin/attachments.php:149 msgid "Attachment has been deleted." msgstr "" -#: admin/attachments.php:164 admin/view_print_transaction.php:72 +#: admin/attachments.php:167 admin/view_print_transaction.php:72 #: admin/void_transaction.php:157 gl/inquiry/journal_inquiry.php:47 #: inventory/includes/item_adjustments_ui.inc:47 #: manufacturing/work_order_add_finished.php:203 @@ -120,7 +143,7 @@ msgstr "" msgid "Type:" msgstr "" -#: admin/attachments.php:180 admin/create_coy.php:277 +#: admin/attachments.php:183 admin/create_coy.php:277 #: admin/crm_categories.php:115 admin/fiscalyears.php:164 #: admin/inst_lang.php:100 admin/payment_terms.php:142 admin/printers.php:96 #: admin/shipping_companies.php:106 admin/tags.php:140 admin/users.php:144 @@ -149,7 +172,7 @@ msgstr "" #: sales/manage/recurrent_invoices.php:130 sales/manage/sales_areas.php:103 #: sales/manage/sales_groups.php:99 sales/manage/sales_people.php:119 #: sales/manage/sales_points.php:99 sales/manage/sales_types.php:121 -#: sales/inquiry/customer_inquiry.php:198 +#: sales/inquiry/customer_inquiry.php:192 #: sales/inquiry/sales_deliveries_view.php:154 #: sales/inquiry/sales_orders_view.php:128 #: sales/includes/ui/sales_credit_ui.inc:197 @@ -158,15 +181,15 @@ msgstr "" msgid "Edit" msgstr "" -#: admin/attachments.php:185 gl/inquiry/journal_inquiry.php:135 +#: admin/attachments.php:188 gl/inquiry/journal_inquiry.php:135 msgid "View" msgstr "" -#: admin/attachments.php:190 +#: admin/attachments.php:193 msgid "Download" msgstr "" -#: admin/attachments.php:195 admin/create_coy.php:278 +#: admin/attachments.php:198 admin/create_coy.php:278 #: admin/crm_categories.php:119 admin/fiscalyears.php:166 #: admin/inst_chart.php:80 admin/inst_lang.php:109 admin/inst_module.php:143 #: admin/inst_theme.php:102 admin/payment_terms.php:143 admin/printers.php:97 @@ -199,12 +222,12 @@ msgstr "" msgid "Delete" msgstr "" -#: admin/attachments.php:202 admin/view_print_transaction.php:126 +#: admin/attachments.php:205 admin/view_print_transaction.php:126 #: admin/void_transaction.php:181 dimensions/inquiry/search_dimensions.php:127 #: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:234 #: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126 #: gl/inquiry/journal_inquiry.php:127 gl/inquiry/journal_inquiry.php:140 -#: includes/ui/allocation_cart.inc:263 +#: includes/ui/allocation_cart.inc:288 includes/ui/mk.allocation_cart.inc:288 #: inventory/inquiry/stock_movements.php:82 #: manufacturing/search_work_orders.php:159 #: manufacturing/includes/manufacturing_ui.inc:157 @@ -227,12 +250,12 @@ msgstr "" #: sales/allocations/customer_allocation_main.php:94 #: sales/view/view_sales_order.php:96 sales/view/view_sales_order.php:129 #: sales/view/view_sales_order.php:161 -#: sales/inquiry/customer_allocation_inquiry.php:144 -#: sales/inquiry/customer_inquiry.php:225 +#: sales/inquiry/customer_allocation_inquiry.php:145 +#: sales/inquiry/customer_inquiry.php:218 msgid "#" msgstr "" -#: admin/attachments.php:203 admin/attachments.php:247 +#: admin/attachments.php:206 admin/attachments.php:250 #: admin/crm_categories.php:97 admin/inst_upgrade.php:137 #: admin/payment_terms.php:127 admin/printers.php:84 #: admin/print_profiles.php:148 gl/inquiry/tax_inquiry.php:82 @@ -257,27 +280,27 @@ msgstr "" msgid "Description" msgstr "" -#: admin/attachments.php:204 admin/backups.php:63 admin/backups.php:149 +#: admin/attachments.php:207 admin/backups.php:63 admin/backups.php:149 msgid "Filename" msgstr "" -#: admin/attachments.php:205 +#: admin/attachments.php:208 msgid "Size" msgstr "" -#: admin/attachments.php:206 +#: admin/attachments.php:209 msgid "Filetype" msgstr "" -#: admin/attachments.php:207 +#: admin/attachments.php:210 msgid "Date Uploaded" msgstr "" -#: admin/attachments.php:241 admin/attachments.php:246 +#: admin/attachments.php:244 admin/attachments.php:249 msgid "Transaction #" msgstr "" -#: admin/attachments.php:248 +#: admin/attachments.php:251 msgid "Attached File" msgstr "" @@ -317,7 +340,7 @@ msgstr "" #: gl/manage/gl_account_classes.php:127 gl/manage/gl_quick_entries.php:230 #: includes/system_tests.inc:38 includes/system_tests.inc:113 #: includes/system_tests.inc:126 includes/ui/ui_lists.inc:1675 -#: purchasing/manage/suppliers.php:120 reporting/rep101.php:114 +#: purchasing/manage/suppliers.php:121 reporting/rep101.php:114 #: reporting/rep102.php:114 reporting/rep102.php:116 reporting/rep104.php:105 #: reporting/rep106.php:75 reporting/rep114.php:74 reporting/rep201.php:106 #: reporting/rep202.php:118 reporting/rep202.php:120 reporting/rep203.php:89 @@ -501,7 +524,7 @@ msgstr "" #: admin/company_preferences.php:165 admin/shipping_companies.php:142 #: includes/ui/contacts_view.inc:109 inventory/manage/locations.php:202 -#: sales/manage/customers.php:231 sales/includes/ui/sales_order_ui.inc:633 +#: sales/manage/customers.php:234 sales/includes/ui/sales_order_ui.inc:633 msgid "Address:" msgstr "" @@ -510,13 +533,13 @@ msgid "Domicile:" msgstr "" #: admin/company_preferences.php:168 admin/shipping_companies.php:138 -#: purchasing/manage/suppliers.php:129 sales/manage/customer_branches.php:260 +#: purchasing/manage/suppliers.php:130 sales/manage/customer_branches.php:260 msgid "Phone Number:" msgstr "" #: admin/company_preferences.php:169 includes/ui/contacts_view.inc:104 -#: purchasing/manage/suppliers.php:159 sales/manage/customer_branches.php:262 -#: sales/manage/customers.php:254 +#: purchasing/manage/suppliers.php:160 sales/manage/customer_branches.php:262 +#: sales/manage/customers.php:258 msgid "Fax Number:" msgstr "" @@ -533,7 +556,7 @@ msgid "Official Company Number:" msgstr "" #: admin/company_preferences.php:175 purchasing/manage/suppliers.php:94 -#: sales/manage/customers.php:233 +#: sales/manage/customers.php:236 msgid "GSTNo:" msgstr "" @@ -629,7 +652,7 @@ msgstr "" #: admin/forms_setup.php:61 admin/gl_setup.php:226 admin/inst_chart.php:74 #: admin/inst_lang.php:103 admin/inst_module.php:137 admin/inst_module.php:155 #: admin/inst_module.php:198 admin/inst_theme.php:96 -#: dimensions/dimension_entry.php:293 gl/gl_bank.php:408 gl/gl_budget.php:135 +#: dimensions/dimension_entry.php:293 gl/gl_bank.php:414 gl/gl_budget.php:135 #: gl/manage/gl_quick_entries.php:60 gl/includes/ui/gl_bank_ui.inc:277 #: gl/includes/ui/gl_journal_ui.inc:221 includes/ui/db_pager_view.inc:174 #: includes/ui/simple_crud_class.inc:56 includes/ui/simple_crud_class.inc:227 @@ -643,7 +666,7 @@ msgstr "" #: purchasing/includes/ui/po_ui.inc:296 purchasing/includes/ui/po_ui.inc:439 #: purchasing/po_receive_items.php:334 sales/credit_note_entry.php:284 #: sales/customer_credit_invoice.php:380 sales/customer_delivery.php:533 -#: sales/customer_invoice.php:582 sales/inquiry/sales_orders_view.php:323 +#: sales/customer_invoice.php:591 sales/inquiry/sales_orders_view.php:323 #: sales/includes/ui/sales_credit_ui.inc:293 #: sales/includes/ui/sales_order_ui.inc:243 #: sales/includes/ui/sales_order_ui.inc:560 @@ -767,7 +790,7 @@ msgstr "" #: gl/manage/gl_account_classes.php:127 gl/manage/gl_quick_entries.php:230 #: includes/system_tests.inc:38 includes/system_tests.inc:113 #: includes/system_tests.inc:126 includes/ui/ui_lists.inc:1676 -#: purchasing/manage/suppliers.php:120 reporting/rep101.php:113 +#: purchasing/manage/suppliers.php:121 reporting/rep101.php:113 #: reporting/rep102.php:113 reporting/rep102.php:115 reporting/rep104.php:107 #: reporting/rep106.php:77 reporting/rep114.php:76 reporting/rep201.php:105 #: reporting/rep202.php:117 reporting/rep202.php:119 reporting/rep203.php:88 @@ -799,7 +822,8 @@ msgstr "" #: admin/create_coy.php:344 admin/inst_chart.php:68 admin/inst_chart.php:70 #: admin/inst_lang.php:87 admin/inst_lang.php:90 admin/inst_module.php:126 #: admin/inst_theme.php:91 admin/inst_theme.php:93 admin/inst_upgrade.php:149 -#: gl/manage/gl_account_types.php:190 includes/ui/allocation_cart.inc:286 +#: gl/manage/gl_account_types.php:190 includes/ui/allocation_cart.inc:314 +#: includes/ui/mk.allocation_cart.inc:314 msgid "None" msgstr "" @@ -1241,7 +1265,7 @@ msgstr "" msgid "Payable Account:" msgstr "" -#: admin/gl_setup.php:195 purchasing/manage/suppliers.php:126 +#: admin/gl_setup.php:195 purchasing/manage/suppliers.php:127 msgid "Purchase Discount Account:" msgstr "" @@ -1321,7 +1345,7 @@ msgstr "" msgid "Available" msgstr "" -#: admin/inst_chart.php:50 admin/inst_lang.php:35 admin/inst_lang.php:218 +#: admin/inst_chart.php:50 admin/inst_lang.php:35 admin/inst_lang.php:220 msgid "Encoding" msgstr "" @@ -1366,7 +1390,7 @@ msgstr "" msgid "Name" msgstr "" -#: admin/inst_lang.php:35 admin/inst_lang.php:220 +#: admin/inst_lang.php:35 admin/inst_lang.php:222 msgid "Right To Left" msgstr "" @@ -1415,23 +1439,23 @@ msgid "" "install this language manually, uninstall standard language package first." msgstr "" -#: admin/inst_lang.php:216 +#: admin/inst_lang.php:218 msgid "Language Code" msgstr "" -#: admin/inst_lang.php:217 +#: admin/inst_lang.php:219 msgid "Language Name" msgstr "" -#: admin/inst_lang.php:221 +#: admin/inst_lang.php:223 msgid "Default Language" msgstr "" -#: admin/inst_lang.php:223 admin/inst_lang.php:224 +#: admin/inst_lang.php:225 admin/inst_lang.php:226 msgid "Language File" msgstr "" -#: admin/inst_lang.php:227 +#: admin/inst_lang.php:229 msgid "Select your language files from your local harddisk." msgstr "" @@ -1614,8 +1638,8 @@ msgstr "" #: reporting/rep710.php:86 reporting/reports_main.php:327 #: reporting/reports_main.php:491 reporting/includes/doctext.inc:140 #: reporting/includes/doctext.inc:181 reporting/includes/doctext.inc:200 -#: sales/inquiry/customer_allocation_inquiry.php:143 -#: sales/inquiry/customer_inquiry.php:224 +#: sales/inquiry/customer_allocation_inquiry.php:144 +#: sales/inquiry/customer_inquiry.php:217 msgid "Type" msgstr "" @@ -1808,8 +1832,8 @@ msgid "Role:" msgstr "" #: admin/security_roles.php:180 gl/manage/gl_accounts.php:199 -#: inventory/manage/items.php:433 purchasing/manage/suppliers.php:289 -#: sales/manage/customers.php:326 +#: inventory/manage/items.php:433 purchasing/manage/suppliers.php:290 +#: sales/manage/customers.php:330 msgid "Show inactive:" msgstr "" @@ -1868,7 +1892,7 @@ msgid "Cancel Edition" msgstr "" #: admin/shipping_companies.php:15 sales/customer_credit_invoice.php:254 -#: sales/customer_delivery.php:368 sales/customer_invoice.php:422 +#: sales/customer_delivery.php:368 sales/customer_invoice.php:431 #: sales/view/view_credit.php:74 sales/view/view_dispatch.php:92 #: sales/view/view_invoice.php:91 msgid "Shipping Company" @@ -1924,14 +1948,14 @@ msgstr "" msgid "Name:" msgstr "" -#: admin/shipping_companies.php:136 purchasing/manage/suppliers.php:158 +#: admin/shipping_companies.php:136 purchasing/manage/suppliers.php:159 #: sales/manage/customer_branches.php:259 msgid "Contact Person:" msgstr "" #: admin/shipping_companies.php:140 includes/ui/contacts_view.inc:103 -#: inventory/manage/locations.php:205 purchasing/manage/suppliers.php:130 -#: sales/manage/customer_branches.php:261 sales/manage/customers.php:253 +#: inventory/manage/locations.php:205 purchasing/manage/suppliers.php:131 +#: sales/manage/customer_branches.php:261 sales/manage/customers.php:257 msgid "Secondary Phone Number:" msgstr "" @@ -2070,7 +2094,7 @@ msgstr "" #: admin/view_print_transaction.php:43 admin/view_print_transaction.php:45 #: admin/view_print_transaction.php:129 includes/ui/ui_controls.inc:188 #: purchasing/inquiry/po_search_completed.php:113 -#: purchasing/inquiry/po_search.php:93 sales/inquiry/customer_inquiry.php:209 +#: purchasing/inquiry/po_search.php:93 sales/inquiry/customer_inquiry.php:202 #: sales/inquiry/sales_deliveries_view.php:160 #: sales/inquiry/sales_orders_view.php:119 msgid "Print" @@ -2119,8 +2143,8 @@ msgstr "" #: dimensions/inquiry/search_dimensions.php:128 #: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:235 #: gl/inquiry/bank_inquiry.php:70 gl/inquiry/journal_inquiry.php:131 -#: gl/view/bank_transfer_view.php:86 gl/view/gl_deposit_view.php:75 -#: gl/view/gl_payment_view.php:73 gl/view/gl_trans_view.php:35 +#: gl/view/bank_transfer_view.php:86 gl/view/gl_deposit_view.php:80 +#: gl/view/gl_payment_view.php:78 gl/view/gl_trans_view.php:35 #: includes/ui/contacts_view.inc:41 inventory/inquiry/stock_movements.php:82 #: inventory/view/view_adjustment.php:44 inventory/view/view_transfer.php:44 #: manufacturing/search_work_orders.php:160 @@ -2144,13 +2168,13 @@ msgstr "" #: reporting/rep501.php:87 reporting/rep601.php:79 reporting/rep702.php:53 #: reporting/includes/doctext.inc:199 sales/customer_credit_invoice.php:245 #: sales/customer_credit_invoice.php:247 sales/customer_delivery.php:348 -#: sales/customer_delivery.php:350 sales/customer_invoice.php:394 -#: sales/customer_invoice.php:396 +#: sales/customer_delivery.php:350 sales/customer_invoice.php:403 +#: sales/customer_invoice.php:405 #: sales/allocations/customer_allocation_main.php:95 #: sales/view/view_dispatch.php:85 sales/view/view_invoice.php:84 #: sales/view/view_receipt.php:39 sales/view/view_sales_order.php:81 -#: sales/inquiry/customer_allocation_inquiry.php:145 -#: sales/inquiry/customer_inquiry.php:227 +#: sales/inquiry/customer_allocation_inquiry.php:146 +#: sales/inquiry/customer_inquiry.php:220 #: sales/inquiry/sales_deliveries_view.php:184 #: sales/includes/ui/sales_credit_ui.inc:85 #: sales/includes/ui/sales_credit_ui.inc:87 @@ -2166,8 +2190,8 @@ msgstr "" #: gl/inquiry/journal_inquiry.php:128 gl/view/accrual_trans.php:52 #: gl/view/bank_transfer_view.php:83 gl/view/gl_deposit_view.php:68 #: gl/view/gl_payment_view.php:66 gl/view/gl_trans_view.php:36 -#: includes/ui/allocation_cart.inc:263 includes/ui/ui_view.inc:547 -#: inventory/inquiry/stock_movements.php:84 +#: includes/ui/allocation_cart.inc:288 includes/ui/mk.allocation_cart.inc:288 +#: includes/ui/ui_view.inc:547 inventory/inquiry/stock_movements.php:84 #: inventory/view/view_adjustment.php:45 inventory/view/view_transfer.php:47 #: manufacturing/search_work_orders.php:166 #: manufacturing/work_order_entry.php:419 @@ -2190,12 +2214,12 @@ msgstr "" #: reporting/rep710.php:77 reporting/includes/doctext.inc:145 #: reporting/includes/doctext.inc:186 reporting/includes/doctext.inc:224 #: reporting/includes/header2.inc:135 sales/customer_delivery.php:378 -#: sales/customer_invoice.php:432 +#: sales/customer_invoice.php:441 #: sales/allocations/customer_allocation_main.php:96 #: sales/view/view_credit.php:69 sales/view/view_sales_order.php:96 #: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161 -#: sales/inquiry/customer_allocation_inquiry.php:147 -#: sales/inquiry/customer_inquiry.php:228 +#: sales/inquiry/customer_allocation_inquiry.php:148 +#: sales/inquiry/customer_inquiry.php:221 msgid "Date" msgstr "" @@ -2229,8 +2253,7 @@ msgstr "" #: manufacturing/work_order_entry.php:451 #: manufacturing/work_order_release.php:103 #: purchasing/includes/ui/invoice_ui.inc:174 purchasing/po_entry_items.php:529 -#: purchasing/supplier_payment.php:326 sales/customer_payments.php:406 -#: sales/customer_payments.php.sav:413 +#: purchasing/supplier_payment.php:325 sales/customer_payments.php:399 msgid "Memo:" msgstr "" @@ -2261,24 +2284,23 @@ msgstr "" #: gl/manage/revaluate_currencies.php:53 #: manufacturing/work_order_add_finished.php:98 #: manufacturing/work_order_costs.php:83 purchasing/po_receive_items.php:174 -#: purchasing/supplier_payment.php:183 sales/customer_credit_invoice.php:91 -#: sales/sales_order_entry.php:350 sales/manage/recurrent_invoices.php:41 +#: purchasing/supplier_payment.php:185 sales/customer_credit_invoice.php:91 +#: sales/sales_order_entry.php:353 sales/manage/recurrent_invoices.php:41 #: sales/manage/recurrent_invoices.php:46 #: sales/manage/recurrent_invoices.php:51 msgid "The entered date is invalid." msgstr "" #: admin/void_transaction.php:254 gl/accruals.php:38 gl/bank_transfer.php:121 -#: gl/gl_bank.php:265 gl/gl_journal.php:162 +#: gl/gl_bank.php:266 gl/gl_journal.php:162 #: gl/manage/revaluate_currencies.php:59 inventory/adjustments.php:114 #: inventory/transfers.php:109 manufacturing/work_order_add_finished.php:104 #: manufacturing/work_order_costs.php:89 #: manufacturing/work_order_entry.php:160 -#: manufacturing/work_order_issue.php:83 purchasing/supplier_credit.php:176 -#: purchasing/supplier_invoice.php:174 purchasing/supplier_payment.php:189 -#: sales/create_recurrent_invoices.php:121 sales/credit_note_entry.php:157 -#: sales/customer_credit_invoice.php:95 sales/customer_payments.php:151 -#: sales/customer_payments.php.sav:151 +#: manufacturing/work_order_issue.php:83 purchasing/supplier_credit.php:186 +#: purchasing/supplier_invoice.php:185 sales/create_recurrent_invoices.php:121 +#: sales/credit_note_entry.php:157 sales/customer_credit_invoice.php:95 +#: sales/customer_payments.php:156 msgid "The entered date is not in fiscal year." msgstr "" @@ -2294,6 +2316,10 @@ msgstr "" msgid "Selected transaction has been voided." msgstr "" +#: admin/db/attachments_db.inc:67 +msgid "Attached File:" +msgstr "" + #: admin/db/fiscalyears_db.inc:136 msgid "" "The Retained Earnings Account or the Profit and Loss Year Account has not " @@ -2304,7 +2330,7 @@ msgstr "" msgid "Closing Year" msgstr "" -#: admin/db/fiscalyears_db.inc:214 reporting/rep101.php:175 +#: admin/db/fiscalyears_db.inc:219 reporting/rep101.php:175 #: reporting/rep201.php:170 reporting/rep706.php:185 msgid "Open Balance" msgstr "" @@ -2345,11 +2371,11 @@ msgstr "" msgid "SQL script execution failed in line %d: %s" msgstr "" -#: admin/db/users_db.inc:210 +#: admin/db/users_db.inc:221 msgid "user online" msgstr "" -#: admin/db/users_db.inc:210 +#: admin/db/users_db.inc:221 msgid "users online" msgstr "" @@ -2922,18 +2948,17 @@ msgid "The dimension reference must be entered." msgstr "" #: dimensions/dimension_entry.php:123 gl/bank_transfer.php:176 -#: gl/gl_bank.php:253 gl/gl_journal.php:176 +#: gl/gl_bank.php:254 gl/gl_journal.php:176 #: gl/manage/revaluate_currencies.php:72 inventory/adjustments.php:101 #: inventory/transfers.php:97 manufacturing/work_order_add_finished.php:84 #: manufacturing/work_order_entry.php:139 #: manufacturing/work_order_issue.php:96 purchasing/po_entry_items.php:366 -#: purchasing/po_receive_items.php:195 purchasing/supplier_credit.php:156 -#: purchasing/supplier_invoice.php:154 purchasing/supplier_payment.php:212 +#: purchasing/po_receive_items.php:195 purchasing/supplier_credit.php:166 +#: purchasing/supplier_invoice.php:165 purchasing/supplier_payment.php:214 #: sales/create_recurrent_invoices.php:57 sales/credit_note_entry.php:181 #: sales/customer_credit_invoice.php:205 sales/customer_delivery.php:312 -#: sales/customer_invoice.php:319 sales/customer_payments.php:164 -#: sales/customer_payments.php:171 sales/customer_payments.php.sav:164 -#: sales/customer_payments.php.sav:171 sales/sales_order_entry.php:442 +#: sales/customer_invoice.php:328 sales/customer_payments.php:169 +#: sales/customer_payments.php:176 sales/sales_order_entry.php:445 msgid "The entered reference is already in use." msgstr "" @@ -3057,8 +3082,8 @@ msgstr "" #: purchasing/inquiry/supplier_inquiry.php:176 reporting/rep601.php:80 #: reporting/rep702.php:54 reporting/rep704.php:84 reporting/rep704.php:87 #: reporting/rep704.php:90 reporting/rep708.php:192 reporting/rep708.php:193 -#: sales/inquiry/customer_allocation_inquiry.php:151 -#: sales/inquiry/customer_inquiry.php:233 +#: sales/inquiry/customer_allocation_inquiry.php:152 +#: sales/inquiry/customer_inquiry.php:226 msgid "Debit" msgstr "" @@ -3075,8 +3100,8 @@ msgstr "" #: purchasing/inquiry/supplier_inquiry.php:177 reporting/rep601.php:80 #: reporting/rep702.php:54 reporting/rep704.php:84 reporting/rep704.php:87 #: reporting/rep704.php:90 reporting/rep708.php:192 reporting/rep708.php:193 -#: sales/inquiry/customer_allocation_inquiry.php:152 -#: sales/inquiry/customer_inquiry.php:234 +#: sales/inquiry/customer_allocation_inquiry.php:153 +#: sales/inquiry/customer_inquiry.php:227 msgid "Credit" msgstr "" @@ -3088,7 +3113,7 @@ msgstr "" #: reporting/rep204.php:84 reporting/rep307.php:117 reporting/rep601.php:80 #: reporting/rep701.php:111 reporting/rep704.php:84 reporting/rep704.php:87 #: reporting/rep704.php:90 reporting/rep708.php:185 -#: sales/inquiry/customer_allocation_inquiry.php:154 +#: sales/inquiry/customer_allocation_inquiry.php:155 msgid "Balance" msgstr "" @@ -3113,24 +3138,23 @@ msgstr "" #: manufacturing/includes/work_order_issue_ui.inc:156 #: purchasing/includes/ui/invoice_ui.inc:105 #: purchasing/includes/ui/po_ui.inc:176 purchasing/includes/ui/po_ui.inc:181 -#: purchasing/supplier_payment.php:300 sales/customer_payments.php:370 -#: sales/customer_payments.php.sav:377 +#: purchasing/supplier_payment.php:298 sales/customer_payments.php:368 msgid "Reference:" msgstr "" #: dimensions/inquiry/search_dimensions.php:75 -#: includes/ui/allocation_cart.inc:284 includes/ui/ui_lists.inc:1923 -#: reporting/rep101.php:100 reporting/rep102.php:96 reporting/rep104.php:97 -#: reporting/rep104.php:101 reporting/rep105.php:95 reporting/rep105.php:99 -#: reporting/rep201.php:92 reporting/rep202.php:100 reporting/rep203.php:74 -#: reporting/rep204.php:77 reporting/rep301.php:92 reporting/rep301.php:99 -#: reporting/rep302.php:105 reporting/rep302.php:112 reporting/rep303.php:96 -#: reporting/rep303.php:103 reporting/rep304.php:98 reporting/rep304.php:103 -#: reporting/rep304.php:108 reporting/rep306.php:120 reporting/rep306.php:125 -#: reporting/rep306.php:130 reporting/rep306.php:135 reporting/rep307.php:103 -#: reporting/rep307.php:110 reporting/rep308.php:138 reporting/rep308.php:143 -#: reporting/rep309.php:92 reporting/rep702.php:61 reporting/rep710.php:86 -#: reporting/rep710.php:87 +#: includes/ui/allocation_cart.inc:312 includes/ui/mk.allocation_cart.inc:312 +#: includes/ui/ui_lists.inc:1923 reporting/rep101.php:100 +#: reporting/rep102.php:96 reporting/rep104.php:97 reporting/rep104.php:101 +#: reporting/rep105.php:95 reporting/rep105.php:99 reporting/rep201.php:92 +#: reporting/rep202.php:100 reporting/rep203.php:74 reporting/rep204.php:77 +#: reporting/rep301.php:92 reporting/rep301.php:99 reporting/rep302.php:105 +#: reporting/rep302.php:112 reporting/rep303.php:96 reporting/rep303.php:103 +#: reporting/rep304.php:98 reporting/rep304.php:103 reporting/rep304.php:108 +#: reporting/rep306.php:120 reporting/rep306.php:125 reporting/rep306.php:130 +#: reporting/rep306.php:135 reporting/rep307.php:103 reporting/rep307.php:110 +#: reporting/rep308.php:138 reporting/rep308.php:143 reporting/rep309.php:92 +#: reporting/rep702.php:61 reporting/rep710.php:86 reporting/rep710.php:87 msgid "All" msgstr "" @@ -3164,7 +3188,8 @@ msgid "Only Open:" msgstr "" #: dimensions/inquiry/search_dimensions.php:132 -#: dimensions/view/view_dimension.php:55 includes/ui/allocation_cart.inc:263 +#: dimensions/view/view_dimension.php:55 includes/ui/allocation_cart.inc:288 +#: includes/ui/mk.allocation_cart.inc:288 #: purchasing/includes/ui/invoice_ui.inc:125 #: purchasing/view/view_supp_credit.php:48 #: purchasing/view/view_supp_invoice.php:51 @@ -3174,10 +3199,10 @@ msgstr "" #: reporting/includes/doctext.inc:100 reporting/includes/doctext.inc:122 #: reporting/includes/doctext.inc:143 reporting/includes/doctext.inc:145 #: reporting/includes/doctext.inc:184 reporting/includes/doctext.inc:186 -#: sales/customer_invoice.php:439 sales/view/view_dispatch.php:97 +#: sales/customer_invoice.php:448 sales/view/view_dispatch.php:97 #: sales/view/view_invoice.php:96 -#: sales/inquiry/customer_allocation_inquiry.php:148 -#: sales/inquiry/customer_inquiry.php:229 +#: sales/inquiry/customer_allocation_inquiry.php:149 +#: sales/inquiry/customer_inquiry.php:222 #: sales/includes/ui/sales_order_ui.inc:601 msgid "Due Date" msgstr "" @@ -3256,9 +3281,9 @@ msgstr "" #: gl/inquiry/profit_loss.php:181 gl/manage/gl_quick_entries.php:261 #: gl/manage/gl_quick_entries.php:263 gl/manage/gl_quick_entries.php:343 #: gl/manage/gl_quick_entries.php:345 gl/view/accrual_trans.php:54 -#: gl/view/accrual_trans.php:56 gl/view/gl_deposit_view.php:99 -#: gl/view/gl_deposit_view.php:102 gl/view/gl_payment_view.php:98 -#: gl/view/gl_payment_view.php:101 gl/view/gl_trans_view.php:63 +#: gl/view/accrual_trans.php:56 gl/view/gl_deposit_view.php:104 +#: gl/view/gl_deposit_view.php:107 gl/view/gl_payment_view.php:103 +#: gl/view/gl_payment_view.php:106 gl/view/gl_trans_view.php:63 #: gl/view/gl_trans_view.php:66 gl/includes/ui/gl_bank_ui.inc:152 #: gl/includes/ui/gl_bank_ui.inc:153 gl/includes/ui/gl_bank_ui.inc:155 #: gl/includes/ui/gl_journal_ui.inc:83 gl/includes/ui/gl_journal_ui.inc:84 @@ -3267,8 +3292,8 @@ msgstr "" #: inventory/manage/item_categories.php:218 inventory/manage/items.php:343 #: inventory/manage/items.php:345 purchasing/includes/ui/invoice_ui.inc:258 #: purchasing/includes/ui/invoice_ui.inc:260 -#: purchasing/manage/suppliers.php:137 purchasing/manage/suppliers.php:138 -#: purchasing/manage/suppliers.php:140 reporting/rep103.php:243 +#: purchasing/manage/suppliers.php:138 purchasing/manage/suppliers.php:139 +#: purchasing/manage/suppliers.php:141 reporting/rep103.php:243 #: reporting/rep103.php:255 reporting/rep205.php:161 reporting/rep205.php:173 #: reporting/rep501.php:92 reporting/rep704.php:83 reporting/rep704.php:86 #: reporting/rep704.php:97 reporting/rep704.php:99 reporting/rep704.php:107 @@ -3284,9 +3309,9 @@ msgstr "" #: reporting/reports_main.php:395 reporting/reports_main.php:401 #: reporting/reports_main.php:409 reporting/reports_main.php:420 #: reporting/reports_main.php:432 sales/customer_delivery.php:395 -#: sales/customer_delivery.php:403 sales/customer_invoice.php:409 -#: sales/customer_invoice.php:447 sales/manage/customers.php:270 -#: sales/manage/customers.php:272 sales/includes/ui/sales_credit_ui.inc:132 +#: sales/customer_delivery.php:403 sales/customer_invoice.php:418 +#: sales/customer_invoice.php:456 sales/manage/customers.php:274 +#: sales/manage/customers.php:276 sales/includes/ui/sales_credit_ui.inc:132 #: sales/includes/ui/sales_credit_ui.inc:137 #: sales/includes/ui/sales_order_ui.inc:456 #: sales/includes/ui/sales_order_ui.inc:461 @@ -3296,9 +3321,9 @@ msgstr "" #: gl/accruals.php:98 gl/accruals.php:213 gl/inquiry/bank_inquiry.php:71 #: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143 #: gl/inquiry/journal_inquiry.php:133 gl/view/accrual_trans.php:60 -#: gl/view/gl_deposit_view.php:100 gl/view/gl_deposit_view.php:103 -#: gl/view/gl_deposit_view.php:106 gl/view/gl_payment_view.php:99 -#: gl/view/gl_payment_view.php:102 gl/view/gl_payment_view.php:105 +#: gl/view/gl_deposit_view.php:105 gl/view/gl_deposit_view.php:108 +#: gl/view/gl_deposit_view.php:111 gl/view/gl_payment_view.php:104 +#: gl/view/gl_payment_view.php:107 gl/view/gl_payment_view.php:110 #: gl/view/gl_trans_view.php:64 gl/view/gl_trans_view.php:67 #: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_bank_ui.inc:153 #: gl/includes/ui/gl_bank_ui.inc:156 gl/includes/ui/gl_bank_ui.inc:159 @@ -3312,7 +3337,7 @@ msgstr "" #: purchasing/includes/ui/invoice_ui.inc:260 #: purchasing/includes/ui/invoice_ui.inc:262 #: sales/customer_credit_invoice.php:364 sales/customer_delivery.php:529 -#: sales/customer_invoice.php:578 sales/includes/ui/sales_credit_ui.inc:339 +#: sales/customer_invoice.php:587 sales/includes/ui/sales_credit_ui.inc:339 msgid "Memo" msgstr "" @@ -3359,13 +3384,14 @@ msgstr "" #: gl/manage/gl_quick_entries.php:261 gl/manage/gl_quick_entries.php:263 #: gl/manage/gl_quick_entries.php:265 gl/manage/gl_quick_entries.php:339 #: gl/view/bank_transfer_view.php:70 gl/view/bank_transfer_view.php:80 -#: gl/view/gl_deposit_view.php:67 gl/view/gl_deposit_view.php:100 -#: gl/view/gl_deposit_view.php:103 gl/view/gl_deposit_view.php:106 -#: gl/view/gl_payment_view.php:65 gl/view/gl_payment_view.php:99 -#: gl/view/gl_payment_view.php:102 gl/view/gl_payment_view.php:105 +#: gl/view/gl_deposit_view.php:67 gl/view/gl_deposit_view.php:105 +#: gl/view/gl_deposit_view.php:108 gl/view/gl_deposit_view.php:111 +#: gl/view/gl_payment_view.php:65 gl/view/gl_payment_view.php:104 +#: gl/view/gl_payment_view.php:107 gl/view/gl_payment_view.php:110 #: gl/includes/ui/gl_bank_ui.inc:153 gl/includes/ui/gl_bank_ui.inc:156 #: gl/includes/ui/gl_bank_ui.inc:159 includes/sysnames.inc:132 -#: includes/ui/allocation_cart.inc:263 includes/ui/ui_lists.inc:1187 +#: includes/ui/allocation_cart.inc:288 includes/ui/mk.allocation_cart.inc:288 +#: includes/ui/ui_lists.inc:1187 #: manufacturing/includes/manufacturing_ui.inc:236 #: purchasing/includes/ui/invoice_ui.inc:258 #: purchasing/includes/ui/invoice_ui.inc:260 @@ -3409,7 +3435,7 @@ msgstr "" #: gl/bank_account_reconcile.php:35 gl/bank_transfer.php:30 gl/gl_bank.php:49 #: gl/inquiry/bank_inquiry.php:30 purchasing/supplier_payment.php:42 -#: sales/customer_payments.php:39 sales/customer_payments.php.sav:39 +#: sales/customer_payments.php:38 msgid "There are no bank accounts defined in the system." msgstr "" @@ -3503,26 +3529,29 @@ msgid "Transfer Date:" msgstr "" #: gl/bank_transfer.php:87 gl/bank_transfer.php:94 -#: sales/customer_payments.php:404 sales/customer_payments.php.sav:411 +#: sales/customer_payments.php:397 msgid "Amount:" msgstr "" #: gl/bank_transfer.php:88 gl/bank_transfer.php:95 -#: purchasing/supplier_payment.php:313 sales/customer_payments.php:389 -#: sales/customer_payments.php.sav:396 +#: purchasing/supplier_payment.php:313 sales/customer_payments.php:383 msgid "Bank Charge:" msgstr "" +#: gl/bank_transfer.php:90 +msgid "Incoming Amount:" +msgstr "" + #: gl/bank_transfer.php:102 msgid "Enter Transfer" msgstr "" #: gl/bank_transfer.php:128 gl/bank_transfer.php:158 gl/bank_transfer.php:190 -#: purchasing/supplier_payment.php:126 purchasing/supplier_payment.php:132 +#: purchasing/supplier_payment.php:135 purchasing/supplier_payment.php:141 msgid "The entered amount is invalid or less than zero." msgstr "" -#: gl/bank_transfer.php:133 gl/gl_bank.php:223 +#: gl/bank_transfer.php:133 gl/gl_bank.php:224 msgid "The total bank amount cannot be 0." msgstr "" @@ -3531,28 +3560,28 @@ msgstr "" msgid "The total bank amount exceeds allowed limit (%s) for source account." msgstr "" -#: gl/bank_transfer.php:150 gl/gl_bank.php:240 +#: gl/bank_transfer.php:150 gl/gl_bank.php:241 #, php-format msgid "" "The bank transaction would result in exceed of authorized overdraft limit " "for transaction: %s #%s on %s." msgstr "" -#: gl/bank_transfer.php:163 purchasing/supplier_payment.php:140 -#: sales/customer_payments.php:190 sales/customer_payments.php.sav:190 +#: gl/bank_transfer.php:163 purchasing/supplier_payment.php:149 +#: sales/customer_payments.php:195 msgid "" "The Bank Charge Account has not been set in System and General GL Setup." msgstr "" -#: gl/bank_transfer.php:169 gl/gl_bank.php:247 gl/gl_journal.php:168 +#: gl/bank_transfer.php:169 gl/gl_bank.php:248 gl/gl_journal.php:168 #: gl/manage/revaluate_currencies.php:65 inventory/adjustments.php:94 #: inventory/transfers.php:91 manufacturing/work_order_add_finished.php:77 #: manufacturing/work_order_entry.php:132 #: manufacturing/work_order_issue.php:89 purchasing/po_receive_items.php:188 -#: purchasing/supplier_payment.php:205 sales/credit_note_entry.php:147 +#: purchasing/supplier_payment.php:207 sales/credit_note_entry.php:147 #: sales/customer_credit_invoice.php:102 sales/customer_delivery.php:166 -#: sales/customer_invoice.php:280 sales/customer_payments.php:157 -#: sales/customer_payments.php.sav:157 sales/sales_order_entry.php:413 +#: sales/customer_invoice.php:289 sales/customer_payments.php:162 +#: sales/sales_order_entry.php:416 msgid "You must enter a reference." msgstr "" @@ -3600,9 +3629,9 @@ msgstr "" #: gl/gl_bank.php:82 gl/gl_journal.php:61 inventory/adjustments.php:50 #: manufacturing/work_order_entry.php:68 purchasing/po_entry_items.php:112 #: purchasing/po_entry_items.php:136 purchasing/supplier_credit.php:49 -#: purchasing/supplier_invoice.php:52 sales/credit_note_entry.php:77 -#: sales/customer_credit_invoice.php:62 sales/customer_invoice.php:66 -#: sales/sales_order_entry.php:234 +#: purchasing/supplier_invoice.php:53 sales/credit_note_entry.php:77 +#: sales/customer_credit_invoice.php:62 sales/customer_invoice.php:75 +#: sales/sales_order_entry.php:237 msgid "Add an Attachment" msgstr "" @@ -3645,48 +3674,52 @@ msgstr "" msgid "Enter A &Payment" msgstr "" -#: gl/gl_bank.php:217 +#: gl/gl_bank.php:218 msgid "You must enter at least one payment line." msgstr "" -#: gl/gl_bank.php:234 purchasing/supplier_payment.php:198 +#: gl/gl_bank.php:235 purchasing/supplier_payment.php:200 #, php-format msgid "The total bank amount exceeds allowed limit (%s)." msgstr "" -#: gl/gl_bank.php:259 +#: gl/gl_bank.php:260 msgid "The entered date for the payment is invalid." msgstr "" -#: gl/gl_bank.php:271 +#: gl/gl_bank.php:272 msgid "You have to select customer and customer branch." msgstr "" -#: gl/gl_bank.php:275 +#: gl/gl_bank.php:276 msgid "You have to select supplier." msgstr "" -#: gl/gl_bank.php:324 +#: gl/gl_bank.php:284 +msgid "Settled amount have to be positive number." +msgstr "" + +#: gl/gl_bank.php:330 msgid "The amount entered is not a valid number or is less than zero." msgstr "" -#: gl/gl_bank.php:330 gl/manage/exchange_rates.php:39 +#: gl/gl_bank.php:336 gl/manage/exchange_rates.php:39 msgid "The exchange rate cannot be zero or a negative number." msgstr "" -#: gl/gl_bank.php:402 +#: gl/gl_bank.php:408 msgid "Payment Items" msgstr "" -#: gl/gl_bank.php:402 +#: gl/gl_bank.php:408 msgid "Deposit Items" msgstr "" -#: gl/gl_bank.php:410 +#: gl/gl_bank.php:416 msgid "Process Payment" msgstr "" -#: gl/gl_bank.php:410 +#: gl/gl_bank.php:416 msgid "Process Deposit" msgstr "" @@ -3743,8 +3776,8 @@ msgstr "" #: gl/gl_budget.php:127 gl/inquiry/balance_sheet.php:98 #: gl/inquiry/balance_sheet.php:205 gl/inquiry/balance_sheet.php:236 #: gl/inquiry/gl_trial_balance.php:224 gl/inquiry/profit_loss.php:115 -#: gl/inquiry/profit_loss.php:288 gl/view/gl_deposit_view.php:132 -#: gl/view/gl_payment_view.php:131 gl/view/gl_trans_view.php:106 +#: gl/inquiry/profit_loss.php:288 gl/view/gl_deposit_view.php:137 +#: gl/view/gl_payment_view.php:136 gl/view/gl_trans_view.php:106 #: gl/includes/ui/gl_bank_ui.inc:202 gl/includes/ui/gl_journal_ui.inc:141 #: inventory/includes/item_adjustments_ui.inc:63 #: inventory/includes/item_adjustments_ui.inc:102 @@ -3768,7 +3801,7 @@ msgstr "" #: reporting/rep707.php:297 reporting/rep708.php:253 #: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:170 #: sales/customer_credit_invoice.php:281 sales/customer_delivery.php:433 -#: sales/customer_invoice.php:470 +#: sales/customer_invoice.php:479 #: sales/allocations/customer_allocation_main.php:99 #: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113 #: sales/view/view_invoice.php:114 sales/view/view_sales_order.php:96 @@ -3844,7 +3877,7 @@ msgid "The credit amount entered is not a valid number or is less than zero." msgstr "" #: gl/gl_journal.php:243 includes/ui/ui_view.inc:732 -#: purchasing/supplier_credit.php:119 purchasing/supplier_invoice.php:119 +#: purchasing/supplier_credit.php:128 purchasing/supplier_invoice.php:129 msgid "Cannot post to GL account used by more than one tax type." msgstr "" @@ -3902,7 +3935,7 @@ msgstr "" msgid "Opening Balance" msgstr "" -#: gl/inquiry/bank_inquiry.php:124 gl/inquiry/gl_account_inquiry.php:211 +#: gl/inquiry/bank_inquiry.php:124 gl/inquiry/gl_account_inquiry.php:213 #: gl/inquiry/gl_trial_balance.php:234 reporting/rep601.php:157 #: reporting/rep704.php:192 reporting/rep708.php:262 msgid "Ending Balance" @@ -3924,7 +3957,7 @@ msgstr "" msgid "Amount max:" msgstr "" -#: gl/inquiry/gl_account_inquiry.php:220 +#: gl/inquiry/gl_account_inquiry.php:222 msgid "" "No general ledger transactions have been created for the specified criteria." msgstr "" @@ -4126,16 +4159,16 @@ msgstr "" #: reporting/rep103.php:232 reporting/rep104.php:116 reporting/rep201.php:120 #: reporting/rep202.php:138 reporting/rep203.php:101 reporting/rep205.php:150 #: sales/customer_credit_invoice.php:237 sales/customer_delivery.php:340 -#: sales/customer_invoice.php:404 +#: sales/customer_invoice.php:413 #: sales/allocations/customer_allocation_main.php:98 #: sales/allocations/customer_allocation_main.php:106 #: sales/view/view_credit.php:70 sales/view/view_dispatch.php:86 #: sales/view/view_invoice.php:85 -#: sales/inquiry/customer_allocation_inquiry.php:150 -#: sales/inquiry/customer_allocation_inquiry.php:160 +#: sales/inquiry/customer_allocation_inquiry.php:151 +#: sales/inquiry/customer_allocation_inquiry.php:161 #: sales/inquiry/customer_inquiry.php:80 -#: sales/inquiry/customer_inquiry.php:232 -#: sales/inquiry/customer_inquiry.php:245 +#: sales/inquiry/customer_inquiry.php:225 +#: sales/inquiry/customer_inquiry.php:238 #: sales/inquiry/sales_deliveries_view.php:189 #: sales/inquiry/sales_orders_view.php:272 #: sales/inquiry/sales_orders_view.php:286 @@ -4684,7 +4717,7 @@ msgid "Posted" msgstr "" #: gl/manage/gl_quick_entries.php:329 sales/customer_delivery.php:433 -#: sales/customer_invoice.php:470 +#: sales/customer_invoice.php:479 msgid "Tax Type" msgstr "" @@ -4752,7 +4785,7 @@ msgstr "" msgid "GL Deposit" msgstr "" -#: gl/view/gl_deposit_view.php:71 gl/includes/db/gl_db_banking.inc:212 +#: gl/view/gl_deposit_view.php:71 gl/includes/db/gl_db_banking.inc:213 #: reporting/reports_main.php:96 reporting/reports_main.php:106 #: reporting/reports_main.php:114 reporting/reports_main.php:128 #: reporting/reports_main.php:136 reporting/reports_main.php:143 @@ -4761,29 +4794,37 @@ msgstr "" msgid "From" msgstr "" -#: gl/view/gl_deposit_view.php:72 +#: gl/view/gl_deposit_view.php:74 gl/view/gl_payment_view.php:72 +msgid "Settle currency" +msgstr "" + +#: gl/view/gl_deposit_view.php:75 gl/view/gl_payment_view.php:73 +msgid "Settled amount" +msgstr "" + +#: gl/view/gl_deposit_view.php:77 msgid "Deposit Type" msgstr "" -#: gl/view/gl_deposit_view.php:81 +#: gl/view/gl_deposit_view.php:86 msgid "This deposit has been voided." msgstr "" -#: gl/view/gl_deposit_view.php:87 +#: gl/view/gl_deposit_view.php:92 msgid "There are no items for this deposit." msgstr "" -#: gl/view/gl_deposit_view.php:92 +#: gl/view/gl_deposit_view.php:97 msgid "Items for this Deposit" msgstr "" -#: gl/view/gl_deposit_view.php:94 gl/view/gl_payment_view.php:92 -msgid "Item Amounts are Shown in :" +#: gl/view/gl_deposit_view.php:99 gl/view/gl_payment_view.php:97 +msgid "Item Amounts are Shown in:" msgstr "" -#: gl/view/gl_deposit_view.php:99 gl/view/gl_deposit_view.php:102 -#: gl/view/gl_deposit_view.php:105 gl/view/gl_payment_view.php:98 -#: gl/view/gl_payment_view.php:101 gl/view/gl_payment_view.php:104 +#: gl/view/gl_deposit_view.php:104 gl/view/gl_deposit_view.php:107 +#: gl/view/gl_deposit_view.php:110 gl/view/gl_payment_view.php:103 +#: gl/view/gl_payment_view.php:106 gl/view/gl_payment_view.php:109 #: gl/view/gl_trans_view.php:63 gl/view/gl_trans_view.php:66 #: gl/view/gl_trans_view.php:69 gl/includes/ui/gl_bank_ui.inc:152 #: gl/includes/ui/gl_bank_ui.inc:155 gl/includes/ui/gl_bank_ui.inc:158 @@ -4792,9 +4833,9 @@ msgstr "" msgid "Account Code" msgstr "" -#: gl/view/gl_deposit_view.php:99 gl/view/gl_deposit_view.php:102 -#: gl/view/gl_deposit_view.php:105 gl/view/gl_payment_view.php:98 -#: gl/view/gl_payment_view.php:101 gl/view/gl_payment_view.php:104 +#: gl/view/gl_deposit_view.php:104 gl/view/gl_deposit_view.php:107 +#: gl/view/gl_deposit_view.php:110 gl/view/gl_payment_view.php:103 +#: gl/view/gl_payment_view.php:106 gl/view/gl_payment_view.php:109 #: gl/includes/ui/gl_bank_ui.inc:152 gl/includes/ui/gl_bank_ui.inc:155 #: gl/includes/ui/gl_bank_ui.inc:158 gl/includes/ui/gl_journal_ui.inc:83 #: gl/includes/ui/gl_journal_ui.inc:86 gl/includes/ui/gl_journal_ui.inc:89 @@ -4813,20 +4854,20 @@ msgstr "" msgid "Pay To" msgstr "" -#: gl/view/gl_payment_view.php:70 purchasing/view/view_supp_payment.php:64 +#: gl/view/gl_payment_view.php:75 purchasing/view/view_supp_payment.php:64 #: purchasing/view/view_supp_payment.php:78 sales/view/view_receipt.php:50 msgid "Payment Type" msgstr "" -#: gl/view/gl_payment_view.php:79 purchasing/view/view_supp_payment.php:85 +#: gl/view/gl_payment_view.php:84 purchasing/view/view_supp_payment.php:85 msgid "This payment has been voided." msgstr "" -#: gl/view/gl_payment_view.php:85 +#: gl/view/gl_payment_view.php:90 msgid "There are no items for this payment." msgstr "" -#: gl/view/gl_payment_view.php:90 +#: gl/view/gl_payment_view.php:95 msgid "Items for this Payment" msgstr "" @@ -4847,11 +4888,12 @@ msgid "This transaction has been voided." msgstr "" #: gl/includes/db/gl_db_banking.inc:44 gl/includes/db/gl_db_banking.inc:47 -#: gl/includes/db/gl_db_banking.inc:59 gl/includes/db/gl_db_banking.inc:62 +#: gl/includes/db/gl_db_banking.inc:60 gl/includes/db/gl_db_banking.inc:63 +#: gl/includes/db/gl_db_banking.inc:256 msgid "Exchange Variance" msgstr "" -#: gl/includes/db/gl_db_banking.inc:212 reporting/reports_main.php:97 +#: gl/includes/db/gl_db_banking.inc:213 reporting/reports_main.php:97 #: reporting/reports_main.php:107 reporting/reports_main.php:115 #: reporting/reports_main.php:129 reporting/reports_main.php:137 #: reporting/reports_main.php:144 reporting/reports_main.php:193 @@ -4859,7 +4901,7 @@ msgstr "" msgid "To" msgstr "" -#: gl/includes/db/gl_db_banking.inc:439 +#: gl/includes/db/gl_db_banking.inc:445 msgid "Document reentered." msgstr "" @@ -4873,8 +4915,8 @@ msgstr "" #: inventory/includes/stock_transfers_ui.inc:42 #: manufacturing/work_order_add_finished.php:208 #: manufacturing/work_order_costs.php:152 -#: purchasing/allocations/supplier_allocate.php:53 -#: sales/allocations/customer_allocate.php:52 +#: purchasing/allocations/supplier_allocate.php:56 +#: sales/allocations/customer_allocate.php:54 #: sales/includes/ui/sales_credit_ui.inc:121 msgid "Date:" msgstr "" @@ -4900,15 +4942,15 @@ msgstr "" msgid "Customer:" msgstr "" -#: gl/includes/ui/gl_bank_ui.inc:71 sales/customer_payments.php:348 -#: sales/customer_payments.php.sav:355 sales/manage/recurrent_invoices.php:172 +#: gl/includes/ui/gl_bank_ui.inc:71 sales/customer_payments.php:345 +#: sales/manage/recurrent_invoices.php:172 #: sales/includes/ui/sales_credit_ui.inc:37 #: sales/includes/ui/sales_order_ui.inc:291 msgid "Branch:" msgstr "" #: gl/includes/ui/gl_bank_ui.inc:85 gl/includes/ui/gl_bank_ui.inc:88 -#: sales/customer_payments.php:363 sales/customer_payments.php.sav:370 +#: sales/customer_payments.php:361 msgid "This customer account is on hold." msgstr "" @@ -5577,7 +5619,11 @@ msgstr "" msgid "System is available for site admin only until full database upgrade" msgstr "" -#: includes/current_user.inc:523 +#: includes/current_user.inc:153 +msgid "New password for" +msgstr "" + +#: includes/current_user.inc:549 msgid "Requesting data..." msgstr "" @@ -5597,7 +5643,7 @@ msgstr "" msgid "DATABASE ERROR :" msgstr "" -#: includes/errors.inc:212 +#: includes/errors.inc:216 msgid "" "The entered information is a duplicate. Please go back and enter different " "values." @@ -5661,50 +5707,70 @@ msgstr "" msgid "The user and password combination is not valid for the system." msgstr "" -#: includes/session.inc:139 +#: includes/session.inc:139 includes/session.inc:154 msgid "" "If you are not an authorized user, please contact your system administrator " "to obtain an account to enable you to use the system." msgstr "" -#: includes/session.inc:140 +#: includes/session.inc:140 includes/session.inc:155 msgid "Try again" msgstr "" -#: includes/session.inc:180 +#: includes/session.inc:151 +msgid "Incorrect Email" +msgstr "" + +#: includes/session.inc:152 +msgid "The email address does not exist in the system." +msgstr "" + +#: includes/session.inc:166 +msgid "New password sent" +msgstr "" + +#: includes/session.inc:167 +msgid "A new password has been sent to your mailbox." +msgstr "" + +#: includes/session.inc:169 +msgid "Login here" +msgstr "" + +#: includes/session.inc:209 #, php-format msgid "" "Brute force attack on account '%s' detected. Access for non-logged users " "temporarily blocked." msgstr "" -#: includes/session.inc:211 +#: includes/session.inc:240 msgid "Security settings have not been defined for your user account." msgstr "" -#: includes/session.inc:212 +#: includes/session.inc:241 msgid "Please contact your system administrator." msgstr "" -#: includes/session.inc:213 +#: includes/session.inc:242 msgid "" "Please remove $security_groups and $security_headings arrays from config.php " "file!" msgstr "" -#: includes/session.inc:215 +#: includes/session.inc:244 msgid "" "Access to application has been blocked until database upgrade is completed " "by system administrator." msgstr "" -#: includes/session.inc:229 +#: includes/session.inc:258 msgid "" "The security settings on your account do not permit you to access this " "function" msgstr "" -#: includes/session.inc:238 +#: includes/session.inc:267 msgid "" "System is blocked after source upgrade until database is updated on System/" "Software Upgrade page" @@ -5784,7 +5850,7 @@ msgstr "" msgid "Sales Order" msgstr "" -#: includes/sysnames.inc:41 sales/sales_order_entry.php:637 +#: includes/sysnames.inc:41 sales/sales_order_entry.php:641 msgid "Sales Quotation" msgstr "" @@ -5820,7 +5886,7 @@ msgstr "" msgid "CP" msgstr "" -#: includes/sysnames.inc:54 sales/customer_invoice.php:473 +#: includes/sysnames.inc:54 sales/customer_invoice.php:482 msgid "DN" msgstr "" @@ -5916,14 +5982,14 @@ msgstr "" #: reporting/reports_main.php:121 reporting/reports_main.php:237 #: sales/create_recurrent_invoices.php:134 #: sales/customer_credit_invoice.php:235 sales/customer_delivery.php:338 -#: sales/customer_invoice.php:380 +#: sales/customer_invoice.php:389 #: sales/allocations/customer_allocation_main.php:97 #: sales/allocations/customer_allocation_main.php:105 #: sales/manage/recurrent_invoices.php:102 sales/view/view_credit.php:47 -#: sales/inquiry/customer_allocation_inquiry.php:149 -#: sales/inquiry/customer_allocation_inquiry.php:159 -#: sales/inquiry/customer_inquiry.php:230 -#: sales/inquiry/customer_inquiry.php:244 +#: sales/inquiry/customer_allocation_inquiry.php:150 +#: sales/inquiry/customer_allocation_inquiry.php:160 +#: sales/inquiry/customer_inquiry.php:223 +#: sales/inquiry/customer_inquiry.php:237 #: sales/inquiry/sales_deliveries_view.php:180 #: sales/inquiry/sales_orders_view.php:264 #: sales/inquiry/sales_orders_view.php:278 @@ -6379,7 +6445,7 @@ msgstr "" #: reporting/reports_main.php:485 reporting/reports_main.php:493 #: reporting/includes/excel_report.inc:295 #: reporting/includes/excel_report.inc:428 -#: reporting/includes/pdf_report.inc:346 reporting/includes/pdf_report.inc:619 +#: reporting/includes/pdf_report.inc:346 reporting/includes/pdf_report.inc:618 #: sales/view/view_sales_order.php:85 msgid "Comments" msgstr "" @@ -6404,54 +6470,65 @@ msgstr "" msgid "Zero/negative inventory handling" msgstr "" -#: includes/ui/allocation_cart.inc:263 +#: includes/ui/allocation_cart.inc:286 includes/ui/mk.allocation_cart.inc:286 +#, php-format +msgid "Allocated amounts in %s:" +msgstr "" + +#: includes/ui/allocation_cart.inc:288 includes/ui/mk.allocation_cart.inc:288 #: purchasing/allocations/supplier_allocation_main.php:94 #: sales/allocations/customer_allocation_main.php:93 msgid "Transaction Type" msgstr "" -#: includes/ui/allocation_cart.inc:263 reporting/rep704.php:83 -#: reporting/rep704.php:86 reporting/rep704.php:89 reporting/rep709.php:111 -#: sales/view/view_credit.php:68 sales/view/view_sales_order.php:96 -#: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161 -#: sales/inquiry/sales_orders_view.php:226 +#: includes/ui/allocation_cart.inc:288 includes/ui/mk.allocation_cart.inc:288 +msgid "Supplier Ref" +msgstr "" + +#: includes/ui/allocation_cart.inc:288 includes/ui/mk.allocation_cart.inc:288 +#: reporting/rep704.php:83 reporting/rep704.php:86 reporting/rep704.php:89 +#: reporting/rep709.php:111 sales/view/view_credit.php:68 +#: sales/view/view_sales_order.php:96 sales/view/view_sales_order.php:129 +#: sales/view/view_sales_order.php:161 sales/inquiry/sales_orders_view.php:226 #: sales/inquiry/sales_orders_view.php:263 #: sales/inquiry/sales_orders_view.php:277 msgid "Ref" msgstr "" -#: includes/ui/allocation_cart.inc:264 +#: includes/ui/allocation_cart.inc:289 includes/ui/mk.allocation_cart.inc:289 msgid "Other Allocations" msgstr "" -#: includes/ui/allocation_cart.inc:264 includes/ui/ui_view.inc:548 -#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186 -msgid "This Allocation" -msgstr "" - -#: includes/ui/allocation_cart.inc:264 includes/ui/allocation_cart.inc:311 -#: includes/ui/ui_view.inc:548 +#: includes/ui/allocation_cart.inc:289 includes/ui/allocation_cart.inc:342 +#: includes/ui/mk.allocation_cart.inc:289 +#: includes/ui/mk.allocation_cart.inc:343 includes/ui/ui_view.inc:548 #: purchasing/allocations/supplier_allocation_main.php:101 -#: reporting/rep112.php:156 reporting/rep210.php:163 +#: reporting/rep112.php:157 reporting/rep210.php:164 #: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186 #: sales/allocations/customer_allocation_main.php:100 msgid "Left to Allocate" msgstr "" -#: includes/ui/allocation_cart.inc:294 reporting/rep112.php:153 -#: reporting/rep210.php:160 +#: includes/ui/allocation_cart.inc:289 includes/ui/mk.allocation_cart.inc:289 +#: includes/ui/ui_view.inc:548 reporting/includes/doctext.inc:145 +#: reporting/includes/doctext.inc:186 +msgid "This Allocation" +msgstr "" + +#: includes/ui/allocation_cart.inc:322 includes/ui/mk.allocation_cart.inc:322 +#: reporting/rep112.php:154 reporting/rep210.php:161 msgid "Total Allocated" msgstr "" -#: includes/ui/allocation_cart.inc:331 +#: includes/ui/allocation_cart.inc:363 includes/ui/mk.allocation_cart.inc:364 msgid "The entry for one or more amounts is invalid or negative." msgstr "" -#: includes/ui/allocation_cart.inc:340 +#: includes/ui/allocation_cart.inc:374 includes/ui/mk.allocation_cart.inc:375 msgid "At least one transaction is overallocated." msgstr "" -#: includes/ui/allocation_cart.inc:358 +#: includes/ui/allocation_cart.inc:393 includes/ui/mk.allocation_cart.inc:395 msgid "" "These allocations cannot be processed because the amount allocated is more " "than the total amount left to allocate." @@ -6491,17 +6568,17 @@ msgstr "" msgid "Contact active for:" msgstr "" -#: includes/ui/contacts_view.inc:102 sales/manage/customers.php:252 +#: includes/ui/contacts_view.inc:102 sales/manage/customers.php:256 msgid "Phone:" msgstr "" #: includes/ui/contacts_view.inc:105 inventory/manage/locations.php:207 -#: purchasing/manage/suppliers.php:160 sales/manage/customer_branches.php:263 -#: sales/manage/customers.php:255 sales/manage/sales_people.php:158 +#: purchasing/manage/suppliers.php:161 sales/manage/customer_branches.php:263 +#: sales/manage/customers.php:259 sales/manage/sales_people.php:158 msgid "E-mail:" msgstr "" -#: includes/ui/contacts_view.inc:110 purchasing/manage/suppliers.php:161 +#: includes/ui/contacts_view.inc:110 purchasing/manage/suppliers.php:162 #: sales/manage/customer_branches.php:264 msgid "Document Language:" msgstr "" @@ -6514,15 +6591,15 @@ msgstr "" msgid "Notes:" msgstr "" -#: includes/ui/contacts_view.inc:132 +#: includes/ui/contacts_view.inc:131 msgid "The contact name cannot be empty." msgstr "" -#: includes/ui/contacts_view.inc:137 +#: includes/ui/contacts_view.inc:136 msgid "Contact reference cannot be empty." msgstr "" -#: includes/ui/contacts_view.inc:142 +#: includes/ui/contacts_view.inc:141 msgid "You have to select at least one category." msgstr "" @@ -6595,10 +6672,6 @@ msgstr "" msgid "to continue" msgstr "" -#: includes/ui/ui_controls.inc:187 -msgid "View Attachment" -msgstr "" - #: includes/ui/ui_controls.inc:190 msgid "Close" msgstr "" @@ -7021,7 +7094,7 @@ msgid "Enter &Another Adjustment" msgstr "" #: inventory/adjustments.php:88 inventory/transfers.php:85 -#: sales/sales_order_entry.php:360 +#: sales/sales_order_entry.php:363 msgid "You must enter at least one non empty item line." msgstr "" @@ -7140,7 +7213,7 @@ msgid "The selected price has been deleted." msgstr "" #: inventory/prices.php:146 reporting/rep104.php:118 -#: sales/customer_delivery.php:355 sales/customer_invoice.php:402 +#: sales/customer_delivery.php:355 sales/customer_invoice.php:411 #: sales/view/view_credit.php:73 sales/view/view_dispatch.php:93 #: sales/view/view_invoice.php:92 sales/includes/ui/sales_credit_ui.inc:102 msgid "Sales Type" @@ -7152,7 +7225,7 @@ msgstr "" #: purchasing/view/view_po.php:45 reporting/rep104.php:111 #: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:170 #: sales/customer_credit_invoice.php:281 sales/customer_delivery.php:433 -#: sales/customer_invoice.php:470 sales/view/view_credit.php:91 +#: sales/customer_invoice.php:479 sales/view/view_credit.php:91 #: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:114 #: sales/view/view_sales_order.php:202 #: sales/includes/ui/sales_credit_ui.inc:168 @@ -7289,14 +7362,13 @@ msgid "Location" msgstr "" #: inventory/reorder_level.php:65 inventory/inquiry/stock_movements.php:84 -#: inventory/inquiry/stock_status.php:76 purchasing/supplier_credit.php:203 -#: sales/sales_order_entry.php:515 sales/includes/ui/sales_order_ui.inc:181 +#: inventory/inquiry/stock_status.php:76 purchasing/supplier_credit.php:213 +#: sales/sales_order_entry.php:518 sales/includes/ui/sales_order_ui.inc:181 msgid "Quantity On Hand" msgstr "" -#: inventory/reorder_level.php:65 inventory/inquiry/stock_status.php:76 -#: sales/includes/db/sales_order_db.inc:110 -#: sales/includes/db/sales_order_db.inc:283 +#: inventory/reorder_level.php:65 inventory/includes/inventory_db.inc:72 +#: inventory/inquiry/stock_status.php:76 msgid "Re-Order Level" msgstr "" @@ -7342,6 +7414,18 @@ msgstr "" msgid "Process Transfer" msgstr "" +#: inventory/includes/inventory_db.inc:69 +msgid "Stocks below Re-Order Level at " +msgstr "" + +#: inventory/includes/inventory_db.inc:72 +msgid "Below" +msgstr "" + +#: inventory/includes/inventory_db.inc:73 +msgid "Please reorder" +msgstr "" + #: inventory/includes/item_adjustments_ui.inc:20 #: inventory/includes/stock_transfers_ui.inc:20 #: manufacturing/includes/work_order_issue_ui.inc:20 @@ -7375,7 +7459,7 @@ msgstr "" #: purchasing/view/view_grn.php:40 purchasing/view/view_po.php:45 #: reporting/includes/doctext.inc:29 reporting/includes/doctext.inc:169 #: reporting/includes/doctext.inc:206 sales/customer_credit_invoice.php:280 -#: sales/customer_delivery.php:431 sales/customer_invoice.php:469 +#: sales/customer_delivery.php:431 sales/customer_invoice.php:478 #: sales/view/view_credit.php:90 sales/view/view_dispatch.php:112 #: sales/view/view_invoice.php:113 sales/view/view_sales_order.php:201 #: sales/includes/ui/sales_credit_ui.inc:167 @@ -7390,7 +7474,7 @@ msgstr "" #: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:29 #: reporting/includes/doctext.inc:169 reporting/includes/doctext.inc:206 #: sales/customer_credit_invoice.php:280 sales/customer_delivery.php:431 -#: sales/customer_invoice.php:469 sales/view/view_credit.php:90 +#: sales/customer_invoice.php:478 sales/view/view_credit.php:90 #: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:113 #: sales/view/view_sales_order.php:201 #: sales/includes/ui/sales_credit_ui.inc:167 @@ -7574,7 +7658,7 @@ msgstr "" #: inventory/view/view_transfer.php:56 manufacturing/view/wo_issue_view.php:77 #: manufacturing/manage/bom_edit.php:71 purchasing/po_receive_items.php:62 #: sales/customer_credit_invoice.php:280 sales/customer_delivery.php:432 -#: sales/customer_invoice.php:469 +#: sales/customer_invoice.php:478 msgid "Units" msgstr "" @@ -7626,7 +7710,7 @@ msgstr "" msgid "Foreign Item Codes" msgstr "" -#: inventory/manage/item_codes.php:23 sales/sales_order_entry.php:682 +#: inventory/manage/item_codes.php:23 sales/sales_order_entry.php:686 msgid "There are no inventory items defined in the system." msgstr "" @@ -7809,8 +7893,8 @@ msgstr "" msgid "New item" msgstr "" -#: inventory/manage/items.php:454 purchasing/manage/suppliers.php:306 -#: sales/manage/customer_branches.php:322 sales/manage/customers.php:344 +#: inventory/manage/items.php:454 purchasing/manage/suppliers.php:307 +#: sales/manage/customer_branches.php:322 sales/manage/customers.php:348 msgid "&General settings" msgstr "" @@ -7822,8 +7906,8 @@ msgstr "" msgid "&Purchasing Pricing" msgstr "" -#: inventory/manage/items.php:459 purchasing/manage/suppliers.php:308 -#: sales/manage/customers.php:346 +#: inventory/manage/items.php:459 purchasing/manage/suppliers.php:309 +#: sales/manage/customers.php:350 msgid "&Transactions" msgstr "" @@ -8233,8 +8317,8 @@ msgid "Return Items to Work Order" msgstr "" #: manufacturing/work_order_add_finished.php:214 -#: purchasing/allocations/supplier_allocate.php:64 -#: sales/allocations/customer_allocate.php:63 +#: purchasing/allocations/supplier_allocate.php:74 +#: sales/allocations/customer_allocate.php:72 msgid "Process" msgstr "" @@ -8797,7 +8881,7 @@ msgstr "" #: manufacturing/includes/db/work_orders_db.inc:278 #: purchasing/includes/db/po_db.inc:116 #: sales/includes/db/cust_trans_db.inc:111 -#: sales/includes/db/sales_order_db.inc:267 +#: sales/includes/db/sales_order_db.inc:204 msgid "Updated." msgstr "" @@ -8891,13 +8975,13 @@ msgid "Terms:" msgstr "" #: purchasing/includes/ui/invoice_ui.inc:139 -#: purchasing/manage/suppliers.php:98 purchasing/manage/suppliers.php:103 +#: purchasing/manage/suppliers.php:99 purchasing/manage/suppliers.php:104 msgid "Supplier's Currency:" msgstr "" #: purchasing/includes/ui/invoice_ui.inc:143 -#: purchasing/manage/suppliers.php:105 sales/manage/customer_branches.php:246 -#: sales/manage/customers.php:294 +#: purchasing/manage/suppliers.php:106 sales/manage/customer_branches.php:246 +#: sales/manage/customers.php:298 msgid "Tax Group:" msgstr "" @@ -8948,7 +9032,7 @@ msgstr "" msgid "Add to Credit Note" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:409 sales/customer_invoice.php:524 +#: purchasing/includes/ui/invoice_ui.inc:409 sales/customer_invoice.php:533 msgid "Remove" msgstr "" @@ -9053,15 +9137,15 @@ msgstr "" msgid "Credits can only be applied to invoiced items." msgstr "" -#: purchasing/includes/ui/po_ui.inc:154 sales/sales_order_entry.php:706 +#: purchasing/includes/ui/po_ui.inc:154 sales/sales_order_entry.php:710 msgid "Order Date:" msgstr "" -#: purchasing/includes/ui/po_ui.inc:155 sales/sales_order_entry.php:693 +#: purchasing/includes/ui/po_ui.inc:155 sales/sales_order_entry.php:697 msgid "Delivery Date:" msgstr "" -#: purchasing/includes/ui/po_ui.inc:155 sales/sales_order_entry.php:687 +#: purchasing/includes/ui/po_ui.inc:155 sales/sales_order_entry.php:691 msgid "Invoice Date:" msgstr "" @@ -9113,7 +9197,7 @@ msgstr "" #: reporting/rep107.php:150 reporting/rep109.php:149 reporting/rep110.php:159 #: reporting/rep111.php:134 reporting/rep113.php:144 reporting/rep209.php:162 #: sales/customer_credit_invoice.php:322 sales/customer_delivery.php:511 -#: sales/customer_invoice.php:565 sales/view/view_dispatch.php:146 +#: sales/customer_invoice.php:574 sales/view/view_dispatch.php:146 #: sales/view/view_invoice.php:148 sales/includes/ui/sales_credit_ui.inc:217 #: sales/includes/ui/sales_order_ui.inc:235 msgid "Sub-total" @@ -9127,8 +9211,8 @@ msgid "Amount Total" msgstr "" #: purchasing/includes/ui/po_ui.inc:296 -#: purchasing/allocations/supplier_allocate.php:63 -#: sales/allocations/customer_allocate.php:62 +#: purchasing/allocations/supplier_allocate.php:73 +#: sales/allocations/customer_allocate.php:71 #: sales/includes/ui/sales_order_ui.inc:243 msgid "Refresh" msgstr "" @@ -9248,7 +9332,7 @@ msgstr "" msgid "Enter a new purchase order" msgstr "" -#: purchasing/po_entry_items.php:216 sales/sales_order_entry.php:487 +#: purchasing/po_entry_items.php:216 sales/sales_order_entry.php:490 msgid "Item description cannot be empty." msgstr "" @@ -9283,8 +9367,8 @@ msgid "" "purchased." msgstr "" -#: purchasing/po_entry_items.php:329 purchasing/supplier_invoice.php:343 -#: purchasing/supplier_payment.php:114 +#: purchasing/po_entry_items.php:329 purchasing/supplier_invoice.php:355 +#: purchasing/supplier_payment.php:123 msgid "There is no supplier selected." msgstr "" @@ -9293,7 +9377,7 @@ msgid "The entered order date is invalid." msgstr "" #: purchasing/po_entry_items.php:343 purchasing/po_receive_items.php:181 -#: sales/sales_order_entry.php:355 +#: sales/sales_order_entry.php:358 msgid "The entered date is not in fiscal year" msgstr "" @@ -9305,11 +9389,11 @@ msgstr "" msgid "There is no reference entered for this purchase order." msgstr "" -#: purchasing/po_entry_items.php:374 purchasing/supplier_invoice.php:161 +#: purchasing/po_entry_items.php:374 purchasing/supplier_invoice.php:172 msgid "You must enter a supplier's invoice reference." msgstr "" -#: purchasing/po_entry_items.php:381 purchasing/supplier_invoice.php:187 +#: purchasing/po_entry_items.php:381 purchasing/supplier_invoice.php:198 msgid "" "This invoice number has already been entered. It cannot be entered again." msgstr "" @@ -9327,7 +9411,7 @@ msgid "" "The order cannot be placed because there are no lines entered on this order." msgstr "" -#: purchasing/po_entry_items.php:534 sales/sales_order_entry.php:710 +#: purchasing/po_entry_items.php:534 sales/sales_order_entry.php:714 msgid "Place Order" msgstr "" @@ -9335,7 +9419,7 @@ msgstr "" msgid "Update Order" msgstr "" -#: purchasing/po_entry_items.php:536 sales/sales_order_entry.php:709 +#: purchasing/po_entry_items.php:536 sales/sales_order_entry.php:713 msgid "Cancel Order" msgstr "" @@ -9351,7 +9435,7 @@ msgstr "" msgid "Cancel GRN" msgstr "" -#: purchasing/po_entry_items.php:543 sales/customer_invoice.php:584 +#: purchasing/po_entry_items.php:543 sales/customer_invoice.php:593 msgid "Process Invoice" msgstr "" @@ -9359,7 +9443,7 @@ msgstr "" msgid "Update Invoice" msgstr "" -#: purchasing/po_entry_items.php:545 sales/sales_order_entry.php:690 +#: purchasing/po_entry_items.php:545 sales/sales_order_entry.php:694 msgid "Cancel Invoice" msgstr "" @@ -9457,66 +9541,66 @@ msgstr "" msgid "Enter Another Credit Note" msgstr "" -#: purchasing/supplier_credit.php:102 purchasing/supplier_invoice.php:102 +#: purchasing/supplier_credit.php:111 purchasing/supplier_invoice.php:112 msgid "" "The account code entered is not a valid code, this line cannot be added to " "the transaction." msgstr "" -#: purchasing/supplier_credit.php:112 purchasing/supplier_invoice.php:112 +#: purchasing/supplier_credit.php:121 purchasing/supplier_invoice.php:122 msgid "" "The amount entered is not numeric. This line cannot be added to the " "transaction." msgstr "" -#: purchasing/supplier_credit.php:142 +#: purchasing/supplier_credit.php:152 msgid "" "The credit note cannot be processed because the there are no items or values " "on the invoice. Credit notes are expected to have a charge." msgstr "" -#: purchasing/supplier_credit.php:149 +#: purchasing/supplier_credit.php:159 msgid "You must enter an credit note reference." msgstr "" -#: purchasing/supplier_credit.php:163 +#: purchasing/supplier_credit.php:173 msgid "You must enter a supplier's credit note reference." msgstr "" -#: purchasing/supplier_credit.php:170 +#: purchasing/supplier_credit.php:180 msgid "" "The credit note as entered cannot be processed because the date entered is " "not valid." msgstr "" -#: purchasing/supplier_credit.php:182 purchasing/supplier_invoice.php:180 +#: purchasing/supplier_credit.php:192 purchasing/supplier_invoice.php:191 msgid "" "The invoice as entered cannot be processed because the due date is in an " "incorrect format." msgstr "" -#: purchasing/supplier_credit.php:189 +#: purchasing/supplier_credit.php:199 msgid "" "The credit note total as entered is less than the sum of the the general " "ledger entires (if any) and the charges for goods received. There must be a " "mistake somewhere, the credit note as entered will not be processed." msgstr "" -#: purchasing/supplier_credit.php:201 +#: purchasing/supplier_credit.php:211 msgid "" "The return cannot be processed because there is an insufficient quantity for " "item:" msgstr "" -#: purchasing/supplier_credit.php:244 +#: purchasing/supplier_credit.php:254 msgid "The quantity to credit must be numeric and greater than zero." msgstr "" -#: purchasing/supplier_credit.php:251 +#: purchasing/supplier_credit.php:261 msgid "The price is either not numeric or negative." msgstr "" -#: purchasing/supplier_credit.php:353 +#: purchasing/supplier_credit.php:363 msgid "Enter Credit Note" msgstr "" @@ -9532,46 +9616,46 @@ msgstr "" msgid "View this Invoice" msgstr "" -#: purchasing/supplier_invoice.php:50 +#: purchasing/supplier_invoice.php:51 msgid "Enter Another Invoice" msgstr "" -#: purchasing/supplier_invoice.php:141 +#: purchasing/supplier_invoice.php:152 msgid "" "The invoice cannot be processed because the there are no items or values on " "the invoice. Invoices are expected to have a charge." msgstr "" -#: purchasing/supplier_invoice.php:147 +#: purchasing/supplier_invoice.php:158 msgid "You must enter an invoice reference." msgstr "" -#: purchasing/supplier_invoice.php:168 +#: purchasing/supplier_invoice.php:179 msgid "" "The invoice as entered cannot be processed because the invoice date is in an " "incorrect format." msgstr "" -#: purchasing/supplier_invoice.php:224 +#: purchasing/supplier_invoice.php:235 msgid "The quantity to invoice must be numeric and greater than zero." msgstr "" -#: purchasing/supplier_invoice.php:231 +#: purchasing/supplier_invoice.php:242 msgid "The price is not numeric." msgstr "" -#: purchasing/supplier_invoice.php:244 +#: purchasing/supplier_invoice.php:255 msgid "" "The price being invoiced is more than the purchase order price by more than " "the allowed over-charge percentage. The system is set up to prohibit this. " "See the system administrator to modify the set up parameters if necessary." msgstr "" -#: purchasing/supplier_invoice.php:245 purchasing/supplier_invoice.php:258 +#: purchasing/supplier_invoice.php:256 purchasing/supplier_invoice.php:269 msgid "The over-charge percentage allowance is :" msgstr "" -#: purchasing/supplier_invoice.php:257 +#: purchasing/supplier_invoice.php:268 msgid "" "The quantity being invoiced is more than the outstanding quantity by more " "than the allowed over-charge percentage. The system is set up to prohibit " @@ -9579,12 +9663,12 @@ msgid "" "necessary." msgstr "" -#: purchasing/supplier_invoice.php:325 +#: purchasing/supplier_invoice.php:337 #, php-format msgid "All yet non-invoiced items on delivery line # %d has been removed." msgstr "" -#: purchasing/supplier_invoice.php:367 +#: purchasing/supplier_invoice.php:379 msgid "Enter Invoice" msgstr "" @@ -9592,76 +9676,95 @@ msgstr "" msgid "Supplier Payment Entry" msgstr "" -#: purchasing/supplier_payment.php:85 +#: purchasing/supplier_payment.php:92 msgid "Invalid purchase invoice number." msgstr "" -#: purchasing/supplier_payment.php:91 +#: purchasing/supplier_payment.php:98 msgid "Payment has been sucessfully entered" msgstr "" -#: purchasing/supplier_payment.php:93 +#: purchasing/supplier_payment.php:100 msgid "&Print This Remittance" msgstr "" -#: purchasing/supplier_payment.php:94 +#: purchasing/supplier_payment.php:101 msgid "&Email This Remittance" msgstr "" -#: purchasing/supplier_payment.php:96 +#: purchasing/supplier_payment.php:103 +msgid "View this Payment" +msgstr "" + +#: purchasing/supplier_payment.php:104 msgid "View the GL &Journal Entries for this Payment" msgstr "" -#: purchasing/supplier_payment.php:98 -msgid "Select Another &Supplier Transaction for Payment" +#: purchasing/supplier_payment.php:106 +msgid "Enter another supplier &payment" msgstr "" -#: purchasing/supplier_payment.php:101 -msgid "Enter Another Supplier &Payment" +#: purchasing/supplier_payment.php:107 sales/customer_payments.php:106 +msgid "Enter Other &Payment" +msgstr "" + +#: purchasing/supplier_payment.php:108 +msgid "Enter &Customer Payment" +msgstr "" + +#: purchasing/supplier_payment.php:109 sales/customer_payments.php:104 +msgid "Enter Other &Deposit" msgstr "" -#: purchasing/supplier_payment.php:160 +#: purchasing/supplier_payment.php:110 sales/customer_payments.php:107 +msgid "Bank Account &Transfer" +msgstr "" + +#: purchasing/supplier_payment.php:162 msgid "The entered discount is invalid or less than zero." msgstr "" -#: purchasing/supplier_payment.php:168 +#: purchasing/supplier_payment.php:170 msgid "" "The total of the amount and the discount is zero or negative. Please enter " "positive values." msgstr "" -#: purchasing/supplier_payment.php:175 +#: purchasing/supplier_payment.php:177 msgid "The entered bank amount is zero or negative." msgstr "" -#: purchasing/supplier_payment.php:284 +#: purchasing/supplier_payment.php:191 +msgid "" +"The entered date is out of fiscal year or is closed for further data entry." +msgstr "" + +#: purchasing/supplier_payment.php:275 msgid "Payment To:" msgstr "" -#: purchasing/supplier_payment.php:294 +#: purchasing/supplier_payment.php:290 msgid "From Bank Account:" msgstr "" -#: purchasing/supplier_payment.php:302 +#: purchasing/supplier_payment.php:296 #: purchasing/view/view_supp_payment.php:55 msgid "Date Paid" msgstr "" -#: purchasing/supplier_payment.php:319 -#, php-format -msgid "Accounts Payable settled in %s:" +#: purchasing/supplier_payment.php:310 +msgid "Bank Amount:" msgstr "" -#: purchasing/supplier_payment.php:324 sales/customer_payments.php:402 -#: sales/customer_payments.php.sav:409 +#: purchasing/supplier_payment.php:323 sales/customer_payments.php:395 msgid "Amount of Discount:" msgstr "" -#: purchasing/supplier_payment.php:325 +#: purchasing/supplier_payment.php:324 msgid "Amount of Payment:" msgstr "" -#: purchasing/supplier_payment.php:329 +#: purchasing/supplier_payment.php:328 msgid "Enter Payment" msgstr "" @@ -9711,8 +9814,8 @@ msgstr "" #: purchasing/view/view_po.php:100 #: purchasing/inquiry/supplier_allocation_inquiry.php:148 #: purchasing/inquiry/supplier_inquiry.php:193 -#: sales/inquiry/customer_allocation_inquiry.php:164 -#: sales/inquiry/customer_inquiry.php:251 +#: sales/inquiry/customer_allocation_inquiry.php:165 +#: sales/inquiry/customer_inquiry.php:244 #: sales/inquiry/sales_deliveries_view.php:206 #: sales/inquiry/sales_orders_view.php:318 msgid "Marked items are overdue." @@ -9786,8 +9889,9 @@ msgstr "" msgid "Payment Currency" msgstr "" -#: purchasing/view/view_supp_payment.php:62 sales/customer_delivery.php:433 -#: sales/customer_invoice.php:470 sales/view/view_receipt.php:45 +#: purchasing/view/view_supp_payment.php:62 reporting/rep112.php:162 +#: reporting/rep210.php:171 sales/customer_delivery.php:433 +#: sales/customer_invoice.php:479 sales/view/view_receipt.php:45 #: sales/view/view_sales_order.php:202 msgid "Discount" msgstr "" @@ -9818,148 +9922,148 @@ msgstr "" msgid "Website:" msgstr "" -#: purchasing/manage/suppliers.php:106 +#: purchasing/manage/suppliers.php:107 msgid "Our Customer No:" msgstr "" -#: purchasing/manage/suppliers.php:108 +#: purchasing/manage/suppliers.php:109 msgid "Purchasing" msgstr "" -#: purchasing/manage/suppliers.php:109 +#: purchasing/manage/suppliers.php:110 msgid "Bank Name/Account:" msgstr "" -#: purchasing/manage/suppliers.php:110 sales/manage/customers.php:264 +#: purchasing/manage/suppliers.php:111 sales/manage/customers.php:268 msgid "Credit Limit:" msgstr "" -#: purchasing/manage/suppliers.php:111 sales/manage/customers.php:266 +#: purchasing/manage/suppliers.php:112 sales/manage/customers.php:270 msgid "Payment Terms:" msgstr "" -#: purchasing/manage/suppliers.php:117 purchasing/manage/suppliers.php:120 +#: purchasing/manage/suppliers.php:118 purchasing/manage/suppliers.php:121 msgid "Prices contain tax included:" msgstr "" -#: purchasing/manage/suppliers.php:122 reporting/rep704.php:96 +#: purchasing/manage/suppliers.php:123 reporting/rep704.php:96 #: reporting/rep704.php:106 reporting/rep704.php:114 msgid "Accounts" msgstr "" -#: purchasing/manage/suppliers.php:123 +#: purchasing/manage/suppliers.php:124 msgid "Accounts Payable Account:" msgstr "" -#: purchasing/manage/suppliers.php:124 +#: purchasing/manage/suppliers.php:125 msgid "Purchase Account:" msgstr "" -#: purchasing/manage/suppliers.php:125 +#: purchasing/manage/suppliers.php:126 msgid "Use Item Inventory/COGS Account" msgstr "" -#: purchasing/manage/suppliers.php:128 purchasing/manage/suppliers.php:157 +#: purchasing/manage/suppliers.php:129 purchasing/manage/suppliers.php:158 msgid "Contact Data" msgstr "" -#: purchasing/manage/suppliers.php:148 sales/manage/customer_branches.php:266 +#: purchasing/manage/suppliers.php:149 sales/manage/customer_branches.php:266 msgid "Addresses" msgstr "" -#: purchasing/manage/suppliers.php:149 reporting/rep205.php:102 +#: purchasing/manage/suppliers.php:150 reporting/rep205.php:102 #: sales/manage/customer_branches.php:267 msgid "Mailing Address:" msgstr "" -#: purchasing/manage/suppliers.php:150 +#: purchasing/manage/suppliers.php:151 msgid "Physical Address:" msgstr "" -#: purchasing/manage/suppliers.php:152 +#: purchasing/manage/suppliers.php:153 msgid "General" msgstr "" -#: purchasing/manage/suppliers.php:153 sales/manage/customer_branches.php:269 -#: sales/manage/customers.php:287 +#: purchasing/manage/suppliers.php:154 sales/manage/customer_branches.php:269 +#: sales/manage/customers.php:291 msgid "General Notes:" msgstr "" -#: purchasing/manage/suppliers.php:155 +#: purchasing/manage/suppliers.php:156 msgid "Supplier status:" msgstr "" -#: purchasing/manage/suppliers.php:161 +#: purchasing/manage/suppliers.php:162 msgid "System default" msgstr "" -#: purchasing/manage/suppliers.php:168 +#: purchasing/manage/suppliers.php:169 msgid "Update Supplier" msgstr "" -#: purchasing/manage/suppliers.php:169 +#: purchasing/manage/suppliers.php:170 msgid "Update supplier data" msgstr "" -#: purchasing/manage/suppliers.php:170 +#: purchasing/manage/suppliers.php:171 msgid "Select this supplier and return to document entry." msgstr "" -#: purchasing/manage/suppliers.php:171 +#: purchasing/manage/suppliers.php:172 msgid "Delete Supplier" msgstr "" -#: purchasing/manage/suppliers.php:172 +#: purchasing/manage/suppliers.php:173 msgid "Delete supplier data if have been never used" msgstr "" -#: purchasing/manage/suppliers.php:176 +#: purchasing/manage/suppliers.php:177 msgid "Add New Supplier Details" msgstr "" -#: purchasing/manage/suppliers.php:195 +#: purchasing/manage/suppliers.php:196 msgid "The supplier name must be entered." msgstr "" -#: purchasing/manage/suppliers.php:202 +#: purchasing/manage/suppliers.php:203 msgid "The supplier short name must be entered." msgstr "" -#: purchasing/manage/suppliers.php:222 +#: purchasing/manage/suppliers.php:223 msgid "Supplier has been updated." msgstr "" -#: purchasing/manage/suppliers.php:240 +#: purchasing/manage/suppliers.php:241 msgid "A new supplier has been added." msgstr "" -#: purchasing/manage/suppliers.php:258 +#: purchasing/manage/suppliers.php:259 msgid "" "Cannot delete this supplier because there are transactions that refer to " "this supplier." msgstr "" -#: purchasing/manage/suppliers.php:266 +#: purchasing/manage/suppliers.php:267 msgid "" "Cannot delete the supplier record because purchase orders have been created " "against this supplier." msgstr "" -#: purchasing/manage/suppliers.php:287 +#: purchasing/manage/suppliers.php:288 #: purchasing/inquiry/supplier_allocation_inquiry.php:48 msgid "Select a supplier: " msgstr "" -#: purchasing/manage/suppliers.php:288 +#: purchasing/manage/suppliers.php:289 msgid "New supplier" msgstr "" -#: purchasing/manage/suppliers.php:307 sales/manage/customer_branches.php:323 -#: sales/manage/customers.php:345 +#: purchasing/manage/suppliers.php:308 sales/manage/customer_branches.php:323 +#: sales/manage/customers.php:349 msgid "&Contacts" msgstr "" -#: purchasing/manage/suppliers.php:309 +#: purchasing/manage/suppliers.php:310 msgid "Purchase &Orders" msgstr "" @@ -10022,7 +10126,7 @@ msgstr "" #: purchasing/inquiry/supplier_allocation_inquiry.php:136 #: reporting/rep101.php:119 reporting/rep201.php:111 #: reporting/includes/doctext.inc:225 -#: sales/inquiry/customer_allocation_inquiry.php:153 +#: sales/inquiry/customer_allocation_inquiry.php:154 msgid "Allocated" msgstr "" @@ -10084,41 +10188,46 @@ msgstr "" msgid "Allocate Supplier Payment or Credit Note" msgstr "" -#: purchasing/allocations/supplier_allocate.php:49 +#: purchasing/allocations/supplier_allocate.php:52 msgid "Allocation of" msgstr "" -#: purchasing/allocations/supplier_allocate.php:54 -#: sales/allocations/customer_allocate.php:53 +#: purchasing/allocations/supplier_allocate.php:58 +#: sales/allocations/customer_allocate.php:55 msgid "Total:" msgstr "" -#: purchasing/allocations/supplier_allocate.php:63 -#: sales/allocations/customer_allocate.php:62 +#: purchasing/allocations/supplier_allocate.php:62 +#: sales/allocations/customer_allocate.php:59 +msgid "Total in clearing currency:" +msgstr "" + +#: purchasing/allocations/supplier_allocate.php:73 +#: sales/allocations/customer_allocate.php:71 msgid "Start again allocation of selected amount" msgstr "" -#: purchasing/allocations/supplier_allocate.php:64 -#: sales/allocations/customer_allocate.php:63 +#: purchasing/allocations/supplier_allocate.php:74 +#: sales/allocations/customer_allocate.php:72 msgid "Process allocations" msgstr "" -#: purchasing/allocations/supplier_allocate.php:65 -#: purchasing/allocations/supplier_allocate.php:71 -#: sales/allocations/customer_allocate.php:64 -#: sales/allocations/customer_allocate.php:70 +#: purchasing/allocations/supplier_allocate.php:75 +#: purchasing/allocations/supplier_allocate.php:81 +#: sales/allocations/customer_allocate.php:73 +#: sales/allocations/customer_allocate.php:79 msgid "Back to Allocations" msgstr "" -#: purchasing/allocations/supplier_allocate.php:66 -#: purchasing/allocations/supplier_allocate.php:72 -#: sales/allocations/customer_allocate.php:64 -#: sales/allocations/customer_allocate.php:71 +#: purchasing/allocations/supplier_allocate.php:76 +#: purchasing/allocations/supplier_allocate.php:82 +#: sales/allocations/customer_allocate.php:73 +#: sales/allocations/customer_allocate.php:80 msgid "Abandon allocations and return to selection of allocatable amounts" msgstr "" -#: purchasing/allocations/supplier_allocate.php:70 -#: sales/allocations/customer_allocate.php:68 +#: purchasing/allocations/supplier_allocate.php:80 +#: sales/allocations/customer_allocate.php:77 msgid "There are no unsettled transactions to allocate." msgstr "" @@ -10300,11 +10409,6 @@ msgstr "" msgid "Turnover" msgstr "" -#: reporting/rep103.php:277 reporting/rep106.php:88 reporting/rep205.php:195 -#: reporting/includes/header2.inc:110 sales/manage/sales_people.php:99 -msgid "Email" -msgstr "" - #: reporting/rep104.php:111 msgid "Category/Items" msgstr "" @@ -10339,17 +10443,17 @@ msgid "Back Orders Only" msgstr "" #: reporting/rep105.php:109 reporting/rep204.php:84 -#: sales/inquiry/customer_allocation_inquiry.php:146 -#: sales/inquiry/customer_inquiry.php:226 +#: sales/inquiry/customer_allocation_inquiry.php:147 +#: sales/inquiry/customer_inquiry.php:219 msgid "Order" msgstr "" -#: reporting/rep105.php:109 reporting/rep106.php:83 reporting/rep112.php:179 +#: reporting/rep105.php:109 reporting/rep106.php:83 reporting/rep112.php:187 #: sales/create_recurrent_invoices.php:134 #: sales/customer_credit_invoice.php:236 sales/customer_delivery.php:339 -#: sales/customer_invoice.php:381 sales/manage/customers.php:251 -#: sales/manage/customers.php:290 sales/manage/recurrent_invoices.php:102 -#: sales/view/view_credit.php:58 sales/inquiry/customer_inquiry.php:231 +#: sales/customer_invoice.php:390 sales/manage/customers.php:255 +#: sales/manage/customers.php:294 sales/manage/recurrent_invoices.php:102 +#: sales/view/view_credit.php:58 sales/inquiry/customer_inquiry.php:224 #: sales/inquiry/sales_deliveries_view.php:182 #: sales/inquiry/sales_orders_view.php:265 #: sales/inquiry/sales_orders_view.php:279 @@ -10373,8 +10477,8 @@ msgid "Loc" msgstr "" #: reporting/rep105.php:114 sales/customer_delivery.php:432 -#: sales/customer_invoice.php:469 -msgid "Invoiced" +#: sales/customer_invoice.php:478 sales/includes/ui/sales_order_ui.inc:145 +msgid "Delivered" msgstr "" #: reporting/rep105.php:121 @@ -10476,31 +10580,31 @@ msgstr "" msgid "SALES QUOTATION" msgstr "" -#: reporting/rep112.php:94 reporting/includes/doctext.inc:176 +#: reporting/rep112.php:95 reporting/includes/doctext.inc:176 msgid "RECEIPT" msgstr "" -#: reporting/rep112.php:125 reporting/rep210.php:133 +#: reporting/rep112.php:126 reporting/rep210.php:134 msgid "As advance / full / part / payment towards:" msgstr "" -#: reporting/rep112.php:160 +#: reporting/rep112.php:167 msgid "TOTAL RECEIPT" msgstr "" -#: reporting/rep112.php:170 +#: reporting/rep112.php:178 msgid "Received / Sign" msgstr "" -#: reporting/rep112.php:172 +#: reporting/rep112.php:180 msgid "By Cash / Cheque* / Draft No." msgstr "" -#: reporting/rep112.php:174 +#: reporting/rep112.php:182 msgid "Dated" msgstr "" -#: reporting/rep112.php:177 +#: reporting/rep112.php:185 msgid "Drawn on Bank" msgstr "" @@ -10594,12 +10698,12 @@ msgstr "" msgid "TOTAL PO" msgstr "" -#: reporting/rep210.php:95 reporting/rep210.php:117 +#: reporting/rep210.php:96 reporting/rep210.php:118 #: reporting/includes/doctext.inc:129 msgid "REMITTANCE" msgstr "" -#: reporting/rep210.php:168 +#: reporting/rep210.php:177 msgid "TOTAL REMITTANCE" msgstr "" @@ -10653,7 +10757,7 @@ msgid "Qty" msgstr "" #: reporting/rep304.php:114 reporting/rep309.php:98 -#: sales/manage/customer_branches.php:240 sales/manage/customers.php:260 +#: sales/manage/customer_branches.php:240 sales/manage/customers.php:264 msgid "Sales" msgstr "" @@ -11038,8 +11142,7 @@ msgid "Print &Statements" msgstr "" #: reporting/reports_main.php:124 reporting/reports_main.php:131 -#: reporting/reports_main.php:139 reporting/reports_main.php:195 -#: reporting/reports_main.php:202 +#: reporting/reports_main.php:139 msgid "Email Customers" msgstr "" @@ -11083,6 +11186,10 @@ msgstr "" msgid "Print Purchase &Orders" msgstr "" +#: reporting/reports_main.php:195 reporting/reports_main.php:202 +msgid "Email Suppliers" +msgstr "" + #: reporting/reports_main.php:198 msgid "Print Remittances" msgstr "" @@ -11364,7 +11471,7 @@ msgstr "" msgid "DueDate" msgstr "" -#: reporting/includes/doctext.inc:259 reporting/includes/pdf_report.inc:1020 +#: reporting/includes/doctext.inc:259 reporting/includes/pdf_report.inc:1019 msgid "You can pay through" msgstr "" @@ -11392,12 +11499,12 @@ msgid "Report Date" msgstr "" #: reporting/includes/excel_report.inc:413 -#: reporting/includes/pdf_report.inc:601 +#: reporting/includes/pdf_report.inc:600 msgid "Generated At" msgstr "" #: reporting/includes/excel_report.inc:419 -#: reporting/includes/pdf_report.inc:610 +#: reporting/includes/pdf_report.inc:609 msgid "Generated By" msgstr "" @@ -11410,46 +11517,46 @@ msgid "Domicile" msgstr "" #: reporting/includes/header2.inc:143 reporting/includes/pdf_report.inc:352 -#: reporting/includes/pdf_report.inc:501 reporting/includes/pdf_report.inc:629 +#: reporting/includes/pdf_report.inc:501 reporting/includes/pdf_report.inc:628 msgid "Page" msgstr "" -#: reporting/includes/pdf_report.inc:584 +#: reporting/includes/pdf_report.inc:583 msgid "Report Period" msgstr "" -#: reporting/includes/pdf_report.inc:987 -#: reporting/includes/pdf_report.inc:1035 +#: reporting/includes/pdf_report.inc:986 +#: reporting/includes/pdf_report.inc:1034 #, php-format msgid "You have no email contact defined for this type of document for '%s'." msgstr "" -#: reporting/includes/pdf_report.inc:1006 +#: reporting/includes/pdf_report.inc:1005 msgid "Dear" msgstr "" -#: reporting/includes/pdf_report.inc:1007 +#: reporting/includes/pdf_report.inc:1006 msgid "Attached you will find " msgstr "" -#: reporting/includes/pdf_report.inc:1023 +#: reporting/includes/pdf_report.inc:1022 msgid "Kindest regards" msgstr "" -#: reporting/includes/pdf_report.inc:1038 +#: reporting/includes/pdf_report.inc:1037 msgid "Sending document by email failed" msgstr "" -#: reporting/includes/pdf_report.inc:1038 -#: reporting/includes/pdf_report.inc:1041 +#: reporting/includes/pdf_report.inc:1037 +#: reporting/includes/pdf_report.inc:1040 msgid "Email:" msgstr "" -#: reporting/includes/pdf_report.inc:1041 +#: reporting/includes/pdf_report.inc:1040 msgid "has been sent by email to destination." msgstr "" -#: reporting/includes/pdf_report.inc:1071 +#: reporting/includes/pdf_report.inc:1070 msgid "Report has been sent to network printer " msgstr "" @@ -11646,7 +11753,7 @@ msgstr "" msgid "Modifying Customer Credit Note #%d" msgstr "" -#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:684 +#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:688 msgid "" "There are no customers, or there are no customers with branches. Please " "define customers and customer branches." @@ -11912,7 +12019,7 @@ msgstr "" msgid "The entered dead-line for invoice is invalid." msgstr "" -#: sales/customer_delivery.php:176 sales/customer_invoice.php:291 +#: sales/customer_delivery.php:176 sales/customer_invoice.php:300 msgid "The entered shipping value is not numeric." msgstr "" @@ -11920,7 +12027,7 @@ msgstr "" msgid "There are no item quantities on this delivery note." msgstr "" -#: sales/customer_delivery.php:285 sales/sales_order_entry.php:513 +#: sales/customer_delivery.php:285 sales/sales_order_entry.php:516 #: sales/includes/ui/sales_order_ui.inc:250 msgid "" "The delivery cannot be processed because there is an insufficient quantity " @@ -11939,7 +12046,7 @@ msgstr "" msgid "Invoice Dead-line" msgstr "" -#: sales/customer_delivery.php:421 sales/customer_invoice.php:459 +#: sales/customer_delivery.php:421 sales/customer_invoice.php:468 #: sales/includes/ui/sales_order_ui.inc:84 #: sales/includes/ui/sales_order_ui.inc:374 msgid "" @@ -11955,12 +12062,11 @@ msgstr "" msgid "Max. delivery" msgstr "" -#: sales/customer_delivery.php:432 sales/customer_invoice.php:469 -#: sales/includes/ui/sales_order_ui.inc:145 -msgid "Delivered" +#: sales/customer_delivery.php:432 sales/customer_invoice.php:478 +msgid "Invoiced" msgstr "" -#: sales/customer_delivery.php:503 sales/customer_invoice.php:554 +#: sales/customer_delivery.php:503 sales/customer_invoice.php:563 msgid "Shipping Cost" msgstr "" @@ -11974,7 +12080,7 @@ msgid "Action For Balance" msgstr "" #: sales/customer_delivery.php:534 sales/customer_delivery.php:536 -#: sales/customer_delivery.php:539 sales/customer_invoice.php:583 +#: sales/customer_delivery.php:539 sales/customer_invoice.php:592 msgid "Refresh document page" msgstr "" @@ -11990,8 +12096,8 @@ msgstr "" msgid "Process Dispatch" msgstr "" -#: sales/customer_delivery.php:542 sales/customer_invoice.php:585 -#: sales/sales_order_entry.php:732 +#: sales/customer_delivery.php:542 sales/customer_invoice.php:594 +#: sales/sales_order_entry.php:736 msgid "Check entered data and save document" msgstr "" @@ -12012,16 +12118,16 @@ msgstr "" msgid "Selected deliveries has been processed" msgstr "" -#: sales/customer_invoice.php:57 sales/customer_invoice.php:77 +#: sales/customer_invoice.php:57 sales/customer_invoice.php:86 #: sales/sales_order_entry.php:212 msgid "&View This Invoice" msgstr "" -#: sales/customer_invoice.php:59 sales/customer_invoice.php:79 +#: sales/customer_invoice.php:59 sales/customer_invoice.php:88 msgid "&Print This Invoice" msgstr "" -#: sales/customer_invoice.php:60 sales/customer_invoice.php:80 +#: sales/customer_invoice.php:60 sales/customer_invoice.php:89 msgid "&Email This Invoice" msgstr "" @@ -12033,26 +12139,30 @@ msgstr "" msgid "Select Another &Delivery For Invoicing" msgstr "" -#: sales/customer_invoice.php:75 +#: sales/customer_invoice.php:72 sales/sales_order_entry.php:235 +msgid "Entry &customer payment for this invoice" +msgstr "" + +#: sales/customer_invoice.php:84 #, php-format msgid "Sales Invoice # %d has been updated." msgstr "" -#: sales/customer_invoice.php:82 +#: sales/customer_invoice.php:91 msgid "Select Another &Invoice to Modify" msgstr "" -#: sales/customer_invoice.php:121 +#: sales/customer_invoice.php:130 msgid "Select a different delivery to invoice" msgstr "" -#: sales/customer_invoice.php:122 +#: sales/customer_invoice.php:131 msgid "" "There are no delivered items with a quantity left to invoice. There is " "nothing left to invoice." msgstr "" -#: sales/customer_invoice.php:131 +#: sales/customer_invoice.php:140 msgid "" "There are no delivery notes for this invoice.
\n" "\t\tMost likely this invoice was created in Front Accounting version prior " @@ -12060,176 +12170,168 @@ msgid "" "\t\tand therefore can not be modified." msgstr "" -#: sales/customer_invoice.php:140 +#: sales/customer_invoice.php:149 msgid "" "All quantities on this invoice has been credited. There is nothing to modify " "on this invoice" msgstr "" -#: sales/customer_invoice.php:146 +#: sales/customer_invoice.php:155 msgid "" "This page can only be opened after delivery selection. Please select " "delivery to invoicing first." msgstr "" -#: sales/customer_invoice.php:148 +#: sales/customer_invoice.php:157 msgid "Select Delivery to Invoice" msgstr "" -#: sales/customer_invoice.php:153 sales/customer_invoice.php:302 +#: sales/customer_invoice.php:162 sales/customer_invoice.php:311 msgid "" "Selected quantity cannot be less than quantity credited nor more than " "quantity not invoiced yet." msgstr "" -#: sales/customer_invoice.php:261 +#: sales/customer_invoice.php:270 msgid "The entered invoice date is invalid." msgstr "" -#: sales/customer_invoice.php:267 +#: sales/customer_invoice.php:276 msgid "The entered invoice date is not in fiscal year." msgstr "" -#: sales/customer_invoice.php:273 +#: sales/customer_invoice.php:282 msgid "The entered invoice due date is invalid." msgstr "" -#: sales/customer_invoice.php:297 +#: sales/customer_invoice.php:306 msgid "There are no item quantities on this invoice." msgstr "" -#: sales/customer_invoice.php:385 +#: sales/customer_invoice.php:394 msgid "Payment terms:" msgstr "" -#: sales/customer_invoice.php:388 sales/includes/ui/sales_order_ui.inc:410 +#: sales/customer_invoice.php:397 sales/includes/ui/sales_order_ui.inc:410 #: sales/includes/ui/sales_order_ui.inc:414 msgid "Payment:" msgstr "" -#: sales/customer_invoice.php:465 +#: sales/customer_invoice.php:474 msgid "Invoice Items" msgstr "" -#: sales/customer_invoice.php:470 +#: sales/customer_invoice.php:479 msgid "This Invoice" msgstr "" -#: sales/customer_invoice.php:478 +#: sales/customer_invoice.php:487 msgid "Credited" msgstr "" -#: sales/customer_invoice.php:572 +#: sales/customer_invoice.php:581 msgid "Invoice Total" msgstr "" -#: sales/customer_payments.php:33 sales/customer_payments.php.sav:33 +#: sales/customer_payments.php:32 msgid "Customer Payment Entry" msgstr "" -#: sales/customer_payments.php:37 sales/customer_payments.php.sav:37 +#: sales/customer_payments.php:36 msgid "There are no customers defined in the system." msgstr "" -#: sales/customer_payments.php:68 sales/customer_payments.php.sav:68 +#: sales/customer_payments.php:70 msgid "Invalid sales invoice number." msgstr "" -#: sales/customer_payments.php:94 sales/customer_payments.php.sav:94 +#: sales/customer_payments.php:97 msgid "The customer payment has been successfully entered." msgstr "" -#: sales/customer_payments.php:96 sales/customer_payments.php:113 -#: sales/customer_payments.php.sav:96 sales/customer_payments.php.sav:113 +#: sales/customer_payments.php:99 sales/customer_payments.php:118 msgid "&Print This Receipt" msgstr "" -#: sales/customer_payments.php:98 sales/customer_payments.php:115 -#: sales/customer_payments.php.sav:98 sales/customer_payments.php.sav:115 -msgid "&View the GL Journal Entries for this Customer Payment" +#: sales/customer_payments.php:101 +msgid "&View this Customer Payment" msgstr "" -#: sales/customer_payments.php:102 sales/customer_payments.php.sav:102 -msgid "Select Another &Customer Transaction for Payment" +#: sales/customer_payments.php:103 sales/customer_payments.php:126 +msgid "Enter Another &Customer Payment" msgstr "" -#: sales/customer_payments.php:104 sales/customer_payments.php:121 -#: sales/customer_payments.php.sav:104 sales/customer_payments.php.sav:121 -msgid "Enter Another &Customer Payment" +#: sales/customer_payments.php:105 +msgid "Enter Payment to &Supplier" +msgstr "" + +#: sales/customer_payments.php:109 sales/customer_payments.php:120 +msgid "&View the GL Journal Entries for this Customer Payment" msgstr "" -#: sales/customer_payments.php:111 sales/customer_payments.php.sav:111 +#: sales/customer_payments.php:116 msgid "The customer payment has been successfully updated." msgstr "" -#: sales/customer_payments.php:119 sales/customer_payments.php.sav:119 +#: sales/customer_payments.php:124 msgid "Select Another Customer Payment for &Edition" msgstr "" -#: sales/customer_payments.php:134 sales/customer_payments.php.sav:134 -#: sales/sales_order_entry.php:337 +#: sales/customer_payments.php:139 sales/sales_order_entry.php:340 msgid "There is no customer selected." msgstr "" -#: sales/customer_payments.php:141 sales/customer_payments.php.sav:141 -#: sales/sales_order_entry.php:344 +#: sales/customer_payments.php:146 sales/sales_order_entry.php:347 msgid "This customer has no branch defined." msgstr "" -#: sales/customer_payments.php:147 sales/customer_payments.php.sav:147 +#: sales/customer_payments.php:152 msgid "The entered date is invalid. Please enter a valid date for the payment." msgstr "" -#: sales/customer_payments.php:177 sales/customer_payments.php:183 -#: sales/customer_payments.php.sav:177 sales/customer_payments.php.sav:183 +#: sales/customer_payments.php:182 sales/customer_payments.php:188 msgid "The entered amount is invalid or negative and cannot be processed." msgstr "" -#: sales/customer_payments.php:209 sales/customer_payments.php.sav:209 +#: sales/customer_payments.php:214 msgid "The entered discount is not a valid number." msgstr "" -#: sales/customer_payments.php:216 sales/customer_payments.php.sav:216 +#: sales/customer_payments.php:221 msgid "" "The balance of the amount and discount is zero or negative. Please enter " "valid amounts." msgstr "" -#: sales/customer_payments.php:223 sales/customer_payments.php.sav:223 +#: sales/customer_payments.php:228 msgid "The entered payment amount is zero or negative." msgstr "" -#: sales/customer_payments.php:338 sales/customer_payments.php.sav:345 +#: sales/customer_payments.php:335 msgid "Into Bank Account:" msgstr "" -#: sales/customer_payments.php:341 sales/customer_payments.php:343 -#: sales/customer_payments.php.sav:348 sales/customer_payments.php.sav:350 +#: sales/customer_payments.php:338 sales/customer_payments.php:340 msgid "From Customer:" msgstr "" -#: sales/customer_payments.php:368 sales/customer_payments.php.sav:375 +#: sales/customer_payments.php:366 msgid "Date of Deposit:" msgstr "" -#: sales/customer_payments.php:384 sales/customer_payments.php.sav:391 +#: sales/customer_payments.php:380 msgid "Payment Amount:" msgstr "" -#: sales/customer_payments.php:393 sales/customer_payments.php.sav:400 -#, php-format -msgid "Accounts Receivable settled in %s:" -msgstr "" - -#: sales/customer_payments.php:400 sales/customer_payments.php.sav:407 +#: sales/customer_payments.php:393 msgid "Customer prompt payment discount :" msgstr "" -#: sales/customer_payments.php:410 sales/customer_payments.php.sav:419 +#: sales/customer_payments.php:403 msgid "Add Payment" msgstr "" -#: sales/customer_payments.php:412 sales/customer_payments.php.sav:417 +#: sales/customer_payments.php:405 msgid "Update Payment" msgstr "" @@ -12364,201 +12466,201 @@ msgstr "" msgid "Enter a &New Direct Invoice" msgstr "" -#: sales/sales_order_entry.php:366 +#: sales/sales_order_entry.php:369 msgid "" "You must enter the person or company to whom delivery should be made to." msgstr "" -#: sales/sales_order_entry.php:373 +#: sales/sales_order_entry.php:376 msgid "" "You should enter the street address in the box provided. Orders cannot be " "accepted without a valid street address." msgstr "" -#: sales/sales_order_entry.php:382 +#: sales/sales_order_entry.php:385 msgid "The shipping cost entered is expected to be numeric." msgstr "" -#: sales/sales_order_entry.php:388 +#: sales/sales_order_entry.php:391 msgid "The Valid date is invalid." msgstr "" -#: sales/sales_order_entry.php:390 +#: sales/sales_order_entry.php:393 msgid "The delivery date is invalid." msgstr "" -#: sales/sales_order_entry.php:397 +#: sales/sales_order_entry.php:400 msgid "The requested valid date is before the date of the quotation." msgstr "" -#: sales/sales_order_entry.php:399 +#: sales/sales_order_entry.php:402 msgid "The requested delivery date is before the date of the order." msgstr "" -#: sales/sales_order_entry.php:408 +#: sales/sales_order_entry.php:411 msgid "You need to define a cash account for your Sales Point." msgstr "" -#: sales/sales_order_entry.php:446 +#: sales/sales_order_entry.php:449 msgid "" "The reference number field has been increased. Please save the document " "again." msgstr "" -#: sales/sales_order_entry.php:492 +#: sales/sales_order_entry.php:495 msgid "" "The item could not be updated because you are attempting to set the quantity " "ordered to less than 0, or the discount percent to more than 100." msgstr "" -#: sales/sales_order_entry.php:496 +#: sales/sales_order_entry.php:499 msgid "Price for inventory item must be entered and can not be less than 0" msgstr "" -#: sales/sales_order_entry.php:503 +#: sales/sales_order_entry.php:506 msgid "" "You attempting to make the quantity ordered a quantity less than has already " "been delivered. The quantity delivered cannot be modified retrospectively." msgstr "" -#: sales/sales_order_entry.php:534 +#: sales/sales_order_entry.php:537 #, php-format msgid "Price %s is below Standard Cost %s" msgstr "" -#: sales/sales_order_entry.php:559 +#: sales/sales_order_entry.php:562 msgid "" "This item cannot be deleted because some of it has already been delivered." msgstr "" -#: sales/sales_order_entry.php:588 +#: sales/sales_order_entry.php:591 msgid "Direct delivery entry has been cancelled as requested." msgstr "" -#: sales/sales_order_entry.php:589 +#: sales/sales_order_entry.php:592 msgid "Enter a New Sales Delivery" msgstr "" -#: sales/sales_order_entry.php:591 +#: sales/sales_order_entry.php:594 msgid "Direct invoice entry has been cancelled as requested." msgstr "" -#: sales/sales_order_entry.php:592 +#: sales/sales_order_entry.php:595 msgid "Enter a New Sales Invoice" msgstr "" -#: sales/sales_order_entry.php:596 +#: sales/sales_order_entry.php:600 msgid "This sales quotation has been cancelled as requested." msgstr "" -#: sales/sales_order_entry.php:597 +#: sales/sales_order_entry.php:601 msgid "Enter a New Sales Quotation" msgstr "" -#: sales/sales_order_entry.php:604 +#: sales/sales_order_entry.php:608 msgid "Undelivered part of order has been cancelled as requested." msgstr "" -#: sales/sales_order_entry.php:605 +#: sales/sales_order_entry.php:609 msgid "Select Another Sales Order for Edition" msgstr "" -#: sales/sales_order_entry.php:609 +#: sales/sales_order_entry.php:613 msgid "This sales order has been cancelled as requested." msgstr "" -#: sales/sales_order_entry.php:610 +#: sales/sales_order_entry.php:614 msgid "Enter a New Sales Order" msgstr "" -#: sales/sales_order_entry.php:688 +#: sales/sales_order_entry.php:692 msgid "Sales Invoice Items" msgstr "" -#: sales/sales_order_entry.php:689 +#: sales/sales_order_entry.php:693 msgid "Enter Delivery Details and Confirm Invoice" msgstr "" -#: sales/sales_order_entry.php:691 +#: sales/sales_order_entry.php:695 msgid "Place Invoice" msgstr "" -#: sales/sales_order_entry.php:694 +#: sales/sales_order_entry.php:698 msgid "Delivery Note Items" msgstr "" -#: sales/sales_order_entry.php:695 +#: sales/sales_order_entry.php:699 msgid "Enter Delivery Details and Confirm Dispatch" msgstr "" -#: sales/sales_order_entry.php:696 +#: sales/sales_order_entry.php:700 msgid "Cancel Delivery" msgstr "" -#: sales/sales_order_entry.php:697 +#: sales/sales_order_entry.php:701 msgid "Place Delivery" msgstr "" -#: sales/sales_order_entry.php:699 +#: sales/sales_order_entry.php:703 msgid "Quotation Date:" msgstr "" -#: sales/sales_order_entry.php:700 +#: sales/sales_order_entry.php:704 msgid "Sales Quotation Items" msgstr "" -#: sales/sales_order_entry.php:701 +#: sales/sales_order_entry.php:705 msgid "Enter Delivery Details and Confirm Quotation" msgstr "" -#: sales/sales_order_entry.php:702 +#: sales/sales_order_entry.php:706 msgid "Cancel Quotation" msgstr "" -#: sales/sales_order_entry.php:703 +#: sales/sales_order_entry.php:707 msgid "Place Quotation" msgstr "" -#: sales/sales_order_entry.php:704 +#: sales/sales_order_entry.php:708 msgid "Commit Quotations Changes" msgstr "" -#: sales/sales_order_entry.php:707 +#: sales/sales_order_entry.php:711 msgid "Sales Order Items" msgstr "" -#: sales/sales_order_entry.php:708 +#: sales/sales_order_entry.php:712 msgid "Enter Delivery Details and Confirm Order" msgstr "" -#: sales/sales_order_entry.php:711 +#: sales/sales_order_entry.php:715 msgid "Commit Order Changes" msgstr "" -#: sales/sales_order_entry.php:733 -msgid "You are about to void this Document.\\nDo you want to continue?" +#: sales/sales_order_entry.php:738 sales/sales_order_entry.php:744 +msgid "" +"Cancels document entry or removes sales order when editing an old document" msgstr "" -#: sales/sales_order_entry.php:736 -msgid "" -"You are about to cancel undelivered part of this order.\\nDo you want to " -"continue?" +#: sales/sales_order_entry.php:739 sales/sales_order_entry.php:748 +msgid "You are about to void this Document.\\nDo you want to continue?" msgstr "" -#: sales/sales_order_entry.php:738 +#: sales/sales_order_entry.php:742 msgid "Validate changes and update document" msgstr "" -#: sales/sales_order_entry.php:742 +#: sales/sales_order_entry.php:746 msgid "" -"Cancels document entry or removes sales order when editing an old document" +"You are about to cancel undelivered part of this order.\\nDo you want to " +"continue?" msgstr "" #: sales/allocations/customer_allocate.php:28 msgid "Allocate Customer Payment or Credit Note" msgstr "" -#: sales/allocations/customer_allocate.php:47 +#: sales/allocations/customer_allocate.php:50 #, php-format msgid "Allocation of %s # %d" msgstr "" @@ -12568,7 +12670,7 @@ msgid "Customer Allocations" msgstr "" #: sales/allocations/customer_allocation_main.php:32 -#: sales/manage/customer_branches.php:280 sales/manage/customers.php:324 +#: sales/manage/customer_branches.php:280 sales/manage/customers.php:328 #: sales/inquiry/customer_allocation_inquiry.php:42 #: sales/inquiry/customer_inquiry.php:48 #: sales/inquiry/sales_orders_view.php:243 @@ -12693,11 +12795,11 @@ msgstr "" msgid "Branch Short Name:" msgstr "" -#: sales/manage/customer_branches.php:241 sales/manage/customers.php:256 +#: sales/manage/customer_branches.php:241 sales/manage/customers.php:260 msgid "Sales Person:" msgstr "" -#: sales/manage/customer_branches.php:242 sales/manage/customers.php:293 +#: sales/manage/customer_branches.php:242 sales/manage/customers.php:297 msgid "Sales Area:" msgstr "" @@ -12706,11 +12808,11 @@ msgstr "" msgid "Sales Group:" msgstr "" -#: sales/manage/customer_branches.php:244 sales/manage/customers.php:291 +#: sales/manage/customer_branches.php:244 sales/manage/customers.php:295 msgid "Default Inventory Location:" msgstr "" -#: sales/manage/customer_branches.php:245 sales/manage/customers.php:292 +#: sales/manage/customer_branches.php:245 sales/manage/customers.php:296 msgid "Default Shipping Company:" msgstr "" @@ -12786,121 +12888,121 @@ msgstr "" msgid "Customer has been updated." msgstr "" -#: sales/manage/customers.php:127 +#: sales/manage/customers.php:130 msgid "A new customer has been added." msgstr "" -#: sales/manage/customers.php:130 +#: sales/manage/customers.php:133 msgid "" "A default Branch has been automatically created, please check default Branch " "values by using link below." msgstr "" -#: sales/manage/customers.php:153 +#: sales/manage/customers.php:156 msgid "" "This customer cannot be deleted because there are transactions that refer to " "it." msgstr "" -#: sales/manage/customers.php:160 +#: sales/manage/customers.php:163 msgid "" "Cannot delete the customer record because orders have been created against " "it." msgstr "" -#: sales/manage/customers.php:167 +#: sales/manage/customers.php:170 msgid "" "Cannot delete this customer because there are branch records set up against " "it." msgstr "" -#: sales/manage/customers.php:178 +#: sales/manage/customers.php:181 msgid "Selected customer has been deleted." msgstr "" -#: sales/manage/customers.php:227 +#: sales/manage/customers.php:230 msgid "Name and Address" msgstr "" -#: sales/manage/customers.php:229 +#: sales/manage/customers.php:232 msgid "Customer Name:" msgstr "" -#: sales/manage/customers.php:230 +#: sales/manage/customers.php:233 msgid "Customer Short Name:" msgstr "" -#: sales/manage/customers.php:238 sales/manage/customers.php:242 +#: sales/manage/customers.php:242 sales/manage/customers.php:246 msgid "Customer's Currency:" msgstr "" -#: sales/manage/customers.php:245 +#: sales/manage/customers.php:249 msgid "Sales Type/Price List:" msgstr "" -#: sales/manage/customers.php:248 +#: sales/manage/customers.php:252 msgid "Customer status:" msgstr "" -#: sales/manage/customers.php:262 +#: sales/manage/customers.php:266 msgid "Discount Percent:" msgstr "" -#: sales/manage/customers.php:263 +#: sales/manage/customers.php:267 msgid "Prompt Payment Discount Percent:" msgstr "" -#: sales/manage/customers.php:267 +#: sales/manage/customers.php:271 msgid "Credit Status:" msgstr "" -#: sales/manage/customers.php:280 +#: sales/manage/customers.php:284 msgid "Customer branches" msgstr "" -#: sales/manage/customers.php:282 +#: sales/manage/customers.php:286 msgid "Select or &Add" msgstr "" -#: sales/manage/customers.php:282 +#: sales/manage/customers.php:286 msgid "&Add or Edit " msgstr "" -#: sales/manage/customers.php:301 +#: sales/manage/customers.php:305 msgid "Add New Customer" msgstr "" -#: sales/manage/customers.php:305 +#: sales/manage/customers.php:309 msgid "Update Customer" msgstr "" -#: sales/manage/customers.php:306 +#: sales/manage/customers.php:310 msgid "Update customer data" msgstr "" -#: sales/manage/customers.php:307 +#: sales/manage/customers.php:311 msgid "Select this customer and return to document entry." msgstr "" -#: sales/manage/customers.php:308 +#: sales/manage/customers.php:312 msgid "Delete Customer" msgstr "" -#: sales/manage/customers.php:309 +#: sales/manage/customers.php:313 msgid "Delete customer data if have been never used" msgstr "" -#: sales/manage/customers.php:316 +#: sales/manage/customers.php:320 msgid "" "There are no sales types defined. Please define at least one sales type " "before adding a customer." msgstr "" -#: sales/manage/customers.php:325 +#: sales/manage/customers.php:329 msgid "New customer" msgstr "" -#: sales/manage/customers.php:347 +#: sales/manage/customers.php:351 msgid "Sales &Orders" msgstr "" @@ -13350,12 +13452,12 @@ msgstr "" msgid "CUSTOMER ACCOUNT IS ON HOLD" msgstr "" -#: sales/inquiry/customer_inquiry.php:205 +#: sales/inquiry/customer_inquiry.php:198 msgid "Print Receipt" msgstr "" -#: sales/inquiry/customer_inquiry.php:235 -#: sales/inquiry/customer_inquiry.php:248 +#: sales/inquiry/customer_inquiry.php:228 +#: sales/inquiry/customer_inquiry.php:241 msgid "RB" msgstr "" @@ -13470,7 +13572,7 @@ msgid "" "browser tab. You cannot edit more than one sales document at once." msgstr "" -#: sales/includes/db/custalloc_db.inc:292 +#: sales/includes/db/custalloc_db.inc:303 msgid "" "Unsuspected overallocation happened due to sparse credit notes exists for " "this invoice.\n" @@ -13482,22 +13584,7 @@ msgstr "" msgid "Cash invoice" msgstr "" -#: sales/includes/db/sales_order_db.inc:107 -#: sales/includes/db/sales_order_db.inc:279 -msgid "Stocks below Re-Order Level at " -msgstr "" - -#: sales/includes/db/sales_order_db.inc:110 -#: sales/includes/db/sales_order_db.inc:284 -msgid "Below" -msgstr "" - -#: sales/includes/db/sales_order_db.inc:111 -#: sales/includes/db/sales_order_db.inc:285 -msgid "Please reorder" -msgstr "" - -#: sales/includes/db/sales_order_db.inc:139 +#: sales/includes/db/sales_order_db.inc:101 msgid "Deleted." msgstr ""