From: Janusz Dobrowolski Date: Thu, 25 Dec 2014 15:59:14 +0000 (+0100) Subject: Merged changes form stabel branch up to the current state (2.3.22+). X-Git-Tag: v2.4.2~19^2~309 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=fbf51ab0febfd0885620abcab8738339d156ff45;p=fa-stable.git Merged changes form stabel branch up to the current state (2.3.22+). --- fbf51ab0febfd0885620abcab8738339d156ff45 diff --cc admin/db/maintenance_db.inc index 16434ecd,40bf751f..71081c57 --- a/admin/db/maintenance_db.inc +++ b/admin/db/maintenance_db.inc @@@ -299,14 -282,14 +299,16 @@@ function db_import($filename, $connecti $table_queries = array(); $sql_errors = array(); + $old_encoding = db_get_charset($db); + ini_set("max_execution_time", "180"); db_query("SET foreign_key_checks=0"); + $check_line_len = false; // uncrompress gziped backup files if (strpos($filename, ".gz") || strpos($filename, ".GZ")) - $lines = db_ungzip("lines", $filename); - elseif (strpos($filename, ".zip") || strpos($filename, ".ZIP")) + { $lines = db_ungzip("lines", $filename); + $check_line_len = true; + } elseif (strpos($filename, ".zip") || strpos($filename, ".ZIP")) $lines = db_unzip("lines", $filename); else $lines = file("". $filename); @@@ -314,13 -297,12 +316,14 @@@ // parse input file $query_table = ''; $delimiter = ';'; + foreach($lines as $line_no => $line) { + $gzfile_bug = $check_line_len && (strlen($line) == 8190); // there is a bug in php (at least 4.1.1-5.5.9) gzfile which limits line length to 8190 bytes! + $line = trim($line); - - $line = str_replace("0_", $connection["tbpref"], $line); + if ($init) + $line = str_replace("0_", $connection["tbpref"], $line); if ($query_table == '') { // check if line begins with one of allowed queries diff --cc admin/gl_setup.php index 79cda9b9,aeae18d9..a160f448 --- a/admin/gl_setup.php +++ b/admin/gl_setup.php @@@ -71,8 -71,8 +71,8 @@@ if (isset($_POST['submit']) && can_proc 'exchange_diff_act', 'bank_charge_act', 'default_sales_act', 'default_sales_discount_act', 'default_prompt_payment_act', 'default_inventory_act', 'default_cogs_act', 'default_adj_act', 'default_inv_sales_act', 'default_assembly_act', 'legal_text', - 'past_due_days', 'default_workorder_required', 'default_dim_required', - 'default_delivery_required', 'default_quote_valid_days', 'grn_clearing_act', + 'past_due_days', 'default_workorder_required', 'default_dim_required', 'default_receival_required', - 'default_delivery_required', 'grn_clearing_act', 'tax_algorithm', ++ 'default_delivery_required', 'default_quote_valid_days', 'grn_clearing_act', 'tax_algorithm', 'allow_negative_stock'=> 0, 'accumulate_shipping'=> 0, 'po_over_receive' => 0.0, 'po_over_charge' => 0.0, 'default_credit_limit'=>0.0 ))); @@@ -93,11 -93,12 +93,16 @@@ if (get_company_pref('grn_clearing_act' set_company_pref('grn_clearing_act', 'glsetup.purchase', 'varchar', 15, 0); refresh_sys_prefs(); } +if (get_company_pref('default_receival_required') === null) { // new in 2.4 installations + set_company_pref('default_receival_required', 'glsetup.purchase', 'smallint', 6, '10'); + refresh_sys_prefs(); +} + if (get_company_pref('default_quote_valid_days') === null) { // available from 2.3.23, can be not defined on pre-2.4 installations + set_company_pref('default_quote_valid_days', 'glsetup.sales', 'smallint', 6, 30); + refresh_sys_prefs(); + } + $myrow = get_company_prefs(); $_POST['retained_earnings_act'] = $myrow["retained_earnings_act"]; @@@ -136,7 -135,7 +141,8 @@@ $_POST['accumulate_shipping'] = $myrow[ $_POST['default_workorder_required'] = $myrow['default_workorder_required']; $_POST['default_dim_required'] = $myrow['default_dim_required']; $_POST['default_delivery_required'] = $myrow['default_delivery_required']; +$_POST['default_receival_required'] = $myrow['default_receival_required']; + $_POST['default_quote_valid_days'] = $myrow['default_quote_valid_days']; //--------------- @@@ -183,9 -177,11 +189,11 @@@ gl_all_accounts_list_row(_("Sales Disco gl_all_accounts_list_row(_("Prompt Payment Discount Account:"), 'default_prompt_payment_act'); + text_row(_("Quote Valid Days:"), 'default_quote_valid_days', $_POST['default_quote_valid_days'], 6, 6, '', "", _("days")); + text_row(_("Delivery Required By:"), 'default_delivery_required', $_POST['default_delivery_required'], 6, 6, '', "", _("days")); -//---------------- +//--------------- table_section(2); diff --cc inventory/adjustments.php index 18f26096,dc14d93e..94e10b30 --- a/inventory/adjustments.php +++ b/inventory/adjustments.php @@@ -111,19 -111,19 +111,19 @@@ function can_process( } elseif (!is_date_in_fiscalyear($_POST['AdjDate'])) { - display_error(_("The entered date is not in fiscal year.")); + display_error(_("The entered date is out of fiscal year or is closed for further data entry.")); set_focus('AdjDate'); return false; - } else { - $failed_item = $adj->check_qoh($_POST['StockLocation'], $_POST['AdjDate'], !$_POST['Increase']); - if ($failed_item >= 0) + } + elseif (!$SysPrefs->allow_negative_stock()) + { + $low_stock = $adj->check_qoh($_POST['StockLocation'], $_POST['AdjDate'], !$_POST['Increase']); + + if ($low_stock) { - $line = $adj->line_items[$failed_item]; - display_error(_("The adjustment cannot be processed because an adjustment item would cause a negative inventory balance :") . - " " . $line->stock_id . " - " . $line->item_description); - $_POST['Edit'.$failed_item] = 1; // enter edit mode + display_error(_("The adjustment cannot be processed because it would cause negative inventory balance for marked items as of document date or later.")); unset($_POST['Process']); - return false; + return false; } } return true; diff --cc inventory/includes/db/items_trans_db.inc index b54c1980,d1e06ea2..cf72ee34 --- a/inventory/includes/db/items_trans_db.inc +++ b/inventory/includes/db/items_trans_db.inc @@@ -70,7 -64,8 +70,9 @@@ function stock_cost_update($stock_id, $ add_gl_trans_std_cost(ST_COSTUPDATE, $update_no, $date_, $stock_gl_code["inventory_account"], 0, 0, $memo_, $value_of_change); ++ + change_stock_moves_std_cost($stock_id, $date_, $new_cost - $last_cost); - } + } } if ($update_no != -1) diff --cc lang/new_language_template/LC_MESSAGES/empty.po index adf356d5,1666f7cf..40932dd2 --- a/lang/new_language_template/LC_MESSAGES/empty.po +++ b/lang/new_language_template/LC_MESSAGES/empty.po @@@ -8,7 -8,7 +8,7 @@@ msgid " msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2014-05-31 13:29+0200\n" -"POT-Creation-Date: 2014-09-29 15:35+0200\n" ++"POT-Creation-Date: 2014-12-25 16:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@@ -74,8 -66,7 +74,8 @@@ msgstr " msgid "User name" msgstr "" -#: access/login.php:97 admin/users.php:200 +#: ../access/login.php:97 - #: ../admin/users.php:191 ++#: ../admin/users.php:200 msgid "Password:" msgstr "" @@@ -93,10 -80,8 +93,10 @@@ msgstr " msgid "Login -->" msgstr "" - #: ../access/login.php:152 -#: access/login.php:156 access/password_reset.php:108 -#: admin/display_prefs.php:112 themes/default/renderer.php:129 ++#: ../access/login.php:156 +#: ../access/password_reset.php:108 +#: ../admin/display_prefs.php:112 +#: ../themes/default/renderer.php:129 msgid "Theme:" msgstr "" @@@ -113,12 -97,9 +113,12 @@@ msgstr " 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:113 sales/manage/sales_people.php:99 +#: ../access/password_reset.php:63 +#: ../reporting/rep103.php:277 +#: ../reporting/rep106.php:88 +#: ../reporting/rep205.php:195 - #: ../reporting/includes/header2.inc:110 ++#: ../reporting/includes/header2.inc:113 +#: ../sales/manage/sales_people.php:99 msgid "Email" msgstr "" @@@ -150,78 -131,53 +150,78 @@@ msgstr " msgid "Attachment has been deleted." msgstr "" -#: 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:200 -#: manufacturing/work_order_costs.php:150 -#: manufacturing/work_order_entry.php:377 -#: manufacturing/work_order_entry.php:385 -#: manufacturing/includes/work_order_issue_ui.inc:168 -#: sales/inquiry/customer_allocation_inquiry.php:47 +#: ../admin/attachments.php:167 +#: ../admin/view_print_transaction.php:72 +#: ../gl/inquiry/journal_inquiry.php:47 +#: ../inventory/includes/item_adjustments_ui.inc:47 - #: ../manufacturing/work_order_add_finished.php:203 ++#: ../manufacturing/work_order_add_finished.php:200 +#: ../manufacturing/work_order_costs.php:136 - #: ../manufacturing/work_order_entry.php:379 - #: ../manufacturing/work_order_entry.php:387 - #: ../manufacturing/includes/work_order_issue_ui.inc:161 ++#: ../manufacturing/work_order_entry.php:377 ++#: ../manufacturing/work_order_entry.php:385 ++#: ../manufacturing/includes/work_order_issue_ui.inc:168 +#: ../sales/inquiry/customer_allocation_inquiry.php:47 msgid "Type:" msgstr "" -#: 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:153 -#: dimensions/inquiry/search_dimensions.php:120 -#: gl/inquiry/journal_inquiry.php:118 gl/manage/bank_accounts.php:130 -#: gl/manage/currencies.php:164 gl/manage/exchange_rates.php:94 -#: gl/manage/gl_account_classes.php:132 gl/manage/gl_account_types.php:154 -#: gl/manage/gl_quick_entries.php:196 gl/manage/gl_quick_entries.php:295 -#: gl/includes/ui/gl_bank_ui.inc:186 gl/includes/ui/gl_journal_ui.inc:122 -#: includes/ui/contacts_view.inc:64 includes/ui/simple_crud_class.inc:52 -#: inventory/prices.php:158 inventory/purchasing_data.php:164 -#: inventory/includes/item_adjustments_ui.inc:91 -#: inventory/includes/stock_transfers_ui.inc:83 -#: inventory/manage/item_categories.php:121 -#: inventory/manage/item_codes.php:140 inventory/manage/item_units.php:110 -#: inventory/manage/locations.php:161 inventory/manage/movement_types.php:106 -#: inventory/manage/sales_kits.php:55 manufacturing/search_work_orders.php:109 -#: manufacturing/manage/bom_edit.php:86 -#: manufacturing/manage/work_centres.php:114 -#: manufacturing/includes/work_order_issue_ui.inc:63 -#: purchasing/includes/ui/invoice_ui.inc:533 -#: purchasing/includes/ui/po_ui.inc:263 -#: purchasing/inquiry/po_search_completed.php:109 -#: purchasing/inquiry/po_search.php:89 sales/manage/credit_status.php:119 -#: sales/manage/customer_branches.php:159 -#: sales/manage/recurrent_invoices.php:130 sales/manage/sales_areas.php:103 -#: sales/manage/sales_groups.php:99 sales/manage/sales_people.php:119 -#: sales/manage/sales_points.php:99 sales/manage/sales_types.php:121 -#: sales/inquiry/customer_inquiry.php:192 -#: sales/inquiry/sales_deliveries_view.php:156 -#: sales/inquiry/sales_orders_view.php:128 -#: sales/includes/ui/sales_credit_ui.inc:197 -#: sales/includes/ui/sales_order_ui.inc:194 taxes/item_tax_types.php:139 -#: taxes/tax_groups.php:142 taxes/tax_types.php:132 +#: ../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 ++#: ../admin/users.php:153 +#: ../dimensions/inquiry/search_dimensions.php:120 +#: ../gl/inquiry/journal_inquiry.php:118 +#: ../gl/manage/bank_accounts.php:133 +#: ../gl/manage/currencies.php:164 +#: ../gl/manage/exchange_rates.php:94 +#: ../gl/manage/gl_account_classes.php:132 +#: ../gl/manage/gl_account_types.php:154 +#: ../gl/manage/gl_quick_entries.php:196 +#: ../gl/manage/gl_quick_entries.php:295 +#: ../gl/includes/ui/gl_bank_ui.inc:186 +#: ../gl/includes/ui/gl_journal_ui.inc:134 +#: ../includes/ui/contacts_view.inc:64 +#: ../includes/ui/simple_crud_class.inc:52 +#: ../includes/ui/ui_input.inc:961 +#: ../inventory/prices.php:159 +#: ../inventory/purchasing_data.php:165 - #: ../inventory/includes/item_adjustments_ui.inc:87 - #: ../inventory/includes/stock_transfers_ui.inc:79 ++#: ../inventory/includes/item_adjustments_ui.inc:91 ++#: ../inventory/includes/stock_transfers_ui.inc:83 +#: ../inventory/manage/item_categories.php:121 +#: ../inventory/manage/item_codes.php:140 +#: ../inventory/manage/item_units.php:110 +#: ../inventory/manage/locations.php:161 +#: ../inventory/manage/movement_types.php:106 +#: ../inventory/manage/sales_kits.php:55 +#: ../manufacturing/search_work_orders.php:109 +#: ../manufacturing/manage/bom_edit.php:86 +#: ../manufacturing/manage/work_centres.php:114 - #: ../manufacturing/includes/work_order_issue_ui.inc:58 ++#: ../manufacturing/includes/work_order_issue_ui.inc:63 +#: ../purchasing/includes/ui/invoice_ui.inc:557 +#: ../purchasing/includes/ui/po_ui.inc:275 - #: ../purchasing/inquiry/po_search_completed.php:105 - #: ../purchasing/inquiry/po_search.php:87 ++#: ../purchasing/inquiry/po_search_completed.php:108 ++#: ../purchasing/inquiry/po_search.php:89 +#: ../sales/manage/credit_status.php:119 +#: ../sales/manage/customer_branches.php:159 +#: ../sales/manage/recurrent_invoices.php:130 +#: ../sales/manage/sales_areas.php:103 +#: ../sales/manage/sales_groups.php:99 +#: ../sales/manage/sales_people.php:119 +#: ../sales/manage/sales_points.php:99 +#: ../sales/manage/sales_types.php:121 - #: ../sales/inquiry/sales_deliveries_view.php:154 ++#: ../sales/inquiry/sales_deliveries_view.php:156 +#: ../sales/inquiry/sales_orders_view.php:136 +#: ../sales/includes/ui/sales_credit_ui.inc:197 - #: ../sales/includes/ui/sales_order_ui.inc:209 ++#: ../sales/includes/ui/sales_order_ui.inc:197 +#: ../taxes/item_tax_types.php:139 +#: ../taxes/sav.tax_types.php:211 +#: ../taxes/sav.tax_types.php:262 +#: ../taxes/tax_groups.php:137 +#: ../taxes/tax_types.php:132 msgid "Edit" msgstr "" @@@ -234,154 -189,94 +234,154 @@@ msgstr " msgid "Download" msgstr "" -#: admin/attachments.php:198 admin/create_coy.php:278 -#: admin/crm_categories.php:119 admin/fiscalyears.php:166 -#: admin/inst_chart.php:80 admin/inst_lang.php:109 admin/inst_module.php:143 -#: admin/inst_theme.php:102 admin/payment_terms.php:143 admin/printers.php:97 -#: admin/shipping_companies.php:107 admin/tags.php:141 admin/users.php:155 -#: gl/gl_budget.php:137 gl/manage/bank_accounts.php:131 -#: gl/manage/currencies.php:166 gl/manage/exchange_rates.php:99 -#: gl/manage/gl_account_classes.php:133 gl/manage/gl_account_types.php:155 -#: gl/manage/gl_quick_entries.php:197 gl/manage/gl_quick_entries.php:296 -#: gl/includes/ui/gl_bank_ui.inc:188 gl/includes/ui/gl_journal_ui.inc:124 -#: includes/ui/contacts_view.inc:67 includes/ui/simple_crud_class.inc:54 -#: includes/ui/ui_input.inc:285 inventory/prices.php:159 -#: inventory/purchasing_data.php:165 -#: inventory/includes/item_adjustments_ui.inc:93 -#: inventory/includes/stock_transfers_ui.inc:85 -#: inventory/manage/item_categories.php:122 -#: inventory/manage/item_codes.php:141 inventory/manage/item_units.php:111 -#: inventory/manage/locations.php:162 inventory/manage/movement_types.php:107 -#: inventory/manage/sales_kits.php:56 manufacturing/manage/bom_edit.php:87 -#: manufacturing/manage/work_centres.php:115 -#: manufacturing/includes/work_order_issue_ui.inc:65 -#: purchasing/includes/ui/invoice_ui.inc:297 -#: purchasing/includes/ui/po_ui.inc:265 sales/manage/credit_status.php:120 -#: sales/manage/customer_branches.php:163 -#: sales/manage/recurrent_invoices.php:131 sales/manage/sales_areas.php:104 -#: sales/manage/sales_groups.php:100 sales/manage/sales_people.php:120 -#: sales/manage/sales_points.php:100 sales/manage/sales_types.php:122 -#: sales/includes/ui/sales_credit_ui.inc:199 -#: sales/includes/ui/sales_order_ui.inc:196 taxes/item_tax_types.php:140 -#: taxes/tax_groups.php:143 taxes/tax_types.php:133 +#: ../admin/attachments.php:198 +#: ../admin/create_coy.php:278 +#: ../admin/crm_categories.php:119 +#: ../admin/fiscalyears.php:166 +#: ../admin/inst_chart.php:80 +#: ../admin/inst_lang.php:109 +#: ../admin/inst_module.php:143 +#: ../admin/inst_theme.php:102 +#: ../admin/payment_terms.php:143 +#: ../admin/printers.php:97 +#: ../admin/shipping_companies.php:107 +#: ../admin/tags.php:141 - #: ../admin/users.php:146 ++#: ../admin/users.php:155 +#: ../gl/gl_budget.php:137 +#: ../gl/manage/bank_accounts.php:134 +#: ../gl/manage/currencies.php:166 +#: ../gl/manage/exchange_rates.php:99 +#: ../gl/manage/gl_account_classes.php:133 +#: ../gl/manage/gl_account_types.php:155 +#: ../gl/manage/gl_quick_entries.php:197 +#: ../gl/manage/gl_quick_entries.php:296 +#: ../gl/includes/ui/gl_bank_ui.inc:188 +#: ../gl/includes/ui/gl_journal_ui.inc:136 +#: ../includes/ui/contacts_view.inc:67 +#: ../includes/ui/simple_crud_class.inc:54 +#: ../includes/ui/ui_input.inc:286 +#: ../inventory/prices.php:160 +#: ../inventory/purchasing_data.php:166 - #: ../inventory/includes/item_adjustments_ui.inc:89 - #: ../inventory/includes/stock_transfers_ui.inc:81 ++#: ../inventory/includes/item_adjustments_ui.inc:93 ++#: ../inventory/includes/stock_transfers_ui.inc:85 +#: ../inventory/manage/item_categories.php:122 +#: ../inventory/manage/item_codes.php:141 +#: ../inventory/manage/item_units.php:111 +#: ../inventory/manage/locations.php:162 +#: ../inventory/manage/movement_types.php:107 +#: ../inventory/manage/sales_kits.php:56 +#: ../manufacturing/manage/bom_edit.php:87 +#: ../manufacturing/manage/work_centres.php:115 - #: ../manufacturing/includes/work_order_issue_ui.inc:60 ++#: ../manufacturing/includes/work_order_issue_ui.inc:65 +#: ../purchasing/includes/ui/invoice_ui.inc:319 +#: ../purchasing/includes/ui/po_ui.inc:277 +#: ../sales/manage/credit_status.php:120 +#: ../sales/manage/customer_branches.php:163 +#: ../sales/manage/recurrent_invoices.php:131 +#: ../sales/manage/sales_areas.php:104 +#: ../sales/manage/sales_groups.php:100 +#: ../sales/manage/sales_people.php:120 +#: ../sales/manage/sales_points.php:100 +#: ../sales/manage/sales_types.php:122 +#: ../sales/includes/ui/sales_credit_ui.inc:199 - #: ../sales/includes/ui/sales_order_ui.inc:211 ++#: ../sales/includes/ui/sales_order_ui.inc:199 +#: ../taxes/item_tax_types.php:140 +#: ../taxes/sav.tax_types.php:212 +#: ../taxes/tax_groups.php:138 +#: ../taxes/tax_types.php:133 msgid "Delete" msgstr "" -#: admin/attachments.php:205 admin/view_print_transaction.php:126 -#: admin/void_transaction.php:181 dimensions/inquiry/search_dimensions.php:127 -#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:234 -#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126 -#: gl/inquiry/journal_inquiry.php:127 gl/inquiry/journal_inquiry.php:140 -#: includes/ui/allocation_cart.inc:288 -#: inventory/inquiry/stock_movements.php:82 -#: manufacturing/search_work_orders.php:159 -#: manufacturing/includes/manufacturing_ui.inc:157 -#: manufacturing/includes/manufacturing_ui.inc:200 -#: manufacturing/includes/manufacturing_ui.inc:236 -#: manufacturing/includes/manufacturing_ui.inc:276 -#: manufacturing/includes/manufacturing_ui.inc:280 -#: manufacturing/includes/manufacturing_ui.inc:331 -#: purchasing/view/view_po.php:115 purchasing/view/view_po.php:140 -#: purchasing/inquiry/po_search_completed.php:124 -#: purchasing/inquiry/po_search.php:132 -#: purchasing/inquiry/supplier_allocation_inquiry.php:127 -#: purchasing/inquiry/supplier_inquiry.php:169 -#: purchasing/allocations/supplier_allocation_main.php:95 -#: reporting/rep101.php:118 reporting/rep201.php:110 reporting/rep203.php:93 -#: reporting/rep306.php:141 reporting/rep601.php:79 reporting/rep704.php:83 -#: reporting/rep704.php:86 reporting/rep704.php:89 reporting/rep710.php:78 -#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186 -#: reporting/includes/doctext.inc:224 -#: sales/allocations/customer_allocation_main.php:94 -#: sales/view/view_sales_order.php:96 sales/view/view_sales_order.php:129 -#: sales/view/view_sales_order.php:161 -#: sales/inquiry/customer_allocation_inquiry.php:145 -#: sales/inquiry/customer_inquiry.php:218 +#: ../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:232 +#: ../gl/inquiry/bank_inquiry.php:70 +#: ../gl/inquiry/gl_account_inquiry.php:126 +#: ../gl/inquiry/journal_inquiry.php:127 +#: ../gl/inquiry/journal_inquiry.php:140 +#: ../includes/ui/allocation_cart.inc:290 +#: ../inventory/inquiry/stock_movements.php:78 +#: ../manufacturing/search_work_orders.php:159 +#: ../manufacturing/includes/manufacturing_ui.inc:157 +#: ../manufacturing/includes/manufacturing_ui.inc:200 +#: ../manufacturing/includes/manufacturing_ui.inc:236 +#: ../manufacturing/includes/manufacturing_ui.inc:276 +#: ../manufacturing/includes/manufacturing_ui.inc:280 +#: ../manufacturing/includes/manufacturing_ui.inc:331 +#: ../purchasing/view/view_po.php:115 +#: ../purchasing/view/view_po.php:140 - #: ../purchasing/inquiry/po_search_completed.php:120 - #: ../purchasing/inquiry/po_search.php:130 ++#: ../purchasing/inquiry/po_search_completed.php:123 ++#: ../purchasing/inquiry/po_search.php:132 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:127 +#: ../purchasing/inquiry/supplier_inquiry.php:174 +#: ../purchasing/allocations/supplier_allocation_main.php:95 +#: ../reporting/rep101.php:118 +#: ../reporting/rep201.php:110 +#: ../reporting/rep203.php:93 +#: ../reporting/rep306.php:141 +#: ../reporting/rep601.php:79 +#: ../reporting/rep602.php:80 +#: ../reporting/rep704.php:83 +#: ../reporting/rep704.php:86 +#: ../reporting/rep704.php:89 +#: ../reporting/rep710.php:78 +#: ../reporting/includes/doctext.inc:167 +#: ../reporting/includes/doctext.inc:208 +#: ../reporting/includes/doctext.inc:246 +#: ../sales/allocations/customer_allocation_main.php:94 +#: ../sales/view/view_sales_order.php:109 +#: ../sales/view/view_sales_order.php:142 +#: ../sales/view/view_sales_order.php:179 +#: ../sales/inquiry/customer_allocation_inquiry.php:145 +#: ../sales/inquiry/customer_inquiry.php:201 msgid "#" msgstr "" -#: admin/attachments.php:206 admin/attachments.php:250 -#: admin/crm_categories.php:97 admin/inst_upgrade.php:137 -#: admin/payment_terms.php:127 admin/printers.php:84 -#: admin/print_profiles.php:148 gl/inquiry/tax_inquiry.php:82 -#: gl/manage/gl_quick_entries.php:186 gl/manage/gl_quick_entries.php:224 -#: includes/ui/view_package.php:32 inventory/manage/item_codes.php:125 -#: inventory/manage/item_units.php:94 inventory/manage/movement_types.php:95 -#: inventory/manage/sales_kits.php:40 inventory/view/view_adjustment.php:56 -#: inventory/view/view_transfer.php:56 manufacturing/manage/bom_edit.php:70 -#: manufacturing/includes/manufacturing_ui.inc:28 -#: purchasing/includes/ui/invoice_ui.inc:484 -#: purchasing/includes/ui/invoice_ui.inc:496 -#: purchasing/po_receive_items.php:62 reporting/rep104.php:111 -#: reporting/rep105.php:114 reporting/rep204.php:84 reporting/rep303.php:121 -#: reporting/rep303.php:127 reporting/rep304.php:114 reporting/rep305.php:101 -#: reporting/rep306.php:141 reporting/rep307.php:117 reporting/rep308.php:230 -#: reporting/rep309.php:98 reporting/rep401.php:71 -#: sales/create_recurrent_invoices.php:134 sales/manage/credit_status.php:97 -#: sales/manage/recurrent_invoices.php:102 -#: sales/inquiry/sales_orders_view.php:295 -#: sales/inquiry/sales_orders_view.php:299 taxes/tax_groups.php:124 -#: taxes/tax_types.php:115 +#: ../admin/attachments.php:206 +#: ../admin/attachments.php:250 +#: ../admin/crm_categories.php:97 +#: ../admin/inst_upgrade.php:141 +#: ../admin/payment_terms.php:127 +#: ../admin/printers.php:84 +#: ../admin/print_profiles.php:148 +#: ../gl/inquiry/tax_inquiry.php:82 +#: ../gl/manage/gl_quick_entries.php:186 +#: ../gl/manage/gl_quick_entries.php:224 +#: ../includes/ui/view_package.php:32 +#: ../inventory/manage/item_codes.php:125 +#: ../inventory/manage/item_units.php:94 +#: ../inventory/manage/movement_types.php:95 +#: ../inventory/manage/sales_kits.php:40 +#: ../inventory/view/view_adjustment.php:56 +#: ../inventory/view/view_transfer.php:56 +#: ../manufacturing/manage/bom_edit.php:70 +#: ../manufacturing/includes/manufacturing_ui.inc:28 +#: ../purchasing/includes/ui/invoice_ui.inc:507 +#: ../purchasing/includes/ui/invoice_ui.inc:519 +#: ../purchasing/po_receive_items.php:62 +#: ../reporting/rep104.php:111 +#: ../reporting/rep105.php:114 +#: ../reporting/rep204.php:84 +#: ../reporting/rep303.php:121 +#: ../reporting/rep303.php:127 +#: ../reporting/rep304.php:114 +#: ../reporting/rep305.php:101 +#: ../reporting/rep306.php:141 +#: ../reporting/rep307.php:117 - #: ../reporting/rep308.php:149 ++#: ../reporting/rep308.php:230 +#: ../reporting/rep309.php:98 +#: ../reporting/rep401.php:71 +#: ../sales/create_recurrent_invoices.php:134 +#: ../sales/manage/credit_status.php:97 +#: ../sales/manage/recurrent_invoices.php:102 +#: ../sales/inquiry/sales_orders_view.php:318 +#: ../sales/inquiry/sales_orders_view.php:322 +#: ../taxes/sav.tax_types.php:190 +#: ../taxes/tax_groups.php:123 +#: ../taxes/tax_types.php:115 msgid "Description" msgstr "" @@@ -445,38 -333,22 +445,40 @@@ msgstr " msgid "Database backup failed." msgstr "" -#: admin/backups.php:98 admin/create_coy.php:265 admin/fiscalyears.php:155 -#: admin/inst_lang.php:85 admin/inst_lang.php:97 -#: admin/void_transaction.php:125 dimensions/inquiry/search_dimensions.php:107 -#: gl/manage/bank_accounts.php:127 gl/manage/currencies.php:162 -#: gl/manage/gl_account_classes.php:127 gl/manage/gl_quick_entries.php:230 -#: includes/system_tests.inc:38 includes/system_tests.inc:113 -#: includes/system_tests.inc:126 includes/ui/ui_lists.inc:1677 -#: 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 -#: reporting/rep303.php:113 reporting/rep303.php:117 reporting/rep402.php:99 -#: reporting/rep402.php:134 reporting/rep501.php:113 -#: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95 -#: sales/manage/sales_types.php:119 taxes/item_tax_types.php:129 -#: taxes/tax_groups.php:139 +#: ../admin/backups.php:98 +#: ../admin/create_coy.php:265 +#: ../admin/fiscalyears.php:155 +#: ../admin/inst_lang.php:85 +#: ../admin/inst_lang.php:97 +#: ../dimensions/inquiry/search_dimensions.php:107 +#: ../gl/manage/bank_accounts.php:130 +#: ../gl/manage/currencies.php:162 +#: ../gl/manage/gl_account_classes.php:127 +#: ../gl/manage/gl_quick_entries.php:230 +#: ../includes/system_tests.inc:38 +#: ../includes/system_tests.inc:113 +#: ../includes/system_tests.inc:126 - #: ../includes/ui/ui_lists.inc:1679 ++#: ../includes/ui/ui_lists.inc:1681 +#: ../purchasing/manage/suppliers.php:123 +#: ../reporting/rep101.php:114 +#: ../reporting/rep102.php:114 +#: ../reporting/rep102.php:116 +#: ../reporting/rep104.php:105 +#: ../reporting/rep106.php:75 +#: ../reporting/rep114.php:74 +#: ../reporting/rep201.php:106 +#: ../reporting/rep202.php:118 +#: ../reporting/rep202.php:120 +#: ../reporting/rep203.php:89 +#: ../reporting/rep303.php:113 +#: ../reporting/rep303.php:117 ++#: ../reporting/rep402.php:99 ++#: ../reporting/rep402.php:134 +#: ../reporting/rep501.php:113 +#: ../sales/manage/sales_points.php:94 +#: ../sales/manage/sales_points.php:95 +#: ../sales/manage/sales_types.php:119 +#: ../taxes/item_tax_types.php:129 msgid "No" msgstr "" @@@ -508,9 -380,8 +510,9 @@@ msgstr " msgid "Create backup" msgstr "" -#: admin/backups.php:181 sales/includes/ui/sales_order_ui.inc:577 -#: sales/includes/ui/sales_order_ui.inc:625 +#: ../admin/backups.php:181 - #: ../sales/includes/ui/sales_order_ui.inc:595 - #: ../sales/includes/ui/sales_order_ui.inc:651 ++#: ../sales/includes/ui/sales_order_ui.inc:580 ++#: ../sales/includes/ui/sales_order_ui.inc:636 msgid "Comments:" msgstr "" @@@ -591,8 -459,7 +593,8 @@@ msgstr " msgid "Your password has been updated." msgstr "" -#: admin/change_current_user_password.php:85 admin/users.php:189 +#: ../admin/change_current_user_password.php:85 - #: ../admin/users.php:180 ++#: ../admin/users.php:189 msgid "User login:" msgstr "" @@@ -661,12 -523,9 +663,12 @@@ msgstr " msgid "Name (to appear on reports):" 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:234 sales/includes/ui/sales_order_ui.inc:616 +#: ../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:234 - #: ../sales/includes/ui/sales_order_ui.inc:642 ++#: ../sales/includes/ui/sales_order_ui.inc:627 msgid "Address:" msgstr "" @@@ -689,8 -544,7 +691,8 @@@ msgstr " msgid "Fax Number:" msgstr "" -#: admin/company_preferences.php:170 admin/users.php:211 +#: ../admin/company_preferences.php:170 - #: ../admin/users.php:202 ++#: ../admin/users.php:211 msgid "Email Address:" msgstr "" @@@ -797,48 -649,28 +799,48 @@@ msgstr " msgid "Version Id" msgstr "" -#: admin/company_preferences.php:208 admin/display_prefs.php:143 -#: admin/forms_setup.php:61 admin/gl_setup.php:226 admin/inst_chart.php:74 -#: admin/inst_lang.php:103 admin/inst_module.php:137 admin/inst_module.php:155 -#: admin/inst_module.php:198 admin/inst_theme.php:96 -#: dimensions/dimension_entry.php:293 gl/gl_bank.php: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 -#: includes/ui/ui_input.inc:207 includes/ui/ui_input.inc:905 -#: inventory/adjustments.php:234 inventory/cost_update.php:136 -#: inventory/reorder_level.php:111 inventory/transfers.php:230 -#: inventory/includes/item_adjustments_ui.inc:163 -#: inventory/includes/stock_transfers_ui.inc:143 -#: inventory/manage/sales_kits.php:208 manufacturing/work_order_entry.php:457 -#: manufacturing/includes/work_order_issue_ui.inc:138 -#: 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:517 -#: 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:229 -#: sales/includes/ui/sales_order_ui.inc:543 +#: ../admin/company_preferences.php:208 +#: ../admin/display_prefs.php:145 +#: ../admin/forms_setup.php:61 - #: ../admin/gl_setup.php:241 ++#: ../admin/gl_setup.php:249 +#: ../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:417 +#: ../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:257 +#: ../includes/ui/db_pager_view.inc:174 +#: ../includes/ui/simple_crud_class.inc:56 +#: ../includes/ui/simple_crud_class.inc:227 +#: ../includes/ui/ui_input.inc:208 +#: ../includes/ui/ui_input.inc:906 - #: ../inventory/adjustments.php:233 ++#: ../inventory/adjustments.php:234 +#: ../inventory/cost_update.php:134 +#: ../inventory/reorder_level.php:112 - #: ../inventory/transfers.php:234 - #: ../inventory/includes/item_adjustments_ui.inc:157 - #: ../inventory/includes/stock_transfers_ui.inc:137 ++#: ../inventory/transfers.php:230 ++#: ../inventory/includes/item_adjustments_ui.inc:163 ++#: ../inventory/includes/stock_transfers_ui.inc:143 +#: ../inventory/manage/sales_kits.php:208 - #: ../manufacturing/work_order_entry.php:459 - #: ../manufacturing/includes/work_order_issue_ui.inc:131 ++#: ../manufacturing/work_order_entry.php:457 ++#: ../manufacturing/includes/work_order_issue_ui.inc:138 +#: ../purchasing/includes/ui/po_ui.inc:308 +#: ../purchasing/includes/ui/po_ui.inc:459 +#: ../purchasing/po_receive_items.php:332 +#: ../sales/credit_note_entry.php:284 +#: ../sales/customer_credit_invoice.php:380 - #: ../sales/customer_delivery.php:547 ++#: ../sales/customer_delivery.php:563 +#: ../sales/customer_invoice.php:693 +#: ../sales/inquiry/sales_orders_view.php:350 +#: ../sales/includes/ui/sales_credit_ui.inc:293 - #: ../sales/includes/ui/sales_order_ui.inc:244 - #: ../sales/includes/ui/sales_order_ui.inc:561 ++#: ../sales/includes/ui/sales_order_ui.inc:232 ++#: ../sales/includes/ui/sales_order_ui.inc:546 +#: ../taxes/sav.tax_types.php:255 msgid "Update" msgstr "" @@@ -968,37 -785,20 +970,38 @@@ msgstr " msgid "Default" msgstr "" -#: admin/create_coy.php:263 admin/fiscalyears.php:159 admin/inst_lang.php:85 -#: admin/inst_lang.php:97 dimensions/inquiry/search_dimensions.php:107 -#: gl/manage/bank_accounts.php:125 gl/manage/currencies.php:162 -#: gl/manage/gl_account_classes.php:127 gl/manage/gl_quick_entries.php:230 -#: includes/system_tests.inc:38 includes/system_tests.inc:113 -#: includes/system_tests.inc:126 includes/ui/ui_lists.inc:1678 -#: 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 -#: reporting/rep303.php:108 reporting/rep303.php:116 reporting/rep402.php:99 -#: reporting/rep501.php:111 sales/manage/sales_points.php:94 -#: sales/manage/sales_points.php:95 sales/manage/sales_types.php:119 -#: taxes/item_tax_types.php:133 taxes/tax_groups.php:137 +#: ../admin/create_coy.php:263 +#: ../admin/fiscalyears.php:159 +#: ../admin/inst_lang.php:85 +#: ../admin/inst_lang.php:97 +#: ../dimensions/inquiry/search_dimensions.php:107 +#: ../gl/manage/bank_accounts.php:128 +#: ../gl/manage/currencies.php:162 +#: ../gl/manage/gl_account_classes.php:127 +#: ../gl/manage/gl_quick_entries.php:230 +#: ../includes/system_tests.inc:38 +#: ../includes/system_tests.inc:113 +#: ../includes/system_tests.inc:126 - #: ../includes/ui/ui_lists.inc:1680 ++#: ../includes/ui/ui_lists.inc:1682 +#: ../purchasing/manage/suppliers.php:123 +#: ../reporting/rep101.php:113 +#: ../reporting/rep102.php:113 +#: ../reporting/rep102.php:115 +#: ../reporting/rep104.php:107 +#: ../reporting/rep106.php:77 +#: ../reporting/rep114.php:76 +#: ../reporting/rep201.php:105 +#: ../reporting/rep202.php:117 +#: ../reporting/rep202.php:119 +#: ../reporting/rep203.php:88 +#: ../reporting/rep303.php:108 +#: ../reporting/rep303.php:116 ++#: ../reporting/rep402.php:99 +#: ../reporting/rep501.php:111 +#: ../sales/manage/sales_points.php:94 +#: ../sales/manage/sales_points.php:95 +#: ../sales/manage/sales_types.php:119 +#: ../taxes/item_tax_types.php:133 msgid "Yes" msgstr "" @@@ -1172,8 -957,7 +1175,8 @@@ msgstr " msgid "Language" msgstr "" -#: admin/display_prefs.php:101 admin/users.php:215 +#: ../admin/display_prefs.php:101 - #: ../admin/users.php:206 ++#: ../admin/users.php:215 msgid "Language:" msgstr "" @@@ -1203,13 -986,11 +1206,13 @@@ msgstr " msgid "Start-up Tab" msgstr "" -#: admin/display_prefs.php:127 admin/users.php:219 +#: ../admin/display_prefs.php:127 - #: ../admin/users.php:210 ++#: ../admin/users.php:219 msgid "Printing profile" msgstr "" -#: admin/display_prefs.php:128 admin/users.php:220 +#: ../admin/display_prefs.php:128 - #: ../admin/users.php:211 ++#: ../admin/users.php:220 msgid "Browser printing support" msgstr "" @@@ -1217,8 -998,7 +1220,8 @@@ msgid "Use popup window to display reports:" msgstr "" -#: admin/display_prefs.php:131 admin/users.php:223 +#: ../admin/display_prefs.php:131 - #: ../admin/users.php:214 ++#: ../admin/users.php:223 msgid "Set this option to on if your browser directly supports pdf files" msgstr "" @@@ -1307,16 -1083,12 +1310,17 @@@ msgstr " msgid "Fiscal Year End" msgstr "" -#: admin/fiscalyears.php:138 dimensions/inquiry/search_dimensions.php:133 -#: dimensions/inquiry/search_dimensions.php:139 includes/ui/ui_lists.inc:678 -#: manufacturing/search_work_orders.php:108 reporting/rep402.php:103 -#: reporting/rep501.php:87 reporting/rep710.php:113 -#: reporting/includes/excel_report.inc:234 -#: reporting/includes/pdf_report.inc:266 +#: ../admin/fiscalyears.php:138 +#: ../dimensions/inquiry/search_dimensions.php:133 +#: ../dimensions/inquiry/search_dimensions.php:139 +#: ../includes/ui/ui_input.inc:959 - #: ../includes/ui/ui_lists.inc:675 ++#: ../includes/ui/ui_lists.inc:677 +#: ../manufacturing/search_work_orders.php:108 ++#: ../reporting/rep402.php:103 +#: ../reporting/rep501.php:87 +#: ../reporting/rep710.php:113 +#: ../reporting/includes/excel_report.inc:234 +#: ../reporting/includes/pdf_report.inc:266 msgid "Closed" msgstr "" @@@ -1394,195 -1163,163 +1398,200 @@@ msgstr " msgid "The general GL setup has been updated." msgstr "" - #: ../admin/gl_setup.php:144 -#: admin/gl_setup.php:137 ++#: ../admin/gl_setup.php:150 msgid "General GL" msgstr "" - #: ../admin/gl_setup.php:146 -#: admin/gl_setup.php:139 ++#: ../admin/gl_setup.php:152 msgid "Past Due Days Interval:" msgstr "" - #: ../admin/gl_setup.php:146 - #: ../admin/gl_setup.php:186 -#: admin/gl_setup.php:139 admin/gl_setup.php:174 admin/gl_setup.php:182 -#: admin/gl_setup.php:219 admin/payment_terms.php:140 ++#: ../admin/gl_setup.php:152 ++#: ../admin/gl_setup.php:192 +#: ../admin/gl_setup.php:194 - #: ../admin/gl_setup.php:212 - #: ../admin/gl_setup.php:234 ++#: ../admin/gl_setup.php:202 ++#: ../admin/gl_setup.php:220 ++#: ../admin/gl_setup.php:242 +#: ../admin/payment_terms.php:140 msgid "days" msgstr "" - #: ../admin/gl_setup.php:148 -#: admin/gl_setup.php:141 ++#: ../admin/gl_setup.php:154 msgid "Retained Earnings:" msgstr "" - #: ../admin/gl_setup.php:150 -#: admin/gl_setup.php:143 ++#: ../admin/gl_setup.php:156 msgid "Profit/Loss Year:" msgstr "" - #: ../admin/gl_setup.php:152 -#: admin/gl_setup.php:145 ++#: ../admin/gl_setup.php:158 msgid "Exchange Variances Account:" msgstr "" - #: ../admin/gl_setup.php:154 -#: admin/gl_setup.php:147 ++#: ../admin/gl_setup.php:160 +#: ../gl/manage/bank_accounts.php:193 msgid "Bank Charges Account:" msgstr "" - #: ../admin/gl_setup.php:156 -#: admin/gl_setup.php:151 ++#: ../admin/gl_setup.php:162 +msgid "Tax Algorithm:" +msgstr "" + - #: ../admin/gl_setup.php:160 ++#: ../admin/gl_setup.php:166 msgid "Customers and Sales" msgstr "" - #: ../admin/gl_setup.php:162 -#: admin/gl_setup.php:153 ++#: ../admin/gl_setup.php:168 msgid "Default Credit Limit:" msgstr "" - #: ../admin/gl_setup.php:164 -#: admin/gl_setup.php:155 ++#: ../admin/gl_setup.php:170 msgid "Accumulate batch shipping:" msgstr "" - #: ../admin/gl_setup.php:166 -#: admin/gl_setup.php:157 ++#: ../admin/gl_setup.php:172 msgid "Legal Text on Invoice:" msgstr "" - #: ../admin/gl_setup.php:168 -#: admin/gl_setup.php:159 ++#: ../admin/gl_setup.php:174 msgid "Shipping Charged Account:" msgstr "" - #: ../admin/gl_setup.php:170 -#: admin/gl_setup.php:163 ++#: ../admin/gl_setup.php:176 +msgid "Deferred Income Account:" +msgstr "" + - #: ../admin/gl_setup.php:171 ++#: ../admin/gl_setup.php:177 +msgid "Not used" +msgstr "" + - #: ../admin/gl_setup.php:175 ++#: ../admin/gl_setup.php:181 msgid "Customers and Sales Defaults" msgstr "" - #: ../admin/gl_setup.php:177 -#: admin/gl_setup.php:165 ++#: ../admin/gl_setup.php:183 msgid "Receivable Account:" msgstr "" - #: ../admin/gl_setup.php:179 - #: ../admin/gl_setup.php:220 -#: admin/gl_setup.php:167 admin/gl_setup.php:205 -#: inventory/manage/item_categories.php:192 inventory/manage/items.php:354 -#: sales/manage/customer_branches.php:250 ++#: ../admin/gl_setup.php:185 ++#: ../admin/gl_setup.php:228 +#: ../inventory/manage/item_categories.php:196 +#: ../inventory/manage/items.php:365 +#: ../sales/manage/customer_branches.php:251 msgid "Sales Account:" msgstr "" - #: ../admin/gl_setup.php:182 -#: admin/gl_setup.php:170 sales/manage/customer_branches.php:251 ++#: ../admin/gl_setup.php:188 +#: ../sales/manage/customer_branches.php:252 msgid "Sales Discount Account:" msgstr "" - #: ../admin/gl_setup.php:184 -#: admin/gl_setup.php:172 sales/manage/customer_branches.php:253 ++#: ../admin/gl_setup.php:190 +#: ../sales/manage/customer_branches.php:254 msgid "Prompt Payment Discount Account:" msgstr "" - #: ../admin/gl_setup.php:186 -#: admin/gl_setup.php:174 ++#: ../admin/gl_setup.php:192 ++msgid "Quote Valid Days:" ++msgstr "" ++ ++#: ../admin/gl_setup.php:194 msgid "Delivery Required By:" msgstr "" - #: ../admin/gl_setup.php:192 -#: admin/gl_setup.php:180 ++#: ../admin/gl_setup.php:200 msgid "Dimension Defaults" msgstr "" - #: ../admin/gl_setup.php:194 -#: admin/gl_setup.php:182 ++#: ../admin/gl_setup.php:202 msgid "Dimension Required By After:" msgstr "" - #: ../admin/gl_setup.php:198 -#: admin/gl_setup.php:185 ++#: ../admin/gl_setup.php:206 msgid "Suppliers and Purchasing" msgstr "" - #: ../admin/gl_setup.php:200 -#: admin/gl_setup.php:187 ++#: ../admin/gl_setup.php:208 msgid "Delivery Over-Receive Allowance:" msgstr "" - #: ../admin/gl_setup.php:202 -#: admin/gl_setup.php:189 ++#: ../admin/gl_setup.php:210 msgid "Invoice Over-Charge Allowance:" msgstr "" - #: ../admin/gl_setup.php:204 -#: admin/gl_setup.php:191 ++#: ../admin/gl_setup.php:212 msgid "Suppliers and Purchasing Defaults" msgstr "" - #: ../admin/gl_setup.php:206 -#: admin/gl_setup.php:193 ++#: ../admin/gl_setup.php:214 msgid "Payable Account:" msgstr "" - #: ../admin/gl_setup.php:208 -#: admin/gl_setup.php:195 purchasing/manage/suppliers.php:127 ++#: ../admin/gl_setup.php:216 +#: ../purchasing/manage/suppliers.php:133 msgid "Purchase Discount Account:" msgstr "" - #: ../admin/gl_setup.php:210 -#: admin/gl_setup.php:197 ++#: ../admin/gl_setup.php:218 msgid "GRN Clearing Account:" msgstr "" - #: ../admin/gl_setup.php:210 -#: admin/gl_setup.php:197 ++#: ../admin/gl_setup.php:218 msgid "No postings on GRN" msgstr "" - #: ../admin/gl_setup.php:212 -#: admin/gl_setup.php:199 reporting/reports_main.php:206 ++#: ../admin/gl_setup.php:220 +msgid "Receival Required By:" +msgstr "" + - #: ../admin/gl_setup.php:214 ++#: ../admin/gl_setup.php:222 +#: ../reporting/reports_main.php:206 msgid "Inventory" msgstr "" - #: ../admin/gl_setup.php:216 -#: admin/gl_setup.php:201 ++#: ../admin/gl_setup.php:224 msgid "Allow Negative Inventory:" msgstr "" - #: ../admin/gl_setup.php:217 -#: admin/gl_setup.php:202 ++#: ../admin/gl_setup.php:225 msgid "Warning: This may cause a delay in GL postings" msgstr "" - #: ../admin/gl_setup.php:219 -#: admin/gl_setup.php:204 ++#: ../admin/gl_setup.php:227 msgid "Items Defaults" msgstr "" - #: ../admin/gl_setup.php:222 -#: admin/gl_setup.php:207 inventory/manage/item_categories.php:202 -#: inventory/manage/items.php:358 ++#: ../admin/gl_setup.php:230 +#: ../inventory/manage/item_categories.php:206 +#: ../inventory/manage/items.php:369 msgid "Inventory Account:" msgstr "" - #: ../admin/gl_setup.php:224 -#: admin/gl_setup.php:209 inventory/manage/item_categories.php:196 -#: inventory/manage/item_categories.php:204 inventory/manage/items.php:359 -#: inventory/manage/items.php:364 ++#: ../admin/gl_setup.php:232 +#: ../inventory/manage/item_categories.php:200 +#: ../inventory/manage/item_categories.php:208 +#: ../inventory/manage/items.php:370 +#: ../inventory/manage/items.php:375 msgid "C.O.G.S. Account:" msgstr "" - #: ../admin/gl_setup.php:226 -#: admin/gl_setup.php:211 inventory/manage/item_categories.php:205 -#: inventory/manage/items.php:360 ++#: ../admin/gl_setup.php:234 +#: ../inventory/manage/item_categories.php:209 +#: ../inventory/manage/items.php:371 msgid "Inventory Adjustments Account:" msgstr "" - #: ../admin/gl_setup.php:228 -#: admin/gl_setup.php:213 inventory/manage/item_categories.php:209 -#: inventory/manage/items.php:371 ++#: ../admin/gl_setup.php:236 +#: ../inventory/manage/item_categories.php:213 +#: ../inventory/manage/items.php:382 msgid "Item Assembly Costs Account:" msgstr "" - #: ../admin/gl_setup.php:232 -#: admin/gl_setup.php:217 ++#: ../admin/gl_setup.php:240 msgid "Manufacturing Defaults" msgstr "" - #: ../admin/gl_setup.php:234 -#: admin/gl_setup.php:219 ++#: ../admin/gl_setup.php:242 msgid "Work Order Required By After:" msgstr "" @@@ -1659,23 -1376,18 +1668,23 @@@ msgstr " msgid "Install/Update Languages" msgstr "" -#: admin/inst_lang.php:35 admin/printers.php:84 -#: admin/shipping_companies.php:91 dimensions/dimension_entry.php:271 -#: dimensions/inquiry/search_dimensions.php:129 -#: dimensions/view/view_dimension.php:55 -#: inventory/manage/item_categories.php:98 -#: manufacturing/manage/work_centres.php:101 -#: purchasing/includes/ui/invoice_ui.inc:258 -#: purchasing/includes/ui/invoice_ui.inc:260 -#: purchasing/includes/ui/invoice_ui.inc:262 reporting/rep501.php:87 -#: reporting/rep709.php:116 reporting/rep709.php:117 -#: sales/manage/customer_branches.php:294 sales/manage/sales_people.php:99 -#: taxes/item_tax_types.php:117 +#: ../admin/inst_lang.php:35 +#: ../admin/printers.php:84 +#: ../admin/shipping_companies.php:91 +#: ../dimensions/dimension_entry.php:271 +#: ../dimensions/inquiry/search_dimensions.php:129 +#: ../dimensions/view/view_dimension.php:55 +#: ../inventory/manage/item_categories.php:98 +#: ../manufacturing/manage/work_centres.php:101 +#: ../purchasing/includes/ui/invoice_ui.inc:280 +#: ../purchasing/includes/ui/invoice_ui.inc:282 +#: ../purchasing/includes/ui/invoice_ui.inc:284 +#: ../reporting/rep501.php:87 - #: ../reporting/rep709.php:111 - #: ../reporting/rep709.php:112 ++#: ../reporting/rep709.php:116 ++#: ../reporting/rep709.php:117 +#: ../sales/manage/customer_branches.php:296 +#: ../sales/manage/sales_people.php:99 +#: ../taxes/item_tax_types.php:117 msgid "Name" msgstr "" @@@ -1777,11 -1484,9 +1786,11 @@@ msgstr " msgid "Install third-party extension." msgstr "" -#: admin/inst_module.php:168 includes/ui/ui_lists.inc:678 -#: includes/ui/ui_lists.inc:2158 reporting/includes/excel_report.inc:232 -#: reporting/includes/pdf_report.inc:264 +#: ../admin/inst_module.php:168 - #: ../includes/ui/ui_lists.inc:675 - #: ../includes/ui/ui_lists.inc:2160 ++#: ../includes/ui/ui_lists.inc:677 ++#: ../includes/ui/ui_lists.inc:2162 +#: ../reporting/includes/excel_report.inc:232 +#: ../reporting/includes/pdf_report.inc:264 msgid "Active" msgstr "" @@@ -1914,50 -1616,32 +1923,51 @@@ msgstr " msgid "Selected payment terms have been deleted" msgstr "" -#: admin/payment_terms.php:127 dimensions/dimension_entry.php:275 -#: dimensions/inquiry/search_dimensions.php:75 -#: dimensions/inquiry/search_dimensions.php:130 -#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:233 -#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126 -#: gl/inquiry/journal_inquiry.php:129 gl/inquiry/tax_inquiry.php:82 -#: gl/manage/bank_accounts.php:106 gl/manage/gl_quick_entries.php:186 -#: gl/view/accrual_trans.php:52 gl/includes/ui/gl_bank_ui.inc:93 -#: includes/ui/ui_view.inc:547 inventory/inquiry/stock_movements.php:82 -#: inventory/manage/item_categories.php:98 -#: manufacturing/search_work_orders.php:161 -#: manufacturing/includes/manufacturing_ui.inc:236 -#: manufacturing/includes/manufacturing_ui.inc:276 -#: manufacturing/includes/manufacturing_ui.inc:280 -#: manufacturing/includes/manufacturing_ui.inc:331 -#: purchasing/inquiry/supplier_allocation_inquiry.php:126 -#: purchasing/inquiry/supplier_inquiry.php:168 reporting/rep102.php:134 -#: reporting/rep202.php:139 reporting/rep402.php:103 reporting/rep501.php:87 -#: reporting/rep601.php:79 reporting/rep702.php:60 reporting/rep704.php:83 -#: reporting/rep704.php:86 reporting/rep704.php:89 reporting/rep709.php:112 -#: reporting/rep710.php:78 reporting/rep710.php:86 -#: reporting/reports_main.php:334 reporting/reports_main.php:498 -#: reporting/includes/doctext.inc:140 reporting/includes/doctext.inc:181 -#: reporting/includes/doctext.inc:200 -#: sales/inquiry/customer_allocation_inquiry.php:144 -#: sales/inquiry/customer_inquiry.php:217 +#: ../admin/payment_terms.php:127 +#: ../dimensions/dimension_entry.php:275 +#: ../dimensions/inquiry/search_dimensions.php:75 +#: ../dimensions/inquiry/search_dimensions.php:130 +#: ../dimensions/view/view_dimension.php:55 +#: ../gl/bank_account_reconcile.php:231 +#: ../gl/inquiry/bank_inquiry.php:70 +#: ../gl/inquiry/gl_account_inquiry.php:126 +#: ../gl/inquiry/journal_inquiry.php:129 +#: ../gl/inquiry/tax_inquiry.php:82 +#: ../gl/manage/bank_accounts.php:109 +#: ../gl/manage/gl_quick_entries.php:186 +#: ../gl/view/accrual_trans.php:52 +#: ../gl/includes/ui/gl_bank_ui.inc:93 +#: ../includes/ui/ui_view.inc:547 +#: ../inventory/inquiry/stock_movements.php:78 +#: ../inventory/manage/item_categories.php:98 +#: ../manufacturing/search_work_orders.php:161 +#: ../manufacturing/view/wo_costs_view.php:46 +#: ../manufacturing/includes/manufacturing_ui.inc:236 +#: ../manufacturing/includes/manufacturing_ui.inc:276 +#: ../manufacturing/includes/manufacturing_ui.inc:280 +#: ../manufacturing/includes/manufacturing_ui.inc:331 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:126 +#: ../purchasing/inquiry/supplier_inquiry.php:173 +#: ../reporting/rep102.php:134 +#: ../reporting/rep202.php:139 ++#: ../reporting/rep402.php:103 +#: ../reporting/rep501.php:87 +#: ../reporting/rep601.php:79 +#: ../reporting/rep602.php:80 +#: ../reporting/rep702.php:60 +#: ../reporting/rep704.php:83 +#: ../reporting/rep704.php:86 +#: ../reporting/rep704.php:89 - #: ../reporting/rep709.php:107 ++#: ../reporting/rep709.php:112 +#: ../reporting/rep710.php:78 +#: ../reporting/rep710.php:86 - #: ../reporting/reports_main.php:333 - #: ../reporting/reports_main.php:497 ++#: ../reporting/reports_main.php:340 ++#: ../reporting/reports_main.php:504 +#: ../reporting/includes/doctext.inc:162 +#: ../reporting/includes/doctext.inc:203 +#: ../reporting/includes/doctext.inc:222 +#: ../sales/inquiry/customer_allocation_inquiry.php:144 +#: ../sales/inquiry/customer_inquiry.php:200 msgid "Type" msgstr "" @@@ -2197,25 -1875,17 +2207,25 @@@ msgstr " msgid "Delete This Role" msgstr "" -#: admin/security_roles.php:249 admin/void_transaction.php:229 -#: gl/manage/gl_quick_entries.php:61 gl/includes/ui/gl_bank_ui.inc:279 -#: gl/includes/ui/gl_journal_ui.inc:223 includes/ui/simple_crud_class.inc:58 -#: includes/ui/simple_crud_class.inc:231 includes/ui/ui_controls.inc:589 -#: includes/ui/ui_input.inc:210 inventory/includes/item_adjustments_ui.inc:165 -#: inventory/includes/stock_transfers_ui.inc:145 -#: inventory/manage/items.php:416 -#: manufacturing/includes/work_order_issue_ui.inc:140 -#: purchasing/includes/ui/po_ui.inc:441 -#: sales/includes/ui/sales_credit_ui.inc:295 -#: sales/includes/ui/sales_order_ui.inc:545 +#: ../admin/security_roles.php:249 +#: ../admin/void_transaction.php:229 +#: ../gl/manage/gl_quick_entries.php:61 +#: ../gl/includes/ui/gl_bank_ui.inc:279 +#: ../gl/includes/ui/gl_journal_ui.inc:259 +#: ../includes/ui/simple_crud_class.inc:58 +#: ../includes/ui/simple_crud_class.inc:231 +#: ../includes/ui/ui_controls.inc:596 +#: ../includes/ui/ui_input.inc:211 - #: ../inventory/includes/item_adjustments_ui.inc:159 - #: ../inventory/includes/stock_transfers_ui.inc:139 ++#: ../inventory/includes/item_adjustments_ui.inc:165 ++#: ../inventory/includes/stock_transfers_ui.inc:145 +#: ../inventory/manage/items.php:427 - #: ../manufacturing/includes/work_order_issue_ui.inc:133 ++#: ../manufacturing/includes/work_order_issue_ui.inc:140 +#: ../purchasing/includes/ui/po_ui.inc:461 +#: ../sales/includes/ui/sales_credit_ui.inc:295 - #: ../sales/includes/ui/sales_order_ui.inc:563 ++#: ../sales/includes/ui/sales_order_ui.inc:548 +#: ../taxes/sav.tax_types.php:173 +#: ../taxes/sav.tax_types.php:253 +#: ../taxes/sav.tax_types.php:256 msgid "Cancel" msgstr "" @@@ -2224,13 -1893,10 +2234,13 @@@ msgid "Cancel Edition" msgstr "" -#: admin/shipping_companies.php:15 sales/customer_credit_invoice.php:254 -#: sales/customer_delivery.php:346 sales/customer_invoice.php:431 -#: sales/view/view_credit.php:74 sales/view/view_dispatch.php:92 -#: sales/view/view_invoice.php:91 +#: ../admin/shipping_companies.php:15 +#: ../sales/customer_credit_invoice.php:254 - #: ../sales/customer_delivery.php:382 ++#: ../sales/customer_delivery.php:392 +#: ../sales/customer_invoice.php:497 +#: ../sales/view/view_credit.php:74 +#: ../sales/view/view_dispatch.php:92 +#: ../sales/view/view_invoice.php:92 msgid "Shipping Company" msgstr "" @@@ -2311,16 -1969,11 +2321,16 @@@ msgstr " msgid "Unspecified tag type" msgstr "" -#: admin/tags.php:40 reporting/reports_main.php:357 -#: reporting/reports_main.php:366 reporting/reports_main.php:378 -#: reporting/reports_main.php:409 reporting/reports_main.php:417 -#: reporting/reports_main.php:428 reporting/reports_main.php:456 -#: reporting/reports_main.php:463 reporting/reports_main.php:473 +#: ../admin/tags.php:40 - #: ../reporting/reports_main.php:356 - #: ../reporting/reports_main.php:365 - #: ../reporting/reports_main.php:377 - #: ../reporting/reports_main.php:408 - #: ../reporting/reports_main.php:416 - #: ../reporting/reports_main.php:427 - #: ../reporting/reports_main.php:455 ++#: ../reporting/reports_main.php:363 ++#: ../reporting/reports_main.php:372 ++#: ../reporting/reports_main.php:384 ++#: ../reporting/reports_main.php:415 ++#: ../reporting/reports_main.php:423 ++#: ../reporting/reports_main.php:434 +#: ../reporting/reports_main.php:462 - #: ../reporting/reports_main.php:472 ++#: ../reporting/reports_main.php:469 ++#: ../reporting/reports_main.php:479 msgid "Account Tags" msgstr "" @@@ -2381,64 -2034,62 +2391,68 @@@ msgstr " msgid "A new user has been added." msgstr "" - #: ../admin/users.php:97 -#: admin/users.php:100 ++#: ../admin/users.php:100 + msgid "Cannot delete this user because entries are associated with this user." + msgstr "" + -#: admin/users.php:105 ++#: ../admin/users.php:105 msgid "User has been deleted." msgstr "" - #: ../admin/users.php:114 -#: admin/users.php:123 ++#: ../admin/users.php:123 msgid "User login" msgstr "" - #: ../admin/users.php:114 - #: ../admin/users.php:198 -#: admin/users.php:123 admin/users.php:207 includes/ui/contacts_view.inc:41 ++#: ../admin/users.php:123 ++#: ../admin/users.php:207 +#: ../includes/ui/contacts_view.inc:41 msgid "Full Name" msgstr "" - #: ../admin/users.php:114 -#: admin/users.php:123 includes/ui/contacts_view.inc:41 -#: inventory/manage/locations.php:146 reporting/rep106.php:88 -#: reporting/includes/header2.inc:101 sales/manage/sales_people.php:99 ++#: ../admin/users.php:123 +#: ../includes/ui/contacts_view.inc:41 +#: ../inventory/manage/locations.php:146 +#: ../reporting/rep106.php:88 - #: ../reporting/includes/header2.inc:98 ++#: ../reporting/includes/header2.inc:101 +#: ../sales/manage/sales_people.php:99 msgid "Phone" msgstr "" - #: ../admin/users.php:115 -#: admin/users.php:124 sales/manage/customer_branches.php:300 -#: sales/view/view_sales_order.php:83 ++#: ../admin/users.php:124 +#: ../sales/manage/customer_branches.php:302 +#: ../sales/view/view_sales_order.php:96 msgid "E-mail" msgstr "" - #: ../admin/users.php:115 -#: admin/users.php:124 ++#: ../admin/users.php:124 msgid "Last Visit" msgstr "" - #: ../admin/users.php:115 -#: admin/users.php:124 ++#: ../admin/users.php:124 msgid "Access Level" msgstr "" - #: ../admin/users.php:184 -#: admin/users.php:193 ++#: ../admin/users.php:193 msgid "User Login:" msgstr "" - #: ../admin/users.php:195 -#: admin/users.php:204 ++#: ../admin/users.php:204 msgid "Enter a new password to change, leave empty to keep current." msgstr "" - #: ../admin/users.php:200 -#: admin/users.php:209 ++#: ../admin/users.php:209 msgid "Telephone No.:" msgstr "" - #: ../admin/users.php:204 -#: admin/users.php:213 ++#: ../admin/users.php:213 msgid "Access Level:" msgstr "" - #: ../admin/users.php:208 -#: admin/users.php:217 ++#: ../admin/users.php:217 msgid "User's POS" msgstr "" - #: ../admin/users.php:213 -#: admin/users.php:222 ++#: ../admin/users.php:222 msgid "Use popup window for reports:" msgstr "" @@@ -2446,15 -2097,12 +2460,15 @@@ msgid "View or Print Transactions" 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:116 -#: purchasing/inquiry/po_search.php:95 sales/inquiry/customer_inquiry.php:202 -#: sales/inquiry/sales_deliveries_view.php:162 -#: sales/inquiry/sales_orders_view.php:119 +#: ../admin/view_print_transaction.php:43 +#: ../admin/view_print_transaction.php:45 +#: ../admin/view_print_transaction.php:129 +#: ../includes/ui/ui_controls.inc:195 - #: ../purchasing/inquiry/po_search_completed.php:112 - #: ../purchasing/inquiry/po_search.php:93 ++#: ../purchasing/inquiry/po_search_completed.php:115 ++#: ../purchasing/inquiry/po_search.php:95 +#: ../sales/inquiry/customer_inquiry.php:185 - #: ../sales/inquiry/sales_deliveries_view.php:160 ++#: ../sales/inquiry/sales_deliveries_view.php:162 +#: ../sales/inquiry/sales_orders_view.php:125 msgid "Print" msgstr "" @@@ -2472,20 -2118,18 +2486,20 @@@ msgstr " msgid "to #:" msgstr "" -#: admin/view_print_transaction.php:83 admin/void_transaction.php:170 -#: dimensions/inquiry/search_dimensions.php:88 -#: gl/inquiry/journal_inquiry.php:53 manufacturing/search_work_orders.php:78 -#: purchasing/includes/ui/invoice_ui.inc:466 -#: purchasing/inquiry/po_search_completed.php:80 -#: purchasing/inquiry/po_search.php:78 -#: purchasing/inquiry/supplier_allocation_inquiry.php:57 -#: purchasing/inquiry/supplier_inquiry.php:58 -#: sales/inquiry/customer_allocation_inquiry.php:51 -#: sales/inquiry/customer_inquiry.php:58 -#: sales/inquiry/sales_deliveries_view.php:118 -#: sales/inquiry/sales_orders_view.php:247 +#: ../admin/view_print_transaction.php:83 +#: ../admin/void_transaction.php:170 +#: ../dimensions/inquiry/search_dimensions.php:88 +#: ../gl/inquiry/journal_inquiry.php:53 +#: ../manufacturing/search_work_orders.php:78 +#: ../purchasing/includes/ui/invoice_ui.inc:489 - #: ../purchasing/inquiry/po_search_completed.php:74 - #: ../purchasing/inquiry/po_search.php:76 ++#: ../purchasing/inquiry/po_search_completed.php:77 ++#: ../purchasing/inquiry/po_search.php:78 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:57 +#: ../purchasing/inquiry/supplier_inquiry.php:55 +#: ../sales/inquiry/customer_allocation_inquiry.php:51 +#: ../sales/inquiry/customer_inquiry.php:54 - #: ../sales/inquiry/sales_deliveries_view.php:116 ++#: ../sales/inquiry/sales_deliveries_view.php:118 +#: ../sales/inquiry/sales_orders_view.php:270 msgid "Search" msgstr "" @@@ -2501,128 -2145,87 +2515,129 @@@ msgid " "zero." msgstr "" -#: admin/view_print_transaction.php:127 admin/void_transaction.php:182 -#: 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:80 -#: gl/view/gl_payment_view.php:78 gl/view/gl_trans_view.php:35 -#: includes/ui/contacts_view.inc:41 inventory/inquiry/stock_movements.php:82 -#: inventory/view/view_adjustment.php:44 inventory/view/view_transfer.php:44 -#: manufacturing/search_work_orders.php:160 -#: manufacturing/view/wo_issue_view.php:43 -#: manufacturing/view/wo_production_view.php:44 -#: manufacturing/includes/manufacturing_ui.inc:157 -#: manufacturing/includes/manufacturing_ui.inc:200 -#: manufacturing/includes/manufacturing_ui.inc:276 -#: manufacturing/includes/manufacturing_ui.inc:280 -#: manufacturing/includes/manufacturing_ui.inc:331 -#: purchasing/includes/ui/grn_ui.inc:32 purchasing/includes/ui/grn_ui.inc:64 -#: purchasing/includes/ui/po_ui.inc:311 purchasing/view/view_po.php:115 -#: purchasing/view/view_supp_credit.php:43 -#: purchasing/view/view_supp_invoice.php:46 -#: purchasing/view/view_supp_payment.php:73 -#: purchasing/inquiry/po_search_completed.php:125 -#: purchasing/inquiry/po_search.php:133 -#: purchasing/inquiry/supplier_allocation_inquiry.php:128 -#: purchasing/inquiry/supplier_inquiry.php:170 -#: purchasing/allocations/supplier_allocation_main.php:96 -#: 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:326 -#: sales/customer_delivery.php:328 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:146 -#: sales/inquiry/customer_inquiry.php:220 -#: sales/inquiry/sales_deliveries_view.php:186 -#: sales/includes/ui/sales_credit_ui.inc:85 -#: sales/includes/ui/sales_credit_ui.inc:87 -#: sales/includes/ui/sales_order_ui.inc:361 +#: ../admin/view_print_transaction.php:127 +#: ../admin/void_transaction.php:182 +#: ../dimensions/inquiry/search_dimensions.php:128 +#: ../dimensions/view/view_dimension.php:55 +#: ../gl/bank_account_reconcile.php:233 +#: ../gl/inquiry/bank_inquiry.php:70 +#: ../gl/inquiry/journal_inquiry.php:131 +#: ../gl/view/bank_transfer_view.php:86 +#: ../gl/view/gl_deposit_view.php: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:78 +#: ../inventory/view/view_adjustment.php:44 +#: ../inventory/view/view_transfer.php:44 +#: ../manufacturing/search_work_orders.php:160 +#: ../manufacturing/view/wo_issue_view.php:43 +#: ../manufacturing/view/wo_production_view.php:44 +#: ../manufacturing/includes/manufacturing_ui.inc:157 +#: ../manufacturing/includes/manufacturing_ui.inc:200 +#: ../manufacturing/includes/manufacturing_ui.inc:276 +#: ../manufacturing/includes/manufacturing_ui.inc:280 +#: ../manufacturing/includes/manufacturing_ui.inc:331 +#: ../purchasing/includes/ui/grn_ui.inc:32 +#: ../purchasing/includes/ui/grn_ui.inc:64 +#: ../purchasing/includes/ui/po_ui.inc:323 +#: ../purchasing/view/view_po.php:115 +#: ../purchasing/view/view_supp_credit.php:43 +#: ../purchasing/view/view_supp_invoice.php:47 +#: ../purchasing/view/view_supp_payment.php:73 - #: ../purchasing/inquiry/po_search_completed.php:121 - #: ../purchasing/inquiry/po_search.php:131 ++#: ../purchasing/inquiry/po_search_completed.php:124 ++#: ../purchasing/inquiry/po_search.php:133 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:128 +#: ../purchasing/inquiry/supplier_inquiry.php:175 +#: ../purchasing/allocations/supplier_allocation_main.php:96 +#: ../reporting/rep501.php:87 +#: ../reporting/rep601.php:79 +#: ../reporting/rep602.php:80 +#: ../reporting/rep702.php:53 +#: ../reporting/includes/doctext.inc:221 +#: ../sales/customer_credit_invoice.php:245 +#: ../sales/customer_credit_invoice.php:247 - #: ../sales/customer_delivery.php:362 - #: ../sales/customer_delivery.php:364 ++#: ../sales/customer_delivery.php:372 ++#: ../sales/customer_delivery.php:374 +#: ../sales/customer_invoice.php:469 +#: ../sales/customer_invoice.php:471 +#: ../sales/allocations/customer_allocation_main.php:95 +#: ../sales/view/view_dispatch.php:85 +#: ../sales/view/view_invoice.php:85 +#: ../sales/view/view_receipt.php:39 +#: ../sales/view/view_sales_order.php:94 +#: ../sales/inquiry/customer_allocation_inquiry.php:146 +#: ../sales/inquiry/customer_inquiry.php:203 - #: ../sales/inquiry/sales_deliveries_view.php:184 ++#: ../sales/inquiry/sales_deliveries_view.php:186 +#: ../sales/includes/ui/sales_credit_ui.inc:85 +#: ../sales/includes/ui/sales_credit_ui.inc:87 - #: ../sales/includes/ui/sales_order_ui.inc:379 ++#: ../sales/includes/ui/sales_order_ui.inc:364 msgid "Reference" msgstr "" -#: admin/view_print_transaction.php:128 admin/void_transaction.php:183 -#: dimensions/inquiry/search_dimensions.php:131 -#: dimensions/view/view_dimension.php:55 gl/accruals.php:90 -#: gl/accruals.php:195 gl/bank_account_reconcile.php:236 -#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126 -#: gl/inquiry/journal_inquiry.php:128 gl/view/accrual_trans.php:52 -#: gl/view/bank_transfer_view.php:83 gl/view/gl_deposit_view.php:68 -#: gl/view/gl_payment_view.php:66 gl/view/gl_trans_view.php:36 -#: includes/ui/allocation_cart.inc: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:417 -#: manufacturing/work_order_entry.php:423 -#: manufacturing/view/wo_production_view.php:45 -#: manufacturing/includes/manufacturing_ui.inc:157 -#: manufacturing/includes/manufacturing_ui.inc:200 -#: manufacturing/includes/manufacturing_ui.inc:236 -#: manufacturing/includes/manufacturing_ui.inc:277 -#: manufacturing/includes/manufacturing_ui.inc:281 -#: manufacturing/includes/manufacturing_ui.inc:332 -#: purchasing/includes/ui/invoice_ui.inc:116 -#: purchasing/includes/ui/po_ui.inc:325 purchasing/view/view_po.php:140 -#: purchasing/inquiry/supplier_allocation_inquiry.php:131 -#: purchasing/inquiry/supplier_inquiry.php:173 -#: purchasing/allocations/supplier_allocation_main.php:97 -#: reporting/rep101.php:118 reporting/rep201.php:110 reporting/rep306.php:141 -#: reporting/rep402.php:103 reporting/rep501.php:87 reporting/rep601.php:79 -#: reporting/rep704.php:83 reporting/rep704.php:86 reporting/rep704.php:89 -#: reporting/rep709.php:116 reporting/rep710.php:77 -#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186 -#: reporting/includes/doctext.inc:224 reporting/includes/header2.inc:138 -#: sales/customer_delivery.php:356 sales/customer_invoice.php:441 -#: sales/allocations/customer_allocation_main.php:96 -#: sales/view/view_credit.php:69 sales/view/view_sales_order.php:96 -#: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161 -#: sales/inquiry/customer_allocation_inquiry.php:148 -#: sales/inquiry/customer_inquiry.php:221 +#: ../admin/view_print_transaction.php:128 +#: ../admin/void_transaction.php:183 +#: ../dimensions/inquiry/search_dimensions.php:131 +#: ../dimensions/view/view_dimension.php:55 +#: ../gl/accruals.php:94 +#: ../gl/accruals.php:199 +#: ../gl/bank_account_reconcile.php:234 +#: ../gl/inquiry/bank_inquiry.php:70 +#: ../gl/inquiry/gl_account_inquiry.php:126 +#: ../gl/inquiry/journal_inquiry.php:128 +#: ../gl/view/accrual_trans.php:52 +#: ../gl/view/bank_transfer_view.php:83 +#: ../gl/view/gl_deposit_view.php:68 +#: ../gl/view/gl_payment_view.php:66 +#: ../gl/view/gl_trans_view.php:36 +#: ../includes/ui/allocation_cart.inc:290 +#: ../includes/ui/ui_view.inc:547 +#: ../inventory/inquiry/stock_movements.php:80 +#: ../inventory/view/view_adjustment.php:45 +#: ../inventory/view/view_transfer.php:47 +#: ../manufacturing/search_work_orders.php:166 - #: ../manufacturing/work_order_entry.php:419 - #: ../manufacturing/work_order_entry.php:425 ++#: ../manufacturing/work_order_entry.php:417 ++#: ../manufacturing/work_order_entry.php:423 +#: ../manufacturing/view/wo_costs_view.php:46 +#: ../manufacturing/view/wo_production_view.php:45 +#: ../manufacturing/includes/manufacturing_ui.inc:157 +#: ../manufacturing/includes/manufacturing_ui.inc:200 +#: ../manufacturing/includes/manufacturing_ui.inc:236 +#: ../manufacturing/includes/manufacturing_ui.inc:277 +#: ../manufacturing/includes/manufacturing_ui.inc:281 +#: ../manufacturing/includes/manufacturing_ui.inc:332 +#: ../purchasing/includes/ui/invoice_ui.inc:129 +#: ../purchasing/includes/ui/po_ui.inc:337 +#: ../purchasing/view/view_po.php:140 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:131 +#: ../purchasing/inquiry/supplier_inquiry.php:178 +#: ../purchasing/allocations/supplier_allocation_main.php:97 +#: ../reporting/rep101.php:118 +#: ../reporting/rep107.php:202 +#: ../reporting/rep201.php:110 +#: ../reporting/rep306.php:141 ++#: ../reporting/rep402.php:103 +#: ../reporting/rep501.php:87 +#: ../reporting/rep601.php:79 +#: ../reporting/rep602.php:80 +#: ../reporting/rep704.php:83 +#: ../reporting/rep704.php:86 +#: ../reporting/rep704.php:89 - #: ../reporting/rep709.php:111 ++#: ../reporting/rep709.php:116 +#: ../reporting/rep710.php:77 +#: ../reporting/includes/doctext.inc:167 +#: ../reporting/includes/doctext.inc:208 +#: ../reporting/includes/doctext.inc:246 - #: ../reporting/includes/header2.inc:135 - #: ../sales/customer_delivery.php:392 ++#: ../reporting/includes/header2.inc:138 ++#: ../sales/customer_delivery.php:402 +#: ../sales/customer_invoice.php:512 +#: ../sales/allocations/customer_allocation_main.php:96 +#: ../sales/view/view_credit.php:69 +#: ../sales/view/view_sales_order.php:109 +#: ../sales/view/view_sales_order.php:142 +#: ../sales/view/view_sales_order.php:179 +#: ../sales/inquiry/customer_allocation_inquiry.php:148 +#: ../sales/inquiry/customer_inquiry.php:204 msgid "Date" msgstr "" @@@ -2656,22 -2252,14 +2671,22 @@@ msgstr " msgid "Voiding Date:" msgstr "" -#: admin/void_transaction.php:208 dimensions/dimension_entry.php:283 -#: gl/bank_transfer.php:98 gl/inquiry/journal_inquiry.php:56 -#: gl/manage/revaluate_currencies.php:106 includes/ui/ui_view.inc:344 -#: manufacturing/work_order_add_finished.php:207 -#: manufacturing/work_order_entry.php:449 -#: manufacturing/work_order_release.php:103 -#: purchasing/includes/ui/invoice_ui.inc:174 purchasing/po_entry_items.php:529 -#: purchasing/supplier_payment.php:325 sales/customer_payments.php:399 +#: ../admin/void_transaction.php:208 +#: ../dimensions/dimension_entry.php:283 +#: ../gl/bank_transfer.php:98 +#: ../gl/inquiry/journal_inquiry.php:56 +#: ../gl/manage/revaluate_currencies.php:106 +#: ../includes/ui/ui_view.inc:344 - #: ../manufacturing/work_order_add_finished.php:210 ++#: ../manufacturing/work_order_add_finished.php:207 +#: ../manufacturing/work_order_costs.php:146 - #: ../manufacturing/work_order_entry.php:451 ++#: ../manufacturing/work_order_entry.php:449 +#: ../manufacturing/work_order_release.php:103 +#: ../purchasing/includes/ui/invoice_ui.inc:195 +#: ../purchasing/includes/ui/po_ui.inc:494 +#: ../purchasing/po_entry_items.php:485 +#: ../purchasing/supplier_payment.php:325 +#: ../sales/customer_invoice.php:689 +#: ../sales/customer_payments.php:402 msgid "Memo:" msgstr "" @@@ -2700,22 -2285,15 +2715,22 @@@ msgstr " msgid "The selected transaction was closed for edition and cannot be voided." msgstr "" -#: admin/void_transaction.php:248 gl/accruals.php:32 gl/bank_transfer.php:115 -#: gl/gl_journal.php:156 gl/manage/exchange_rates.php:33 -#: gl/manage/revaluate_currencies.php:53 -#: manufacturing/work_order_add_finished.php:98 -#: manufacturing/work_order_costs.php:83 purchasing/po_receive_items.php:174 -#: purchasing/supplier_payment.php:185 sales/customer_credit_invoice.php:91 -#: sales/sales_order_entry.php:356 sales/manage/recurrent_invoices.php:41 -#: sales/manage/recurrent_invoices.php:46 -#: sales/manage/recurrent_invoices.php:51 +#: ../admin/void_transaction.php:248 +#: ../gl/accruals.php:32 +#: ../gl/bank_transfer.php:115 +#: ../gl/gl_journal.php:162 +#: ../gl/manage/close_period.php:34 +#: ../gl/manage/exchange_rates.php:33 +#: ../gl/manage/revaluate_currencies.php:53 +#: ../manufacturing/work_order_add_finished.php:98 +#: ../manufacturing/work_order_costs.php:80 +#: ../purchasing/po_receive_items.php:174 +#: ../purchasing/supplier_payment.php:185 +#: ../sales/customer_credit_invoice.php:91 - #: ../sales/sales_order_entry.php:363 ++#: ../sales/sales_order_entry.php:366 +#: ../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 "" @@@ -2750,10 -2336,8 +2765,10 @@@ msgstr " msgid "Closing Year" msgstr "" -#: admin/db/fiscalyears_db.inc:219 reporting/rep101.php:175 -#: reporting/rep201.php:170 reporting/rep706.php:185 +#: ../admin/db/fiscalyears_db.inc:219 - #: ../reporting/rep101.php:175 - #: ../reporting/rep201.php:170 ++#: ../reporting/rep101.php:173 ++#: ../reporting/rep201.php:165 +#: ../reporting/rep706.php:185 msgid "Open Balance" msgstr "" @@@ -2788,13 -2372,7 +2803,13 @@@ msgstr " msgid "The language files folder " msgstr "" - #: ../admin/db/maintenance_db.inc:389 -#: admin/db/maintenance_db.inc:389 ++#: ../admin/db/maintenance_db.inc:391 +msgid "" +"This is new format backup file which cannot be restored on database not " +"migrated to utf8." +msgstr "" + - #: ../admin/db/maintenance_db.inc:471 ++#: ../admin/db/maintenance_db.inc:473 #, php-format msgid "SQL script execution failed in line %d: %s" msgstr "" @@@ -3021,10 -2587,8 +3036,10 @@@ msgstr " msgid "Ta&x Inquiry" msgstr "" -#: applications/generalledger.php:44 reporting/reports_main.php:384 -#: reporting/reports_main.php:434 reporting/reports_main.php:479 +#: ../applications/generalledger.php:44 - #: ../reporting/reports_main.php:383 - #: ../reporting/reports_main.php:433 - #: ../reporting/reports_main.php:478 ++#: ../reporting/reports_main.php:390 ++#: ../reporting/reports_main.php:440 ++#: ../reporting/reports_main.php:485 msgid "Trial &Balance" msgstr "" @@@ -3396,29 -2953,18 +3411,30 @@@ msgstr " msgid "The dimension reference must be entered." msgstr "" -#: dimensions/dimension_entry.php:123 gl/bank_transfer.php:176 -#: gl/gl_bank.php:254 gl/gl_journal.php:176 -#: gl/manage/revaluate_currencies.php:72 inventory/adjustments.php:101 -#: inventory/transfers.php:96 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: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:290 -#: sales/customer_invoice.php:328 sales/customer_payments.php:169 -#: sales/customer_payments.php:176 sales/sales_order_entry.php:453 +#: ../dimensions/dimension_entry.php:123 +#: ../gl/bank_transfer.php:176 +#: ../gl/gl_bank.php:257 +#: ../gl/gl_journal.php:182 +#: ../gl/manage/revaluate_currencies.php:72 +#: ../inventory/adjustments.php:101 - #: ../inventory/transfers.php:97 ++#: ../inventory/transfers.php:96 +#: ../manufacturing/work_order_add_finished.php:84 +#: ../manufacturing/work_order_entry.php:139 +#: ../manufacturing/work_order_issue.php:97 ++#: ../manufacturing/work_order_issue.php.orig:97 +#: ../purchasing/po_entry_items.php:365 +#: ../purchasing/po_receive_items.php:193 +#: ../purchasing/supplier_credit.php:182 +#: ../purchasing/supplier_invoice.php:190 +#: ../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:324 ++#: ../sales/customer_delivery.php:334 +#: ../sales/customer_invoice.php:388 +#: ../sales/customer_payments.php:169 +#: ../sales/customer_payments.php:176 - #: ../sales/sales_order_entry.php:461 ++#: ../sales/sales_order_entry.php:475 msgid "The entered reference is already in use." msgstr "" @@@ -3426,10 -2972,8 +3442,10 @@@ msgid "The dimension name must be entered." msgstr "" -#: dimensions/dimension_entry.php:138 manufacturing/work_order_entry.php:154 -#: manufacturing/work_order_entry.php:232 purchasing/po_entry_items.php:238 +#: ../dimensions/dimension_entry.php:138 +#: ../manufacturing/work_order_entry.php:154 - #: ../manufacturing/work_order_entry.php:234 ++#: ../manufacturing/work_order_entry.php:232 +#: ../purchasing/po_entry_items.php:238 msgid "The date entered is in an invalid format." msgstr "" @@@ -3450,40 -2993,24 +3466,40 @@@ msgstr " msgid "Dimension Reference:" msgstr "" -#: dimensions/dimension_entry.php:277 reporting/reports_main.php:34 -#: reporting/reports_main.php:64 reporting/reports_main.php:80 -#: reporting/reports_main.php:89 reporting/reports_main.php:151 -#: reporting/reports_main.php:233 reporting/reports_main.php:242 -#: reporting/reports_main.php:248 reporting/reports_main.php:258 -#: reporting/reports_main.php:266 reporting/reports_main.php:274 -#: reporting/reports_main.php:318 reporting/reports_main.php:332 -#: reporting/reports_main.php:344 reporting/reports_main.php:362 -#: reporting/reports_main.php:373 reporting/reports_main.php:385 -#: reporting/reports_main.php:398 reporting/reports_main.php:414 -#: reporting/reports_main.php:424 reporting/reports_main.php:435 -#: reporting/reports_main.php:447 reporting/reports_main.php:461 -#: reporting/reports_main.php:470 reporting/reports_main.php:480 -#: reporting/reports_main.php:489 reporting/reports_main.php:496 +#: ../dimensions/dimension_entry.php:277 +#: ../reporting/reports_main.php:34 +#: ../reporting/reports_main.php:64 +#: ../reporting/reports_main.php:80 +#: ../reporting/reports_main.php:89 +#: ../reporting/reports_main.php:151 +#: ../reporting/reports_main.php:233 +#: ../reporting/reports_main.php:242 +#: ../reporting/reports_main.php:248 +#: ../reporting/reports_main.php:258 +#: ../reporting/reports_main.php:266 +#: ../reporting/reports_main.php:274 - #: ../reporting/reports_main.php:311 - #: ../reporting/reports_main.php:319 - #: ../reporting/reports_main.php:331 - #: ../reporting/reports_main.php:343 - #: ../reporting/reports_main.php:361 - #: ../reporting/reports_main.php:372 - #: ../reporting/reports_main.php:384 - #: ../reporting/reports_main.php:397 - #: ../reporting/reports_main.php:413 - #: ../reporting/reports_main.php:423 - #: ../reporting/reports_main.php:434 - #: ../reporting/reports_main.php:446 - #: ../reporting/reports_main.php:460 - #: ../reporting/reports_main.php:469 - #: ../reporting/reports_main.php:479 - #: ../reporting/reports_main.php:488 ++#: ../reporting/reports_main.php:318 ++#: ../reporting/reports_main.php:326 ++#: ../reporting/reports_main.php:338 ++#: ../reporting/reports_main.php:350 ++#: ../reporting/reports_main.php:368 ++#: ../reporting/reports_main.php:379 ++#: ../reporting/reports_main.php:391 ++#: ../reporting/reports_main.php:404 ++#: ../reporting/reports_main.php:420 ++#: ../reporting/reports_main.php:430 ++#: ../reporting/reports_main.php:441 ++#: ../reporting/reports_main.php:453 ++#: ../reporting/reports_main.php:467 ++#: ../reporting/reports_main.php:476 ++#: ../reporting/reports_main.php:486 +#: ../reporting/reports_main.php:495 ++#: ../reporting/reports_main.php:502 msgid "Start Date" msgstr "" -#: dimensions/dimension_entry.php:279 manufacturing/work_order_entry.php:418 +#: ../dimensions/dimension_entry.php:279 - #: ../manufacturing/work_order_entry.php:420 ++#: ../manufacturing/work_order_entry.php:418 msgid "Date Required By" msgstr "" @@@ -3651,63 -3131,36 +3667,65 @@@ msgstr " msgid "Search Dimensions" msgstr "" -#: dimensions/inquiry/search_dimensions.php:73 gl/bank_transfer.php:79 -#: gl/inquiry/journal_inquiry.php:45 gl/manage/revaluate_currencies.php:105 -#: gl/includes/ui/gl_bank_ui.inc:26 gl/includes/ui/gl_journal_ui.inc:30 -#: includes/ui/contacts_view.inc:94 -#: inventory/includes/item_adjustments_ui.inc:35 -#: inventory/includes/stock_transfers_ui.inc:40 -#: manufacturing/search_work_orders.php:67 -#: manufacturing/work_order_add_finished.php:195 -#: manufacturing/work_order_entry.php:376 -#: manufacturing/work_order_entry.php:383 -#: manufacturing/includes/work_order_issue_ui.inc:163 -#: purchasing/includes/ui/invoice_ui.inc:105 -#: purchasing/includes/ui/po_ui.inc:176 purchasing/includes/ui/po_ui.inc:181 -#: purchasing/supplier_payment.php:298 sales/customer_payments.php:368 +#: ../dimensions/inquiry/search_dimensions.php:73 +#: ../gl/bank_transfer.php:79 +#: ../gl/inquiry/journal_inquiry.php:45 +#: ../gl/manage/revaluate_currencies.php:105 +#: ../gl/includes/ui/gl_bank_ui.inc:26 +#: ../gl/includes/ui/gl_journal_ui.inc:30 +#: ../includes/ui/contacts_view.inc:94 +#: ../inventory/includes/item_adjustments_ui.inc:35 +#: ../inventory/includes/stock_transfers_ui.inc:40 +#: ../manufacturing/search_work_orders.php:67 - #: ../manufacturing/work_order_add_finished.php:198 ++#: ../manufacturing/work_order_add_finished.php:195 +#: ../manufacturing/work_order_costs.php:134 - #: ../manufacturing/work_order_entry.php:378 - #: ../manufacturing/work_order_entry.php:385 - #: ../manufacturing/includes/work_order_issue_ui.inc:156 ++#: ../manufacturing/work_order_entry.php:376 ++#: ../manufacturing/work_order_entry.php:383 ++#: ../manufacturing/includes/work_order_issue_ui.inc:163 +#: ../purchasing/includes/ui/invoice_ui.inc:119 +#: ../purchasing/includes/ui/po_ui.inc:188 +#: ../purchasing/includes/ui/po_ui.inc:193 +#: ../purchasing/supplier_payment.php:298 +#: ../sales/customer_payments.php:371 msgid "Reference:" msgstr "" -#: dimensions/inquiry/search_dimensions.php:75 -#: includes/ui/allocation_cart.inc:312 includes/ui/ui_lists.inc:1925 -#: 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:156 reporting/rep301.php:163 -#: 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:219 reporting/rep308.php:224 -#: reporting/rep309.php:92 reporting/rep402.php:87 reporting/rep402.php:95 -#: reporting/rep702.php:61 reporting/rep710.php:86 reporting/rep710.php:87 +#: ../dimensions/inquiry/search_dimensions.php:75 +#: ../includes/ui/allocation_cart.inc:314 - #: ../includes/ui/ui_lists.inc:1927 ++#: ../includes/ui/ui_lists.inc:1929 +#: ../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/rep301.php:156 ++#: ../reporting/rep301.php:163 +#: ../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/rep308.php:219 ++#: ../reporting/rep308.php:224 +#: ../reporting/rep309.php:92 ++#: ../reporting/rep402.php:87 ++#: ../reporting/rep402.php:95 +#: ../reporting/rep702.php:61 +#: ../reporting/rep710.php:86 +#: ../reporting/rep710.php:87 msgid "All" msgstr "" @@@ -3747,30 -3193,22 +3765,30 @@@ msgstr " msgid "Only Open:" msgstr "" -#: dimensions/inquiry/search_dimensions.php:132 -#: dimensions/view/view_dimension.php:55 includes/ui/allocation_cart.inc:288 -#: purchasing/includes/ui/invoice_ui.inc:125 -#: purchasing/view/view_supp_credit.php:48 -#: purchasing/view/view_supp_invoice.php:51 -#: purchasing/inquiry/supplier_allocation_inquiry.php:132 -#: purchasing/inquiry/supplier_inquiry.php:174 reporting/rep101.php:118 -#: reporting/rep201.php:110 reporting/rep203.php:93 reporting/rep501.php:87 -#: reporting/includes/doctext.inc:100 reporting/includes/doctext.inc:122 -#: reporting/includes/doctext.inc:143 reporting/includes/doctext.inc:145 -#: reporting/includes/doctext.inc:184 reporting/includes/doctext.inc:186 -#: sales/customer_invoice.php:448 sales/view/view_dispatch.php:97 -#: sales/view/view_invoice.php:96 -#: sales/inquiry/customer_allocation_inquiry.php:149 -#: sales/inquiry/customer_inquiry.php:222 -#: sales/includes/ui/sales_order_ui.inc:584 +#: ../dimensions/inquiry/search_dimensions.php:132 +#: ../dimensions/view/view_dimension.php:55 +#: ../includes/ui/allocation_cart.inc:290 +#: ../purchasing/includes/ui/invoice_ui.inc:138 +#: ../purchasing/view/view_supp_credit.php:48 +#: ../purchasing/view/view_supp_invoice.php:52 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:132 +#: ../purchasing/inquiry/supplier_inquiry.php:179 +#: ../reporting/rep101.php:118 +#: ../reporting/rep201.php:110 +#: ../reporting/rep203.php:93 +#: ../reporting/rep501.php:87 +#: ../reporting/includes/doctext.inc:112 +#: ../reporting/includes/doctext.inc:144 +#: ../reporting/includes/doctext.inc:165 +#: ../reporting/includes/doctext.inc:167 +#: ../reporting/includes/doctext.inc:206 +#: ../reporting/includes/doctext.inc:208 +#: ../sales/customer_invoice.php:519 +#: ../sales/view/view_dispatch.php:97 +#: ../sales/view/view_invoice.php:96 +#: ../sales/inquiry/customer_allocation_inquiry.php:149 +#: ../sales/inquiry/customer_inquiry.php:205 - #: ../sales/includes/ui/sales_order_ui.inc:602 ++#: ../sales/includes/ui/sales_order_ui.inc:587 msgid "Due Date" msgstr "" @@@ -3827,34 -3257,7 +3845,35 @@@ msgstr " msgid "Revenue / Cost Accruals" msgstr "" -#: gl/accruals.php:44 +#: ../gl/accruals.php:38 +#: ../gl/bank_transfer.php:121 +#: ../gl/gl_bank.php:269 +#: ../gl/gl_journal.php:168 +#: ../gl/manage/revaluate_currencies.php:59 +#: ../inventory/adjustments.php:114 - #: ../inventory/transfers.php:109 ++#: ../inventory/transfers.php:108 +#: ../manufacturing/work_order_add_finished.php:104 +#: ../manufacturing/work_order_costs.php:86 +#: ../manufacturing/work_order_entry.php:160 +#: ../manufacturing/work_order_issue.php:84 ++#: ../manufacturing/work_order_issue.php.orig:84 +#: ../purchasing/po_entry_items.php:342 +#: ../purchasing/po_receive_items.php:179 +#: ../purchasing/supplier_credit.php:202 +#: ../purchasing/supplier_invoice.php:210 +#: ../purchasing/supplier_payment.php:191 +#: ../sales/create_recurrent_invoices.php:121 +#: ../sales/credit_note_entry.php:157 +#: ../sales/customer_credit_invoice.php:95 +#: ../sales/customer_delivery.php:165 +#: ../sales/customer_invoice.php:327 +#: ../sales/customer_payments.php:156 - #: ../sales/sales_order_entry.php:368 ++#: ../sales/sales_order_entry.php:371 +msgid "" +"The entered date is out of fiscal year or is closed for further data entry." +msgstr "" + +#: ../gl/accruals.php:44 msgid "The amount can not be 0." msgstr "" @@@ -3873,136 -3276,73 +3892,136 @@@ msgstr " msgid "Accruals for %s" msgstr "" -#: gl/accruals.php:92 gl/accruals.php:94 gl/accruals.php:203 -#: gl/accruals.php:205 gl/gl_budget.php:71 gl/gl_budget.php:72 -#: gl/gl_budget.php:76 gl/inquiry/balance_sheet.php:128 -#: gl/inquiry/balance_sheet.php:130 gl/inquiry/gl_account_inquiry.php:79 -#: gl/inquiry/gl_account_inquiry.php:81 gl/inquiry/gl_account_inquiry.php:134 -#: gl/inquiry/gl_account_inquiry.php:136 gl/inquiry/gl_trial_balance.php:57 -#: gl/inquiry/gl_trial_balance.php:59 gl/inquiry/profit_loss.php:179 -#: gl/inquiry/profit_loss.php:181 gl/manage/gl_quick_entries.php:261 -#: gl/manage/gl_quick_entries.php:263 gl/manage/gl_quick_entries.php:343 -#: gl/manage/gl_quick_entries.php:345 gl/view/accrual_trans.php:54 -#: gl/view/accrual_trans.php:56 gl/view/gl_deposit_view.php:104 -#: gl/view/gl_deposit_view.php:107 gl/view/gl_payment_view.php:103 -#: gl/view/gl_payment_view.php:106 gl/view/gl_trans_view.php:63 -#: gl/view/gl_trans_view.php:66 gl/includes/ui/gl_bank_ui.inc:152 -#: gl/includes/ui/gl_bank_ui.inc:153 gl/includes/ui/gl_bank_ui.inc:155 -#: gl/includes/ui/gl_journal_ui.inc:83 gl/includes/ui/gl_journal_ui.inc:84 -#: gl/includes/ui/gl_journal_ui.inc:86 includes/sysnames.inc:43 -#: includes/sysnames.inc:165 inventory/manage/item_categories.php:216 -#: inventory/manage/item_categories.php:218 inventory/manage/items.php:343 -#: inventory/manage/items.php:345 purchasing/includes/ui/invoice_ui.inc:258 -#: purchasing/includes/ui/invoice_ui.inc:260 -#: 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 -#: reporting/rep705.php:249 reporting/rep705.php:251 reporting/rep705.php:262 -#: reporting/rep706.php:194 reporting/rep706.php:196 reporting/rep706.php:204 -#: reporting/rep707.php:218 reporting/rep707.php:220 reporting/rep707.php:228 -#: reporting/rep708.php:201 reporting/rep708.php:203 reporting/rep708.php:210 -#: reporting/reports_main.php:348 reporting/reports_main.php:349 -#: reporting/reports_main.php:355 reporting/reports_main.php:356 -#: reporting/reports_main.php:364 reporting/reports_main.php:365 -#: reporting/reports_main.php:376 reporting/reports_main.php:377 -#: reporting/reports_main.php:389 reporting/reports_main.php:390 -#: reporting/reports_main.php:402 reporting/reports_main.php:408 -#: reporting/reports_main.php:416 reporting/reports_main.php:427 -#: reporting/reports_main.php:439 sales/customer_delivery.php:373 -#: sales/customer_delivery.php:381 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:439 -#: sales/includes/ui/sales_order_ui.inc:444 +#: ../gl/accruals.php:96 +#: ../gl/accruals.php:98 +#: ../gl/accruals.php:207 +#: ../gl/accruals.php:209 +#: ../gl/gl_budget.php:71 +#: ../gl/gl_budget.php:72 +#: ../gl/gl_budget.php:76 +#: ../gl/inquiry/balance_sheet.php:128 +#: ../gl/inquiry/balance_sheet.php:130 +#: ../gl/inquiry/gl_account_inquiry.php:79 +#: ../gl/inquiry/gl_account_inquiry.php:81 +#: ../gl/inquiry/gl_account_inquiry.php:134 +#: ../gl/inquiry/gl_account_inquiry.php:136 +#: ../gl/inquiry/gl_trial_balance.php:57 +#: ../gl/inquiry/gl_trial_balance.php:59 +#: ../gl/inquiry/profit_loss.php:179 +#: ../gl/inquiry/profit_loss.php:181 +#: ../gl/manage/gl_quick_entries.php:261 +#: ../gl/manage/gl_quick_entries.php:263 +#: ../gl/manage/gl_quick_entries.php:343 +#: ../gl/manage/gl_quick_entries.php:345 +#: ../gl/view/accrual_trans.php:54 +#: ../gl/view/accrual_trans.php:56 +#: ../gl/view/gl_deposit_view.php: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:68 +#: ../gl/view/gl_trans_view.php:71 +#: ../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:86 +#: ../gl/includes/ui/gl_journal_ui.inc:87 +#: ../gl/includes/ui/gl_journal_ui.inc:89 +#: ../includes/sysnames.inc:43 +#: ../includes/sysnames.inc:166 +#: ../inventory/manage/item_categories.php:220 +#: ../inventory/manage/item_categories.php:222 +#: ../inventory/manage/items.php:354 +#: ../inventory/manage/items.php:356 +#: ../purchasing/includes/ui/invoice_ui.inc:280 +#: ../purchasing/includes/ui/invoice_ui.inc:282 +#: ../purchasing/manage/suppliers.php:147 +#: ../purchasing/manage/suppliers.php:148 +#: ../purchasing/manage/suppliers.php:150 +#: ../reporting/rep103.php:243 +#: ../reporting/rep103.php:255 +#: ../reporting/rep205.php:161 +#: ../reporting/rep205.php:173 +#: ../reporting/rep501.php:92 +#: ../reporting/rep704.php:83 +#: ../reporting/rep704.php:86 +#: ../reporting/rep704.php:97 +#: ../reporting/rep704.php:99 +#: ../reporting/rep704.php:107 +#: ../reporting/rep705.php:249 +#: ../reporting/rep705.php:251 +#: ../reporting/rep705.php:262 +#: ../reporting/rep706.php:194 +#: ../reporting/rep706.php:196 +#: ../reporting/rep706.php:204 +#: ../reporting/rep707.php:218 +#: ../reporting/rep707.php:220 +#: ../reporting/rep707.php:228 +#: ../reporting/rep708.php:201 +#: ../reporting/rep708.php:203 +#: ../reporting/rep708.php:210 - #: ../reporting/reports_main.php:347 - #: ../reporting/reports_main.php:348 +#: ../reporting/reports_main.php:354 +#: ../reporting/reports_main.php:355 - #: ../reporting/reports_main.php:363 - #: ../reporting/reports_main.php:364 - #: ../reporting/reports_main.php:375 - #: ../reporting/reports_main.php:376 - #: ../reporting/reports_main.php:388 - #: ../reporting/reports_main.php:389 - #: ../reporting/reports_main.php:401 - #: ../reporting/reports_main.php:407 - #: ../reporting/reports_main.php:415 - #: ../reporting/reports_main.php:426 - #: ../reporting/reports_main.php:438 - #: ../sales/customer_delivery.php:409 - #: ../sales/customer_delivery.php:417 ++#: ../reporting/reports_main.php:361 ++#: ../reporting/reports_main.php:362 ++#: ../reporting/reports_main.php:370 ++#: ../reporting/reports_main.php:371 ++#: ../reporting/reports_main.php:382 ++#: ../reporting/reports_main.php:383 ++#: ../reporting/reports_main.php:395 ++#: ../reporting/reports_main.php:396 ++#: ../reporting/reports_main.php:408 ++#: ../reporting/reports_main.php:414 ++#: ../reporting/reports_main.php:422 ++#: ../reporting/reports_main.php:433 ++#: ../reporting/reports_main.php:445 ++#: ../sales/customer_delivery.php:419 ++#: ../sales/customer_delivery.php:427 +#: ../sales/customer_invoice.php:484 +#: ../sales/customer_invoice.php:527 +#: ../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:457 - #: ../sales/includes/ui/sales_order_ui.inc:462 ++#: ../sales/includes/ui/sales_order_ui.inc:442 ++#: ../sales/includes/ui/sales_order_ui.inc:447 msgid "Dimension" 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: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 -#: gl/includes/ui/gl_bank_ui.inc:312 gl/includes/ui/gl_journal_ui.inc:84 -#: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90 -#: gl/includes/ui/gl_journal_ui.inc:240 -#: inventory/includes/item_adjustments_ui.inc:187 -#: inventory/includes/stock_transfers_ui.inc:167 -#: manufacturing/includes/work_order_issue_ui.inc:176 -#: purchasing/includes/ui/invoice_ui.inc:258 -#: purchasing/includes/ui/invoice_ui.inc:260 -#: purchasing/includes/ui/invoice_ui.inc:262 -#: sales/customer_credit_invoice.php:364 sales/customer_delivery.php:513 -#: sales/customer_invoice.php:587 sales/includes/ui/sales_credit_ui.inc:339 +#: ../gl/accruals.php:102 +#: ../gl/accruals.php:217 +#: ../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: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:69 +#: ../gl/view/gl_trans_view.php:72 +#: ../gl/view/gl_trans_view.php:75 +#: ../gl/includes/ui/gl_bank_ui.inc:153 +#: ../gl/includes/ui/gl_bank_ui.inc:156 +#: ../gl/includes/ui/gl_bank_ui.inc:159 +#: ../gl/includes/ui/gl_bank_ui.inc:312 +#: ../gl/includes/ui/gl_journal_ui.inc:87 +#: ../gl/includes/ui/gl_journal_ui.inc:90 +#: ../gl/includes/ui/gl_journal_ui.inc:93 +#: ../gl/includes/ui/gl_journal_ui.inc:276 - #: ../inventory/includes/item_adjustments_ui.inc:181 - #: ../inventory/includes/stock_transfers_ui.inc:161 ++#: ../inventory/includes/item_adjustments_ui.inc:187 ++#: ../inventory/includes/stock_transfers_ui.inc:167 +#: ../manufacturing/view/wo_costs_view.php:46 - #: ../manufacturing/includes/work_order_issue_ui.inc:169 ++#: ../manufacturing/includes/work_order_issue_ui.inc:176 +#: ../purchasing/includes/ui/invoice_ui.inc:280 +#: ../purchasing/includes/ui/invoice_ui.inc:282 +#: ../purchasing/includes/ui/invoice_ui.inc:284 +#: ../sales/customer_credit_invoice.php:364 - #: ../sales/customer_delivery.php:543 ++#: ../sales/customer_delivery.php:559 +#: ../sales/includes/ui/sales_credit_ui.inc:339 msgid "Memo" msgstr "" @@@ -4046,51 -3384,28 +4065,51 @@@ msgstr " msgid "Revenue / Cost Account" msgstr "" -#: gl/accruals.php:208 gl/gl_budget.php:91 gl/gl_budget.php:93 -#: gl/inquiry/journal_inquiry.php:132 gl/inquiry/tax_inquiry.php:82 -#: gl/manage/gl_quick_entries.php:261 gl/manage/gl_quick_entries.php:263 -#: gl/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:105 -#: gl/view/gl_deposit_view.php:108 gl/view/gl_deposit_view.php:111 -#: gl/view/gl_payment_view.php:65 gl/view/gl_payment_view.php:104 -#: gl/view/gl_payment_view.php:107 gl/view/gl_payment_view.php:110 -#: gl/includes/ui/gl_bank_ui.inc:153 gl/includes/ui/gl_bank_ui.inc:156 -#: gl/includes/ui/gl_bank_ui.inc:159 includes/sysnames.inc:132 -#: includes/ui/allocation_cart.inc:288 includes/ui/ui_lists.inc:1189 -#: manufacturing/includes/manufacturing_ui.inc:236 -#: purchasing/includes/ui/invoice_ui.inc:258 -#: purchasing/includes/ui/invoice_ui.inc:260 -#: purchasing/includes/ui/invoice_ui.inc:262 -#: purchasing/view/view_supp_payment.php:60 -#: purchasing/view/view_supp_payment.php:72 reporting/rep102.php:245 -#: reporting/rep107.php:184 reporting/rep109.php:189 reporting/rep110.php:193 -#: reporting/rep111.php:192 reporting/rep113.php:178 reporting/rep202.php:253 -#: reporting/rep209.php:192 reporting/rep706.php:309 reporting/rep707.php:327 -#: reporting/rep710.php:78 sales/view/view_receipt.php:44 +#: ../gl/accruals.php:212 +#: ../gl/gl_budget.php:91 +#: ../gl/gl_budget.php:93 +#: ../gl/inquiry/journal_inquiry.php:132 +#: ../gl/inquiry/tax_inquiry.php:82 +#: ../gl/manage/gl_quick_entries.php:261 +#: ../gl/manage/gl_quick_entries.php:263 +#: ../gl/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: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:133 +#: ../includes/ui/allocation_cart.inc:290 - #: ../includes/ui/ui_lists.inc:1185 ++#: ../includes/ui/ui_lists.inc:1187 +#: ../manufacturing/view/wo_costs_view.php:46 +#: ../manufacturing/includes/manufacturing_ui.inc:236 +#: ../purchasing/includes/ui/invoice_ui.inc:280 +#: ../purchasing/includes/ui/invoice_ui.inc:282 +#: ../purchasing/includes/ui/invoice_ui.inc:284 +#: ../purchasing/view/view_supp_payment.php:60 +#: ../purchasing/view/view_supp_payment.php:72 +#: ../reporting/rep102.php:245 +#: ../reporting/rep107.php:204 +#: ../reporting/rep107.php:265 +#: ../reporting/rep109.php:195 +#: ../reporting/rep110.php:193 - #: ../reporting/rep111.php:174 ++#: ../reporting/rep111.php:192 +#: ../reporting/rep113.php:178 +#: ../reporting/rep202.php:253 +#: ../reporting/rep209.php:195 +#: ../reporting/rep706.php:309 +#: ../reporting/rep707.php:327 +#: ../reporting/rep710.php:78 +#: ../sales/view/view_receipt.php:44 msgid "Amount" msgstr "" @@@ -4284,23 -3577,15 +4303,24 @@@ 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:248 gl/gl_journal.php:168 -#: gl/manage/revaluate_currencies.php:65 inventory/adjustments.php:94 -#: inventory/transfers.php:90 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:207 sales/credit_note_entry.php:147 -#: sales/customer_credit_invoice.php:102 sales/customer_delivery.php:166 -#: sales/customer_invoice.php:289 sales/customer_payments.php:162 -#: sales/sales_order_entry.php:424 +#: ../gl/bank_transfer.php:169 +#: ../gl/gl_bank.php:251 +#: ../gl/gl_journal.php:174 +#: ../gl/manage/revaluate_currencies.php:65 +#: ../inventory/adjustments.php:94 - #: ../inventory/transfers.php:91 ++#: ../inventory/transfers.php:90 +#: ../manufacturing/work_order_add_finished.php:77 +#: ../manufacturing/work_order_entry.php:132 +#: ../manufacturing/work_order_issue.php:90 ++#: ../manufacturing/work_order_issue.php.orig:90 +#: ../purchasing/po_receive_items.php:186 +#: ../purchasing/supplier_payment.php:207 +#: ../sales/credit_note_entry.php:147 +#: ../sales/customer_credit_invoice.php:102 +#: ../sales/customer_delivery.php:178 +#: ../sales/customer_invoice.php:341 +#: ../sales/customer_payments.php:162 - #: ../sales/sales_order_entry.php:432 ++#: ../sales/sales_order_entry.php:446 msgid "You must enter a reference." msgstr "" @@@ -4483,40 -3754,18 +4503,40 @@@ msgstr " msgid "Get" msgstr "" -#: gl/gl_budget.php:91 gl/gl_budget.php:93 gl/inquiry/profit_loss.php:236 -#: gl/manage/gl_quick_entries.php:240 reporting/rep101.php:126 -#: reporting/rep105.php:118 reporting/rep106.php:92 reporting/rep114.php:90 -#: reporting/rep201.php:118 reporting/rep304.php:121 reporting/rep305.php:106 -#: reporting/rep306.php:148 reporting/rep307.php:122 reporting/rep308.php:236 -#: reporting/rep309.php:103 reporting/rep601.php:85 reporting/rep702.php:59 -#: reporting/rep704.php:95 reporting/rep704.php:105 reporting/rep704.php:113 -#: reporting/rep706.php:185 reporting/rep706.php:193 reporting/rep706.php:203 -#: reporting/rep706.php:211 reporting/rep707.php:210 reporting/rep707.php:217 -#: reporting/rep707.php:227 reporting/rep707.php:235 reporting/rep708.php:200 -#: reporting/rep708.php:209 reporting/rep708.php:216 reporting/rep709.php:111 -#: reporting/rep710.php:85 +#: ../gl/gl_budget.php:91 +#: ../gl/gl_budget.php:93 +#: ../gl/inquiry/profit_loss.php:236 +#: ../gl/manage/gl_quick_entries.php:240 +#: ../reporting/rep101.php:126 +#: ../reporting/rep105.php:118 +#: ../reporting/rep106.php:92 +#: ../reporting/rep114.php:90 +#: ../reporting/rep201.php:118 +#: ../reporting/rep304.php:121 +#: ../reporting/rep305.php:106 +#: ../reporting/rep306.php:148 +#: ../reporting/rep307.php:122 - #: ../reporting/rep308.php:155 ++#: ../reporting/rep308.php:236 +#: ../reporting/rep309.php:103 +#: ../reporting/rep601.php:85 +#: ../reporting/rep602.php:86 +#: ../reporting/rep702.php:59 +#: ../reporting/rep704.php:95 +#: ../reporting/rep704.php:105 +#: ../reporting/rep704.php:113 +#: ../reporting/rep706.php:185 +#: ../reporting/rep706.php:193 +#: ../reporting/rep706.php:203 +#: ../reporting/rep706.php:211 +#: ../reporting/rep707.php:210 +#: ../reporting/rep707.php:217 +#: ../reporting/rep707.php:227 +#: ../reporting/rep707.php:235 +#: ../reporting/rep708.php:200 +#: ../reporting/rep708.php:209 +#: ../reporting/rep708.php:216 - #: ../reporting/rep709.php:106 ++#: ../reporting/rep709.php:111 +#: ../reporting/rep710.php:85 msgid "Period" msgstr "" @@@ -4529,78 -3777,42 +4549,79 @@@ msgstr " msgid "Last Year" 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: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:106 -#: manufacturing/includes/manufacturing_ui.inc:178 -#: purchasing/includes/ui/invoice_ui.inc:322 -#: purchasing/includes/ui/invoice_ui.inc:487 -#: purchasing/includes/ui/invoice_ui.inc:557 -#: purchasing/po_receive_items.php:63 purchasing/view/view_po.php:140 -#: purchasing/allocations/supplier_allocation_main.php:100 -#: reporting/rep101.php:234 reporting/rep106.php:84 reporting/rep106.php:119 -#: reporting/rep106.php:162 reporting/rep114.php:161 reporting/rep201.php:223 -#: reporting/rep203.php:94 reporting/rep203.php:171 reporting/rep204.php:113 -#: reporting/rep204.php:141 reporting/rep301.php:197 reporting/rep301.php:245 -#: reporting/rep304.php:146 reporting/rep304.php:188 reporting/rep305.php:101 -#: reporting/rep305.php:127 reporting/rep305.php:183 reporting/rep306.php:141 -#: reporting/rep306.php:176 reporting/rep306.php:196 reporting/rep306.php:212 -#: reporting/rep306.php:261 reporting/rep306.php:276 reporting/rep306.php:287 -#: reporting/rep308.php:311 reporting/rep309.php:126 reporting/rep309.php:153 -#: reporting/rep702.php:142 reporting/rep705.php:152 reporting/rep705.php:315 -#: reporting/rep706.php:106 reporting/rep706.php:255 reporting/rep706.php:290 -#: reporting/rep707.php:115 reporting/rep707.php:297 reporting/rep708.php:253 -#: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:170 -#: sales/customer_credit_invoice.php:281 sales/customer_delivery.php:411 -#: sales/customer_invoice.php:479 -#: sales/allocations/customer_allocation_main.php:99 -#: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113 -#: sales/view/view_invoice.php:114 sales/view/view_sales_order.php:96 -#: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161 -#: sales/view/view_sales_order.php:202 -#: sales/includes/ui/sales_credit_ui.inc:168 -#: sales/includes/ui/sales_order_ui.inc:145 +#: ../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:223 +#: ../gl/inquiry/profit_loss.php:115 +#: ../gl/inquiry/profit_loss.php:288 +#: ../gl/view/gl_deposit_view.php:137 +#: ../gl/view/gl_payment_view.php:136 +#: ../gl/view/gl_trans_view.php:115 +#: ../gl/includes/ui/gl_bank_ui.inc:202 +#: ../gl/includes/ui/gl_journal_ui.inc:153 +#: ../inventory/includes/item_adjustments_ui.inc:63 - #: ../inventory/includes/item_adjustments_ui.inc:102 ++#: ../inventory/includes/item_adjustments_ui.inc:106 +#: ../manufacturing/includes/manufacturing_ui.inc:178 +#: ../purchasing/includes/ui/invoice_ui.inc:344 +#: ../purchasing/includes/ui/invoice_ui.inc:510 +#: ../purchasing/includes/ui/invoice_ui.inc:581 +#: ../purchasing/po_receive_items.php:63 +#: ../purchasing/view/view_po.php:140 +#: ../purchasing/allocations/supplier_allocation_main.php:100 +#: ../reporting/rep101.php:234 +#: ../reporting/rep106.php:84 +#: ../reporting/rep106.php:119 +#: ../reporting/rep106.php:162 +#: ../reporting/rep114.php:161 - #: ../reporting/rep201.php:223 ++#: ../reporting/rep201.php:224 +#: ../reporting/rep203.php:94 +#: ../reporting/rep203.php:171 +#: ../reporting/rep204.php:113 +#: ../reporting/rep204.php:141 - #: ../reporting/rep301.php:133 - #: ../reporting/rep301.php:170 ++#: ../reporting/rep301.php:197 ++#: ../reporting/rep301.php:245 +#: ../reporting/rep304.php:146 +#: ../reporting/rep304.php:188 +#: ../reporting/rep305.php:101 +#: ../reporting/rep305.php:127 +#: ../reporting/rep305.php:183 +#: ../reporting/rep306.php:141 +#: ../reporting/rep306.php:176 +#: ../reporting/rep306.php:196 +#: ../reporting/rep306.php:212 +#: ../reporting/rep306.php:261 +#: ../reporting/rep306.php:276 +#: ../reporting/rep306.php:287 ++#: ../reporting/rep308.php:311 +#: ../reporting/rep309.php:126 +#: ../reporting/rep309.php:153 +#: ../reporting/rep702.php:142 +#: ../reporting/rep705.php:152 +#: ../reporting/rep705.php:315 +#: ../reporting/rep706.php:106 +#: ../reporting/rep706.php:255 +#: ../reporting/rep706.php:290 +#: ../reporting/rep707.php:115 +#: ../reporting/rep707.php:297 +#: ../reporting/rep708.php:253 +#: ../reporting/includes/doctext.inc:30 +#: ../reporting/includes/doctext.inc:192 +#: ../sales/customer_credit_invoice.php:281 - #: ../sales/customer_delivery.php:447 ++#: ../sales/customer_delivery.php:457 +#: ../sales/customer_invoice.php:551 +#: ../sales/customer_invoice.php:554 +#: ../sales/allocations/customer_allocation_main.php:99 +#: ../sales/view/view_credit.php:91 +#: ../sales/view/view_dispatch.php:113 +#: ../sales/view/view_invoice.php:116 +#: ../sales/view/view_sales_order.php:109 +#: ../sales/view/view_sales_order.php:142 +#: ../sales/view/view_sales_order.php:179 +#: ../sales/view/view_sales_order.php:220 +#: ../sales/includes/ui/sales_credit_ui.inc:168 - #: ../sales/includes/ui/sales_order_ui.inc:147 ++#: ../sales/includes/ui/sales_order_ui.inc:148 msgid "Total" msgstr "" @@@ -4785,10 -3974,8 +4806,10 @@@ msgstr " msgid "No zero values" msgstr "" -#: gl/inquiry/gl_trial_balance.php:61 reporting/reports_main.php:388 -#: reporting/reports_main.php:438 reporting/reports_main.php:483 +#: ../gl/inquiry/gl_trial_balance.php:61 - #: ../reporting/reports_main.php:387 - #: ../reporting/reports_main.php:437 - #: ../reporting/reports_main.php:482 ++#: ../reporting/reports_main.php:394 ++#: ../reporting/reports_main.php:444 ++#: ../reporting/reports_main.php:489 msgid "Only balances" msgstr "" @@@ -4863,10 -4036,8 +4884,10 @@@ msgstr " msgid "Trans #" msgstr "" -#: gl/inquiry/journal_inquiry.php:134 reporting/rep710.php:77 -#: reporting/rep710.php:87 reporting/reports_main.php:499 +#: ../gl/inquiry/journal_inquiry.php:134 +#: ../reporting/rep710.php:77 +#: ../reporting/rep710.php:87 - #: ../reporting/reports_main.php:498 ++#: ../reporting/reports_main.php:505 msgid "User" msgstr "" @@@ -4874,28 -4045,23 +4895,28 @@@ msgid "Profit & Loss Drilldown" msgstr "" -#: gl/inquiry/profit_loss.php:173 reporting/rep707.php:210 -#: reporting/includes/reports_classes.inc:248 +#: ../gl/inquiry/profit_loss.php:173 +#: ../reporting/rep707.php:210 - #: ../reporting/includes/reports_classes.inc:245 ++#: ../reporting/includes/reports_classes.inc:248 msgid "Accumulated" msgstr "" -#: gl/inquiry/profit_loss.php:173 reporting/rep707.php:255 -#: reporting/includes/reports_classes.inc:248 +#: ../gl/inquiry/profit_loss.php:173 +#: ../reporting/rep707.php:255 - #: ../reporting/includes/reports_classes.inc:245 ++#: ../reporting/includes/reports_classes.inc:248 msgid "Period Y-1" msgstr "" -#: gl/inquiry/profit_loss.php:173 reporting/rep707.php:246 -#: reporting/includes/reports_classes.inc:248 +#: ../gl/inquiry/profit_loss.php:173 +#: ../reporting/rep707.php:246 - #: ../reporting/includes/reports_classes.inc:245 ++#: ../reporting/includes/reports_classes.inc:248 msgid "Budget" msgstr "" -#: gl/inquiry/profit_loss.php:174 reporting/reports_main.php:375 -#: reporting/reports_main.php:426 reporting/reports_main.php:472 +#: ../gl/inquiry/profit_loss.php:174 - #: ../reporting/reports_main.php:374 - #: ../reporting/reports_main.php:425 - #: ../reporting/reports_main.php:471 ++#: ../reporting/reports_main.php:381 ++#: ../reporting/reports_main.php:432 ++#: ../reporting/reports_main.php:478 msgid "Compare to" msgstr "" @@@ -4912,13 -4077,11 +4933,13 @@@ msgstr " msgid "Tax Inquiry" msgstr "" -#: gl/inquiry/tax_inquiry.php:82 reporting/rep709.php:188 +#: ../gl/inquiry/tax_inquiry.php:82 - #: ../reporting/rep709.php:183 ++#: ../reporting/rep709.php:188 msgid "Outputs" msgstr "" -#: gl/inquiry/tax_inquiry.php:82 reporting/rep709.php:188 +#: ../gl/inquiry/tax_inquiry.php:82 - #: ../reporting/rep709.php:183 ++#: ../reporting/rep709.php:188 msgid "Inputs" msgstr "" @@@ -4926,8 -4089,7 +4947,8 @@@ msgid "Charged on sales" msgstr "" -#: gl/inquiry/tax_inquiry.php:100 reporting/rep709.php:188 +#: ../gl/inquiry/tax_inquiry.php:100 - #: ../reporting/rep709.php:183 ++#: ../reporting/rep709.php:188 msgid "Output Tax" msgstr "" @@@ -4935,8 -4097,7 +4956,8 @@@ msgid "Paid on purchases" msgstr "" -#: gl/inquiry/tax_inquiry.php:106 reporting/rep709.php:188 +#: ../gl/inquiry/tax_inquiry.php:106 - #: ../reporting/rep709.php:183 ++#: ../reporting/rep709.php:188 msgid "Input Tax" msgstr "" @@@ -4944,14 -4105,11 +4965,14 @@@ msgid "Net payable or collectible" msgstr "" -#: gl/inquiry/tax_inquiry.php:119 reporting/rep709.php:219 +#: ../gl/inquiry/tax_inquiry.php:119 - #: ../reporting/rep709.php:214 ++#: ../reporting/rep709.php:219 msgid "Total payable or refund" msgstr "" -#: gl/manage/bank_accounts.php:16 reporting/reports_main.php:317 +#: ../gl/manage/bank_accounts.php:16 - #: ../reporting/reports_main.php:310 - #: ../reporting/reports_main.php:318 ++#: ../reporting/reports_main.php:317 ++#: ../reporting/reports_main.php:325 msgid "Bank Accounts" msgstr "" @@@ -4987,49 -4145,37 +5008,49 @@@ msgstr " msgid "Selected bank account has been deleted" msgstr "" -#: gl/manage/bank_accounts.php:106 gl/view/bank_transfer_view.php:69 -#: gl/view/bank_transfer_view.php:78 gl/view/gl_deposit_view.php:66 -#: gl/view/gl_payment_view.php:64 inventory/prices.php:146 -#: inventory/purchasing_data.php:147 purchasing/view/view_supp_credit.php:49 -#: purchasing/view/view_supp_invoice.php:53 -#: purchasing/inquiry/po_search_completed.php:130 -#: purchasing/inquiry/po_search.php:138 -#: purchasing/inquiry/supplier_allocation_inquiry.php:133 -#: purchasing/inquiry/supplier_allocation_inquiry.php:143 -#: purchasing/inquiry/supplier_inquiry.php:76 -#: purchasing/inquiry/supplier_inquiry.php:175 -#: purchasing/inquiry/supplier_inquiry.php:186 -#: purchasing/allocations/supplier_allocation_main.php:99 -#: purchasing/allocations/supplier_allocation_main.php:107 -#: reporting/rep101.php:128 reporting/rep102.php:133 reporting/rep102.php:139 -#: reporting/rep103.php:232 reporting/rep104.php:116 reporting/rep201.php:120 -#: reporting/rep202.php:138 reporting/rep203.php:101 reporting/rep205.php:150 -#: sales/customer_credit_invoice.php:237 sales/customer_delivery.php:318 -#: 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:151 -#: sales/inquiry/customer_allocation_inquiry.php:161 -#: sales/inquiry/customer_inquiry.php:80 -#: sales/inquiry/customer_inquiry.php:225 -#: sales/inquiry/customer_inquiry.php:238 -#: sales/inquiry/sales_deliveries_view.php:191 -#: sales/inquiry/sales_orders_view.php:272 -#: sales/inquiry/sales_orders_view.php:286 +#: ../gl/manage/bank_accounts.php:109 +#: ../gl/view/bank_transfer_view.php:69 +#: ../gl/view/bank_transfer_view.php:78 +#: ../gl/view/gl_deposit_view.php:66 +#: ../gl/view/gl_payment_view.php:64 +#: ../inventory/prices.php:147 +#: ../inventory/purchasing_data.php:148 +#: ../purchasing/view/view_supp_credit.php:49 +#: ../purchasing/view/view_supp_invoice.php:54 - #: ../purchasing/inquiry/po_search_completed.php:126 - #: ../purchasing/inquiry/po_search.php:136 ++#: ../purchasing/inquiry/po_search_completed.php:129 ++#: ../purchasing/inquiry/po_search.php:138 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:133 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:143 +#: ../purchasing/inquiry/supplier_inquiry.php:73 +#: ../purchasing/inquiry/supplier_inquiry.php:180 +#: ../purchasing/inquiry/supplier_inquiry.php:192 +#: ../purchasing/allocations/supplier_allocation_main.php:99 +#: ../purchasing/allocations/supplier_allocation_main.php:107 +#: ../reporting/rep101.php:128 +#: ../reporting/rep102.php:133 +#: ../reporting/rep102.php:139 +#: ../reporting/rep103.php:232 +#: ../reporting/rep104.php:116 +#: ../reporting/rep201.php:120 +#: ../reporting/rep202.php:138 +#: ../reporting/rep203.php:101 +#: ../reporting/rep205.php:150 +#: ../sales/customer_credit_invoice.php:237 - #: ../sales/customer_delivery.php:354 ++#: ../sales/customer_delivery.php:364 +#: ../sales/customer_invoice.php:479 +#: ../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:86 +#: ../sales/inquiry/customer_allocation_inquiry.php:151 +#: ../sales/inquiry/customer_allocation_inquiry.php:161 +#: ../sales/inquiry/customer_inquiry.php:76 +#: ../sales/inquiry/customer_inquiry.php:208 +#: ../sales/inquiry/customer_inquiry.php:221 - #: ../sales/inquiry/sales_deliveries_view.php:189 ++#: ../sales/inquiry/sales_deliveries_view.php:191 +#: ../sales/inquiry/sales_orders_view.php:295 +#: ../sales/inquiry/sales_orders_view.php:309 msgid "Currency" msgstr "" @@@ -5633,10 -4720,8 +5654,10 @@@ msgstr " msgid "Posted" msgstr "" -#: gl/manage/gl_quick_entries.php:329 sales/customer_delivery.php:411 -#: sales/customer_invoice.php:479 +#: ../gl/manage/gl_quick_entries.php:329 - #: ../sales/customer_delivery.php:447 ++#: ../sales/customer_delivery.php:457 +#: ../sales/customer_invoice.php:551 +#: ../sales/customer_invoice.php:554 msgid "Tax Type" msgstr "" @@@ -5708,17 -4789,12 +5729,17 @@@ msgstr " msgid "GL Deposit" msgstr "" -#: gl/view/gl_deposit_view.php:71 gl/includes/db/gl_db_banking.inc:213 -#: reporting/reports_main.php:96 reporting/reports_main.php:106 -#: reporting/reports_main.php:114 reporting/reports_main.php:128 -#: reporting/reports_main.php:136 reporting/reports_main.php:143 -#: reporting/reports_main.php:192 reporting/reports_main.php:199 -#: reporting/reports_main.php:296 +#: ../gl/view/gl_deposit_view.php:71 +#: ../gl/includes/db/gl_db_banking.inc:212 +#: ../reporting/reports_main.php:96 +#: ../reporting/reports_main.php:106 +#: ../reporting/reports_main.php:114 +#: ../reporting/reports_main.php:128 +#: ../reporting/reports_main.php:136 +#: ../reporting/reports_main.php:143 +#: ../reporting/reports_main.php:192 +#: ../reporting/reports_main.php:199 - #: ../reporting/reports_main.php:289 ++#: ../reporting/reports_main.php:296 msgid "From" msgstr "" @@@ -5849,16 -4897,11 +5870,16 @@@ msgstr " msgid "Exchange Variance" msgstr "" -#: gl/includes/db/gl_db_banking.inc:213 reporting/reports_main.php:97 -#: reporting/reports_main.php:107 reporting/reports_main.php:115 -#: reporting/reports_main.php:129 reporting/reports_main.php:137 -#: reporting/reports_main.php:144 reporting/reports_main.php:193 -#: reporting/reports_main.php:200 reporting/reports_main.php:297 +#: ../gl/includes/db/gl_db_banking.inc:212 +#: ../reporting/reports_main.php:97 +#: ../reporting/reports_main.php:107 +#: ../reporting/reports_main.php:115 +#: ../reporting/reports_main.php:129 +#: ../reporting/reports_main.php:137 +#: ../reporting/reports_main.php:144 +#: ../reporting/reports_main.php:193 +#: ../reporting/reports_main.php:200 - #: ../reporting/reports_main.php:290 ++#: ../reporting/reports_main.php:297 msgid "To" msgstr "" @@@ -5872,15 -4914,14 +5893,15 @@@ msgstr " msgid "Rounding error %s encountered for trans_type:%s,trans_no:%s" msgstr "" -#: gl/includes/ui/gl_bank_ui.inc:24 gl/includes/ui/gl_journal_ui.inc:27 -#: inventory/includes/item_adjustments_ui.inc:39 -#: inventory/includes/stock_transfers_ui.inc:42 -#: manufacturing/work_order_add_finished.php:205 -#: manufacturing/work_order_costs.php:152 -#: purchasing/allocations/supplier_allocate.php:56 -#: sales/allocations/customer_allocate.php:54 -#: sales/includes/ui/sales_credit_ui.inc:121 +#: ../gl/includes/ui/gl_bank_ui.inc:24 +#: ../gl/includes/ui/gl_journal_ui.inc:27 +#: ../inventory/includes/item_adjustments_ui.inc:39 +#: ../inventory/includes/stock_transfers_ui.inc:42 - #: ../manufacturing/work_order_add_finished.php:208 ++#: ../manufacturing/work_order_add_finished.php:205 +#: ../manufacturing/work_order_costs.php:133 +#: ../purchasing/allocations/supplier_allocate.php:56 +#: ../sales/allocations/customer_allocate.php:54 +#: ../sales/includes/ui/sales_credit_ui.inc:121 msgid "Date:" msgstr "" @@@ -5903,18 -4940,16 +5924,18 @@@ msgstr " msgid "Supplier:" msgstr "" -#: gl/includes/ui/gl_bank_ui.inc:67 sales/manage/recurrent_invoices.php:169 -#: sales/includes/ui/sales_credit_ui.inc:29 -#: sales/includes/ui/sales_order_ui.inc:267 +#: ../gl/includes/ui/gl_bank_ui.inc:67 +#: ../sales/manage/recurrent_invoices.php:169 +#: ../sales/includes/ui/sales_credit_ui.inc:29 - #: ../sales/includes/ui/sales_order_ui.inc:285 ++#: ../sales/includes/ui/sales_order_ui.inc:270 msgid "Customer:" msgstr "" -#: 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:274 +#: ../gl/includes/ui/gl_bank_ui.inc:71 +#: ../sales/customer_payments.php:348 +#: ../sales/manage/recurrent_invoices.php:172 +#: ../sales/includes/ui/sales_credit_ui.inc:37 - #: ../sales/includes/ui/sales_order_ui.inc:292 ++#: ../sales/includes/ui/sales_order_ui.inc:277 msgid "Branch:" msgstr "" @@@ -5935,72 -4968,67 +5956,72 @@@ msgstr " msgid "Into:" msgstr "" -#: gl/includes/ui/gl_bank_ui.inc:187 includes/ui/simple_crud_class.inc:52 -#: inventory/includes/item_adjustments_ui.inc:92 -#: inventory/includes/stock_transfers_ui.inc:84 -#: manufacturing/includes/work_order_issue_ui.inc:64 -#: purchasing/includes/ui/invoice_ui.inc:533 -#: purchasing/includes/ui/po_ui.inc:264 -#: sales/includes/ui/sales_credit_ui.inc:198 -#: sales/includes/ui/sales_order_ui.inc:195 +#: ../gl/includes/ui/gl_bank_ui.inc:187 +#: ../includes/ui/simple_crud_class.inc:52 - #: ../inventory/includes/item_adjustments_ui.inc:88 - #: ../inventory/includes/stock_transfers_ui.inc:80 - #: ../manufacturing/includes/work_order_issue_ui.inc:59 ++#: ../inventory/includes/item_adjustments_ui.inc:92 ++#: ../inventory/includes/stock_transfers_ui.inc:84 ++#: ../manufacturing/includes/work_order_issue_ui.inc:64 +#: ../purchasing/includes/ui/invoice_ui.inc:557 +#: ../purchasing/includes/ui/po_ui.inc:276 +#: ../sales/includes/ui/sales_credit_ui.inc:198 - #: ../sales/includes/ui/sales_order_ui.inc:210 ++#: ../sales/includes/ui/sales_order_ui.inc:198 msgid "Edit document line" msgstr "" -#: gl/includes/ui/gl_bank_ui.inc:189 includes/ui/simple_crud_class.inc:54 -#: inventory/includes/item_adjustments_ui.inc:94 -#: inventory/includes/stock_transfers_ui.inc:86 -#: manufacturing/includes/work_order_issue_ui.inc:66 -#: purchasing/includes/ui/invoice_ui.inc:298 -#: purchasing/includes/ui/po_ui.inc:266 -#: sales/includes/ui/sales_credit_ui.inc:200 -#: sales/includes/ui/sales_order_ui.inc:197 +#: ../gl/includes/ui/gl_bank_ui.inc:189 +#: ../includes/ui/simple_crud_class.inc:54 - #: ../inventory/includes/item_adjustments_ui.inc:90 - #: ../inventory/includes/stock_transfers_ui.inc:82 - #: ../manufacturing/includes/work_order_issue_ui.inc:61 ++#: ../inventory/includes/item_adjustments_ui.inc:94 ++#: ../inventory/includes/stock_transfers_ui.inc:86 ++#: ../manufacturing/includes/work_order_issue_ui.inc:66 +#: ../purchasing/includes/ui/invoice_ui.inc:320 +#: ../purchasing/includes/ui/po_ui.inc:278 +#: ../sales/includes/ui/sales_credit_ui.inc:200 - #: ../sales/includes/ui/sales_order_ui.inc:212 ++#: ../sales/includes/ui/sales_order_ui.inc:200 msgid "Remove line from document" msgstr "" -#: gl/includes/ui/gl_bank_ui.inc:278 gl/includes/ui/gl_journal_ui.inc:222 -#: includes/ui/simple_crud_class.inc:56 -#: inventory/includes/item_adjustments_ui.inc:164 -#: inventory/includes/stock_transfers_ui.inc:144 -#: manufacturing/includes/work_order_issue_ui.inc:139 -#: purchasing/includes/ui/po_ui.inc:440 -#: sales/includes/ui/sales_credit_ui.inc:294 -#: sales/includes/ui/sales_order_ui.inc:544 +#: ../gl/includes/ui/gl_bank_ui.inc:278 +#: ../gl/includes/ui/gl_journal_ui.inc:258 +#: ../includes/ui/simple_crud_class.inc:56 - #: ../inventory/includes/item_adjustments_ui.inc:158 - #: ../inventory/includes/stock_transfers_ui.inc:138 - #: ../manufacturing/includes/work_order_issue_ui.inc:132 ++#: ../inventory/includes/item_adjustments_ui.inc:164 ++#: ../inventory/includes/stock_transfers_ui.inc:144 ++#: ../manufacturing/includes/work_order_issue_ui.inc:139 +#: ../purchasing/includes/ui/po_ui.inc:460 +#: ../sales/includes/ui/sales_credit_ui.inc:294 - #: ../sales/includes/ui/sales_order_ui.inc:562 ++#: ../sales/includes/ui/sales_order_ui.inc:547 msgid "Confirm changes" msgstr "" -#: gl/includes/ui/gl_bank_ui.inc:280 gl/includes/ui/gl_journal_ui.inc:224 -#: includes/ui/simple_crud_class.inc:58 -#: inventory/includes/item_adjustments_ui.inc:166 -#: inventory/includes/stock_transfers_ui.inc:146 -#: manufacturing/includes/work_order_issue_ui.inc:141 -#: purchasing/includes/ui/po_ui.inc:442 -#: sales/includes/ui/sales_credit_ui.inc:296 -#: sales/includes/ui/sales_order_ui.inc:546 +#: ../gl/includes/ui/gl_bank_ui.inc:280 +#: ../gl/includes/ui/gl_journal_ui.inc:260 +#: ../includes/ui/simple_crud_class.inc:58 - #: ../inventory/includes/item_adjustments_ui.inc:160 - #: ../inventory/includes/stock_transfers_ui.inc:140 - #: ../manufacturing/includes/work_order_issue_ui.inc:134 ++#: ../inventory/includes/item_adjustments_ui.inc:166 ++#: ../inventory/includes/stock_transfers_ui.inc:146 ++#: ../manufacturing/includes/work_order_issue_ui.inc:141 +#: ../purchasing/includes/ui/po_ui.inc:462 +#: ../sales/includes/ui/sales_credit_ui.inc:296 - #: ../sales/includes/ui/sales_order_ui.inc:564 ++#: ../sales/includes/ui/sales_order_ui.inc:549 msgid "Cancel changes" msgstr "" -#: gl/includes/ui/gl_bank_ui.inc:285 gl/includes/ui/gl_journal_ui.inc:228 -#: inventory/includes/item_adjustments_ui.inc:172 -#: inventory/includes/stock_transfers_ui.inc:152 -#: manufacturing/includes/work_order_issue_ui.inc:147 -#: purchasing/includes/ui/po_ui.inc:448 -#: sales/includes/ui/sales_credit_ui.inc:302 -#: sales/includes/ui/sales_order_ui.inc:552 +#: ../gl/includes/ui/gl_bank_ui.inc:285 +#: ../gl/includes/ui/gl_journal_ui.inc:264 - #: ../inventory/includes/item_adjustments_ui.inc:166 - #: ../inventory/includes/stock_transfers_ui.inc:146 - #: ../manufacturing/includes/work_order_issue_ui.inc:140 ++#: ../inventory/includes/item_adjustments_ui.inc:172 ++#: ../inventory/includes/stock_transfers_ui.inc:152 ++#: ../manufacturing/includes/work_order_issue_ui.inc:147 +#: ../purchasing/includes/ui/po_ui.inc:468 +#: ../sales/includes/ui/sales_credit_ui.inc:302 - #: ../sales/includes/ui/sales_order_ui.inc:570 ++#: ../sales/includes/ui/sales_order_ui.inc:555 msgid "Add Item" msgstr "" -#: gl/includes/ui/gl_bank_ui.inc:286 -#: inventory/includes/item_adjustments_ui.inc:173 -#: inventory/includes/stock_transfers_ui.inc:153 -#: manufacturing/includes/work_order_issue_ui.inc:148 -#: purchasing/includes/ui/po_ui.inc:449 -#: sales/includes/ui/sales_credit_ui.inc:303 -#: sales/includes/ui/sales_order_ui.inc:553 +#: ../gl/includes/ui/gl_bank_ui.inc:286 - #: ../inventory/includes/item_adjustments_ui.inc:167 - #: ../inventory/includes/stock_transfers_ui.inc:147 - #: ../manufacturing/includes/work_order_issue_ui.inc:141 ++#: ../inventory/includes/item_adjustments_ui.inc:173 ++#: ../inventory/includes/stock_transfers_ui.inc:153 ++#: ../manufacturing/includes/work_order_issue_ui.inc:148 +#: ../purchasing/includes/ui/po_ui.inc:469 +#: ../sales/includes/ui/sales_credit_ui.inc:303 - #: ../sales/includes/ui/sales_order_ui.inc:571 ++#: ../sales/includes/ui/sales_order_ui.inc:556 msgid "Add new item to document" msgstr "" @@@ -6106,9 -5128,8 +6127,9 @@@ msgstr " msgid "Dimensions configuration" msgstr "" -#: includes/access_levels.inc:72 inventory/manage/items.php:341 -#: reporting/reports_main.php:301 +#: ../includes/access_levels.inc:72 +#: ../inventory/manage/items.php:352 - #: ../reporting/reports_main.php:294 ++#: ../reporting/reports_main.php:301 msgid "Dimensions" msgstr "" @@@ -6624,32 -5631,23 +6645,32 @@@ msgstr " msgid "Requesting data..." msgstr "" -#: includes/errors.inc:126 +#: ../includes/data_checks.inc:508 +#, php-format +msgid "%s #%s is closed for further edition." +msgstr "" + +#: ../includes/data_checks.inc:534 +msgid "You have no edit access to transactions created by other users." +msgstr "" + - #: ../includes/errors.inc:125 ++#: ../includes/errors.inc:126 msgid "in file" msgstr "" - #: ../includes/errors.inc:125 -#: includes/errors.inc:126 ++#: ../includes/errors.inc:126 msgid "at line " msgstr "" - #: ../includes/errors.inc:179 -#: includes/errors.inc:180 ++#: ../includes/errors.inc:180 msgid "Debug mode database warning:" msgstr "" - #: ../includes/errors.inc:181 -#: includes/errors.inc:182 ++#: ../includes/errors.inc:182 msgid "DATABASE ERROR :" msgstr "" - #: ../includes/errors.inc:216 -#: includes/errors.inc:217 ++#: ../includes/errors.inc:217 msgid "" "The entered information is a duplicate. Please go back and enter different " "values." @@@ -6870,8 -5854,7 +6891,8 @@@ msgstr " msgid "Sales Order" msgstr "" -#: includes/sysnames.inc:41 sales/sales_order_entry.php:636 +#: ../includes/sysnames.inc:41 - #: ../sales/sales_order_entry.php:657 ++#: ../sales/sales_order_entry.php:658 msgid "Sales Quotation" msgstr "" @@@ -7000,70 -5978,47 +7021,70 @@@ msgstr " msgid "Cash" msgstr "" -#: includes/sysnames.inc:96 reporting/rep101.php:127 reporting/rep102.php:125 -#: reporting/rep102.php:132 reporting/rep105.php:109 reporting/rep106.php:83 -#: reporting/rep114.php:95 reporting/rep304.php:114 reporting/rep304.php:124 -#: reporting/reports_main.php:32 reporting/reports_main.php:36 -#: reporting/reports_main.php:45 reporting/reports_main.php:102 -#: reporting/reports_main.php:121 reporting/reports_main.php:237 -#: sales/create_recurrent_invoices.php:134 -#: sales/customer_credit_invoice.php:235 sales/customer_delivery.php:316 -#: sales/customer_invoice.php:389 -#: sales/allocations/customer_allocation_main.php:97 -#: sales/allocations/customer_allocation_main.php:105 -#: sales/manage/recurrent_invoices.php:102 sales/view/view_credit.php:47 -#: sales/inquiry/customer_allocation_inquiry.php:150 -#: sales/inquiry/customer_allocation_inquiry.php:160 -#: sales/inquiry/customer_inquiry.php:223 -#: sales/inquiry/customer_inquiry.php:237 -#: sales/inquiry/sales_deliveries_view.php:182 -#: sales/inquiry/sales_orders_view.php:264 -#: sales/inquiry/sales_orders_view.php:278 +#: ../includes/sysnames.inc:96 +#: ../includes/sysnames.inc:195 +#: ../reporting/rep101.php:127 +#: ../reporting/rep102.php:125 +#: ../reporting/rep102.php:132 +#: ../reporting/rep105.php:109 +#: ../reporting/rep106.php:83 +#: ../reporting/rep114.php:95 +#: ../reporting/rep304.php:114 +#: ../reporting/rep304.php:124 +#: ../reporting/reports_main.php:32 +#: ../reporting/reports_main.php:36 +#: ../reporting/reports_main.php:45 +#: ../reporting/reports_main.php:102 +#: ../reporting/reports_main.php:121 +#: ../reporting/reports_main.php:237 +#: ../sales/create_recurrent_invoices.php:134 +#: ../sales/customer_credit_invoice.php:235 - #: ../sales/customer_delivery.php:352 ++#: ../sales/customer_delivery.php:362 +#: ../sales/customer_invoice.php:455 +#: ../sales/allocations/customer_allocation_main.php:97 +#: ../sales/allocations/customer_allocation_main.php:105 +#: ../sales/manage/recurrent_invoices.php:102 +#: ../sales/view/view_credit.php:47 +#: ../sales/inquiry/customer_allocation_inquiry.php:150 +#: ../sales/inquiry/customer_allocation_inquiry.php:160 +#: ../sales/inquiry/customer_inquiry.php:206 +#: ../sales/inquiry/customer_inquiry.php:220 - #: ../sales/inquiry/sales_deliveries_view.php:180 ++#: ../sales/inquiry/sales_deliveries_view.php:182 +#: ../sales/inquiry/sales_orders_view.php:287 +#: ../sales/inquiry/sales_orders_view.php:301 msgid "Customer" msgstr "" -#: includes/sysnames.inc:97 includes/sysnames.inc:172 -#: inventory/purchasing_data.php:147 purchasing/includes/ui/grn_ui.inc:20 -#: purchasing/includes/ui/grn_ui.inc:52 purchasing/includes/ui/po_ui.inc:313 -#: purchasing/view/view_supp_credit.php:42 -#: purchasing/view/view_supp_invoice.php:45 -#: purchasing/inquiry/po_search_completed.php:126 -#: purchasing/inquiry/po_search.php:134 -#: purchasing/inquiry/supplier_allocation_inquiry.php:129 -#: purchasing/inquiry/supplier_allocation_inquiry.php:142 -#: purchasing/inquiry/supplier_inquiry.php:171 -#: purchasing/inquiry/supplier_inquiry.php:185 -#: purchasing/allocations/supplier_allocation_main.php:98 -#: purchasing/allocations/supplier_allocation_main.php:106 -#: reporting/rep201.php:119 reporting/rep202.php:130 reporting/rep202.php:137 -#: reporting/rep203.php:100 reporting/rep204.php:90 reporting/rep306.php:141 -#: reporting/rep306.php:151 reporting/reports_main.php:149 -#: reporting/reports_main.php:153 reporting/reports_main.php:162 -#: reporting/reports_main.php:173 reporting/reports_main.php:180 -#: reporting/reports_main.php:252 +#: ../includes/sysnames.inc:97 +#: ../includes/sysnames.inc:173 +#: ../includes/sysnames.inc:196 +#: ../inventory/purchasing_data.php:148 +#: ../purchasing/includes/ui/grn_ui.inc:20 +#: ../purchasing/includes/ui/grn_ui.inc:52 +#: ../purchasing/includes/ui/po_ui.inc:325 +#: ../purchasing/view/view_supp_credit.php:42 +#: ../purchasing/view/view_supp_invoice.php:46 - #: ../purchasing/inquiry/po_search_completed.php:122 - #: ../purchasing/inquiry/po_search.php:132 ++#: ../purchasing/inquiry/po_search_completed.php:125 ++#: ../purchasing/inquiry/po_search.php:134 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:129 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:142 +#: ../purchasing/inquiry/supplier_inquiry.php:176 +#: ../purchasing/inquiry/supplier_inquiry.php:191 +#: ../purchasing/allocations/supplier_allocation_main.php:98 +#: ../purchasing/allocations/supplier_allocation_main.php:106 +#: ../reporting/rep201.php:119 +#: ../reporting/rep202.php:130 +#: ../reporting/rep202.php:137 +#: ../reporting/rep203.php:100 +#: ../reporting/rep204.php:90 +#: ../reporting/rep306.php:141 +#: ../reporting/rep306.php:151 +#: ../reporting/reports_main.php:149 +#: ../reporting/reports_main.php:153 +#: ../reporting/reports_main.php:162 +#: ../reporting/reports_main.php:173 +#: ../reporting/reports_main.php:180 +#: ../reporting/reports_main.php:252 msgid "Supplier" msgstr "" @@@ -7163,9 -6114,8 +7184,10 @@@ msgstr " msgid "Supplier Invoice/Credit" msgstr "" -#: includes/sysnames.inc:156 manufacturing/search_work_orders.php:165 -#: manufacturing/includes/manufacturing_ui.inc:278 reporting/rep402.php:103 +#: ../includes/sysnames.inc:157 +#: ../manufacturing/search_work_orders.php:165 +#: ../manufacturing/includes/manufacturing_ui.inc:278 ++#: ../reporting/rep402.php:103 msgid "Manufactured" msgstr "" @@@ -7483,74 -6415,42 +7505,75 @@@ msgstr " msgid "Test type" msgstr "" -#: includes/system_tests.inc:420 includes/ui/view_package.php:47 -#: reporting/rep204.php:85 reporting/rep301.php:169 reporting/rep308.php:231 +#: ../includes/system_tests.inc:420 +#: ../includes/ui/view_package.php:47 +#: ../reporting/rep204.php:85 - #: ../reporting/rep301.php:105 - #: ../reporting/rep308.php:150 ++#: ../reporting/rep301.php:169 ++#: ../reporting/rep308.php:231 msgid "Value" msgstr "" -#: includes/system_tests.inc:420 reporting/reports_main.php:40 -#: reporting/reports_main.php:51 reporting/reports_main.php:60 -#: reporting/reports_main.php:67 reporting/reports_main.php:76 -#: reporting/reports_main.php:85 reporting/reports_main.php:92 -#: reporting/reports_main.php:101 reporting/reports_main.php:111 -#: reporting/reports_main.php:118 reporting/reports_main.php:125 -#: reporting/reports_main.php:133 reporting/reports_main.php:140 -#: reporting/reports_main.php:146 reporting/reports_main.php:157 -#: reporting/reports_main.php:168 reporting/reports_main.php:176 -#: reporting/reports_main.php:181 reporting/reports_main.php:188 -#: reporting/reports_main.php:196 reporting/reports_main.php:203 -#: reporting/reports_main.php:212 reporting/reports_main.php:218 -#: reporting/reports_main.php:229 reporting/reports_main.php:238 -#: reporting/reports_main.php:244 reporting/reports_main.php:254 -#: reporting/reports_main.php:262 reporting/reports_main.php:270 -#: reporting/reports_main.php:277 reporting/reports_main.php:285 -#: reporting/reports_main.php:292 reporting/reports_main.php:299 -#: reporting/reports_main.php:308 reporting/reports_main.php:321 -#: reporting/reports_main.php:328 reporting/reports_main.php:335 -#: reporting/reports_main.php:350 reporting/reports_main.php:358 -#: reporting/reports_main.php:369 reporting/reports_main.php:381 -#: reporting/reports_main.php:391 reporting/reports_main.php:403 -#: reporting/reports_main.php:410 reporting/reports_main.php:420 -#: reporting/reports_main.php:431 reporting/reports_main.php:440 -#: reporting/reports_main.php:451 reporting/reports_main.php:457 -#: reporting/reports_main.php:466 reporting/reports_main.php:476 -#: reporting/reports_main.php:484 reporting/reports_main.php:492 -#: reporting/reports_main.php:500 reporting/includes/excel_report.inc:295 -#: reporting/includes/excel_report.inc:428 -#: reporting/includes/pdf_report.inc:346 reporting/includes/pdf_report.inc:618 -#: sales/view/view_sales_order.php:85 +#: ../includes/system_tests.inc:420 +#: ../reporting/reports_main.php:40 +#: ../reporting/reports_main.php:51 +#: ../reporting/reports_main.php:60 +#: ../reporting/reports_main.php:67 +#: ../reporting/reports_main.php:76 +#: ../reporting/reports_main.php:85 +#: ../reporting/reports_main.php:92 +#: ../reporting/reports_main.php:101 +#: ../reporting/reports_main.php:111 +#: ../reporting/reports_main.php:118 +#: ../reporting/reports_main.php:125 +#: ../reporting/reports_main.php:133 +#: ../reporting/reports_main.php:140 +#: ../reporting/reports_main.php:146 +#: ../reporting/reports_main.php:157 +#: ../reporting/reports_main.php:168 +#: ../reporting/reports_main.php:176 +#: ../reporting/reports_main.php:181 +#: ../reporting/reports_main.php:188 +#: ../reporting/reports_main.php:196 +#: ../reporting/reports_main.php:203 +#: ../reporting/reports_main.php:212 +#: ../reporting/reports_main.php:218 +#: ../reporting/reports_main.php:229 +#: ../reporting/reports_main.php:238 +#: ../reporting/reports_main.php:244 +#: ../reporting/reports_main.php:254 +#: ../reporting/reports_main.php:262 +#: ../reporting/reports_main.php:270 +#: ../reporting/reports_main.php:277 +#: ../reporting/reports_main.php:285 +#: ../reporting/reports_main.php:292 - #: ../reporting/reports_main.php:301 - #: ../reporting/reports_main.php:314 ++#: ../reporting/reports_main.php:299 ++#: ../reporting/reports_main.php:308 +#: ../reporting/reports_main.php:321 - #: ../reporting/reports_main.php:327 ++#: ../reporting/reports_main.php:328 +#: ../reporting/reports_main.php:334 - #: ../reporting/reports_main.php:349 - #: ../reporting/reports_main.php:357 - #: ../reporting/reports_main.php:368 - #: ../reporting/reports_main.php:380 - #: ../reporting/reports_main.php:390 - #: ../reporting/reports_main.php:402 ++#: ../reporting/reports_main.php:341 ++#: ../reporting/reports_main.php:356 ++#: ../reporting/reports_main.php:364 ++#: ../reporting/reports_main.php:375 ++#: ../reporting/reports_main.php:387 ++#: ../reporting/reports_main.php:397 +#: ../reporting/reports_main.php:409 - #: ../reporting/reports_main.php:419 - #: ../reporting/reports_main.php:430 - #: ../reporting/reports_main.php:439 - #: ../reporting/reports_main.php:450 - #: ../reporting/reports_main.php:456 - #: ../reporting/reports_main.php:465 - #: ../reporting/reports_main.php:475 - #: ../reporting/reports_main.php:483 - #: ../reporting/reports_main.php:491 - #: ../reporting/reports_main.php:499 ++#: ../reporting/reports_main.php:416 ++#: ../reporting/reports_main.php:426 ++#: ../reporting/reports_main.php:437 ++#: ../reporting/reports_main.php:446 ++#: ../reporting/reports_main.php:457 ++#: ../reporting/reports_main.php:463 ++#: ../reporting/reports_main.php:472 ++#: ../reporting/reports_main.php:482 ++#: ../reporting/reports_main.php:490 ++#: ../reporting/reports_main.php:498 ++#: ../reporting/reports_main.php:506 +#: ../reporting/includes/excel_report.inc:295 +#: ../reporting/includes/excel_report.inc:428 +#: ../reporting/includes/pdf_report.inc:346 +#: ../reporting/includes/pdf_report.inc:618 +#: ../sales/view/view_sales_order.php:98 msgid "Comments" msgstr "" @@@ -7564,13 -6464,13 +7587,13 @@@ msgid " "trail record." msgstr "" - #: ../includes/db/inventory_db.inc:253 -#: includes/db/inventory_db.inc:284 -#: inventory/includes/db/items_trans_db.inc:60 ++#: ../includes/db/inventory_db.inc:284 +#: ../inventory/includes/db/items_trans_db.inc:66 #, php-format msgid "Cost was %s changed to %s x quantity on hand for item '%s'" msgstr "" - #: ../includes/db/inventory_db.inc:294 -#: includes/db/inventory_db.inc:325 ++#: ../includes/db/inventory_db.inc:325 msgid "Zero/negative inventory handling" msgstr "" @@@ -7589,18 -6489,13 +7612,18 @@@ msgstr " msgid "Supplier Ref" msgstr "" -#: includes/ui/allocation_cart.inc:288 reporting/rep704.php:83 -#: reporting/rep704.php:86 reporting/rep704.php:89 reporting/rep709.php:116 -#: 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 +#: ../includes/ui/allocation_cart.inc:290 +#: ../reporting/rep704.php:83 +#: ../reporting/rep704.php:86 +#: ../reporting/rep704.php:89 - #: ../reporting/rep709.php:111 ++#: ../reporting/rep709.php:116 +#: ../sales/view/view_credit.php:68 +#: ../sales/view/view_sales_order.php:109 +#: ../sales/view/view_sales_order.php:142 +#: ../sales/view/view_sales_order.php:179 +#: ../sales/inquiry/sales_orders_view.php:248 +#: ../sales/inquiry/sales_orders_view.php:286 +#: ../sales/inquiry/sales_orders_view.php:300 msgid "Ref" msgstr "" @@@ -7655,11 -6544,9 +7678,11 @@@ msgstr " msgid "Sec Phone" msgstr "" -#: includes/ui/contacts_view.inc:41 reporting/rep103.php:266 -#: reporting/rep205.php:184 reporting/includes/header2.inc:107 -#: sales/manage/sales_people.php:99 +#: ../includes/ui/contacts_view.inc:41 +#: ../reporting/rep103.php:266 +#: ../reporting/rep205.php:184 - #: ../reporting/includes/header2.inc:104 ++#: ../reporting/includes/header2.inc:107 +#: ../sales/manage/sales_people.php:99 msgid "Fax" msgstr "" @@@ -7817,10 -6690,9 +7840,12 @@@ msgstr " msgid "Suppliers" msgstr "" -#: includes/ui/ui_controls.inc:458 inventory/transfers.php:224 -#: inventory/manage/items.php:21 reporting/rep402.php:108 -#: reporting/reports_main.php:253 reporting/reports_main.php:289 +#: ../includes/ui/ui_controls.inc:465 - #: ../inventory/transfers.php:228 ++#: ../inventory/transfers.php:224 +#: ../inventory/manage/items.php:22 ++#: ../reporting/rep402.php:108 +#: ../reporting/reports_main.php:253 ++#: ../reporting/reports_main.php:289 msgid "Items" msgstr "" @@@ -7828,21 -6700,14 +7853,21 @@@ msgid "Entered data has not been saved yet.\\nDo you want to abandon changes?" msgstr "" -#: includes/ui/ui_input.inc:631 reporting/includes/reports_classes.inc:222 +#: ../includes/ui/ui_input.inc:632 - #: ../reporting/includes/reports_classes.inc:219 ++#: ../reporting/includes/reports_classes.inc:222 msgid "Click Here to Pick up the date" msgstr "" -#: includes/ui/ui_input.inc:915 includes/ui/ui_lists.inc:2158 -#: reporting/rep301.php:229 reporting/rep302.php:170 reporting/rep303.php:184 -#: reporting/rep304.php:170 reporting/rep304.php:174 reporting/rep306.php:235 -#: reporting/rep306.php:242 sales/manage/customer_branches.php:302 +#: ../includes/ui/ui_input.inc:916 - #: ../includes/ui/ui_lists.inc:2160 - #: ../reporting/rep301.php:155 ++#: ../includes/ui/ui_lists.inc:2162 ++#: ../reporting/rep301.php:229 +#: ../reporting/rep302.php:170 +#: ../reporting/rep303.php:184 +#: ../reporting/rep304.php:170 +#: ../reporting/rep304.php:174 +#: ../reporting/rep306.php:235 +#: ../reporting/rep306.php:242 +#: ../sales/manage/customer_branches.php:304 msgid "Inactive" msgstr "" @@@ -7871,153 -6735,140 +7896,153 @@@ msgstr " msgid "Enter description fragment to search or * for all" msgstr "" - #: ../includes/ui/ui_lists.inc:453 - #: ../includes/ui/ui_lists.inc:1389 -#: includes/ui/ui_lists.inc:454 includes/ui/ui_lists.inc:1393 ++#: ../includes/ui/ui_lists.inc:454 ++#: ../includes/ui/ui_lists.inc:1391 msgid "All Suppliers" msgstr "" - #: ../includes/ui/ui_lists.inc:457 -#: includes/ui/ui_lists.inc:458 ++#: ../includes/ui/ui_lists.inc:458 msgid "Press Space tab to filter by name fragment" msgstr "" - #: ../includes/ui/ui_lists.inc:458 -#: includes/ui/ui_lists.inc:459 ++#: ../includes/ui/ui_lists.inc:459 msgid "Select supplier" msgstr "" - #: ../includes/ui/ui_lists.inc:505 -#: includes/ui/ui_lists.inc:507 ++#: ../includes/ui/ui_lists.inc:507 msgid "All Customers" msgstr "" - #: ../includes/ui/ui_lists.inc:509 -#: includes/ui/ui_lists.inc:511 ++#: ../includes/ui/ui_lists.inc:511 msgid "Press Space tab to filter by name fragment; F2 - entry new customer" msgstr "" - #: ../includes/ui/ui_lists.inc:510 -#: includes/ui/ui_lists.inc:512 ++#: ../includes/ui/ui_lists.inc:512 msgid "Select customer" msgstr "" - #: ../includes/ui/ui_lists.inc:557 -#: includes/ui/ui_lists.inc:560 ++#: ../includes/ui/ui_lists.inc:559 msgid "All branches" msgstr "" - #: ../includes/ui/ui_lists.inc:560 -#: includes/ui/ui_lists.inc:563 ++#: ../includes/ui/ui_lists.inc:562 msgid "Select customer branch" msgstr "" - #: ../includes/ui/ui_lists.inc:600 -#: includes/ui/ui_lists.inc:603 ++#: ../includes/ui/ui_lists.inc:602 msgid "All Locations" msgstr "" - #: ../includes/ui/ui_lists.inc:752 - #: ../includes/ui/ui_lists.inc:820 -#: includes/ui/ui_lists.inc:755 includes/ui/ui_lists.inc:824 ++#: ../includes/ui/ui_lists.inc:754 ++#: ../includes/ui/ui_lists.inc:822 msgid "All Items" msgstr "" - #: ../includes/ui/ui_lists.inc:1296 -#: includes/ui/ui_lists.inc:1300 ++#: ../includes/ui/ui_lists.inc:1298 msgid "All Sales Types" msgstr "" - #: ../includes/ui/ui_lists.inc:1633 -#: includes/ui/ui_lists.inc:1631 ++#: ../includes/ui/ui_lists.inc:1635 msgid "Use Item Sales Accounts" msgstr "" - #: ../includes/ui/ui_lists.inc:1944 - #: ../includes/ui/ui_lists.inc:1961 - #: ../includes/ui/ui_lists.inc:1978 -#: includes/ui/ui_lists.inc:1942 includes/ui/ui_lists.inc:1959 -#: includes/ui/ui_lists.inc:1976 ++#: ../includes/ui/ui_lists.inc:1946 ++#: ../includes/ui/ui_lists.inc:1963 ++#: ../includes/ui/ui_lists.inc:1980 msgid "All Types" msgstr "" - #: ../includes/ui/ui_lists.inc:1945 -#: includes/ui/ui_lists.inc:1943 sales/view/view_sales_order.php:127 ++#: ../includes/ui/ui_lists.inc:1947 +#: ../sales/view/view_sales_order.php:140 msgid "Sales Invoices" msgstr "" - #: ../includes/ui/ui_lists.inc:1946 - #: ../includes/ui/ui_lists.inc:1963 - #: ../includes/ui/ui_lists.inc:1981 - msgid "Overdue Invoices" - msgstr "" -#: includes/ui/ui_lists.inc:1944 includes/ui/ui_lists.inc:1961 -#: includes/ui/ui_lists.inc:1979 ++#: ../includes/ui/ui_lists.inc:1948 ++#: ../includes/ui/ui_lists.inc:1965 ++#: ../includes/ui/ui_lists.inc:1983 + msgid "Overdue Invoices" + msgstr "" - #: ../includes/ui/ui_lists.inc:1947 - #: ../includes/ui/ui_lists.inc:1964 - #: ../includes/ui/ui_lists.inc:1982 -#: includes/ui/ui_lists.inc:1945 includes/ui/ui_lists.inc:1962 -#: includes/ui/ui_lists.inc:1980 includes/ui/ui_view.inc:543 ++#: ../includes/ui/ui_lists.inc:1949 ++#: ../includes/ui/ui_lists.inc:1966 ++#: ../includes/ui/ui_lists.inc:1984 +#: ../includes/ui/ui_view.inc:610 +#: ../includes/ui/ui_view.inc:614 msgid "Payments" msgstr "" - #: ../includes/ui/ui_lists.inc:1948 - #: ../includes/ui/ui_lists.inc:1965 - #: ../includes/ui/ui_lists.inc:1983 -#: includes/ui/ui_lists.inc:1946 includes/ui/ui_lists.inc:1963 -#: includes/ui/ui_lists.inc:1981 sales/view/view_sales_order.php:158 ++#: ../includes/ui/ui_lists.inc:1950 ++#: ../includes/ui/ui_lists.inc:1967 ++#: ../includes/ui/ui_lists.inc:1985 +#: ../sales/view/view_sales_order.php:176 msgid "Credit Notes" msgstr "" - #: ../includes/ui/ui_lists.inc:1949 -#: includes/ui/ui_lists.inc:1947 sales/view/view_sales_order.php:93 ++#: ../includes/ui/ui_lists.inc:1951 +#: ../sales/view/view_sales_order.php:106 msgid "Delivery Notes" msgstr "" - #: ../includes/ui/ui_lists.inc:1962 - #: ../includes/ui/ui_lists.inc:1980 -#: includes/ui/ui_lists.inc:1960 includes/ui/ui_lists.inc:1978 ++#: ../includes/ui/ui_lists.inc:1964 ++#: ../includes/ui/ui_lists.inc:1982 msgid "Invoices" msgstr "" - #: ../includes/ui/ui_lists.inc:1966 - #: ../includes/ui/ui_lists.inc:1984 -#: includes/ui/ui_lists.inc:1964 includes/ui/ui_lists.inc:1982 ++#: ../includes/ui/ui_lists.inc:1968 ++#: ../includes/ui/ui_lists.inc:1986 msgid "Overdue Credit Notes" msgstr "" - #: ../includes/ui/ui_lists.inc:1979 -#: includes/ui/ui_lists.inc:1977 ++#: ../includes/ui/ui_lists.inc:1981 msgid "GRNs" msgstr "" - #: ../includes/ui/ui_lists.inc:1997 -#: includes/ui/ui_lists.inc:1995 ++#: ../includes/ui/ui_lists.inc:1999 msgid "Automatically put balance on back order" msgstr "" - #: ../includes/ui/ui_lists.inc:1998 -#: includes/ui/ui_lists.inc:1996 ++#: ../includes/ui/ui_lists.inc:2000 msgid "Cancel any quantites not delivered" msgstr "" - #: ../includes/ui/ui_lists.inc:2015 -#: includes/ui/ui_lists.inc:2013 ++#: ../includes/ui/ui_lists.inc:2017 msgid "Items Returned to Inventory Location" msgstr "" - #: ../includes/ui/ui_lists.inc:2016 -#: includes/ui/ui_lists.inc:2014 ++#: ../includes/ui/ui_lists.inc:2018 msgid "Items Written Off" msgstr "" - #: ../includes/ui/ui_lists.inc:2186 -#: includes/ui/ui_lists.inc:2184 ++#: ../includes/ui/ui_lists.inc:2188 msgid "New role" msgstr "" - #: ../includes/ui/ui_lists.inc:2238 -#: includes/ui/ui_lists.inc:2236 ++#: ../includes/ui/ui_lists.inc:2240 msgid "No tags defined." msgstr "" - #: ../includes/ui/ui_lists.inc:2238 -#: includes/ui/ui_lists.inc:2236 ++#: ../includes/ui/ui_lists.inc:2240 msgid "No active tags defined." msgstr "" - #: ../includes/ui/ui_lists.inc:2276 -#: includes/ui/ui_lists.inc:2274 ++#: ../includes/ui/ui_lists.inc:2278 #, php-format msgid "Activated for '%s'" msgstr "" - #: ../includes/ui/ui_lists.inc:2279 -#: includes/ui/ui_lists.inc:2277 ++#: ../includes/ui/ui_lists.inc:2281 msgid "Available and/or installed" msgstr "" - #: ../includes/ui/ui_lists.inc:2349 -#: includes/ui/ui_lists.inc:2347 ++#: ../includes/ui/ui_lists.inc:2351 msgid "Standard new company American COA (4 digit)" msgstr "" - #: ../includes/ui/ui_lists.inc:2351 -#: includes/ui/ui_lists.inc:2349 ++#: ../includes/ui/ui_lists.inc:2353 msgid "Standard American COA (4 digit) with demo data" msgstr "" - #: ../includes/ui/ui_lists.inc:2372 -#: includes/ui/ui_lists.inc:2370 ++#: ../includes/ui/ui_lists.inc:2374 msgid "No payment Link" msgstr "" @@@ -8036,26 -6887,16 +8061,26 @@@ msgstr " msgid "Date Voided:" msgstr "" -#: includes/ui/ui_view.inc:443 reporting/rep107.php:175 -#: reporting/rep109.php:180 reporting/rep110.php:184 reporting/rep111.php:183 -#: reporting/rep113.php:169 reporting/rep209.php:183 +#: ../includes/ui/ui_view.inc:443 +#: ../reporting/rep107.php:256 +#: ../reporting/rep109.php:186 +#: ../reporting/rep110.php:184 - #: ../reporting/rep111.php:165 ++#: ../reporting/rep111.php:183 +#: ../reporting/rep113.php:169 +#: ../reporting/rep209.php:186 msgid "Total Tax Excluded" msgstr "" -#: includes/ui/ui_view.inc:449 includes/ui/ui_view.inc:468 -#: includes/ui/ui_view.inc:492 includes/ui/ui_view.inc:509 -#: reporting/rep107.php:184 reporting/rep109.php:189 reporting/rep110.php:193 -#: reporting/rep111.php:192 reporting/rep113.php:178 reporting/rep209.php:192 +#: ../includes/ui/ui_view.inc:449 +#: ../includes/ui/ui_view.inc:468 +#: ../includes/ui/ui_view.inc:492 +#: ../includes/ui/ui_view.inc:509 +#: ../reporting/rep107.php:265 +#: ../reporting/rep109.php:195 +#: ../reporting/rep110.php:193 - #: ../reporting/rep111.php:174 ++#: ../reporting/rep111.php:192 +#: ../reporting/rep113.php:178 +#: ../reporting/rep209.php:195 msgid "Included" msgstr "" @@@ -8264,9 -7096,8 +8289,9 @@@ msgstr " msgid "Enter &Another Adjustment" msgstr "" -#: inventory/adjustments.php:88 inventory/transfers.php:84 -#: sales/sales_order_entry.php:366 +#: ../inventory/adjustments.php:88 - #: ../inventory/transfers.php:85 - #: ../sales/sales_order_entry.php:373 ++#: ../inventory/transfers.php:84 ++#: ../sales/sales_order_entry.php:376 msgid "You must enter at least one non empty item line." msgstr "" @@@ -8274,27 -7105,25 +8299,27 @@@ msgid "The entered date for the adjustment is invalid." msgstr "" - #: ../inventory/adjustments.php:122 -#: inventory/adjustments.php:124 ++#: ../inventory/adjustments.php:124 msgid "" - "The adjustment cannot be processed because an adjustment item would cause a " - "negative inventory balance :" + "The adjustment cannot be processed because it would cause negative inventory " + "balance for marked items as of document date or later." msgstr "" - #: ../inventory/adjustments.php:152 - #: ../manufacturing/work_order_issue.php:141 -#: inventory/adjustments.php:153 manufacturing/work_order_issue.php:138 ++#: ../inventory/adjustments.php:153 ++#: ../manufacturing/work_order_issue.php.orig:141 msgid "The quantity entered is negative or invalid." msgstr "" - #: ../inventory/adjustments.php:159 - #: ../manufacturing/work_order_issue.php:148 -#: inventory/adjustments.php:160 manufacturing/work_order_issue.php:145 ++#: ../inventory/adjustments.php:160 ++#: ../manufacturing/work_order_issue.php.orig:148 msgid "The entered standard cost is negative or invalid." msgstr "" - #: ../inventory/adjustments.php:228 -#: inventory/adjustments.php:229 ++#: ../inventory/adjustments.php:229 msgid "Adjustment Items" msgstr "" - #: ../inventory/adjustments.php:234 -#: inventory/adjustments.php:235 ++#: ../inventory/adjustments.php:235 msgid "Process Adjustment" msgstr "" @@@ -8324,18 -7153,14 +8349,18 @@@ msgstr " msgid "View the GL Journal Entries for this Cost Update" msgstr "" -#: inventory/cost_update.php:95 inventory/prices.php:61 -#: inventory/purchasing_data.php:117 inventory/reorder_level.php:48 -#: inventory/inquiry/stock_movements.php:53 -#: inventory/inquiry/stock_status.php:47 inventory/manage/item_codes.php:105 -#: manufacturing/work_order_entry.php:394 -#: manufacturing/work_order_entry.php:399 purchasing/inquiry/po_search.php:74 -#: sales/inquiry/sales_deliveries_view.php:114 -#: sales/inquiry/sales_orders_view.php:241 +#: ../inventory/cost_update.php:94 +#: ../inventory/prices.php:62 +#: ../inventory/purchasing_data.php:118 +#: ../inventory/reorder_level.php:50 +#: ../inventory/inquiry/stock_movements.php:49 +#: ../inventory/inquiry/stock_status.php:41 +#: ../inventory/manage/item_codes.php:105 - #: ../manufacturing/work_order_entry.php:396 - #: ../manufacturing/work_order_entry.php:401 ++#: ../manufacturing/work_order_entry.php:394 ++#: ../manufacturing/work_order_entry.php:399 +#: ../purchasing/inquiry/po_search.php:74 +#: ../sales/inquiry/sales_deliveries_view.php:114 +#: ../sales/inquiry/sales_orders_view.php:263 msgid "Item:" msgstr "" @@@ -8392,35 -7215,23 +8417,35 @@@ msgstr " msgid "The selected price has been deleted." msgstr "" -#: inventory/prices.php:146 reporting/rep104.php:118 -#: sales/customer_delivery.php:333 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 +#: ../inventory/prices.php:147 +#: ../reporting/rep104.php:118 - #: ../sales/customer_delivery.php:369 ++#: ../sales/customer_delivery.php:379 +#: ../sales/customer_invoice.php:477 +#: ../sales/view/view_credit.php:73 +#: ../sales/view/view_dispatch.php:93 +#: ../sales/view/view_invoice.php:93 +#: ../sales/includes/ui/sales_credit_ui.inc:102 msgid "Sales Type" msgstr "" -#: inventory/prices.php:146 inventory/purchasing_data.php:147 -#: purchasing/includes/ui/invoice_ui.inc:497 -#: purchasing/po_receive_items.php:63 purchasing/view/view_grn.php:41 -#: purchasing/view/view_po.php:45 reporting/rep104.php:111 -#: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:170 -#: sales/customer_credit_invoice.php:281 sales/customer_delivery.php:411 -#: 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 +#: ../inventory/prices.php:147 +#: ../inventory/purchasing_data.php:148 +#: ../purchasing/includes/ui/invoice_ui.inc:520 +#: ../purchasing/po_receive_items.php:63 +#: ../purchasing/view/view_grn.php:41 +#: ../purchasing/view/view_po.php:45 +#: ../reporting/rep104.php:111 +#: ../reporting/includes/doctext.inc:30 +#: ../reporting/includes/doctext.inc:192 +#: ../sales/customer_credit_invoice.php:281 - #: ../sales/customer_delivery.php:447 ++#: ../sales/customer_delivery.php:457 +#: ../sales/customer_invoice.php:551 +#: ../sales/customer_invoice.php:554 +#: ../sales/view/view_credit.php:91 +#: ../sales/view/view_dispatch.php:113 +#: ../sales/view/view_invoice.php:116 +#: ../sales/view/view_sales_order.php:220 +#: ../sales/includes/ui/sales_credit_ui.inc:168 msgid "Price" msgstr "" @@@ -8541,52 -7346,32 +8566,51 @@@ msgid " "manufactured items)." msgstr "" -#: inventory/reorder_level.php:65 inventory/inquiry/stock_movements.php:83 -#: inventory/inquiry/stock_status.php:72 inventory/inquiry/stock_status.php:76 -#: manufacturing/search_work_orders.php:162 -#: manufacturing/inquiry/where_used_inquiry.php:45 -#: manufacturing/manage/bom_edit.php:70 -#: purchasing/inquiry/po_search_completed.php:127 -#: purchasing/inquiry/po_search_completed.php:137 -#: purchasing/inquiry/po_search.php:135 purchasing/inquiry/po_search.php:146 -#: reporting/rep105.php:120 reporting/rep301.php:176 reporting/rep302.php:132 -#: reporting/rep303.php:134 reporting/rep304.php:123 reporting/rep306.php:150 -#: reporting/rep307.php:124 reporting/rep308.php:238 reporting/rep402.php:103 -#: reporting/rep402.php:109 reporting/reports_main.php:210 -#: reporting/reports_main.php:217 reporting/reports_main.php:223 -#: reporting/reports_main.php:236 reporting/reports_main.php:251 -#: reporting/reports_main.php:261 reporting/reports_main.php:269 -#: reporting/reports_main.php:290 sales/manage/sales_points.php:84 +#: ../inventory/reorder_level.php:67 +#: ../inventory/inquiry/stock_movements.php:79 +#: ../inventory/inquiry/stock_status.php:66 +#: ../inventory/inquiry/stock_status.php:70 +#: ../manufacturing/search_work_orders.php:162 +#: ../manufacturing/inquiry/where_used_inquiry.php:45 +#: ../manufacturing/manage/bom_edit.php:70 - #: ../purchasing/inquiry/po_search_completed.php:123 - #: ../purchasing/inquiry/po_search_completed.php:133 - #: ../purchasing/inquiry/po_search.php:133 - #: ../purchasing/inquiry/po_search.php:144 ++#: ../purchasing/inquiry/po_search_completed.php:126 ++#: ../purchasing/inquiry/po_search_completed.php:136 ++#: ../purchasing/inquiry/po_search.php:135 ++#: ../purchasing/inquiry/po_search.php:146 +#: ../reporting/rep105.php:120 - #: ../reporting/rep301.php:112 ++#: ../reporting/rep301.php:176 +#: ../reporting/rep302.php:132 +#: ../reporting/rep303.php:134 +#: ../reporting/rep304.php:123 +#: ../reporting/rep306.php:150 +#: ../reporting/rep307.php:124 - #: ../reporting/rep308.php:157 ++#: ../reporting/rep308.php:238 ++#: ../reporting/rep402.php:103 ++#: ../reporting/rep402.php:109 +#: ../reporting/reports_main.php:210 +#: ../reporting/reports_main.php:217 +#: ../reporting/reports_main.php:223 +#: ../reporting/reports_main.php:236 +#: ../reporting/reports_main.php:251 +#: ../reporting/reports_main.php:261 +#: ../reporting/reports_main.php:269 ++#: ../reporting/reports_main.php:290 +#: ../sales/manage/sales_points.php:84 msgid "Location" msgstr "" -#: inventory/reorder_level.php:65 inventory/inquiry/stock_movements.php:84 -#: inventory/inquiry/stock_status.php:76 purchasing/supplier_credit.php:212 +#: ../inventory/reorder_level.php:67 +#: ../inventory/inquiry/stock_movements.php:80 +#: ../inventory/inquiry/stock_status.php:70 - #: ../purchasing/supplier_credit.php:229 - #: ../sales/sales_order_entry.php:534 - #: ../sales/includes/ui/sales_order_ui.inc:182 ++#: ../purchasing/supplier_credit.php:228 msgid "Quantity On Hand" msgstr "" -#: inventory/reorder_level.php:65 inventory/includes/inventory_db.inc:72 -#: inventory/inquiry/stock_status.php:76 +#: ../inventory/reorder_level.php:67 +#: ../inventory/includes/inventory_db.inc:72 +#: ../inventory/inquiry/stock_status.php:70 +#: ../sales/includes/db/old.sales_order_db.inc:110 +#: ../sales/includes/db/old.sales_order_db.inc:263 - #: ../sales/includes/db/sales_order_db.inc.orig:112 - #: ../sales/includes/db/sales_order_db.inc.orig:291 msgid "Re-Order Level" msgstr "" @@@ -8610,49 -7395,37 +8634,43 @@@ msgstr " msgid "Enter &Another Inventory Transfer" msgstr "" - #: ../inventory/transfers.php:103 -#: inventory/transfers.php:102 ++#: ../inventory/transfers.php:102 msgid "The entered transfer date is invalid." msgstr "" - #: ../inventory/transfers.php:115 -#: inventory/transfers.php:114 ++#: ../inventory/transfers.php:114 msgid "The locations to transfer from and to must be different." msgstr "" - #: ../inventory/transfers.php:125 -#: inventory/transfers.php:124 ++#: ../inventory/transfers.php:124 msgid "" - "The quantity entered is greater than the available quantity for this item at " - "the source location :" + "The transfer cannot be processed because it would cause negative inventory " + "balance in source location for marked items as of document date or later." msgstr "" - #: ../inventory/transfers.php:158 -#: inventory/transfers.php:154 ++#: ../inventory/transfers.php:154 msgid "The quantity entered must be a positive number." msgstr "" - #: ../inventory/transfers.php:235 -#: inventory/transfers.php:231 ++#: ../inventory/transfers.php:231 msgid "Process Transfer" msgstr "" -#: inventory/includes/inventory_db.inc:69 +#: ../inventory/includes/inventory_db.inc:69 +#: ../sales/includes/db/old.sales_order_db.inc:107 +#: ../sales/includes/db/old.sales_order_db.inc:259 - #: ../sales/includes/db/sales_order_db.inc.orig:109 - #: ../sales/includes/db/sales_order_db.inc.orig:287 msgid "Stocks below Re-Order Level at " msgstr "" -#: inventory/includes/inventory_db.inc:72 +#: ../inventory/includes/inventory_db.inc:72 +#: ../sales/includes/db/old.sales_order_db.inc:110 +#: ../sales/includes/db/old.sales_order_db.inc:264 - #: ../sales/includes/db/sales_order_db.inc.orig:112 - #: ../sales/includes/db/sales_order_db.inc.orig:292 msgid "Below" msgstr "" -#: inventory/includes/inventory_db.inc:73 +#: ../inventory/includes/inventory_db.inc:73 +#: ../sales/includes/db/old.sales_order_db.inc:111 +#: ../sales/includes/db/old.sales_order_db.inc:265 - #: ../sales/includes/db/sales_order_db.inc.orig:113 - #: ../sales/includes/db/sales_order_db.inc.orig:293 msgid "Please reorder" msgstr "" @@@ -8663,11 -7436,10 +8681,11 @@@ msgid "For Part :" msgstr "" -#: inventory/includes/item_adjustments_ui.inc:34 -#: manufacturing/work_order_entry.php:209 purchasing/inquiry/po_search.php:67 -#: sales/inquiry/sales_deliveries_view.php:107 -#: sales/inquiry/sales_orders_view.php:232 +#: ../inventory/includes/item_adjustments_ui.inc:34 - #: ../manufacturing/work_order_entry.php:210 ++#: ../manufacturing/work_order_entry.php:209 +#: ../purchasing/inquiry/po_search.php:67 +#: ../sales/inquiry/sales_deliveries_view.php:107 +#: ../sales/inquiry/sales_orders_view.php:254 msgid "Location:" msgstr "" @@@ -8683,113 -7455,88 +8701,118 @@@ msgstr " msgid "Negative Adjustment" msgstr "" -#: inventory/includes/item_adjustments_ui.inc:62 -#: inventory/includes/stock_transfers_ui.inc:60 -#: manufacturing/includes/work_order_issue_ui.inc:33 -#: purchasing/includes/ui/po_ui.inc:233 purchasing/po_receive_items.php:62 -#: purchasing/view/view_grn.php:40 purchasing/view/view_po.php:45 -#: reporting/includes/doctext.inc:29 reporting/includes/doctext.inc:169 -#: reporting/includes/doctext.inc:206 sales/customer_credit_invoice.php:280 -#: sales/customer_delivery.php:409 sales/customer_invoice.php:478 -#: sales/view/view_credit.php:90 sales/view/view_dispatch.php:112 -#: sales/view/view_invoice.php:113 sales/view/view_sales_order.php:201 -#: sales/includes/ui/sales_credit_ui.inc:167 -#: sales/includes/ui/sales_order_ui.inc:143 +#: ../inventory/includes/item_adjustments_ui.inc:62 +#: ../inventory/includes/stock_transfers_ui.inc:60 +#: ../manufacturing/includes/work_order_issue_ui.inc:33 +#: ../purchasing/includes/ui/po_ui.inc:245 +#: ../purchasing/po_receive_items.php:62 +#: ../purchasing/view/view_grn.php:40 +#: ../purchasing/view/view_po.php:45 +#: ../reporting/includes/doctext.inc:29 +#: ../reporting/includes/doctext.inc:191 +#: ../reporting/includes/doctext.inc:228 +#: ../sales/customer_credit_invoice.php:280 - #: ../sales/customer_delivery.php:445 ++#: ../sales/customer_delivery.php:455 +#: ../sales/customer_invoice.php:550 +#: ../sales/customer_invoice.php:553 +#: ../sales/view/view_credit.php:90 +#: ../sales/view/view_dispatch.php:112 +#: ../sales/view/view_invoice.php:115 +#: ../sales/view/view_sales_order.php:219 +#: ../sales/includes/ui/sales_credit_ui.inc:167 - #: ../sales/includes/ui/sales_order_ui.inc:145 ++#: ../sales/includes/ui/sales_order_ui.inc:146 msgid "Item Code" msgstr "" -#: inventory/includes/item_adjustments_ui.inc:62 -#: inventory/includes/stock_transfers_ui.inc:60 -#: manufacturing/includes/work_order_issue_ui.inc:33 -#: purchasing/includes/ui/po_ui.inc:233 purchasing/view/view_grn.php:40 -#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:29 -#: reporting/includes/doctext.inc:169 reporting/includes/doctext.inc:206 -#: sales/customer_credit_invoice.php:280 sales/customer_delivery.php:409 -#: sales/customer_invoice.php:478 sales/view/view_credit.php:90 -#: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:113 -#: sales/view/view_sales_order.php:201 -#: sales/includes/ui/sales_credit_ui.inc:167 -#: sales/includes/ui/sales_order_ui.inc:143 +#: ../inventory/includes/item_adjustments_ui.inc:62 +#: ../inventory/includes/stock_transfers_ui.inc:60 +#: ../manufacturing/includes/work_order_issue_ui.inc:33 +#: ../purchasing/includes/ui/po_ui.inc:245 +#: ../purchasing/view/view_grn.php:40 +#: ../purchasing/view/view_po.php:45 +#: ../reporting/includes/doctext.inc:29 +#: ../reporting/includes/doctext.inc:191 +#: ../reporting/includes/doctext.inc:228 +#: ../sales/customer_credit_invoice.php:280 - #: ../sales/customer_delivery.php:445 ++#: ../sales/customer_delivery.php:455 +#: ../sales/customer_invoice.php:550 +#: ../sales/customer_invoice.php:553 +#: ../sales/view/view_credit.php:90 +#: ../sales/view/view_dispatch.php:112 +#: ../sales/view/view_invoice.php:115 +#: ../sales/view/view_sales_order.php:219 +#: ../sales/includes/ui/sales_credit_ui.inc:167 - #: ../sales/includes/ui/sales_order_ui.inc:145 ++#: ../sales/includes/ui/sales_order_ui.inc:146 msgid "Item Description" msgstr "" -#: inventory/includes/item_adjustments_ui.inc:62 -#: inventory/includes/stock_transfers_ui.inc:60 -#: inventory/manage/item_codes.php:124 inventory/manage/sales_kits.php:40 -#: inventory/view/view_adjustment.php:56 inventory/view/view_transfer.php:56 -#: manufacturing/view/wo_issue_view.php:77 -#: manufacturing/manage/bom_edit.php:71 -#: manufacturing/includes/manufacturing_ui.inc:29 -#: manufacturing/includes/manufacturing_ui.inc:157 -#: manufacturing/includes/manufacturing_ui.inc:332 -#: manufacturing/includes/work_order_issue_ui.inc:33 -#: purchasing/includes/ui/invoice_ui.inc:497 -#: purchasing/includes/ui/po_ui.inc:233 purchasing/view/view_grn.php:40 -#: purchasing/view/view_po.php:45 reporting/rep301.php:169 -#: reporting/rep303.php:121 reporting/rep303.php:127 reporting/rep401.php:71 -#: reporting/includes/doctext.inc:29 reporting/includes/doctext.inc:170 -#: reporting/includes/doctext.inc:203 sales/view/view_credit.php:90 -#: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:113 -#: sales/view/view_sales_order.php:201 -#: sales/includes/ui/sales_credit_ui.inc:167 -#: sales/includes/ui/sales_order_ui.inc:143 +#: ../inventory/includes/item_adjustments_ui.inc:62 +#: ../inventory/includes/stock_transfers_ui.inc:60 +#: ../inventory/manage/item_codes.php:124 +#: ../inventory/manage/sales_kits.php:40 +#: ../inventory/view/view_adjustment.php:56 +#: ../inventory/view/view_transfer.php:56 +#: ../manufacturing/view/wo_issue_view.php:77 +#: ../manufacturing/manage/bom_edit.php:71 +#: ../manufacturing/includes/manufacturing_ui.inc:29 +#: ../manufacturing/includes/manufacturing_ui.inc:157 +#: ../manufacturing/includes/manufacturing_ui.inc:332 +#: ../manufacturing/includes/work_order_issue_ui.inc:33 +#: ../purchasing/includes/ui/invoice_ui.inc:520 +#: ../purchasing/includes/ui/po_ui.inc:245 +#: ../purchasing/view/view_grn.php:40 +#: ../purchasing/view/view_po.php:45 - #: ../reporting/rep301.php:105 ++#: ../reporting/rep301.php:169 +#: ../reporting/rep303.php:121 +#: ../reporting/rep303.php:127 +#: ../reporting/rep401.php:71 +#: ../reporting/includes/doctext.inc:29 +#: ../reporting/includes/doctext.inc:192 +#: ../reporting/includes/doctext.inc:225 +#: ../sales/customer_invoice.php:550 +#: ../sales/view/view_credit.php:90 +#: ../sales/view/view_dispatch.php:112 +#: ../sales/view/view_invoice.php:115 +#: ../sales/view/view_sales_order.php:219 +#: ../sales/includes/ui/sales_credit_ui.inc:167 - #: ../sales/includes/ui/sales_order_ui.inc:145 ++#: ../sales/includes/ui/sales_order_ui.inc:146 msgid "Quantity" msgstr "" -#: inventory/includes/item_adjustments_ui.inc:63 -#: inventory/includes/stock_transfers_ui.inc:60 -#: inventory/manage/item_units.php:94 -#: manufacturing/includes/work_order_issue_ui.inc:34 -#: purchasing/includes/ui/po_ui.inc:234 purchasing/view/view_grn.php:41 -#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:30 -#: reporting/includes/doctext.inc:170 sales/view/view_credit.php:91 -#: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:114 -#: sales/view/view_sales_order.php:201 -#: sales/includes/ui/sales_credit_ui.inc:167 -#: sales/includes/ui/sales_order_ui.inc:145 +#: ../inventory/includes/item_adjustments_ui.inc:63 +#: ../inventory/includes/stock_transfers_ui.inc:60 +#: ../inventory/manage/item_units.php:94 +#: ../manufacturing/includes/work_order_issue_ui.inc:34 +#: ../purchasing/includes/ui/po_ui.inc:246 +#: ../purchasing/view/view_grn.php:41 +#: ../purchasing/view/view_po.php:45 +#: ../reporting/includes/doctext.inc:30 +#: ../reporting/includes/doctext.inc:192 +#: ../sales/view/view_credit.php:91 +#: ../sales/view/view_dispatch.php:113 +#: ../sales/view/view_invoice.php:116 +#: ../sales/view/view_sales_order.php:219 +#: ../sales/includes/ui/sales_credit_ui.inc:167 - #: ../sales/includes/ui/sales_order_ui.inc:147 ++#: ../sales/includes/ui/sales_order_ui.inc:148 msgid "Unit" msgstr "" -#: inventory/includes/item_adjustments_ui.inc:63 -#: inventory/view/view_adjustment.php:57 -#: manufacturing/includes/manufacturing_ui.inc:29 -#: manufacturing/includes/work_order_issue_ui.inc:34 reporting/rep301.php:169 +#: ../inventory/includes/item_adjustments_ui.inc:63 +#: ../inventory/view/view_adjustment.php:57 +#: ../manufacturing/includes/manufacturing_ui.inc:29 +#: ../manufacturing/includes/work_order_issue_ui.inc:34 - #: ../reporting/rep301.php:105 ++#: ../reporting/rep301.php:169 msgid "Unit Cost" msgstr "" -#: inventory/includes/item_adjustments_ui.inc:110 ++#: ../inventory/includes/item_adjustments_ui.inc:110 + msgid "" + "Marked items have insufficient quantities in stock as on day of adjustment." + msgstr "" + -#: inventory/includes/stock_transfers_ui.inc:35 -#: inventory/inquiry/stock_movements.php:60 -#: manufacturing/includes/work_order_issue_ui.inc:171 +#: ../inventory/includes/stock_transfers_ui.inc:35 +#: ../inventory/inquiry/stock_movements.php:56 - #: ../manufacturing/includes/work_order_issue_ui.inc:164 ++#: ../manufacturing/includes/work_order_issue_ui.inc:171 msgid "From Location:" msgstr "" @@@ -8801,7 -7548,12 +8824,12 @@@ msgstr " msgid "Transfer Type:" msgstr "" -#: inventory/includes/stock_transfers_ui.inc:100 ++#: ../inventory/includes/stock_transfers_ui.inc:100 + msgid "" + "Marked items have insufficient quantities in stock as on day of transfer." + msgstr "" + -#: inventory/includes/db/items_db.inc:119 +#: ../inventory/includes/db/items_db.inc:121 msgid "" "Cannot delete this item because there are stock movements that refer to this " "item." @@@ -8919,18 -7666,12 +8947,18 @@@ msgstr " msgid "Tax type" msgstr "" -#: inventory/manage/item_categories.php:98 inventory/manage/item_codes.php:124 -#: inventory/manage/sales_kits.php:40 inventory/view/view_adjustment.php:57 -#: inventory/view/view_transfer.php:56 manufacturing/view/wo_issue_view.php:77 -#: manufacturing/manage/bom_edit.php:71 purchasing/po_receive_items.php:62 -#: sales/customer_credit_invoice.php:280 sales/customer_delivery.php:410 -#: sales/customer_invoice.php:478 +#: ../inventory/manage/item_categories.php:98 +#: ../inventory/manage/item_codes.php:124 +#: ../inventory/manage/sales_kits.php:40 +#: ../inventory/view/view_adjustment.php:57 +#: ../inventory/view/view_transfer.php:56 +#: ../manufacturing/view/wo_issue_view.php:77 +#: ../manufacturing/manage/bom_edit.php:71 +#: ../purchasing/po_receive_items.php:62 +#: ../sales/customer_credit_invoice.php:280 - #: ../sales/customer_delivery.php:446 ++#: ../sales/customer_delivery.php:456 +#: ../sales/customer_invoice.php:550 +#: ../sales/customer_invoice.php:553 msgid "Units" msgstr "" @@@ -8991,8 -7723,7 +9019,8 @@@ msgstr " msgid "Foreign Item Codes" msgstr "" -#: inventory/manage/item_codes.php:23 sales/sales_order_entry.php:681 +#: ../inventory/manage/item_codes.php:23 - #: ../sales/sales_order_entry.php:702 ++#: ../sales/sales_order_entry.php:703 msgid "There are no inventory items defined in the system." msgstr "" @@@ -9027,23 -7756,12 +9055,23 @@@ msgstr " msgid "EAN/UPC Code" msgstr "" -#: inventory/manage/item_codes.php:125 reporting/rep104.php:117 -#: reporting/rep105.php:119 reporting/rep301.php:169 reporting/rep301.php:175 -#: reporting/rep302.php:124 reporting/rep302.php:131 reporting/rep303.php:133 -#: reporting/rep304.php:114 reporting/rep304.php:122 reporting/rep306.php:141 -#: reporting/rep306.php:149 reporting/rep307.php:117 reporting/rep307.php:123 -#: reporting/rep308.php:230 reporting/rep308.php:237 reporting/rep309.php:104 +#: ../inventory/manage/item_codes.php:125 +#: ../reporting/rep104.php:117 +#: ../reporting/rep105.php:119 - #: ../reporting/rep301.php:105 - #: ../reporting/rep301.php:111 ++#: ../reporting/rep301.php:169 ++#: ../reporting/rep301.php:175 +#: ../reporting/rep302.php:124 +#: ../reporting/rep302.php:131 +#: ../reporting/rep303.php:133 +#: ../reporting/rep304.php:114 +#: ../reporting/rep304.php:122 +#: ../reporting/rep306.php:141 +#: ../reporting/rep306.php:149 +#: ../reporting/rep307.php:117 +#: ../reporting/rep307.php:123 - #: ../reporting/rep308.php:149 - #: ../reporting/rep308.php:156 ++#: ../reporting/rep308.php:230 ++#: ../reporting/rep308.php:237 +#: ../reporting/rep309.php:104 msgid "Category" msgstr "" @@@ -9051,11 -7769,10 +9079,11 @@@ msgid "UPC/EAN code:" msgstr "" -#: inventory/manage/item_codes.php:179 inventory/manage/sales_kits.php:245 -#: manufacturing/work_order_add_finished.php:203 -#: manufacturing/work_order_entry.php:422 -#: manufacturing/manage/bom_edit.php:228 +#: ../inventory/manage/item_codes.php:179 +#: ../inventory/manage/sales_kits.php:245 - #: ../manufacturing/work_order_add_finished.php:206 - #: ../manufacturing/work_order_entry.php:424 ++#: ../manufacturing/work_order_add_finished.php:203 ++#: ../manufacturing/work_order_entry.php:422 +#: ../manufacturing/manage/bom_edit.php:228 msgid "Quantity:" msgstr "" @@@ -9125,17 -7835,14 +9153,18 @@@ msgstr " msgid "Selected item has been deleted." msgstr "" -#: inventory/manage/items.php:258 inventory/view/view_adjustment.php:56 -#: inventory/view/view_transfer.php:39 inventory/view/view_transfer.php:56 -#: manufacturing/search_work_orders.php:163 -#: manufacturing/view/wo_issue_view.php:44 -#: manufacturing/view/wo_production_view.php:45 -#: purchasing/includes/ui/invoice_ui.inc:484 -#: purchasing/includes/ui/invoice_ui.inc:496 reporting/rep204.php:84 -#: reporting/rep306.php:152 reporting/rep402.php:103 +#: ../inventory/manage/items.php:265 +#: ../inventory/view/view_adjustment.php:56 +#: ../inventory/view/view_transfer.php:39 +#: ../inventory/view/view_transfer.php:56 +#: ../manufacturing/search_work_orders.php:163 +#: ../manufacturing/view/wo_issue_view.php:44 +#: ../manufacturing/view/wo_production_view.php:45 +#: ../purchasing/includes/ui/invoice_ui.inc:507 +#: ../purchasing/includes/ui/invoice_ui.inc:519 +#: ../reporting/rep204.php:84 +#: ../reporting/rep306.php:152 ++#: ../reporting/rep402.php:103 msgid "Item" msgstr "" @@@ -9526,11 -8218,11 +9555,11 @@@ msgstr " msgid "for item:" msgstr "" -#: manufacturing/search_work_orders.php:78 -#: purchasing/inquiry/po_search_completed.php:80 -#: purchasing/inquiry/po_search.php:78 -#: sales/inquiry/sales_deliveries_view.php:118 -#: sales/inquiry/sales_orders_view.php:247 +#: ../manufacturing/search_work_orders.php:78 - #: ../purchasing/inquiry/po_search_completed.php:74 - #: ../purchasing/inquiry/po_search.php:76 - #: ../sales/inquiry/sales_deliveries_view.php:116 ++#: ../purchasing/inquiry/po_search_completed.php:77 ++#: ../purchasing/inquiry/po_search.php:78 ++#: ../sales/inquiry/sales_deliveries_view.php:118 +#: ../sales/inquiry/sales_orders_view.php:270 msgid "Select documents" msgstr "" @@@ -9550,15 -8242,14 +9579,17 @@@ msgstr " msgid "Costs" msgstr "" -#: manufacturing/search_work_orders.php:164 reporting/rep402.php:103 +#: ../manufacturing/search_work_orders.php:164 ++#: ../reporting/rep402.php:103 msgid "Required" msgstr "" -#: manufacturing/search_work_orders.php:167 -#: manufacturing/includes/manufacturing_ui.inc:277 -#: manufacturing/includes/manufacturing_ui.inc:281 reporting/rep402.php:103 -#: reporting/includes/doctext.inc:205 sales/inquiry/sales_orders_view.php:268 +#: ../manufacturing/search_work_orders.php:167 +#: ../manufacturing/includes/manufacturing_ui.inc:277 +#: ../manufacturing/includes/manufacturing_ui.inc:281 ++#: ../reporting/rep402.php:103 +#: ../reporting/includes/doctext.inc:227 +#: ../sales/inquiry/sales_orders_view.php:291 msgid "Required By" msgstr "" @@@ -9574,17 -8265,16 +9605,19 @@@ msgstr " msgid "The manufacturing process has been entered." msgstr "" -#: manufacturing/work_order_add_finished.php:46 -#: manufacturing/work_order_costs.php:45 manufacturing/work_order_entry.php:56 -#: manufacturing/work_order_issue.php:38 -#: manufacturing/work_order_release.php:75 +#: ../manufacturing/work_order_add_finished.php:46 +#: ../manufacturing/work_order_costs.php:45 +#: ../manufacturing/work_order_entry.php:56 +#: ../manufacturing/work_order_issue.php:40 ++#: ../manufacturing/work_order_issue.php.orig:40 +#: ../manufacturing/work_order_release.php:75 msgid "View this Work Order" msgstr "" -#: manufacturing/work_order_add_finished.php:48 -#: manufacturing/work_order_costs.php:47 manufacturing/work_order_entry.php:64 -#: manufacturing/work_order_issue.php:40 +#: ../manufacturing/work_order_add_finished.php:48 +#: ../manufacturing/work_order_entry.php:64 +#: ../manufacturing/work_order_issue.php:42 ++#: ../manufacturing/work_order_issue.php.orig:42 msgid "View the GL Journal Entries for this Work Order" msgstr "" @@@ -9593,17 -8283,16 +9626,18 @@@ msgid "Print the GL Journal Entries for this Work Order" msgstr "" -#: manufacturing/work_order_add_finished.php:52 -#: manufacturing/work_order_costs.php:51 manufacturing/work_order_issue.php:42 +#: ../manufacturing/work_order_add_finished.php:52 +#: ../manufacturing/work_order_costs.php:49 +#: ../manufacturing/work_order_issue.php:44 ++#: ../manufacturing/work_order_issue.php.orig:44 msgid "Select another &Work Order to Process" msgstr "" -#: manufacturing/work_order_add_finished.php:65 -#: manufacturing/work_order_costs.php:64 -#: manufacturing/work_order_entry.php:339 -#: manufacturing/includes/db/work_order_issues_db.inc:30 -#: manufacturing/includes/db/work_order_produce_items_db.inc:27 +#: ../manufacturing/work_order_add_finished.php:65 +#: ../manufacturing/work_order_costs.php:62 - #: ../manufacturing/work_order_entry.php:341 ++#: ../manufacturing/work_order_entry.php:339 +#: ../manufacturing/includes/db/work_order_issues_db.inc:30 +#: ../manufacturing/includes/db/work_order_produce_items_db.inc:27 msgid "The order number sent is not valid." msgstr "" @@@ -9621,32 -8310,32 +9655,32 @@@ msgid " "The production exceeds the quantity needed. Please change the Work Order." msgstr "" - #: ../manufacturing/work_order_add_finished.php:129 -#: manufacturing/work_order_add_finished.php:126 ++#: ../manufacturing/work_order_add_finished.php:126 msgid "" "The unassembling cannot be processed because there is insufficient stock." msgstr "" - #: ../manufacturing/work_order_add_finished.php:147 -#: manufacturing/work_order_add_finished.php:144 ++#: ../manufacturing/work_order_add_finished.php:144 msgid "" "The production cannot be processed because a required item would cause a " "negative inventory balance :" msgstr "" - #: ../manufacturing/work_order_add_finished.php:204 -#: manufacturing/work_order_add_finished.php:201 ++#: ../manufacturing/work_order_add_finished.php:201 msgid "Produce Finished Items" msgstr "" - #: ../manufacturing/work_order_add_finished.php:204 -#: manufacturing/work_order_add_finished.php:201 ++#: ../manufacturing/work_order_add_finished.php:201 msgid "Return Items to Work Order" msgstr "" - #: ../manufacturing/work_order_add_finished.php:214 -#: manufacturing/work_order_add_finished.php:211 -#: purchasing/allocations/supplier_allocate.php:74 -#: sales/allocations/customer_allocate.php:72 ++#: ../manufacturing/work_order_add_finished.php:211 +#: ../purchasing/allocations/supplier_allocate.php:75 +#: ../sales/allocations/customer_allocate.php:73 msgid "Process" msgstr "" - #: ../manufacturing/work_order_add_finished.php:215 -#: manufacturing/work_order_add_finished.php:212 ++#: ../manufacturing/work_order_add_finished.php:212 msgid "Process And Close Order" msgstr "" @@@ -9740,110 -8429,110 +9774,113 @@@ msgstr " msgid "The cost entered is invalid or less than zero." msgstr "" - #: ../manufacturing/work_order_entry.php:209 -#: manufacturing/work_order_entry.php:208 ++#: ../manufacturing/work_order_entry.php:208 msgid "" "The work order cannot be processed because there is an insufficient quantity " "for component:" msgstr "" - #: ../manufacturing/work_order_entry.php:223 -#: manufacturing/work_order_entry.php:221 ++#: ../manufacturing/work_order_entry.php:221 msgid "" "The selected item cannot be unassembled because there is insufficient stock." msgstr "" - #: ../manufacturing/work_order_entry.php:249 -#: manufacturing/work_order_entry.php:247 ++#: ../manufacturing/work_order_entry.php:247 msgid "" "The quantity cannot be changed to be less than the quantity already " "manufactured for this order." msgstr "" - #: ../manufacturing/work_order_entry.php:298 -#: manufacturing/work_order_entry.php:296 ++#: ../manufacturing/work_order_entry.php:296 msgid "" "This work order cannot be deleted because it has already been processed." msgstr "" - #: ../manufacturing/work_order_entry.php:349 -#: manufacturing/work_order_entry.php:347 ++#: ../manufacturing/work_order_entry.php:347 msgid "This work order is closed and cannot be edited." msgstr "" - #: ../manufacturing/work_order_entry.php:397 - #: ../manufacturing/work_order_entry.php:405 -#: manufacturing/work_order_entry.php:395 -#: manufacturing/work_order_entry.php:403 ++#: ../manufacturing/work_order_entry.php:395 ++#: ../manufacturing/work_order_entry.php:403 msgid "Destination Location:" msgstr "" - #: ../manufacturing/work_order_entry.php:416 -#: manufacturing/work_order_entry.php:414 ++#: ../manufacturing/work_order_entry.php:414 msgid "Quantity Required:" msgstr "" - #: ../manufacturing/work_order_entry.php:418 -#: manufacturing/work_order_entry.php:416 ++#: ../manufacturing/work_order_entry.php:416 msgid "Quantity Manufactured:" msgstr "" - #: ../manufacturing/work_order_entry.php:437 -#: manufacturing/work_order_entry.php:435 ++#: ../manufacturing/work_order_entry.php:435 msgid "Credit Labour Account" msgstr "" - #: ../manufacturing/work_order_entry.php:444 -#: manufacturing/work_order_entry.php:442 ++#: ../manufacturing/work_order_entry.php:442 msgid "Credit Overhead Account" msgstr "" - #: ../manufacturing/work_order_entry.php:449 -#: manufacturing/work_order_entry.php:447 ++#: ../manufacturing/work_order_entry.php:447 msgid "Released On:" msgstr "" - #: ../manufacturing/work_order_entry.php:459 -#: manufacturing/work_order_entry.php:457 ++#: ../manufacturing/work_order_entry.php:457 msgid "Save changes to work order" msgstr "" - #: ../manufacturing/work_order_entry.php:462 -#: manufacturing/work_order_entry.php:460 ++#: ../manufacturing/work_order_entry.php:460 msgid "Close This Work Order" msgstr "" - #: ../manufacturing/work_order_entry.php:464 -#: manufacturing/work_order_entry.php:462 ++#: ../manufacturing/work_order_entry.php:462 msgid "Delete This Work Order" msgstr "" - #: ../manufacturing/work_order_entry.php:470 -#: manufacturing/work_order_entry.php:468 ++#: ../manufacturing/work_order_entry.php:468 msgid "Add Workorder" msgstr "" -#: manufacturing/work_order_issue.php:29 +#: ../manufacturing/work_order_issue.php:31 ++#: ../manufacturing/work_order_issue.php.orig:31 msgid "Issue Items to Work Order" msgstr "" -#: manufacturing/work_order_issue.php:36 +#: ../manufacturing/work_order_issue.php:38 ++#: ../manufacturing/work_order_issue.php.orig:38 msgid "The work order issue has been entered." msgstr "" -#: manufacturing/work_order_issue.php:77 +#: ../manufacturing/work_order_issue.php:78 ++#: ../manufacturing/work_order_issue.php.orig:78 msgid "The entered date for the issue is invalid." msgstr "" - #: ../manufacturing/work_order_issue.php:106 -#: manufacturing/work_order_issue.php:104 ++#: ../manufacturing/work_order_issue.php.orig:106 msgid "" -"The issue cannot be processed because it would cause negative inventory " -"balance for marked items as of document date or later." +"The issue cannot be processed because an entered item would cause a negative " +"inventory balance :" msgstr "" - #: ../manufacturing/work_order_issue.php:124 -#: manufacturing/work_order_issue.php:121 ++#: ../manufacturing/work_order_issue.php.orig:124 msgid "" "The process cannot be completed because there is an insufficient total " "quantity for a component." msgstr "" - #: ../manufacturing/work_order_issue.php:125 -#: manufacturing/work_order_issue.php:122 ++#: ../manufacturing/work_order_issue.php.orig:125 msgid "Component is :" msgstr "" - #: ../manufacturing/work_order_issue.php:126 -#: manufacturing/work_order_issue.php:123 ++#: ../manufacturing/work_order_issue.php.orig:126 msgid "From location :" msgstr "" - #: ../manufacturing/work_order_issue.php:219 -#: manufacturing/work_order_issue.php:216 ++#: ../manufacturing/work_order_issue.php.orig:219 msgid "Items to Issue" msgstr "" - #: ../manufacturing/work_order_issue.php:225 -#: manufacturing/work_order_issue.php:222 ++#: ../manufacturing/work_order_issue.php.orig:225 msgid "Process Issue" msgstr "" @@@ -10174,19 -8851,23 +10211,23 @@@ msgstr " msgid "This work order is closed." msgstr "" - #: ../manufacturing/includes/work_order_issue_ui.inc:162 -#: manufacturing/includes/work_order_issue_ui.inc:82 ++#: ../manufacturing/includes/work_order_issue_ui.inc:82 + msgid "Marked items have insufficient quantities in stock as on day of issue." + msgstr "" + -#: manufacturing/includes/work_order_issue_ui.inc:169 ++#: ../manufacturing/includes/work_order_issue_ui.inc:169 msgid "Return Items to Location" msgstr "" - #: ../manufacturing/includes/work_order_issue_ui.inc:162 -#: manufacturing/includes/work_order_issue_ui.inc:169 ++#: ../manufacturing/includes/work_order_issue_ui.inc:169 msgid "Issue Items to Work order" msgstr "" - #: ../manufacturing/includes/work_order_issue_ui.inc:165 -#: manufacturing/includes/work_order_issue_ui.inc:172 ++#: ../manufacturing/includes/work_order_issue_ui.inc:172 msgid "To Work Centre:" msgstr "" - #: ../manufacturing/includes/work_order_issue_ui.inc:167 -#: manufacturing/includes/work_order_issue_ui.inc:174 ++#: ../manufacturing/includes/work_order_issue_ui.inc:174 msgid "Issue Date:" msgstr "" @@@ -10214,20 -8895,18 +10255,19 @@@ msgstr " msgid "Reversed the production " msgstr "" - #: ../manufacturing/includes/db/work_orders_db.inc:79 -#: 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:204 ++#: ../manufacturing/includes/db/work_orders_db.inc.orig:79 +#: ../purchasing/includes/db/po_db.inc:123 +#: ../sales/includes/db/cust_trans_db.inc:114 +#: ../sales/includes/db/old.sales_order_db.inc:249 +#: ../sales/includes/db/sales_order_db.inc:213 - #: ../sales/includes/db/sales_order_db.inc.orig:275 msgid "Updated." msgstr "" - #: ../manufacturing/includes/db/work_orders_db.inc:100 -#: manufacturing/includes/db/work_orders_db.inc:297 ++#: ../manufacturing/includes/db/work_orders_db.inc.orig:100 msgid "Canceled." msgstr "" - #: ../manufacturing/includes/db/work_orders_db.inc:176 -#: manufacturing/includes/db/work_orders_db.inc:373 ++#: ../manufacturing/includes/db/work_orders_db.inc.orig:176 msgid "Released." msgstr "" @@@ -10247,10 -8927,9 +10287,10 @@@ msgstr " msgid "Supplier invoice adjustment for zero inventory of " msgstr "" -#: purchasing/includes/db/invoice_db.inc:311 reporting/rep106.php:83 -#: sales/inquiry/sales_deliveries_view.php:168 -#: sales/inquiry/sales_orders_view.php:147 +#: ../purchasing/includes/db/invoice_db.inc:334 +#: ../reporting/rep106.php:83 - #: ../sales/inquiry/sales_deliveries_view.php:166 ++#: ../sales/inquiry/sales_deliveries_view.php:168 +#: ../sales/inquiry/sales_orders_view.php:159 msgid "Invoice" msgstr "" @@@ -10284,16 -8957,14 +10324,16 @@@ msgstr " msgid "Deliver Into Location" msgstr "" -#: purchasing/includes/ui/grn_ui.inc:34 purchasing/includes/ui/grn_ui.inc:79 -#: purchasing/includes/ui/po_ui.inc:341 -#: purchasing/view/view_supp_credit.php:44 -#: purchasing/view/view_supp_invoice.php:47 -#: purchasing/inquiry/po_search_completed.php:128 -#: purchasing/inquiry/po_search.php:136 -#: purchasing/inquiry/supplier_inquiry.php:172 -#: reporting/includes/doctext.inc:142 reporting/includes/doctext.inc:165 +#: ../purchasing/includes/ui/grn_ui.inc:34 +#: ../purchasing/includes/ui/grn_ui.inc:79 +#: ../purchasing/includes/ui/po_ui.inc:353 +#: ../purchasing/view/view_supp_credit.php:44 +#: ../purchasing/view/view_supp_invoice.php:48 - #: ../purchasing/inquiry/po_search_completed.php:124 - #: ../purchasing/inquiry/po_search.php:134 ++#: ../purchasing/inquiry/po_search_completed.php:127 ++#: ../purchasing/inquiry/po_search.php:136 +#: ../purchasing/inquiry/supplier_inquiry.php:177 +#: ../reporting/includes/doctext.inc:164 +#: ../reporting/includes/doctext.inc:187 msgid "Supplier's Reference" msgstr "" @@@ -10436,10 -9091,9 +10476,10 @@@ msgstr " msgid "Add All Items" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:484 -#: purchasing/includes/ui/invoice_ui.inc:496 reporting/rep308.php:230 -#: sales/inquiry/sales_orders_view.php:155 +#: ../purchasing/includes/ui/invoice_ui.inc:507 +#: ../purchasing/includes/ui/invoice_ui.inc:519 - #: ../reporting/rep308.php:149 ++#: ../reporting/rep308.php:230 +#: ../sales/inquiry/sales_orders_view.php:167 msgid "Delivery" msgstr "" @@@ -10470,15 -9118,15 +10510,15 @@@ msgstr " msgid "Qty Yet To Invoice" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:486 -#: purchasing/includes/ui/po_ui.inc:235 -#: sales/includes/ui/sales_order_ui.inc:145 +#: ../purchasing/includes/ui/invoice_ui.inc:509 +#: ../purchasing/includes/ui/po_ui.inc:247 - #: ../sales/includes/ui/sales_order_ui.inc:147 ++#: ../sales/includes/ui/sales_order_ui.inc:148 msgid "Price after Tax" msgstr "" -#: purchasing/includes/ui/invoice_ui.inc:486 -#: purchasing/includes/ui/po_ui.inc:235 -#: sales/includes/ui/sales_order_ui.inc:145 +#: ../purchasing/includes/ui/invoice_ui.inc:509 +#: ../purchasing/includes/ui/po_ui.inc:247 - #: ../sales/includes/ui/sales_order_ui.inc:147 ++#: ../sales/includes/ui/sales_order_ui.inc:148 msgid "Price before Tax" msgstr "" @@@ -10506,18 -9154,15 +10546,18 @@@ msgstr " msgid "Credits can only be applied to invoiced items." msgstr "" -#: purchasing/includes/ui/po_ui.inc:154 sales/sales_order_entry.php:705 +#: ../purchasing/includes/ui/po_ui.inc:166 - #: ../sales/sales_order_entry.php:726 ++#: ../sales/sales_order_entry.php:727 msgid "Order Date:" msgstr "" -#: purchasing/includes/ui/po_ui.inc:155 sales/sales_order_entry.php:692 +#: ../purchasing/includes/ui/po_ui.inc:167 - #: ../sales/sales_order_entry.php:713 ++#: ../sales/sales_order_entry.php:714 msgid "Delivery Date:" msgstr "" -#: purchasing/includes/ui/po_ui.inc:155 sales/sales_order_entry.php:686 +#: ../purchasing/includes/ui/po_ui.inc:167 - #: ../sales/sales_order_entry.php:707 ++#: ../sales/sales_order_entry.php:708 msgid "Invoice Date:" msgstr "" @@@ -10556,8 -9200,8 +10596,8 @@@ msgstr " msgid "Received" msgstr "" -#: purchasing/includes/ui/po_ui.inc:235 -#: sales/includes/ui/sales_order_ui.inc:599 +#: ../purchasing/includes/ui/po_ui.inc:247 - #: ../sales/includes/ui/sales_order_ui.inc:617 ++#: ../sales/includes/ui/sales_order_ui.inc:602 msgid "Required Delivery Date" msgstr "" @@@ -10567,70 -9210,31 +10607,70 @@@ msgid "Line Total" msgstr "" -#: purchasing/includes/ui/po_ui.inc:286 purchasing/po_receive_items.php:114 -#: reporting/rep107.php:150 reporting/rep109.php:149 reporting/rep110.php:159 -#: reporting/rep111.php:152 reporting/rep113.php:144 reporting/rep209.php:162 -#: sales/customer_credit_invoice.php:322 sales/customer_delivery.php:495 -#: 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:221 +#: ../purchasing/includes/ui/po_ui.inc:298 +#: ../purchasing/po_receive_items.php:114 +#: ../reporting/rep107.php:231 +#: ../reporting/rep109.php:155 +#: ../reporting/rep110.php:159 - #: ../reporting/rep111.php:134 ++#: ../reporting/rep111.php:152 +#: ../reporting/rep113.php:144 +#: ../reporting/rep209.php:162 +#: ../sales/customer_credit_invoice.php:322 - #: ../sales/customer_delivery.php:525 ++#: ../sales/customer_delivery.php:541 +#: ../sales/customer_invoice.php:656 +#: ../sales/view/view_dispatch.php:146 +#: ../sales/view/view_invoice.php:150 +#: ../sales/includes/ui/sales_credit_ui.inc:217 - #: ../sales/includes/ui/sales_order_ui.inc:236 ++#: ../sales/includes/ui/sales_order_ui.inc:224 msgid "Sub-total" msgstr "" -#: purchasing/includes/ui/po_ui.inc:295 purchasing/po_receive_items.php:122 -#: purchasing/view/view_grn.php:79 purchasing/view/view_po.php:93 -#: sales/customer_delivery.php:502 sales/view/view_sales_order.php:244 -#: sales/includes/ui/sales_order_ui.inc:228 +#: ../purchasing/includes/ui/po_ui.inc:307 +#: ../purchasing/po_receive_items.php:122 +#: ../purchasing/view/view_grn.php:79 +#: ../purchasing/view/view_po.php:93 - #: ../sales/customer_delivery.php:532 ++#: ../sales/customer_delivery.php:548 +#: ../sales/view/view_sales_order.php:262 - #: ../sales/includes/ui/sales_order_ui.inc:243 ++#: ../sales/includes/ui/sales_order_ui.inc:231 msgid "Amount Total" msgstr "" -#: purchasing/includes/ui/po_ui.inc:296 -#: purchasing/allocations/supplier_allocate.php:73 -#: sales/allocations/customer_allocate.php:71 -#: sales/includes/ui/sales_order_ui.inc:229 +#: ../purchasing/includes/ui/po_ui.inc:308 +#: ../purchasing/allocations/supplier_allocate.php:74 +#: ../sales/allocations/customer_allocate.php:72 - #: ../sales/includes/ui/sales_order_ui.inc:244 ++#: ../sales/includes/ui/sales_order_ui.inc:232 msgid "Refresh" msgstr "" -#: purchasing/po_entry_items.php:41 +#: ../purchasing/includes/ui/po_ui.inc:363 +#: ../sales/view/view_sales_order.php:83 +msgid "Required Pre-Payment" +msgstr "" + +#: ../purchasing/includes/ui/po_ui.inc:364 +msgid "Pre-Payments Allocated" +msgstr "" + +#: ../purchasing/includes/ui/po_ui.inc:490 +#: ../purchasing/po_entry_items.php:482 +#: ../sales/customer_invoice.php:463 - #: ../sales/includes/ui/sales_order_ui.inc:413 - #: ../sales/includes/ui/sales_order_ui.inc:415 ++#: ../sales/includes/ui/sales_order_ui.inc:398 ++#: ../sales/includes/ui/sales_order_ui.inc:400 +msgid "Payment:" +msgstr "" + +#: ../purchasing/includes/ui/po_ui.inc:490 +#: ../purchasing/po_entry_items.php:482 +msgid "Delayed" +msgstr "" + +#: ../purchasing/includes/ui/po_ui.inc:492 - #: ../sales/includes/ui/sales_order_ui.inc:628 - #: ../sales/includes/ui/sales_order_ui.inc:630 ++#: ../sales/includes/ui/sales_order_ui.inc:613 ++#: ../sales/includes/ui/sales_order_ui.inc:615 +msgid "Pre-Payment Required:" +msgstr "" + +#: ../purchasing/po_entry_items.php:41 msgid "Modify Purchase Order #" msgstr "" @@@ -10746,8 -9349,7 +10786,8 @@@ msgstr " msgid "Enter a new purchase order" msgstr "" -#: purchasing/po_entry_items.php:216 sales/sales_order_entry.php:498 +#: ../purchasing/po_entry_items.php:216 - #: ../sales/sales_order_entry.php:506 ++#: ../sales/sales_order_entry.php:520 msgid "Item description cannot be empty." msgstr "" @@@ -10824,12 -9428,7 +10864,12 @@@ 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:709 +#: ../purchasing/po_entry_items.php:405 +msgid "Required prepayment is greater than total invoice value." +msgstr "" + +#: ../purchasing/po_entry_items.php:490 - #: ../sales/sales_order_entry.php:730 ++#: ../sales/sales_order_entry.php:731 msgid "Place Order" msgstr "" @@@ -10837,8 -9436,7 +10877,8 @@@ msgid "Update Order" msgstr "" -#: purchasing/po_entry_items.php:536 sales/sales_order_entry.php:708 +#: ../purchasing/po_entry_items.php:492 - #: ../sales/sales_order_entry.php:729 ++#: ../sales/sales_order_entry.php:730 msgid "Cancel Order" msgstr "" @@@ -10863,8 -9460,7 +10903,8 @@@ msgstr " msgid "Update Invoice" msgstr "" -#: purchasing/po_entry_items.php:545 sales/sales_order_entry.php:689 +#: ../purchasing/po_entry_items.php:501 - #: ../sales/sales_order_entry.php:710 ++#: ../sales/sales_order_entry.php:711 msgid "Cancel Invoice" msgstr "" @@@ -10890,9 -9486,8 +10930,9 @@@ msgid " "select a purchase order first." msgstr "" -#: purchasing/po_receive_items.php:62 reporting/rep105.php:114 -#: sales/customer_delivery.php:410 +#: ../purchasing/po_receive_items.php:62 +#: ../reporting/rep105.php:114 - #: ../sales/customer_delivery.php:446 ++#: ../sales/customer_delivery.php:456 msgid "Ordered" msgstr "" @@@ -10905,8 -9497,7 +10945,8 @@@ msgid "Outstanding" msgstr "" -#: purchasing/po_receive_items.php:63 sales/customer_delivery.php:411 +#: ../purchasing/po_receive_items.php:63 - #: ../sales/customer_delivery.php:447 ++#: ../sales/customer_delivery.php:457 msgid "This Delivery" msgstr "" @@@ -11016,21 -9603,21 +11056,21 @@@ msgid " "mistake somewhere, the credit note as entered will not be processed." msgstr "" - #: ../purchasing/supplier_credit.php:227 -#: purchasing/supplier_credit.php:210 ++#: ../purchasing/supplier_credit.php:226 msgid "" "The return cannot be processed because there is an insufficient quantity for " "item:" msgstr "" - #: ../purchasing/supplier_credit.php:270 -#: purchasing/supplier_credit.php:253 ++#: ../purchasing/supplier_credit.php:269 msgid "The quantity to credit must be numeric and greater than zero." msgstr "" - #: ../purchasing/supplier_credit.php:277 -#: purchasing/supplier_credit.php:260 ++#: ../purchasing/supplier_credit.php:276 msgid "The price is either not numeric or negative." msgstr "" - #: ../purchasing/supplier_credit.php:379 -#: purchasing/supplier_credit.php:362 ++#: ../purchasing/supplier_credit.php:378 msgid "Enter Credit Note" msgstr "" @@@ -11222,11 -9799,9 +11262,11 @@@ msgstr " msgid "Line Details" msgstr "" -#: purchasing/view/view_grn.php:40 reporting/includes/doctext.inc:65 -#: reporting/includes/doctext.inc:170 reporting/includes/doctext.inc:222 -#: sales/inquiry/sales_deliveries_view.php:188 +#: ../purchasing/view/view_grn.php:40 +#: ../reporting/includes/doctext.inc:77 +#: ../reporting/includes/doctext.inc:192 +#: ../reporting/includes/doctext.inc:244 - #: ../sales/inquiry/sales_deliveries_view.php:186 ++#: ../sales/inquiry/sales_deliveries_view.php:188 msgid "Delivery Date" msgstr "" @@@ -11255,13 -9828,13 +11295,13 @@@ msgstr " msgid "Requested By" 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:165 -#: sales/inquiry/customer_inquiry.php:244 -#: sales/inquiry/sales_deliveries_view.php:208 -#: sales/inquiry/sales_orders_view.php:318 +#: ../purchasing/view/view_po.php:100 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:148 +#: ../purchasing/inquiry/supplier_inquiry.php:197 +#: ../sales/inquiry/customer_allocation_inquiry.php:165 +#: ../sales/inquiry/customer_inquiry.php:227 - #: ../sales/inquiry/sales_deliveries_view.php:206 ++#: ../sales/inquiry/sales_deliveries_view.php:208 +#: ../sales/inquiry/sales_orders_view.php:345 msgid "Marked items are overdue." msgstr "" @@@ -11341,14 -9906,10 +11381,14 @@@ msgstr " msgid "Payment Currency" msgstr "" -#: purchasing/view/view_supp_payment.php:62 reporting/rep112.php:162 -#: reporting/rep210.php:171 sales/customer_delivery.php:411 -#: sales/customer_invoice.php:479 sales/view/view_receipt.php:45 -#: sales/view/view_sales_order.php:202 +#: ../purchasing/view/view_supp_payment.php:62 +#: ../reporting/rep112.php:150 +#: ../reporting/rep210.php:159 - #: ../sales/customer_delivery.php:447 ++#: ../sales/customer_delivery.php:457 +#: ../sales/customer_invoice.php:551 +#: ../sales/customer_invoice.php:554 +#: ../sales/view/view_receipt.php:45 +#: ../sales/view/view_sales_order.php:220 msgid "Discount" msgstr "" @@@ -11519,8 -10066,10 +11559,10 @@@ msgid " "against this supplier." msgstr "" -#: purchasing/manage/suppliers.php:288 -#: purchasing/inquiry/po_search_completed.php:78 -#: purchasing/inquiry/po_search.php:76 -#: purchasing/inquiry/supplier_allocation_inquiry.php:48 +#: ../purchasing/manage/suppliers.php:291 ++#: ../purchasing/inquiry/po_search_completed.php:75 ++#: ../purchasing/inquiry/po_search.php:76 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:48 msgid "Select a supplier: " msgstr "" @@@ -11553,16 -10101,15 +11595,16 @@@ msgstr " msgid "into location:" msgstr "" - #: ../purchasing/inquiry/po_search_completed.php:125 - #: ../purchasing/inquiry/po_search.php:135 -#: purchasing/inquiry/po_search_completed.php:129 -#: purchasing/inquiry/po_search.php:137 reporting/includes/doctext.inc:166 -#: sales/inquiry/sales_orders_view.php:267 ++#: ../purchasing/inquiry/po_search_completed.php:128 ++#: ../purchasing/inquiry/po_search.php:137 +#: ../reporting/includes/doctext.inc:188 +#: ../sales/inquiry/sales_orders_view.php:290 msgid "Order Date" msgstr "" - #: ../purchasing/inquiry/po_search_completed.php:127 - #: ../purchasing/inquiry/po_search.php:137 -#: purchasing/inquiry/po_search_completed.php:131 -#: purchasing/inquiry/po_search.php:139 -#: sales/inquiry/sales_orders_view.php:270 ++#: ../purchasing/inquiry/po_search_completed.php:130 ++#: ../purchasing/inquiry/po_search.php:139 +#: ../sales/inquiry/sales_orders_view.php:293 msgid "Order Total" msgstr "" @@@ -11570,11 -10117,11 +11612,11 @@@ msgid "Search Outstanding Purchase Orders" msgstr "" - #: ../purchasing/inquiry/po_search.php:98 -#: purchasing/inquiry/po_search.php:100 ++#: ../purchasing/inquiry/po_search.php:100 msgid "Receive" msgstr "" - #: ../purchasing/inquiry/po_search.php:148 -#: purchasing/inquiry/po_search.php:150 ++#: ../purchasing/inquiry/po_search.php:150 msgid "Marked orders have overdue items." msgstr "" @@@ -11755,13 -10278,9 +11797,13 @@@ msgstr " msgid "Balances in Home Currency" msgstr "" -#: reporting/rep101.php:118 reporting/rep201.php:110 reporting/rep203.php:93 -#: reporting/rep709.php:116 reporting/includes/doctext.inc:145 -#: reporting/includes/doctext.inc:186 reporting/includes/doctext.inc:224 +#: ../reporting/rep101.php:118 +#: ../reporting/rep201.php:110 +#: ../reporting/rep203.php:93 - #: ../reporting/rep709.php:111 ++#: ../reporting/rep709.php:116 +#: ../reporting/includes/doctext.inc:167 +#: ../reporting/includes/doctext.inc:208 +#: ../reporting/includes/doctext.inc:246 msgid "Trans Type" msgstr "" @@@ -11796,75 -10306,41 +11838,75 @@@ msgstr " msgid "Customer Balances" msgstr "" -#: reporting/rep101.php:241 reporting/rep102.php:228 reporting/rep106.php:171 -#: reporting/rep201.php:233 reporting/rep202.php:235 reporting/rep203.php:181 -#: reporting/rep204.php:148 reporting/rep301.php:254 reporting/rep304.php:195 -#: reporting/rep305.php:188 reporting/rep306.php:293 reporting/rep309.php:158 +#: ../reporting/rep101.php:241 +#: ../reporting/rep102.php:228 +#: ../reporting/rep106.php:171 - #: ../reporting/rep201.php:233 ++#: ../reporting/rep201.php:234 +#: ../reporting/rep202.php:235 +#: ../reporting/rep203.php:181 +#: ../reporting/rep204.php:148 - #: ../reporting/rep301.php:179 ++#: ../reporting/rep301.php:254 +#: ../reporting/rep304.php:195 +#: ../reporting/rep305.php:188 +#: ../reporting/rep306.php:293 +#: ../reporting/rep309.php:158 msgid "Grand Total" msgstr "" -#: reporting/rep102.php:102 reporting/rep106.php:93 reporting/rep202.php:106 -#: reporting/rep709.php:100 reporting/reports_main.php:48 -#: reporting/reports_main.php:91 reporting/reports_main.php:165 -#: reporting/reports_main.php:211 reporting/reports_main.php:491 +#: ../reporting/rep102.php:102 +#: ../reporting/rep106.php:93 +#: ../reporting/rep202.php:106 - #: ../reporting/rep709.php:95 ++#: ../reporting/rep709.php:100 +#: ../reporting/reports_main.php:48 +#: ../reporting/reports_main.php:91 +#: ../reporting/reports_main.php:165 +#: ../reporting/reports_main.php:211 - #: ../reporting/reports_main.php:490 ++#: ../reporting/reports_main.php:497 msgid "Summary Only" msgstr "" -#: reporting/rep102.php:104 reporting/rep202.php:108 reporting/rep709.php:102 +#: ../reporting/rep102.php:104 +#: ../reporting/rep202.php:108 - #: ../reporting/rep709.php:97 ++#: ../reporting/rep709.php:102 msgid "Detailed Report" msgstr "" -#: reporting/rep102.php:131 reporting/rep202.php:136 reporting/rep203.php:99 -#: reporting/rep301.php:174 reporting/reports_main.php:35 -#: reporting/reports_main.php:44 reporting/reports_main.php:65 -#: reporting/reports_main.php:81 reporting/reports_main.php:90 -#: reporting/reports_main.php:152 reporting/reports_main.php:161 -#: reporting/reports_main.php:172 reporting/reports_main.php:208 -#: reporting/reports_main.php:234 reporting/reports_main.php:243 -#: reporting/reports_main.php:249 reporting/reports_main.php:259 -#: reporting/reports_main.php:267 reporting/reports_main.php:275 -#: reporting/reports_main.php:319 reporting/reports_main.php:333 -#: reporting/reports_main.php:345 reporting/reports_main.php:363 -#: reporting/reports_main.php:374 reporting/reports_main.php:386 -#: reporting/reports_main.php:399 reporting/reports_main.php:415 -#: reporting/reports_main.php:425 reporting/reports_main.php:436 -#: reporting/reports_main.php:448 reporting/reports_main.php:462 -#: reporting/reports_main.php:471 reporting/reports_main.php:481 -#: reporting/reports_main.php:490 reporting/reports_main.php:497 +#: ../reporting/rep102.php:131 +#: ../reporting/rep202.php:136 +#: ../reporting/rep203.php:99 - #: ../reporting/rep301.php:110 ++#: ../reporting/rep301.php:174 +#: ../reporting/reports_main.php:35 +#: ../reporting/reports_main.php:44 +#: ../reporting/reports_main.php:65 +#: ../reporting/reports_main.php:81 +#: ../reporting/reports_main.php:90 +#: ../reporting/reports_main.php:152 +#: ../reporting/reports_main.php:161 +#: ../reporting/reports_main.php:172 +#: ../reporting/reports_main.php:208 +#: ../reporting/reports_main.php:234 +#: ../reporting/reports_main.php:243 +#: ../reporting/reports_main.php:249 +#: ../reporting/reports_main.php:259 +#: ../reporting/reports_main.php:267 +#: ../reporting/reports_main.php:275 - #: ../reporting/reports_main.php:312 - #: ../reporting/reports_main.php:320 - #: ../reporting/reports_main.php:332 - #: ../reporting/reports_main.php:344 - #: ../reporting/reports_main.php:362 - #: ../reporting/reports_main.php:373 - #: ../reporting/reports_main.php:385 - #: ../reporting/reports_main.php:398 - #: ../reporting/reports_main.php:414 - #: ../reporting/reports_main.php:424 - #: ../reporting/reports_main.php:435 - #: ../reporting/reports_main.php:447 - #: ../reporting/reports_main.php:461 - #: ../reporting/reports_main.php:470 - #: ../reporting/reports_main.php:480 - #: ../reporting/reports_main.php:489 ++#: ../reporting/reports_main.php:319 ++#: ../reporting/reports_main.php:327 ++#: ../reporting/reports_main.php:339 ++#: ../reporting/reports_main.php:351 ++#: ../reporting/reports_main.php:369 ++#: ../reporting/reports_main.php:380 ++#: ../reporting/reports_main.php:392 ++#: ../reporting/reports_main.php:405 ++#: ../reporting/reports_main.php:421 ++#: ../reporting/reports_main.php:431 ++#: ../reporting/reports_main.php:442 ++#: ../reporting/reports_main.php:454 ++#: ../reporting/reports_main.php:468 ++#: ../reporting/reports_main.php:477 ++#: ../reporting/reports_main.php:487 +#: ../reporting/reports_main.php:496 ++#: ../reporting/reports_main.php:503 msgid "End Date" msgstr "" @@@ -11969,12 -10432,8 +12011,12 @@@ msgstr " msgid "Category/Items" msgstr "" -#: reporting/rep104.php:111 reporting/rep301.php:169 reporting/rep303.php:121 -#: reporting/rep303.php:127 reporting/rep307.php:117 reporting/rep308.php:230 +#: ../reporting/rep104.php:111 - #: ../reporting/rep301.php:105 ++#: ../reporting/rep301.php:169 +#: ../reporting/rep303.php:121 +#: ../reporting/rep303.php:127 +#: ../reporting/rep307.php:117 - #: ../reporting/rep308.php:149 ++#: ../reporting/rep308.php:230 msgid "UOM" msgstr "" @@@ -12011,21 -10467,15 +12053,21 @@@ msgstr " msgid "Order" msgstr "" -#: 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:317 -#: 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:184 -#: sales/inquiry/sales_orders_view.php:265 -#: sales/inquiry/sales_orders_view.php:279 +#: ../reporting/rep105.php:109 +#: ../reporting/rep106.php:83 +#: ../reporting/rep112.php:175 +#: ../sales/create_recurrent_invoices.php:134 +#: ../sales/customer_credit_invoice.php:236 - #: ../sales/customer_delivery.php:353 ++#: ../sales/customer_delivery.php:363 +#: ../sales/customer_invoice.php:456 +#: ../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:207 - #: ../sales/inquiry/sales_deliveries_view.php:182 ++#: ../sales/inquiry/sales_deliveries_view.php:184 +#: ../sales/inquiry/sales_orders_view.php:288 +#: ../sales/inquiry/sales_orders_view.php:302 msgid "Branch" msgstr "" @@@ -12047,10 -10495,8 +12089,10 @@@ msgstr " msgid "Loc" msgstr "" -#: reporting/rep105.php:114 sales/customer_delivery.php:410 -#: sales/customer_invoice.php:478 sales/includes/ui/sales_order_ui.inc:144 +#: ../reporting/rep105.php:114 - #: ../sales/customer_delivery.php:446 ++#: ../sales/customer_delivery.php:456 +#: ../sales/customer_invoice.php:553 - #: ../sales/includes/ui/sales_order_ui.inc:146 ++#: ../sales/includes/ui/sales_order_ui.inc:147 msgid "Delivered" msgstr "" @@@ -12094,44 -10535,16 +12136,44 @@@ msgstr " msgid "INVOICE" msgstr "" -#: reporting/rep107.php:153 reporting/rep109.php:152 reporting/rep110.php:162 -#: reporting/rep111.php:155 reporting/rep113.php:147 -#: sales/view/view_credit.php:138 sales/view/view_dispatch.php:155 -#: sales/view/view_invoice.php:157 sales/view/view_sales_order.php:227 -#: sales/includes/ui/sales_credit_ui.inc:222 +#: ../reporting/rep107.php:196 +msgid "Prepayments invoiced to this order up to day:" +msgstr "" + +#: ../reporting/rep107.php:203 +msgid "Invoice reference" +msgstr "" + +#: ../reporting/rep107.php:220 +msgid "Total payments:" +msgstr "" + +#: ../reporting/rep107.php:234 +#: ../reporting/rep109.php:158 +#: ../reporting/rep110.php:162 - #: ../reporting/rep111.php:137 ++#: ../reporting/rep111.php:155 +#: ../reporting/rep113.php:147 +#: ../sales/view/view_credit.php:138 +#: ../sales/view/view_dispatch.php:155 +#: ../sales/view/view_invoice.php:159 +#: ../sales/view/view_sales_order.php:245 +#: ../sales/includes/ui/sales_credit_ui.inc:222 msgid "Shipping" msgstr "" -#: reporting/rep108.php:85 reporting/rep108.php:110 -#: reporting/includes/doctext.inc:216 +#: ../reporting/rep107.php:280 +#: ../reporting/rep109.php:210 - #: ../reporting/rep111.php:189 ++#: ../reporting/rep111.php:207 +msgid "TOTAL ORDER VAT INCL." +msgstr "" + +#: ../reporting/rep107.php:286 +msgid "THIS INVOICE" +msgstr "" + +#: ../reporting/rep108.php:85 +#: ../reporting/rep108.php:110 +#: ../reporting/includes/doctext.inc:238 msgid "STATEMENT" msgstr "" @@@ -12161,8 -10570,7 +12203,8 @@@ msgstr " msgid "QUOTE" msgstr "" -#: reporting/rep109.php:158 reporting/rep111.php:161 +#: ../reporting/rep109.php:164 - #: ../reporting/rep111.php:143 ++#: ../reporting/rep111.php:161 msgid "TOTAL ORDER EX VAT" msgstr "" @@@ -12185,8 -10595,7 +12227,8 @@@ msgstr " msgid "TOTAL DELIVERY INCL. VAT" msgstr "" - #: ../reporting/rep111.php:60 -#: reporting/rep111.php:64 reporting/includes/doctext.inc:38 ++#: ../reporting/rep111.php:64 +#: ../reporting/includes/doctext.inc:50 msgid "SALES QUOTATION" msgstr "" @@@ -12248,9 -10652,7 +12290,9 @@@ msgstr " msgid "Total ex. Tax" msgstr "" -#: reporting/rep114.php:95 reporting/rep709.php:117 taxes/tax_groups.php:177 +#: ../reporting/rep114.php:95 - #: ../reporting/rep709.php:112 ++#: ../reporting/rep709.php:117 +#: ../taxes/tax_groups.php:171 msgid "Tax" msgstr "" @@@ -12326,7 -10726,7 +12368,7 @@@ msgstr " msgid "TOTAL REMITTANCE" msgstr "" - #: ../reporting/rep301.php:114 -#: reporting/rep301.php:178 ++#: ../reporting/rep301.php:178 msgid "Inventory Valuation Report" msgstr "" @@@ -12435,29 -10828,28 +12477,29 @@@ msgstr " msgid "Inventory Movements" msgstr "" - #: ../reporting/rep308.php:149 -#: reporting/rep308.php:230 ++#: ../reporting/rep308.php:230 msgid "OpeningStock" msgstr "" - #: ../reporting/rep308.php:149 -#: reporting/rep308.php:230 ++#: ../reporting/rep308.php:230 msgid "StockIn" msgstr "" - #: ../reporting/rep308.php:149 -#: reporting/rep308.php:230 ++#: ../reporting/rep308.php:230 msgid "ClosingStock" msgstr "" - #: ../reporting/rep308.php:150 -#: reporting/rep308.php:231 ++#: ../reporting/rep308.php:231 msgid "QTY" msgstr "" - #: ../reporting/rep308.php:150 - #: ../reporting/rep709.php:112 -#: reporting/rep308.php:231 reporting/rep709.php:117 -#: taxes/item_tax_types.php:185 ++#: ../reporting/rep308.php:231 ++#: ../reporting/rep709.php:117 +#: ../taxes/item_tax_types.php:185 msgid "Rate" msgstr "" - #: ../reporting/rep308.php:159 -#: reporting/rep308.php:240 ++#: ../reporting/rep308.php:240 msgid "Costed Inventory Movements" msgstr "" @@@ -12485,9 -10877,16 +12527,17 @@@ msgstr " msgid "Bill of Material Listing" msgstr "" -#: reporting/rep402.php:110 ++#: ../reporting/rep402.php:110 + msgid "Open Only" + msgstr "" + -#: reporting/rep402.php:112 ++#: ../reporting/rep402.php:112 + msgid "Work Order Listing" + msgstr "" + -#: reporting/rep409.php:60 reporting/rep409.php:73 -#: reporting/includes/doctext.inc:192 +#: ../reporting/rep409.php:59 +#: ../reporting/rep409.php:72 +#: ../reporting/includes/doctext.inc:214 msgid "WORK ORDER" msgstr "" @@@ -12555,12 -10934,9 +12605,12 @@@ msgstr " msgid "GL Account Transactions" msgstr "" -#: reporting/rep705.php:247 reporting/rep705.php:260 reporting/rep705.php:271 -#: reporting/reports_main.php:354 reporting/reports_main.php:407 -#: reporting/reports_main.php:455 +#: ../reporting/rep705.php:247 +#: ../reporting/rep705.php:260 +#: ../reporting/rep705.php:271 - #: ../reporting/reports_main.php:353 - #: ../reporting/reports_main.php:406 - #: ../reporting/reports_main.php:454 ++#: ../reporting/reports_main.php:360 ++#: ../reporting/reports_main.php:413 ++#: ../reporting/reports_main.php:461 msgid "Year" msgstr "" @@@ -12594,23 -10962,23 +12644,23 @@@ msgstr " msgid "Profit and Loss Statement" msgstr "" - #: ../reporting/rep709.php:93 -#: reporting/rep709.php:98 ++#: ../reporting/rep709.php:98 msgid "Tax Report" msgstr "" - #: ../reporting/rep709.php:111 -#: reporting/rep709.php:116 ++#: ../reporting/rep709.php:116 msgid "Branch Name" msgstr "" - #: ../reporting/rep709.php:112 -#: reporting/rep709.php:117 ++#: ../reporting/rep709.php:117 msgid "Net" msgstr "" - #: ../reporting/rep709.php:183 -#: reporting/rep709.php:188 ++#: ../reporting/rep709.php:188 msgid "Tax Rate" msgstr "" - #: ../reporting/rep709.php:183 -#: reporting/rep709.php:188 ++#: ../reporting/rep709.php:188 msgid "Net Tax" msgstr "" @@@ -12626,8 -10994,7 +12676,8 @@@ msgstr " msgid "Action" msgstr "" -#: reporting/rep710.php:89 reporting/reports_main.php:495 +#: ../reporting/rep710.php:89 - #: ../reporting/reports_main.php:494 ++#: ../reporting/reports_main.php:501 msgid "Audit Trail" msgstr "" @@@ -12643,9 -11010,8 +12693,9 @@@ msgstr " msgid "Customer &Balances" msgstr "" -#: reporting/reports_main.php:37 reporting/reports_main.php:154 -#: reporting/reports_main.php:307 +#: ../reporting/reports_main.php:37 +#: ../reporting/reports_main.php:154 - #: ../reporting/reports_main.php:300 ++#: ../reporting/reports_main.php:307 msgid "Show Balance" msgstr "" @@@ -12666,106 -11025,58 +12716,108 @@@ msgid "Currency Filter" msgstr "" -#: reporting/reports_main.php:41 reporting/reports_main.php:52 -#: reporting/reports_main.php:61 reporting/reports_main.php:68 -#: reporting/reports_main.php:77 reporting/reports_main.php:86 -#: reporting/reports_main.php:93 reporting/reports_main.php:103 -#: reporting/reports_main.php:112 reporting/reports_main.php:119 -#: reporting/reports_main.php:126 reporting/reports_main.php:134 -#: reporting/reports_main.php:141 reporting/reports_main.php:147 -#: reporting/reports_main.php:158 reporting/reports_main.php:169 -#: reporting/reports_main.php:177 reporting/reports_main.php:182 -#: reporting/reports_main.php:189 reporting/reports_main.php:197 -#: reporting/reports_main.php:204 reporting/reports_main.php:213 -#: reporting/reports_main.php:219 reporting/reports_main.php:230 -#: reporting/reports_main.php:239 reporting/reports_main.php:245 -#: reporting/reports_main.php:255 reporting/reports_main.php:263 -#: reporting/reports_main.php:271 reporting/reports_main.php:278 -#: reporting/reports_main.php:286 reporting/reports_main.php:293 -#: reporting/reports_main.php:300 reporting/reports_main.php:309 -#: reporting/reports_main.php:322 reporting/reports_main.php:329 -#: reporting/reports_main.php:336 reporting/reports_main.php:351 -#: reporting/reports_main.php:359 reporting/reports_main.php:370 -#: reporting/reports_main.php:382 reporting/reports_main.php:392 -#: reporting/reports_main.php:404 reporting/reports_main.php:411 -#: reporting/reports_main.php:421 reporting/reports_main.php:432 -#: reporting/reports_main.php:441 reporting/reports_main.php:452 -#: reporting/reports_main.php:458 reporting/reports_main.php:467 -#: reporting/reports_main.php:477 reporting/reports_main.php:485 -#: reporting/reports_main.php:493 reporting/reports_main.php:501 +#: ../reporting/reports_main.php:41 +#: ../reporting/reports_main.php:52 +#: ../reporting/reports_main.php:61 +#: ../reporting/reports_main.php:68 +#: ../reporting/reports_main.php:77 +#: ../reporting/reports_main.php:86 +#: ../reporting/reports_main.php:93 +#: ../reporting/reports_main.php:103 +#: ../reporting/reports_main.php:112 +#: ../reporting/reports_main.php:119 +#: ../reporting/reports_main.php:126 +#: ../reporting/reports_main.php:134 +#: ../reporting/reports_main.php:141 +#: ../reporting/reports_main.php:147 +#: ../reporting/reports_main.php:158 +#: ../reporting/reports_main.php:169 +#: ../reporting/reports_main.php:177 +#: ../reporting/reports_main.php:182 +#: ../reporting/reports_main.php:189 +#: ../reporting/reports_main.php:197 +#: ../reporting/reports_main.php:204 +#: ../reporting/reports_main.php:213 +#: ../reporting/reports_main.php:219 +#: ../reporting/reports_main.php:230 +#: ../reporting/reports_main.php:239 +#: ../reporting/reports_main.php:245 +#: ../reporting/reports_main.php:255 +#: ../reporting/reports_main.php:263 +#: ../reporting/reports_main.php:271 +#: ../reporting/reports_main.php:278 +#: ../reporting/reports_main.php:286 +#: ../reporting/reports_main.php:293 - #: ../reporting/reports_main.php:302 - #: ../reporting/reports_main.php:315 - #: ../reporting/reports_main.php:328 ++#: ../reporting/reports_main.php:300 ++#: ../reporting/reports_main.php:309 ++#: ../reporting/reports_main.php:322 +#: ../reporting/reports_main.php:335 - #: ../reporting/reports_main.php:350 - #: ../reporting/reports_main.php:358 - #: ../reporting/reports_main.php:369 - #: ../reporting/reports_main.php:381 - #: ../reporting/reports_main.php:391 - #: ../reporting/reports_main.php:403 ++#: ../reporting/reports_main.php:342 ++#: ../reporting/reports_main.php:357 ++#: ../reporting/reports_main.php:365 ++#: ../reporting/reports_main.php:376 ++#: ../reporting/reports_main.php:388 ++#: ../reporting/reports_main.php:398 +#: ../reporting/reports_main.php:410 - #: ../reporting/reports_main.php:420 - #: ../reporting/reports_main.php:431 - #: ../reporting/reports_main.php:440 - #: ../reporting/reports_main.php:451 - #: ../reporting/reports_main.php:457 - #: ../reporting/reports_main.php:466 - #: ../reporting/reports_main.php:476 - #: ../reporting/reports_main.php:484 - #: ../reporting/reports_main.php:492 - #: ../reporting/reports_main.php:500 ++#: ../reporting/reports_main.php:417 ++#: ../reporting/reports_main.php:427 ++#: ../reporting/reports_main.php:438 ++#: ../reporting/reports_main.php:447 ++#: ../reporting/reports_main.php:458 ++#: ../reporting/reports_main.php:464 ++#: ../reporting/reports_main.php:473 ++#: ../reporting/reports_main.php:483 ++#: ../reporting/reports_main.php:491 ++#: ../reporting/reports_main.php:499 ++#: ../reporting/reports_main.php:507 msgid "Orientation" msgstr "" -#: reporting/reports_main.php:42 reporting/reports_main.php:53 -#: reporting/reports_main.php:62 reporting/reports_main.php:69 -#: reporting/reports_main.php:78 reporting/reports_main.php:87 -#: reporting/reports_main.php:94 reporting/reports_main.php:159 -#: reporting/reports_main.php:170 reporting/reports_main.php:178 -#: reporting/reports_main.php:183 reporting/reports_main.php:190 -#: reporting/reports_main.php:214 reporting/reports_main.php:220 -#: reporting/reports_main.php:231 reporting/reports_main.php:240 -#: reporting/reports_main.php:246 reporting/reports_main.php:256 -#: reporting/reports_main.php:264 reporting/reports_main.php:272 -#: reporting/reports_main.php:279 reporting/reports_main.php:287 -#: reporting/reports_main.php:294 reporting/reports_main.php:310 -#: reporting/reports_main.php:323 reporting/reports_main.php:330 -#: reporting/reports_main.php:337 reporting/reports_main.php:352 -#: reporting/reports_main.php:360 reporting/reports_main.php:371 -#: reporting/reports_main.php:383 reporting/reports_main.php:393 -#: reporting/reports_main.php:405 reporting/reports_main.php:412 -#: reporting/reports_main.php:422 reporting/reports_main.php:433 -#: reporting/reports_main.php:442 reporting/reports_main.php:453 -#: reporting/reports_main.php:459 reporting/reports_main.php:468 -#: reporting/reports_main.php:478 reporting/reports_main.php:486 -#: reporting/reports_main.php:494 reporting/reports_main.php:502 +#: ../reporting/reports_main.php:42 +#: ../reporting/reports_main.php:53 +#: ../reporting/reports_main.php:62 +#: ../reporting/reports_main.php:69 +#: ../reporting/reports_main.php:78 +#: ../reporting/reports_main.php:87 +#: ../reporting/reports_main.php:94 +#: ../reporting/reports_main.php:159 +#: ../reporting/reports_main.php:170 +#: ../reporting/reports_main.php:178 +#: ../reporting/reports_main.php:183 +#: ../reporting/reports_main.php:190 +#: ../reporting/reports_main.php:214 +#: ../reporting/reports_main.php:220 +#: ../reporting/reports_main.php:231 +#: ../reporting/reports_main.php:240 +#: ../reporting/reports_main.php:246 +#: ../reporting/reports_main.php:256 +#: ../reporting/reports_main.php:264 +#: ../reporting/reports_main.php:272 +#: ../reporting/reports_main.php:279 +#: ../reporting/reports_main.php:287 - #: ../reporting/reports_main.php:303 - #: ../reporting/reports_main.php:316 - #: ../reporting/reports_main.php:322 ++#: ../reporting/reports_main.php:294 ++#: ../reporting/reports_main.php:310 ++#: ../reporting/reports_main.php:323 +#: ../reporting/reports_main.php:329 +#: ../reporting/reports_main.php:336 - #: ../reporting/reports_main.php:351 - #: ../reporting/reports_main.php:359 - #: ../reporting/reports_main.php:370 - #: ../reporting/reports_main.php:382 - #: ../reporting/reports_main.php:392 - #: ../reporting/reports_main.php:404 ++#: ../reporting/reports_main.php:343 ++#: ../reporting/reports_main.php:358 ++#: ../reporting/reports_main.php:366 ++#: ../reporting/reports_main.php:377 ++#: ../reporting/reports_main.php:389 ++#: ../reporting/reports_main.php:399 +#: ../reporting/reports_main.php:411 - #: ../reporting/reports_main.php:421 - #: ../reporting/reports_main.php:432 - #: ../reporting/reports_main.php:441 - #: ../reporting/reports_main.php:452 - #: ../reporting/reports_main.php:458 - #: ../reporting/reports_main.php:467 - #: ../reporting/reports_main.php:477 - #: ../reporting/reports_main.php:485 - #: ../reporting/reports_main.php:493 - #: ../reporting/reports_main.php:501 ++#: ../reporting/reports_main.php:418 ++#: ../reporting/reports_main.php:428 ++#: ../reporting/reports_main.php:439 ++#: ../reporting/reports_main.php:448 ++#: ../reporting/reports_main.php:459 ++#: ../reporting/reports_main.php:465 ++#: ../reporting/reports_main.php:474 ++#: ../reporting/reports_main.php:484 ++#: ../reporting/reports_main.php:492 ++#: ../reporting/reports_main.php:500 ++#: ../reporting/reports_main.php:508 msgid "Destination" msgstr "" @@@ -12773,14 -11084,10 +12825,14 @@@ msgid "&Aged Customer Analysis" msgstr "" -#: reporting/reports_main.php:50 reporting/reports_main.php:167 -#: reporting/reports_main.php:368 reporting/reports_main.php:380 -#: reporting/reports_main.php:419 reporting/reports_main.php:430 -#: reporting/reports_main.php:465 reporting/reports_main.php:475 +#: ../reporting/reports_main.php:50 +#: ../reporting/reports_main.php:167 - #: ../reporting/reports_main.php:367 - #: ../reporting/reports_main.php:379 - #: ../reporting/reports_main.php:418 - #: ../reporting/reports_main.php:429 - #: ../reporting/reports_main.php:464 - #: ../reporting/reports_main.php:474 ++#: ../reporting/reports_main.php:374 ++#: ../reporting/reports_main.php:386 ++#: ../reporting/reports_main.php:425 ++#: ../reporting/reports_main.php:436 ++#: ../reporting/reports_main.php:471 ++#: ../reporting/reports_main.php:481 msgid "Graphics" msgstr "" @@@ -12991,107 -11285,100 +13043,115 @@@ msgstr " msgid "To product" msgstr "" -#: reporting/reports_main.php:288 +#: ../reporting/reports_main.php:288 - msgid "Print &Work Orders" + msgid "Work Order &Listing" msgstr "" -#: reporting/reports_main.php:291 +#: ../reporting/reports_main.php:291 + msgid "Outstanding Only" + msgstr "" + -#: reporting/reports_main.php:295 ++#: ../reporting/reports_main.php:295 + msgid "Print &Work Orders" + msgstr "" + -#: reporting/reports_main.php:298 ++#: ../reporting/reports_main.php:298 msgid "Email Locations" msgstr "" - #: ../reporting/reports_main.php:297 -#: reporting/reports_main.php:304 ++#: ../reporting/reports_main.php:304 msgid "Dimension &Summary" msgstr "" - #: ../reporting/reports_main.php:298 -#: reporting/reports_main.php:305 ++#: ../reporting/reports_main.php:305 msgid "From Dimension" msgstr "" - #: ../reporting/reports_main.php:299 -#: reporting/reports_main.php:306 ++#: ../reporting/reports_main.php:306 msgid "To Dimension" msgstr "" - #: ../reporting/reports_main.php:308 -#: reporting/reports_main.php:315 ++#: ../reporting/reports_main.php:315 msgid "Banking" msgstr "" - #: ../reporting/reports_main.php:309 -#: reporting/reports_main.php:316 ++#: ../reporting/reports_main.php:316 msgid "Bank &Statement" msgstr "" - #: ../reporting/reports_main.php:313 - #: ../reporting/reports_main.php:386 - #: ../reporting/reports_main.php:436 - #: ../reporting/reports_main.php:481 -#: reporting/reports_main.php:320 reporting/reports_main.php:387 -#: reporting/reports_main.php:437 reporting/reports_main.php:482 ++#: ../reporting/reports_main.php:320 ++#: ../reporting/reports_main.php:393 ++#: ../reporting/reports_main.php:443 ++#: ../reporting/reports_main.php:488 msgid "Zero values" msgstr "" - #: ../reporting/reports_main.php:317 -#: reporting/reports_main.php:325 ++#: ../reporting/reports_main.php:324 +msgid "Bank Statement w/ &Reconcile" +msgstr "" + - #: ../reporting/reports_main.php:324 ++#: ../reporting/reports_main.php:331 msgid "General Ledger" msgstr "" - #: ../reporting/reports_main.php:325 -#: reporting/reports_main.php:326 ++#: ../reporting/reports_main.php:332 msgid "Chart of &Accounts" msgstr "" - #: ../reporting/reports_main.php:326 -#: reporting/reports_main.php:327 ++#: ../reporting/reports_main.php:333 msgid "Show Balances" msgstr "" - #: ../reporting/reports_main.php:330 -#: reporting/reports_main.php:331 ++#: ../reporting/reports_main.php:337 msgid "List of &Journal Entries" msgstr "" - #: ../reporting/reports_main.php:342 - #: ../reporting/reports_main.php:396 - #: ../reporting/reports_main.php:445 -#: reporting/reports_main.php:343 reporting/reports_main.php:397 -#: reporting/reports_main.php:446 ++#: ../reporting/reports_main.php:349 ++#: ../reporting/reports_main.php:403 ++#: ../reporting/reports_main.php:452 msgid "GL Account &Transactions" msgstr "" - #: ../reporting/reports_main.php:345 - #: ../reporting/reports_main.php:399 - #: ../reporting/reports_main.php:448 -#: reporting/reports_main.php:346 reporting/reports_main.php:400 -#: reporting/reports_main.php:449 ++#: ../reporting/reports_main.php:352 ++#: ../reporting/reports_main.php:406 ++#: ../reporting/reports_main.php:455 msgid "From Account" msgstr "" - #: ../reporting/reports_main.php:346 - #: ../reporting/reports_main.php:400 - #: ../reporting/reports_main.php:449 -#: reporting/reports_main.php:347 reporting/reports_main.php:401 -#: reporting/reports_main.php:450 ++#: ../reporting/reports_main.php:353 ++#: ../reporting/reports_main.php:407 ++#: ../reporting/reports_main.php:456 msgid "To Account" msgstr "" - #: ../reporting/reports_main.php:352 - #: ../reporting/reports_main.php:405 - #: ../reporting/reports_main.php:453 -#: reporting/reports_main.php:353 reporting/reports_main.php:406 -#: reporting/reports_main.php:454 ++#: ../reporting/reports_main.php:359 ++#: ../reporting/reports_main.php:412 ++#: ../reporting/reports_main.php:460 msgid "Annual &Expense Breakdown" msgstr "" - #: ../reporting/reports_main.php:360 - #: ../reporting/reports_main.php:412 - #: ../reporting/reports_main.php:459 -#: reporting/reports_main.php:361 reporting/reports_main.php:413 -#: reporting/reports_main.php:460 ++#: ../reporting/reports_main.php:367 ++#: ../reporting/reports_main.php:419 ++#: ../reporting/reports_main.php:466 msgid "&Balance Sheet" msgstr "" - #: ../reporting/reports_main.php:366 - #: ../reporting/reports_main.php:378 - #: ../reporting/reports_main.php:417 - #: ../reporting/reports_main.php:428 - #: ../reporting/reports_main.php:463 - #: ../reporting/reports_main.php:473 -#: reporting/reports_main.php:367 reporting/reports_main.php:379 -#: reporting/reports_main.php:418 reporting/reports_main.php:429 -#: reporting/reports_main.php:464 reporting/reports_main.php:474 ++#: ../reporting/reports_main.php:373 ++#: ../reporting/reports_main.php:385 ++#: ../reporting/reports_main.php:424 ++#: ../reporting/reports_main.php:435 ++#: ../reporting/reports_main.php:470 ++#: ../reporting/reports_main.php:480 msgid "Decimal values" msgstr "" - #: ../reporting/reports_main.php:371 - #: ../reporting/reports_main.php:422 - #: ../reporting/reports_main.php:468 -#: reporting/reports_main.php:372 reporting/reports_main.php:423 -#: reporting/reports_main.php:469 ++#: ../reporting/reports_main.php:378 ++#: ../reporting/reports_main.php:429 ++#: ../reporting/reports_main.php:475 msgid "&Profit and Loss Statement" msgstr "" - #: ../reporting/reports_main.php:487 -#: reporting/reports_main.php:488 ++#: ../reporting/reports_main.php:494 msgid "Ta&x Report" msgstr "" @@@ -13107,13 -11391,10 +13167,13 @@@ msgstr " msgid "Delivered To" msgstr "" -#: reporting/includes/doctext.inc:30 sales/customer_credit_invoice.php:281 -#: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113 -#: sales/view/view_invoice.php:114 sales/includes/ui/sales_credit_ui.inc:168 -#: sales/includes/ui/sales_order_ui.inc:145 +#: ../reporting/includes/doctext.inc:30 +#: ../sales/customer_credit_invoice.php:281 +#: ../sales/view/view_credit.php:91 +#: ../sales/view/view_dispatch.php:113 +#: ../sales/view/view_invoice.php:116 +#: ../sales/includes/ui/sales_credit_ui.inc:168 - #: ../sales/includes/ui/sales_order_ui.inc:147 ++#: ../sales/includes/ui/sales_order_ui.inc:148 msgid "Discount %" msgstr "" @@@ -13164,10 -11433,9 +13224,10 @@@ msgstr " msgid "Our Quotation No" msgstr "" -#: reporting/includes/doctext.inc:48 sales/view/view_sales_order.php:69 -#: sales/inquiry/sales_orders_view.php:282 -#: sales/includes/ui/sales_order_ui.inc:594 +#: ../reporting/includes/doctext.inc:60 +#: ../sales/view/view_sales_order.php:69 +#: ../sales/inquiry/sales_orders_view.php:305 - #: ../sales/includes/ui/sales_order_ui.inc:612 ++#: ../sales/includes/ui/sales_order_ui.inc:597 msgid "Valid until" msgstr "" @@@ -13302,18 -11543,16 +13362,18 @@@ msgstr " msgid "Generated By" msgstr "" - #: ../reporting/includes/header2.inc:122 -#: reporting/includes/header2.inc:125 ++#: ../reporting/includes/header2.inc:125 msgid "Our VAT No." msgstr "" - #: ../reporting/includes/header2.inc:128 -#: reporting/includes/header2.inc:131 ++#: ../reporting/includes/header2.inc:131 msgid "Domicile" msgstr "" - #: ../reporting/includes/header2.inc:143 -#: reporting/includes/header2.inc:146 reporting/includes/pdf_report.inc:352 -#: reporting/includes/pdf_report.inc:501 reporting/includes/pdf_report.inc:628 ++#: ../reporting/includes/header2.inc:146 +#: ../reporting/includes/pdf_report.inc:352 +#: ../reporting/includes/pdf_report.inc:501 +#: ../reporting/includes/pdf_report.inc:628 msgid "Page" msgstr "" @@@ -13396,90 -11635,90 +13456,90 @@@ msgstr " msgid "Display: " msgstr "" - #: ../reporting/includes/reports_classes.inc:149 -#: reporting/includes/reports_classes.inc:152 ++#: ../reporting/includes/reports_classes.inc:152 msgid "Unknown report parameter type:" msgstr "" - #: ../reporting/includes/reports_classes.inc:175 -#: reporting/includes/reports_classes.inc:178 ++#: ../reporting/includes/reports_classes.inc:178 msgid "No Currency Filter" msgstr "" - #: ../reporting/includes/reports_classes.inc:231 -#: reporting/includes/reports_classes.inc:234 ++#: ../reporting/includes/reports_classes.inc:234 msgid "PDF/Printer" msgstr "" - #: ../reporting/includes/reports_classes.inc:238 -#: reporting/includes/reports_classes.inc:241 ++#: ../reporting/includes/reports_classes.inc:241 msgid "Portrait" msgstr "" - #: ../reporting/includes/reports_classes.inc:238 -#: reporting/includes/reports_classes.inc:241 ++#: ../reporting/includes/reports_classes.inc:241 msgid "Landscape" msgstr "" - #: ../reporting/includes/reports_classes.inc:249 -#: reporting/includes/reports_classes.inc:252 ++#: ../reporting/includes/reports_classes.inc:252 msgid "No Graphics" msgstr "" - #: ../reporting/includes/reports_classes.inc:249 -#: reporting/includes/reports_classes.inc:252 ++#: ../reporting/includes/reports_classes.inc:252 msgid "Vertical bars" msgstr "" - #: ../reporting/includes/reports_classes.inc:249 -#: reporting/includes/reports_classes.inc:252 ++#: ../reporting/includes/reports_classes.inc:252 msgid "Horizontal bars" msgstr "" - #: ../reporting/includes/reports_classes.inc:250 -#: reporting/includes/reports_classes.inc:253 ++#: ../reporting/includes/reports_classes.inc:253 msgid "Dots" msgstr "" - #: ../reporting/includes/reports_classes.inc:250 -#: reporting/includes/reports_classes.inc:253 ++#: ../reporting/includes/reports_classes.inc:253 msgid "Lines" msgstr "" - #: ../reporting/includes/reports_classes.inc:250 -#: reporting/includes/reports_classes.inc:253 ++#: ../reporting/includes/reports_classes.inc:253 msgid "Pie" msgstr "" - #: ../reporting/includes/reports_classes.inc:250 -#: reporting/includes/reports_classes.inc:253 ++#: ../reporting/includes/reports_classes.inc:253 msgid "Donut" msgstr "" - #: ../reporting/includes/reports_classes.inc:254 -#: reporting/includes/reports_classes.inc:257 -#: reporting/includes/reports_classes.inc:260 +#: ../reporting/includes/reports_classes.inc:257 ++#: ../reporting/includes/reports_classes.inc:260 msgid "No Type Filter" msgstr "" - #: ../reporting/includes/reports_classes.inc:267 -#: reporting/includes/reports_classes.inc:270 ++#: ../reporting/includes/reports_classes.inc:270 msgid "No Account Group Filter" msgstr "" - #: ../reporting/includes/reports_classes.inc:282 - #: ../reporting/includes/reports_classes.inc:288 - #: ../reporting/includes/reports_classes.inc:294 -#: reporting/includes/reports_classes.inc:285 -#: reporting/includes/reports_classes.inc:291 -#: reporting/includes/reports_classes.inc:297 ++#: ../reporting/includes/reports_classes.inc:285 ++#: ../reporting/includes/reports_classes.inc:291 ++#: ../reporting/includes/reports_classes.inc:297 msgid "No Dimension Filter" msgstr "" - #: ../reporting/includes/reports_classes.inc:300 -#: reporting/includes/reports_classes.inc:303 ++#: ../reporting/includes/reports_classes.inc:303 msgid "No Customer Filter" msgstr "" - #: ../reporting/includes/reports_classes.inc:308 -#: reporting/includes/reports_classes.inc:311 ++#: ../reporting/includes/reports_classes.inc:311 msgid "No Supplier Filter" msgstr "" - #: ../reporting/includes/reports_classes.inc:393 -#: reporting/includes/reports_classes.inc:399 ++#: ../reporting/includes/reports_classes.inc:399 msgid "No Location Filter" msgstr "" - #: ../reporting/includes/reports_classes.inc:396 -#: reporting/includes/reports_classes.inc:402 ++#: ../reporting/includes/reports_classes.inc:402 msgid "No Category Filter" msgstr "" - #: ../reporting/includes/reports_classes.inc:405 -#: reporting/includes/reports_classes.inc:411 ++#: ../reporting/includes/reports_classes.inc:411 msgid "No Sales Folk Filter" msgstr "" - #: ../reporting/includes/reports_classes.inc:412 -#: reporting/includes/reports_classes.inc:418 ++#: ../reporting/includes/reports_classes.inc:418 msgid "No Users Filter" msgstr "" @@@ -13549,8 -11788,7 +13609,8 @@@ msgstr " msgid "Modifying Customer Credit Note #%d" msgstr "" -#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:683 +#: ../sales/credit_note_entry.php:51 - #: ../sales/sales_order_entry.php:704 ++#: ../sales/sales_order_entry.php:705 msgid "" "There are no customers, or there are no customers with branches. Please " "define customers and customer branches." @@@ -13848,85 -12062,76 +13908,89 @@@ msgstr " msgid "There are no item quantities on this delivery note." msgstr "" - #: ../sales/customer_delivery.php:297 - #: ../sales/sales_order_entry.php:532 - #: ../sales/includes/ui/sales_order_ui.inc:251 -#: sales/customer_delivery.php:194 ++#: ../sales/customer_delivery.php:206 + msgid "" + "This document cannot be processed because there is insufficient quantity " + "for: " + msgstr "" + -#: sales/customer_delivery.php:331 ++#: ../sales/customer_delivery.php:305 +msgid "" +"The delivery cannot be processed because there is an insufficient quantity " +"for item:" +msgstr "" + - #: ../sales/customer_delivery.php:367 ++#: ../sales/customer_delivery.php:377 msgid "For Sales Order" msgstr "" - #: ../sales/customer_delivery.php:376 -#: sales/customer_delivery.php:340 ++#: ../sales/customer_delivery.php:386 msgid "Delivery From" msgstr "" - #: ../sales/customer_delivery.php:425 -#: sales/customer_delivery.php:389 ++#: ../sales/customer_delivery.php:435 msgid "Invoice Dead-line" msgstr "" - #: ../sales/customer_delivery.php:435 -#: sales/customer_delivery.php:399 sales/customer_invoice.php:468 -#: sales/includes/ui/sales_order_ui.inc:84 -#: sales/includes/ui/sales_order_ui.inc:357 ++#: ../sales/customer_delivery.php:445 +#: ../sales/customer_invoice.php:539 +#: ../sales/includes/ui/sales_order_ui.inc:84 - #: ../sales/includes/ui/sales_order_ui.inc:375 ++#: ../sales/includes/ui/sales_order_ui.inc:360 msgid "" "The selected customer account is currently on hold. Please contact the " "credit control personnel to discuss." msgstr "" - #: ../sales/customer_delivery.php:440 -#: sales/customer_delivery.php:404 ++#: ../sales/customer_delivery.php:450 msgid "Delivery Items" msgstr "" - #: ../sales/customer_delivery.php:446 -#: sales/customer_delivery.php:410 ++#: ../sales/customer_delivery.php:456 msgid "Max. delivery" msgstr "" - #: ../sales/customer_delivery.php:446 -#: sales/customer_delivery.php:410 sales/customer_invoice.php:478 ++#: ../sales/customer_delivery.php:456 +#: ../sales/customer_invoice.php:553 msgid "Invoiced" msgstr "" - #: ../sales/customer_delivery.php:517 -#: sales/customer_delivery.php:487 sales/customer_invoice.php:563 ++#: ../sales/customer_delivery.php:533 +#: ../sales/customer_invoice.php:642 msgid "Shipping Cost" msgstr "" - #: ../sales/customer_delivery.php:537 - #: ../sales/includes/ui/sales_order_ui.inc:249 -#: sales/customer_delivery.php:507 sales/includes/ui/sales_order_ui.inc:234 ++#: ../sales/customer_delivery.php:553 ++#: ../sales/includes/ui/sales_order_ui.inc:237 msgid "" "Marked items have insufficient quantities in stock as on day of delivery." msgstr "" - #: ../sales/customer_delivery.php:541 -#: sales/customer_delivery.php:511 ++#: ../sales/customer_delivery.php:557 msgid "Action For Balance" msgstr "" - #: ../sales/customer_delivery.php:548 - #: ../sales/customer_delivery.php:550 - #: ../sales/customer_delivery.php:553 -#: sales/customer_delivery.php:518 sales/customer_delivery.php:520 -#: sales/customer_delivery.php:523 sales/customer_invoice.php:592 ++#: ../sales/customer_delivery.php:564 ++#: ../sales/customer_delivery.php:566 ++#: ../sales/customer_delivery.php:569 +#: ../sales/customer_invoice.php:694 msgid "Refresh document page" msgstr "" - #: ../sales/customer_delivery.php:550 -#: sales/customer_delivery.php:520 ++#: ../sales/customer_delivery.php:566 msgid "Reset quantity" msgstr "" - #: ../sales/customer_delivery.php:553 -#: sales/customer_delivery.php:523 ++#: ../sales/customer_delivery.php:569 msgid "Clear quantity" msgstr "" - #: ../sales/customer_delivery.php:555 -#: sales/customer_delivery.php:525 ++#: ../sales/customer_delivery.php:571 msgid "Process Dispatch" msgstr "" - #: ../sales/customer_delivery.php:556 -#: sales/customer_delivery.php:526 sales/customer_invoice.php:594 -#: sales/sales_order_entry.php:731 ++#: ../sales/customer_delivery.php:572 +#: ../sales/customer_invoice.php:696 - #: ../sales/sales_order_entry.php:751 ++#: ../sales/sales_order_entry.php:752 msgid "Check entered data and save document" msgstr "" @@@ -14050,12 -12246,12 +14114,12 @@@ msgstr " msgid "Payment terms:" msgstr "" -#: sales/customer_invoice.php:397 sales/includes/ui/sales_order_ui.inc:393 -#: sales/includes/ui/sales_order_ui.inc:397 -msgid "Payment:" +#: ../sales/customer_invoice.php:545 - #: ../sales/sales_order_entry.php:727 ++#: ../sales/sales_order_entry.php:728 +msgid "Sales Order Items" msgstr "" -#: sales/customer_invoice.php:474 +#: ../sales/customer_invoice.php:545 msgid "Invoice Items" msgstr "" @@@ -14134,13 -12311,11 +14198,13 @@@ msgstr " msgid "Select Another Customer Payment for &Edition" msgstr "" -#: sales/customer_payments.php:139 sales/sales_order_entry.php:343 +#: ../sales/customer_payments.php:139 - #: ../sales/sales_order_entry.php:350 ++#: ../sales/sales_order_entry.php:353 msgid "There is no customer selected." msgstr "" -#: sales/customer_payments.php:146 sales/sales_order_entry.php:350 +#: ../sales/customer_payments.php:146 - #: ../sales/sales_order_entry.php:357 ++#: ../sales/sales_order_entry.php:360 msgid "This customer has no branch defined." msgstr "" @@@ -14332,193 -12500,197 +14396,200 @@@ msgstr " msgid "Enter a &New Direct Invoice" msgstr "" - #: ../sales/sales_order_entry.php:380 -#: sales/sales_order_entry.php:373 -msgid "" -"This document cannot be processed because there is insufficient quantity for " -"items marked." ++#: ../sales/sales_order_entry.php:383 +msgid "Pre-payment required have to be positive and less than total amount." msgstr "" - #: ../sales/sales_order_entry.php:385 -#: sales/sales_order_entry.php:380 ++#: ../sales/sales_order_entry.php:388 ++#: ../sales/sales_order_entry.php:402 msgid "" "You must enter the person or company to whom delivery should be made to." msgstr "" - #: ../sales/sales_order_entry.php:392 -#: sales/sales_order_entry.php:385 ++#: ../sales/sales_order_entry.php:395 ++msgid "" ++"This document cannot be processed because there is insufficient quantity for " ++"items marked." ++msgstr "" ++ ++#: ../sales/sales_order_entry.php:407 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:401 -#: sales/sales_order_entry.php:394 ++#: ../sales/sales_order_entry.php:416 msgid "The shipping cost entered is expected to be numeric." msgstr "" - #: ../sales/sales_order_entry.php:407 -#: sales/sales_order_entry.php:400 ++#: ../sales/sales_order_entry.php:422 msgid "The Valid date is invalid." msgstr "" - #: ../sales/sales_order_entry.php:409 -#: sales/sales_order_entry.php:402 ++#: ../sales/sales_order_entry.php:424 msgid "The delivery date is invalid." msgstr "" - #: ../sales/sales_order_entry.php:416 -#: sales/sales_order_entry.php:408 ++#: ../sales/sales_order_entry.php:430 msgid "The requested valid date is before the date of the quotation." msgstr "" - #: ../sales/sales_order_entry.php:418 -#: sales/sales_order_entry.php:410 ++#: ../sales/sales_order_entry.php:432 msgid "The requested delivery date is before the date of the order." msgstr "" - #: ../sales/sales_order_entry.php:427 -#: sales/sales_order_entry.php:419 ++#: ../sales/sales_order_entry.php:441 msgid "You need to define a cash account for your Sales Point." msgstr "" - #: ../sales/sales_order_entry.php:465 -#: sales/sales_order_entry.php:457 ++#: ../sales/sales_order_entry.php:479 msgid "" "The reference number field has been increased. Please save the document " "again." msgstr "" - #: ../sales/sales_order_entry.php:511 -#: sales/sales_order_entry.php:503 ++#: ../sales/sales_order_entry.php:525 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:515 -#: sales/sales_order_entry.php:507 ++#: ../sales/sales_order_entry.php:529 msgid "Price for inventory item must be entered and can not be less than 0" msgstr "" - #: ../sales/sales_order_entry.php:522 -#: sales/sales_order_entry.php:514 ++#: ../sales/sales_order_entry.php:536 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:553 -#: sales/sales_order_entry.php:532 ++#: ../sales/sales_order_entry.php:554 #, php-format msgid "Price %s is below Standard Cost %s" msgstr "" - #: ../sales/sales_order_entry.php:578 -#: sales/sales_order_entry.php:557 ++#: ../sales/sales_order_entry.php:579 msgid "" "This item cannot be deleted because some of it has already been delivered." msgstr "" - #: ../sales/sales_order_entry.php:607 -#: sales/sales_order_entry.php:586 ++#: ../sales/sales_order_entry.php:608 msgid "Direct delivery entry has been cancelled as requested." msgstr "" - #: ../sales/sales_order_entry.php:608 -#: sales/sales_order_entry.php:587 ++#: ../sales/sales_order_entry.php:609 msgid "Enter a New Sales Delivery" msgstr "" - #: ../sales/sales_order_entry.php:610 -#: sales/sales_order_entry.php:589 ++#: ../sales/sales_order_entry.php:611 msgid "Direct invoice entry has been cancelled as requested." msgstr "" - #: ../sales/sales_order_entry.php:611 -#: sales/sales_order_entry.php:590 ++#: ../sales/sales_order_entry.php:612 msgid "Enter a New Sales Invoice" msgstr "" - #: ../sales/sales_order_entry.php:616 -#: sales/sales_order_entry.php:595 ++#: ../sales/sales_order_entry.php:617 msgid "This sales quotation has been cancelled as requested." msgstr "" - #: ../sales/sales_order_entry.php:617 -#: sales/sales_order_entry.php:596 ++#: ../sales/sales_order_entry.php:618 msgid "Enter a New Sales Quotation" msgstr "" - #: ../sales/sales_order_entry.php:624 -#: sales/sales_order_entry.php:603 ++#: ../sales/sales_order_entry.php:625 msgid "Undelivered part of order has been cancelled as requested." msgstr "" - #: ../sales/sales_order_entry.php:625 -#: sales/sales_order_entry.php:604 ++#: ../sales/sales_order_entry.php:626 msgid "Select Another Sales Order for Edition" msgstr "" - #: ../sales/sales_order_entry.php:629 -#: sales/sales_order_entry.php:608 ++#: ../sales/sales_order_entry.php:630 msgid "This sales order has been cancelled as requested." msgstr "" - #: ../sales/sales_order_entry.php:630 -#: sales/sales_order_entry.php:609 ++#: ../sales/sales_order_entry.php:631 msgid "Enter a New Sales Order" msgstr "" - #: ../sales/sales_order_entry.php:708 -#: sales/sales_order_entry.php:687 ++#: ../sales/sales_order_entry.php:709 msgid "Sales Invoice Items" msgstr "" - #: ../sales/sales_order_entry.php:709 -#: sales/sales_order_entry.php:688 ++#: ../sales/sales_order_entry.php:710 msgid "Enter Delivery Details and Confirm Invoice" msgstr "" - #: ../sales/sales_order_entry.php:711 -#: sales/sales_order_entry.php:690 ++#: ../sales/sales_order_entry.php:712 msgid "Place Invoice" msgstr "" - #: ../sales/sales_order_entry.php:714 -#: sales/sales_order_entry.php:693 ++#: ../sales/sales_order_entry.php:715 msgid "Delivery Note Items" msgstr "" - #: ../sales/sales_order_entry.php:715 -#: sales/sales_order_entry.php:694 ++#: ../sales/sales_order_entry.php:716 msgid "Enter Delivery Details and Confirm Dispatch" msgstr "" - #: ../sales/sales_order_entry.php:716 -#: sales/sales_order_entry.php:695 ++#: ../sales/sales_order_entry.php:717 msgid "Cancel Delivery" msgstr "" - #: ../sales/sales_order_entry.php:717 -#: sales/sales_order_entry.php:696 ++#: ../sales/sales_order_entry.php:718 msgid "Place Delivery" msgstr "" - #: ../sales/sales_order_entry.php:719 -#: sales/sales_order_entry.php:698 ++#: ../sales/sales_order_entry.php:720 msgid "Quotation Date:" msgstr "" - #: ../sales/sales_order_entry.php:720 -#: sales/sales_order_entry.php:699 ++#: ../sales/sales_order_entry.php:721 msgid "Sales Quotation Items" msgstr "" - #: ../sales/sales_order_entry.php:721 -#: sales/sales_order_entry.php:700 ++#: ../sales/sales_order_entry.php:722 msgid "Enter Delivery Details and Confirm Quotation" msgstr "" - #: ../sales/sales_order_entry.php:722 -#: sales/sales_order_entry.php:701 ++#: ../sales/sales_order_entry.php:723 msgid "Cancel Quotation" msgstr "" - #: ../sales/sales_order_entry.php:723 -#: sales/sales_order_entry.php:702 ++#: ../sales/sales_order_entry.php:724 msgid "Place Quotation" msgstr "" - #: ../sales/sales_order_entry.php:724 -#: sales/sales_order_entry.php:703 ++#: ../sales/sales_order_entry.php:725 msgid "Commit Quotations Changes" msgstr "" - #: ../sales/sales_order_entry.php:728 -#: sales/sales_order_entry.php:706 -msgid "Sales Order Items" -msgstr "" - -#: sales/sales_order_entry.php:707 ++#: ../sales/sales_order_entry.php:729 msgid "Enter Delivery Details and Confirm Order" msgstr "" - #: ../sales/sales_order_entry.php:731 -#: sales/sales_order_entry.php:710 ++#: ../sales/sales_order_entry.php:732 msgid "Commit Order Changes" msgstr "" - #: ../sales/sales_order_entry.php:753 - #: ../sales/sales_order_entry.php:759 -#: sales/sales_order_entry.php:733 sales/sales_order_entry.php:739 ++#: ../sales/sales_order_entry.php:754 ++#: ../sales/sales_order_entry.php:760 msgid "" "Cancels document entry or removes sales order when editing an old document" msgstr "" - #: ../sales/sales_order_entry.php:754 - #: ../sales/sales_order_entry.php:763 -#: sales/sales_order_entry.php:734 sales/sales_order_entry.php:743 ++#: ../sales/sales_order_entry.php:755 ++#: ../sales/sales_order_entry.php:764 msgid "You are about to void this Document.\\nDo you want to continue?" msgstr "" - #: ../sales/sales_order_entry.php:757 -#: sales/sales_order_entry.php:737 ++#: ../sales/sales_order_entry.php:758 msgid "Validate changes and update document" msgstr "" - #: ../sales/sales_order_entry.php:761 -#: sales/sales_order_entry.php:741 ++#: ../sales/sales_order_entry.php:762 msgid "" "You are about to cancel undelivered part of this order.\\nDo you want to " "continue?" @@@ -14537,12 -12709,12 +14608,13 @@@ msgstr " msgid "Customer Allocations" msgstr "" -#: sales/allocations/customer_allocation_main.php:32 -#: 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_deliveries_view.php:116 -#: sales/inquiry/sales_orders_view.php:243 +#: ../sales/allocations/customer_allocation_main.php:32 +#: ../sales/manage/customer_branches.php:282 +#: ../sales/manage/customers.php:328 +#: ../sales/inquiry/customer_allocation_inquiry.php:42 +#: ../sales/inquiry/customer_inquiry.php:44 ++#: ../sales/inquiry/sales_deliveries_view.php:116 +#: ../sales/inquiry/sales_orders_view.php:266 msgid "Select a customer: " msgstr "" @@@ -14705,8 -12873,8 +14777,8 @@@ msgstr " msgid "Disable this Branch:" msgstr "" -#: sales/manage/customer_branches.php:295 -#: sales/inquiry/sales_deliveries_view.php:185 +#: ../sales/manage/customer_branches.php:297 - #: ../sales/inquiry/sales_deliveries_view.php:183 ++#: ../sales/inquiry/sales_deliveries_view.php:185 msgid "Contact" msgstr "" @@@ -14726,8 -12894,8 +14798,8 @@@ msgstr " msgid "Tax Group" msgstr "" -#: sales/manage/customer_branches.php:319 -#: sales/includes/ui/sales_order_ui.inc:288 +#: ../sales/manage/customer_branches.php:321 - #: ../sales/includes/ui/sales_order_ui.inc:306 ++#: ../sales/includes/ui/sales_order_ui.inc:291 msgid "" "The selected customer does not have any branches. Please create at least one " "branch." @@@ -15371,27 -13517,27 +15443,27 @@@ msgid " "\t\t the same customer branch." msgstr "" - #: ../sales/inquiry/sales_deliveries_view.php:179 -#: sales/inquiry/sales_deliveries_view.php:181 ++#: ../sales/inquiry/sales_deliveries_view.php:181 msgid "Delivery #" msgstr "" - #: ../sales/inquiry/sales_deliveries_view.php:185 -#: sales/inquiry/sales_deliveries_view.php:187 ++#: ../sales/inquiry/sales_deliveries_view.php:187 msgid "Cust Ref" msgstr "" - #: ../sales/inquiry/sales_deliveries_view.php:187 -#: sales/inquiry/sales_deliveries_view.php:189 ++#: ../sales/inquiry/sales_deliveries_view.php:189 msgid "Due By" msgstr "" - #: ../sales/inquiry/sales_deliveries_view.php:188 -#: sales/inquiry/sales_deliveries_view.php:190 ++#: ../sales/inquiry/sales_deliveries_view.php:190 msgid "Delivery Total" msgstr "" - #: ../sales/inquiry/sales_deliveries_view.php:190 -#: sales/inquiry/sales_deliveries_view.php:192 ++#: ../sales/inquiry/sales_deliveries_view.php:192 msgid "Batch" msgstr "" - #: ../sales/inquiry/sales_deliveries_view.php:190 -#: sales/inquiry/sales_deliveries_view.php:192 ++#: ../sales/inquiry/sales_deliveries_view.php:192 msgid "Batch Invoicing" msgstr "" @@@ -15487,28 -13621,26 +15559,27 @@@ msgid " "charges." msgstr "" -#: sales/includes/db/sales_invoice_db.inc:176 -msgid "Cash invoice" +#: ../sales/includes/db/old.sales_order_db.inc:139 +#: ../sales/includes/db/sales_order_db.inc:103 - #: ../sales/includes/db/sales_order_db.inc.orig:141 +msgid "Deleted." msgstr "" -#: sales/includes/db/sales_order_db.inc:101 -msgid "Deleted." +#: ../sales/includes/db/sales_invoice_db.inc:198 +msgid "Cash invoice" msgstr "" -#: sales/includes/ui/sales_credit_ui.inc:94 -#: sales/includes/ui/sales_order_ui.inc:367 +#: ../sales/includes/ui/sales_credit_ui.inc:94 - #: ../sales/includes/ui/sales_order_ui.inc:385 ++#: ../sales/includes/ui/sales_order_ui.inc:370 msgid "Customer Currency:" msgstr "" -#: sales/includes/ui/sales_credit_ui.inc:112 -#: sales/includes/ui/sales_order_ui.inc:627 +#: ../sales/includes/ui/sales_credit_ui.inc:112 - #: ../sales/includes/ui/sales_order_ui.inc:653 ++#: ../sales/includes/ui/sales_order_ui.inc:638 msgid "Shipping Company:" msgstr "" -#: sales/includes/ui/sales_credit_ui.inc:114 -#: sales/includes/ui/sales_order_ui.inc:374 +#: ../sales/includes/ui/sales_credit_ui.inc:114 - #: ../sales/includes/ui/sales_order_ui.inc:392 ++#: ../sales/includes/ui/sales_order_ui.inc:377 msgid "Customer Discount:" msgstr "" @@@ -15522,98 -13654,98 +15593,98 @@@ msgid " "have any branches." msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:231 -#: sales/includes/ui/sales_order_ui.inc:216 ++#: ../sales/includes/ui/sales_order_ui.inc:219 msgid "Shipping Charge" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:304 -#: sales/includes/ui/sales_order_ui.inc:286 ++#: ../sales/includes/ui/sales_order_ui.inc:289 msgid "No customer found for entered text." msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:330 -#: sales/includes/ui/sales_order_ui.inc:312 ++#: ../sales/includes/ui/sales_order_ui.inc:315 #, php-format msgid "Customer's payment terms '%s' cannot be selected on this POS" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:379 -#: sales/includes/ui/sales_order_ui.inc:361 ++#: ../sales/includes/ui/sales_order_ui.inc:364 msgid "Reference number unique for this document type" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:419 - #: ../sales/includes/ui/sales_order_ui.inc:421 -#: sales/includes/ui/sales_order_ui.inc:401 -#: sales/includes/ui/sales_order_ui.inc:403 ++#: ../sales/includes/ui/sales_order_ui.inc:404 ++#: ../sales/includes/ui/sales_order_ui.inc:406 msgid "Price List:" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:438 -#: sales/includes/ui/sales_order_ui.inc:420 ++#: ../sales/includes/ui/sales_order_ui.inc:423 msgid "Date of order receive" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:588 -#: sales/includes/ui/sales_order_ui.inc:570 ++#: ../sales/includes/ui/sales_order_ui.inc:573 msgid "Cash payment" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:591 - #: ../sales/includes/ui/sales_order_ui.inc:623 -#: sales/includes/ui/sales_order_ui.inc:573 -#: sales/includes/ui/sales_order_ui.inc:605 ++#: ../sales/includes/ui/sales_order_ui.inc:576 ++#: ../sales/includes/ui/sales_order_ui.inc:608 msgid "Deliver from Location:" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:594 -#: sales/includes/ui/sales_order_ui.inc:576 ++#: ../sales/includes/ui/sales_order_ui.inc:579 msgid "Cash account:" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:601 -#: sales/includes/ui/sales_order_ui.inc:583 ++#: ../sales/includes/ui/sales_order_ui.inc:586 msgid "Delivery Details" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:606 -#: sales/includes/ui/sales_order_ui.inc:588 ++#: ../sales/includes/ui/sales_order_ui.inc:591 msgid "Invoice Delivery Details" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:607 -#: sales/includes/ui/sales_order_ui.inc:589 ++#: ../sales/includes/ui/sales_order_ui.inc:592 msgid "Invoice before" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:611 -#: sales/includes/ui/sales_order_ui.inc:593 ++#: ../sales/includes/ui/sales_order_ui.inc:596 msgid "Quotation Delivery Details" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:616 -#: sales/includes/ui/sales_order_ui.inc:598 ++#: ../sales/includes/ui/sales_order_ui.inc:601 msgid "Order Delivery Details" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:637 -#: sales/includes/ui/sales_order_ui.inc:611 ++#: ../sales/includes/ui/sales_order_ui.inc:622 msgid "Enter requested day of delivery" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:638 -#: sales/includes/ui/sales_order_ui.inc:612 ++#: ../sales/includes/ui/sales_order_ui.inc:623 msgid "Enter Valid until Date" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:639 -#: sales/includes/ui/sales_order_ui.inc:613 ++#: ../sales/includes/ui/sales_order_ui.inc:624 msgid "Deliver To:" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:640 -#: sales/includes/ui/sales_order_ui.inc:614 ++#: ../sales/includes/ui/sales_order_ui.inc:625 msgid "Additional identifier for delivery e.g. name of receiving person" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:643 -#: sales/includes/ui/sales_order_ui.inc:617 ++#: ../sales/includes/ui/sales_order_ui.inc:628 msgid "Delivery address. Default is address of customer branch" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:647 -#: sales/includes/ui/sales_order_ui.inc:621 ++#: ../sales/includes/ui/sales_order_ui.inc:632 msgid "Contact Phone Number:" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:648 -#: sales/includes/ui/sales_order_ui.inc:622 ++#: ../sales/includes/ui/sales_order_ui.inc:633 msgid "Phone number of ordering person. Defaults to branch phone number" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:649 -#: sales/includes/ui/sales_order_ui.inc:623 ++#: ../sales/includes/ui/sales_order_ui.inc:634 msgid "Customer Reference:" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc:650 -#: sales/includes/ui/sales_order_ui.inc:624 ++#: ../sales/includes/ui/sales_order_ui.inc:635 msgid "Customer reference number for this order (if any)" msgstr "" diff --cc manufacturing/includes/db/work_order_costing_db.inc index e6d1e123,00000000..418eacd9 mode 100644,000000..100644 --- a/manufacturing/includes/db/work_order_costing_db.inc +++ b/manufacturing/includes/db/work_order_costing_db.inc @@@ -1,291 -1,0 +1,302 @@@ +. +***********************************************************************/ + +function add_wo_costing($workorder_id, $cost_type, $trans_type, $trans_no, $factor=1) +{ + $sql = "INSERT INTO ".TB_PREF."wo_costing (workorder_id, cost_type, trans_type, trans_no, factor) + VALUES (".db_escape($workorder_id)."," + .db_escape($cost_type).",".db_escape($trans_type)."," + .db_escape($trans_no).",".db_escape($factor).")"; + + db_query($sql, "could not add work order costing"); + +} + +function get_wo_costing($workorder_id) +{ + $sql="SELECT * FROM ".TB_PREF."wo_costing WHERE workorder_id=".db_escape($workorder_id); + + return db_query($sql, "could not get work order costing"); +} + +function delete_wo_costing($trans_type, $trans_no) +{ + $sql="DELETE FROM ".TB_PREF."wo_costing WHERE trans_type=".db_escape($trans_type) + ." AND trans_no=".db_escape($trans_no); + + db_query($sql, "could not delete work order costing"); +} +//-------------------------------------------------------------------------------------- + +function add_material_cost($stock_id, $qty, $date_, $advanced=false) +{ + $m_cost = 0; + $result = get_bom($stock_id); + while ($bom_item = db_fetch($result)) + { + $standard_cost = get_standard_cost($bom_item['component']); + $m_cost += ($bom_item['quantity'] * $standard_cost); + } + $bom_cost = $m_cost; + + $sql = "SELECT material_cost, labour_cost, overhead_cost FROM ".TB_PREF."stock_master WHERE stock_id = " + .db_escape($stock_id); + $result = db_query($sql); + $myrow = db_fetch($result); + $material_cost = $myrow['material_cost']; + + if ($advanced) + { + //reduce overhead_cost and labour_cost from price as those will remain as is + $m_cost = $m_cost - $myrow['labour_cost'] - $myrow['overhead_cost']; + } + + $qoh = get_qoh_on_date($stock_id); + $cost_adjust = false; + if ($qoh < 0) + { + if ($qoh + $qty >= 0) + $cost_adjust = true; + $qoh = 0; - } - if ($qoh + $qty != 0) - $material_cost = ($qoh * $material_cost + $qty * $m_cost) / ($qoh + $qty); ++ } ++ if ($qoh + $qty != 0) ++ { ++ if ($qoh == 0) ++ $material_cost += $m_cost; ++ else ++ $material_cost = ($qoh * $material_cost + $qty * $m_cost) / ($qoh + $qty); ++ } + + if ($advanced && $cost_adjust) // new 2010-02-10 + adjust_deliveries($stock_id, $bom_cost, $date_); + + $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=".db_escape($material_cost)." + WHERE stock_id=".db_escape($stock_id); + db_query($sql,"The cost details for the inventory item could not be updated"); +} + +function add_overhead_cost($stock_id, $qty, $date_, $costs, $adj_only=false) +{ + if ($qty != 0) + $costs /= $qty; + $sql = "SELECT overhead_cost FROM ".TB_PREF."stock_master WHERE stock_id = " + .db_escape($stock_id); + $result = db_query($sql); + $myrow = db_fetch($result); + $overhead_cost = $myrow['overhead_cost']; + $qoh = get_qoh_on_date($stock_id); + if ($qoh < 0) + $qoh = 0; + if ($adj_only) + { + if ($qty != 0) + $costs = $qty * $costs; + if ($qoh>0) + $overhead_cost = ($qoh * $overhead_cost + $costs) / $qoh; + else // Journal Entry if QOH is 0/negative + { + global $Refs; + + $id = get_next_trans_no(ST_JOURNAL); + $ref = $Refs->get_next(ST_JOURNAL); + + $stock_gl_code = get_stock_gl_code($stock_id); + $memo = "WO Overhead cost settlement JV for zero/negative respository of ".$stock_id; + //Reverse the inventory effect if $qoh <=0 + add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, + $stock_gl_code["inventory_account"], + $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo, + -$costs); + //GL Posting to inventory adjustment account + add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, + $stock_gl_code["adjustment_account"], + $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo, + $costs); + + add_audit_trail(ST_JOURNAL, $id, $date_); + add_comments(ST_JOURNAL, $id, $date_, $memo); + $Refs->save(ST_JOURNAL, $id, $ref); ++ if ($qty != 0) ++ $overhead_cost = ($qoh * $overhead_cost + $costs) / $qty; + } + } + else + { + if ($qoh + $qty != 0) + $overhead_cost = ($qoh * $overhead_cost + $qty * $costs) / ($qoh + $qty); + } + $sql = "UPDATE ".TB_PREF."stock_master SET overhead_cost=".db_escape($overhead_cost)." + WHERE stock_id=".db_escape($stock_id); + db_query($sql,"The cost details for the inventory item could not be updated"); +} + +function add_labour_cost($stock_id, $qty, $date_, $costs, $adj_only=false) +{ + if ($qty != 0) + $costs /= $qty; + $sql = "SELECT labour_cost FROM ".TB_PREF."stock_master WHERE stock_id = " + .db_escape($stock_id); + $result = db_query($sql); + $myrow = db_fetch($result); + $labour_cost = $myrow['labour_cost']; + $qoh = get_qoh_on_date($stock_id); + if ($qoh < 0) + $qoh = 0; + if ($adj_only) + { + if ($qty != 0) + $costs = $qty * $costs; + if ($qoh>0) + $labour_cost = ($qoh * $labour_cost + $costs) / $qoh; + else // Journal Entry if QOH is 0/negative + { + global $Refs; + + $id = get_next_trans_no(ST_JOURNAL); + $ref = $Refs->get_next(ST_JOURNAL); + + $stock_gl_code = get_stock_gl_code($stock_id); + $memo = "WO labour cost settlement JV for zero/negative respository of ".$stock_id; + //Reverse the inventory effect if $qoh <=0 + add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, + $stock_gl_code["inventory_account"], + $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo, + -$costs); + //GL Posting to inventory adjustment account + add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, + $stock_gl_code["adjustment_account"], + $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo, + $costs); + + add_audit_trail(ST_JOURNAL, $id, $date_); + add_comments(ST_JOURNAL, $id, $date_, $memo); + $Refs->save(ST_JOURNAL, $id, $ref); ++ if ($qty != 0) ++ $labour_cost = ($qoh * $labour_cost + $costs) / $qty; + } + } + else + { + if ($qoh + $qty != 0) + $labour_cost = ($qoh * $labour_cost + $qty * $costs) / ($qoh + $qty); + } + $sql = "UPDATE ".TB_PREF."stock_master SET labour_cost=".db_escape($labour_cost)." + WHERE stock_id=".db_escape($stock_id); + db_query($sql,"The cost details for the inventory item could not be updated"); +} + +function add_issue_cost($stock_id, $qty, $date_, $costs, $adj_only=false) +{ + if ($qty != 0) + $costs /= $qty; + $sql = "SELECT material_cost FROM ".TB_PREF."stock_master WHERE stock_id = " + .db_escape($stock_id); + $result = db_query($sql); + $myrow = db_fetch($result); + $material_cost = $myrow['material_cost']; + $qoh = get_qoh_on_date($stock_id); + if ($qoh < 0) + $qoh = 0; + if ($adj_only) + { + if ($qty != 0) + $costs = $qty * $costs; + if ($qoh>0) + $material_cost = $costs / $qoh; + else // Journal Entry if QOH is 0/negative + { + global $Refs; + + $id = get_next_trans_no(ST_JOURNAL); + $ref = $Refs->get_next(ST_JOURNAL); + + $stock_gl_code = get_stock_gl_code($stock_id); + $memo = "WO Issue settlement JV for zero/negative respository of ".$stock_id; + //Reverse the inventory effect if $qoh <=0 + add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, + $stock_gl_code["inventory_account"], + $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo, + -$costs); + //GL Posting to inventory adjustment account + add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, + $stock_gl_code["adjustment_account"], + $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo, + $costs); + + add_audit_trail(ST_JOURNAL, $id, $date_); + add_comments(ST_JOURNAL, $id, $date_, $memo); + $Refs->save(ST_JOURNAL, $id, $ref); ++ if ($qty != 0) ++ $material_cost = $costs / $qty; + } + } + else + { + if ($qoh + $qty != 0) + $material_cost = ($qty * $costs) / ($qoh + $qty); + } + $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=material_cost+" + .db_escape($material_cost) + ." WHERE stock_id=".db_escape($stock_id); + db_query($sql,"The cost details for the inventory item could not be updated"); +} + +/* + Create journal entry for WO related costs. +*/ +function add_wo_costs_journal($wo_id, $amount, $cost_type, $cr_acc, $db_acc, $date, $dim1=0, $dim2=0, $memo = null, $ref= null) +{ +//-------- this should be done by single call to write_journal_entries() using items_cart() +// + global $Refs, $wo_cost_types; + + begin_transaction(); + + $journal_id = get_next_trans_no(ST_JOURNAL); + if (!$ref) $ref = $Refs->get_next(ST_JOURNAL); + + add_gl_trans_std_cost(ST_JOURNAL, $journal_id, $date, $cr_acc, + 0, 0, $wo_cost_types[$cost_type], -$amount); + $is_bank_to = is_bank_account($cr_acc); + if ($is_bank_to) + { + add_bank_trans(ST_JOURNAL, $journal_id, $is_bank_to, "", + $date, -$amount, PT_WORKORDER, $wo_id, get_company_currency(), + "Cannot insert a destination bank transaction"); + } + + add_gl_trans_std_cost(ST_JOURNAL, $journal_id, $date, $db_acc, + $dim1, $dim2, $wo_cost_types[$cost_type], $amount); + + $Refs->save(ST_JOURNAL, $journal_id, $ref); + + add_wo_costing($wo_id, $cost_type, ST_JOURNAL, $journal_id); + + add_comments(ST_JOURNAL, $journal_id, $date, $memo); + add_audit_trail(ST_JOURNAL, $journal_id, $date); + + commit_transaction(); +} + +function void_wo_costing($wo_id) +{ + $res = get_wo_costing($wo_id); + + while($row = db_fetch($res)) + { + // void any related gl trans + void_gl_trans($row['trans_type'], $row['trans_no'], true); + } + + $sql = "DELETE FROM ".TB_PREF."wo_costing WHERE workorder_id=".db_escape($wo_id); + db_query($sql, "could not delete work order costing"); +} diff --cc manufacturing/includes/db/work_orders_db.inc index c9a352e1,0a45ecb7..24bf6e94 --- a/manufacturing/includes/db/work_orders_db.inc +++ b/manufacturing/includes/db/work_orders_db.inc @@@ -248,43 -446,42 +248,39 @@@ function void_work_order($woid $qty = 0; while ($row = db_fetch($result)) { - void_work_order_produce($row['id']); - - //Post voided entry if not prevoided explicitly - $void_entry = get_voided_entry(ST_MANURECEIVE, $row['id']); - if ($void_entry) - continue; - $memo_ = _("Voiding Work Order Trans # ").$woid; - add_audit_trail(ST_MANURECEIVE, $row['id'], today(), _("Voided.")."\n".$memo_); - add_voided_entry(ST_MANURECEIVE, $row['id'], today(), $memo_); - } + $qty += $row['quantity']; + // clear the production record + $sql = "UPDATE ".TB_PREF."wo_manufacture SET quantity=0 WHERE id=".$$row['id']; + db_query($sql, "Cannot void a wo production"); - $result = get_work_order_issues($woid); + void_stock_move(ST_MANURECEIVE, $row['id']); // and void the stock moves; + } - - $result = get_work_order_issues($woid); ++ $result = get_additional_issues($woid); // check the issued quantities $cost = 0; $issue_no = 0; while ($row = db_fetch($result)) { - void_work_order_issue($row['issue_no']); - - //Post voided entry if not prevoided explicitly - $void_entry = get_voided_entry(ST_MANUISSUE, $row['issue_no']); - if ($void_entry) - continue; - $memo_ = _("Voiding Work Order Trans # ").$woid; - add_audit_trail(ST_MANUISSUE, $row['issue_no'], today(), _("Voided.")."\n".$memo_); - add_voided_entry(ST_MANUISSUE, $row['issue_no'], today(), $memo_); - } + $std_cost = get_standard_cost($row['stock_id']); + $icost = $std_cost * $row['qty_issued']; + $cost += $icost; + if ($issue_no == 0) + $issue_no = $row['issue_no']; + // void the actual issue items and their quantities + $sql = "UPDATE ".TB_PREF."wo_issue_items SET qty_issued = 0 WHERE issue_id=" + .db_escape($row['id']); + db_query($sql,"A work order issue item could not be voided"); + } + if ($issue_no != 0) + void_stock_move(ST_MANUISSUE, $issue_no); // and void the stock moves + if ($cost != 0) + add_issue_cost($work_order['stock_id'], -$qty, $date, $cost); -- //Adust avg labour cost -- $cost = get_gl_wo_cost($woid, WO_LABOUR); ++ $cost = get_gl_wo_cost($woid, WO_LABOUR); // get the labour cost and reduce avg cost if ($cost != 0) -- add_labour_cost($work_order['stock_id'], 1, $date, -$cost, true); -- -- //Adust avg overhead cost -- $cost = get_gl_wo_cost($woid, WO_OVERHEAD); ++ add_labour_cost($work_order['stock_id'], -$qty, $date, $cost); ++ $cost = get_gl_wo_cost($woid, WO_OVERHEAD); // get the overhead cost and reduce avg cost if ($cost != 0) - add_overhead_cost($work_order['stock_id'], 1, $date, -$cost, true); + add_overhead_cost($work_order['stock_id'], -$qty, $date, $cost); $sql = "UPDATE ".TB_PREF."workorders SET closed=1,units_reqd=0,units_issued=0 WHERE id = " .db_escape($woid); diff --cc reporting/rep111.php index a9fa659f,0bbf0425..4287a4de --- a/reporting/rep111.php +++ b/reporting/rep111.php @@@ -114,8 -118,22 +118,22 @@@ function print_sales_quotations( $rep->TextCol(4, 5, $DisplayPrice, -2); $rep->TextCol(5, 6, $DisplayDiscount, -2); $rep->TextCol(6, 7, $DisplayNet, -2); - } + } $rep->row = $newrow; + + if ($pictures) + { + $image = company_path(). "/images/" . item_img_name($myrow2['stk_code']) . ".jpg"; + if (file_exists($image)) + { + //$rep->NewLine(); + if ($rep->row - $pic_height < $rep->bottomMargin) + $rep->NewPage(); + $rep->AddImage($image, $rep->cols[1], $rep->row - $pic_height, 0, $pic_height); + $rep->row -= $pic_height; + $rep->NewLine(); + } + } //$rep->NewLine(1); if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight)) $rep->NewPage(); diff --cc sales/customer_delivery.php index 41e3726b,3c3c1800..f9253802 --- a/sales/customer_delivery.php +++ b/sales/customer_delivery.php @@@ -273,40 -269,8 +281,40 @@@ function check_quantities( } //------------------------------------------------------------------------------ - function check_qoh() + if (isset($_POST['process_delivery']) && check_data()) { + global $SysPrefs; + $dn = &$_SESSION['Items']; + $newdelivery = ($dn->trans_no==0); + if (!$SysPrefs->allow_negative_stock()) { + foreach ($_SESSION['Items']->line_items as $itm) { + + if ($itm->qty_dispatched && has_stock_holding($itm->mb_flag)) { + $qoh_by_date = get_qoh_on_date($itm->stock_id, $_POST['Location'], $_POST['DispatchDate']); + $qoh_abs = get_qoh_on_date($itm->stock_id, $_POST['Location'], null); + //If editing current delivery delivered qty should be added + if (!$newdelivery) + { + $delivered = get_already_delivered($itm->stock_id, $_POST['Location'], key($dn->trans_no)); + + $qoh_abs = $qoh_abs - $delivered; + $qoh_by_date = $qoh_by_date - $delivered; + } + $qoh = ($qoh_by_date < $qoh_abs ? $qoh_by_date : $qoh_abs); + if ($itm->qty_dispatched > $qoh) { + display_error(_("The delivery cannot be processed because there is an insufficient quantity for item:") . + " " . $itm->stock_id . " - " . $itm->item_description); + return false; + } + } + } + } + return true; +} + +//------------------------------------------------------------------------------ + +if (isset($_POST['process_delivery']) && check_data() && check_qoh()) { $dn = &$_SESSION['Items']; if ($_POST['bo_policy']) { diff --cc sales/includes/cart_class.inc index 60491f56,a363562e..78f8309a --- a/sales/includes/cart_class.inc +++ b/sales/includes/cart_class.inc @@@ -558,51 -545,40 +558,85 @@@ class car return $total; } + /* + Checks cart quantities on document_date. + Returns array of stock_ids which stock quantities would go negative on some day. + */ + function check_qoh($date=null, $location=null) + { + $low_stock = array(); + // check only for customer delivery and direct sales invoice + if (!($this->trans_type == ST_CUSTDELIVERY || ($this->trans_type == ST_SALESINVOICE && $this->trans_no==0))) + return $low_stock; + + // collect quantities by stock_id + $qtys = array(); + foreach ($this->line_items as $line_no => $line_item) + { + if (has_stock_holding($line_item->mb_flag)) + { + if (!$this->trans_no) // new delivery + $qtys[$line_item->stock_id]['qty'] = $line_item->qty_dispatched + @$qtys[$line_item->stock_id]['qty']; + else // DN modification: check change in quantity + $qtys[$line_item->stock_id]['qty'] = ($line_item->qty_dispatched-$line_item->qty_old) + @$qtys[$line_item->stock_id]['qty']; + $qtys[$line_item->stock_id]['line'] = $line_no; + } + } + + foreach($qtys as $stock_id => $sum) + { + if (check_negative_stock($stock_id, -$sum['qty'], $location ? $location : $this->Location, $date ? $date : $this->document_date)) + $low_stock[] = $stock_id; + } + + return $low_stock; + } + + /* + Returns true for documents issued in prepayment cycle. + */ + function is_prepaid() + { + return $this->prepaid; //floatcmp($this->prep_amount, 0) > 0; + } + /* + Order is ready for delivery in prepament mode. + */ + function is_released() + { + return floatcmp($this->sum_paid, $this->prep_amount) >= 0; + } + + /* + Check whether order has been already invoiced/send or not. + */ + function is_started() + { + if ($this->trans_no==0) + return false; + $order_no = array_keys($this->trans_no); + + return is_sales_order_started(reset($order_no)); + } + + /* + Check payment terms and prepayments selected for this invoice, + and updates partial/final invoice value respectively. + */ + function update_payments() + { + $remainder = prepaid_invoice_remainder($this->order_no); + + // recalculate prepaid part from payments + if ($this->payment_terms['days_before_due'] < 0) + { // this is partial invoice for selected prepayments made. + $paid = 0; + foreach($this->prepayments as $payment) + $paid += $payment['amt']; + $this->prep_amount = min($remainder, $paid); + } else // this is final invoice + $this->prep_amount = $remainder; + } } /* end of class defintion */ class line_details diff --cc sales/includes/ui/sales_order_ui.inc index ed322737,456f54f7..faa2a3c8 --- a/sales/includes/ui/sales_order_ui.inc +++ b/sales/includes/ui/sales_order_ui.inc @@@ -123,7 -123,8 +123,9 @@@ function get_customer_details_to_order( } elseif ($order->trans_type == ST_SALESORDER) $order->due_date = add_days($order->document_date, $SysPrefs->default_delivery_required_by()); + elseif ($order->trans_type == ST_SALESQUOTE) + $order->due_date = add_days($order->document_date, $SysPrefs->default_quote_valid_days()); + if($order->payment_terms['cash_sale']) { $order->set_location($order->pos["pos_location"], $order->pos["location_name"]); } else diff --cc sales/sales_order_entry.php index b266c000,3873d4a5..bf4d8113 --- a/sales/sales_order_entry.php +++ b/sales/sales_order_entry.php @@@ -374,20 -367,20 +377,32 @@@ function can_process() set_focus('AddItem'); return false; } + if ($_SESSION['Items']->payment_terms['cash_sale'] == 0) { + if (!$_SESSION['Items']->is_started() && ($_SESSION['Items']->payment_terms['days_before_due'] < 0) && ((input_num('prep_amount')<=0) || + input_num('prep_amount')>$_SESSION['Items']->get_trans_total())) { + display_error(_("Pre-payment required have to be positive and less than total amount.")); + set_focus('prep_amount'); + return false; + } + if (strlen($_POST['deliver_to']) <= 1) { + display_error(_("You must enter the person or company to whom delivery should be made to.")); + set_focus('deliver_to'); + return false; + } + if (!$SysPrefs->allow_negative_stock() && ($low_stock = $_SESSION['Items']->check_qoh())) + { + display_error(_("This document cannot be processed because there is insufficient quantity for items marked.")); + return false; + } + + if ($_SESSION['Items']->payment_terms['cash_sale'] == 0) { + if (strlen($_POST['deliver_to']) <= 1) { + display_error(_("You must enter the person or company to whom delivery should be made to.")); + set_focus('deliver_to'); + return false; + } if ($_SESSION['Items']->trans_type != ST_SALESQUOTE && strlen($_POST['delivery_address']) <= 1) { display_error( _("You should enter the street address in the box provided. Orders cannot be accepted without a valid street address.")); set_focus('delivery_address'); diff --cc sql/en_US-demo.sql index 99c98e88,08dc0230..aabfbb6f --- a/sql/en_US-demo.sql +++ b/sql/en_US-demo.sql @@@ -608,9 -611,9 +608,10 @@@ CREATE TABLE IF NOT EXISTS `0_cust_bran `br_post_address` tinytext NOT NULL, `group_no` int(11) NOT NULL default '0', `notes` tinytext NOT NULL, + `bank_account` varchar(60) DEFAULT NULL, `inactive` tinyint(1) NOT NULL default '0', PRIMARY KEY (`branch_code`,`debtor_no`), + KEY `branch_code` (`branch_code`), KEY `branch_ref` (`branch_ref`), KEY `group_no` (`group_no`) ) ENGINE=MyISAM AUTO_INCREMENT=4 ; @@@ -701,14 -702,14 +702,14 @@@ CREATE TABLE IF NOT EXISTS `0_debtor_tr -- Dumping data for table `0_debtor_trans` -- - INSERT INTO `0_debtor_trans` VALUES(17, 10, 0, 2, 2, '2009-06-21', '2009-06-22', '1', 1, 2, 50, 2.5, 0, 0, 0, 0, 0, 1, 1, 0, 0, 4, 0); - INSERT INTO `0_debtor_trans` VALUES(18, 10, 1, 3, 3, '2009-06-21', '2009-07-01', '2', 2, 3, 35.89, 1.79, 0, 0, 0, 37.68, 0, 1.3932, 1, 2, 0, 3, 0); - INSERT INTO `0_debtor_trans` VALUES(19, 10, 0, 2, 2, '2009-06-21', '2009-06-22', '3', 1, 5, 50, 0, 5, 0, 0, 0, 0, 1, 1, 0, 0, 4, 0); - INSERT INTO `0_debtor_trans` VALUES(3, 11, 0, 3, 3, '2009-06-21', '0000-00-00', '1', 2, 3, 35.89, 1.79, 0, 0, 0, 37.68, 0, 1.3932, 1, 2, 0, 3, 0); - INSERT INTO `0_debtor_trans` VALUES(2, 13, 0, 1, 1, '2009-06-21', '2009-06-22', '1', 2, 1, 60.8, 0, 10, 0, 0, 0, 0, 1.6445729799917, 1, 0, 0, 3, 0); - INSERT INTO `0_debtor_trans` VALUES(3, 13, 1, 2, 2, '2009-06-21', '2009-06-22', 'auto', 1, 2, 50, 2.5, 0, 0, 0, 0, 0, 1, 1, 0, 0, 4, 0); - INSERT INTO `0_debtor_trans` VALUES(4, 13, 1, 3, 3, '2009-06-21', '2009-07-01', 'auto', 2, 3, 35.89, 1.79, 0, 0, 0, 0, 0, 1.3932, 1, 2, 0, 3, 0); - INSERT INTO `0_debtor_trans` VALUES(5, 13, 1, 2, 2, '2009-06-21', '2009-06-22', 'auto', 1, 5, 50, 0, 5, 0, 0, 0, 0, 1, 1, 0, 0, 4, 0); -INSERT INTO `0_debtor_trans` VALUES(17, 10, 0, 2, 2, '2014-06-21', '2014-06-22', '1', 1, 2, 50, 2.5, 0, 0, 0, 0, 1, 1, 0, 0, 4); -INSERT INTO `0_debtor_trans` VALUES(18, 10, 1, 3, 3, '2014-06-21', '2014-07-01', '2', 2, 3, 35.89, 1.79, 0, 0, 0, 37.68, 1.3932, 1, 2, 0, 3); -INSERT INTO `0_debtor_trans` VALUES(19, 10, 0, 2, 2, '2014-06-21', '2014-06-22', '3', 1, 5, 50, 0, 5, 0, 0, 0, 1, 1, 0, 0, 4); -INSERT INTO `0_debtor_trans` VALUES(3, 11, 0, 3, 3, '2014-06-21', '0000-00-00', '1', 2, 3, 35.89, 1.79, 0, 0, 0, 37.68, 1.3932, 1, 2, 0, 3); -INSERT INTO `0_debtor_trans` VALUES(2, 13, 0, 1, 1, '2014-06-21', '2014-06-22', '1', 2, 1, 60.8, 0, 10, 0, 0, 0, 1.6445729799917, 1, 0, 0, 3); -INSERT INTO `0_debtor_trans` VALUES(3, 13, 1, 2, 2, '2014-06-21', '2014-06-22', 'auto', 1, 2, 50, 2.5, 0, 0, 0, 0, 1, 1, 0, 0, 4); -INSERT INTO `0_debtor_trans` VALUES(4, 13, 1, 3, 3, '2014-06-21', '2014-07-01', 'auto', 2, 3, 35.89, 1.79, 0, 0, 0, 0, 1.3932, 1, 2, 0, 3); -INSERT INTO `0_debtor_trans` VALUES(5, 13, 1, 2, 2, '2014-06-21', '2014-06-22', 'auto', 1, 5, 50, 0, 5, 0, 0, 0, 1, 1, 0, 0, 4); ++INSERT INTO `0_debtor_trans` VALUES(17, 10, 0, 2, 2, '2014-06-21', '2014-06-22', '1', 1, 2, 50, 2.5, 0, 0, 0, 0, 0, 1, 1, 0, 0, 4, 0); ++INSERT INTO `0_debtor_trans` VALUES(18, 10, 1, 3, 3, '2014-06-21', '2014-07-01', '2', 2, 3, 35.89, 1.79, 0, 0, 0, 37.68, 0, 1.3932, 1, 2, 0, 3, 0); ++INSERT INTO `0_debtor_trans` VALUES(19, 10, 0, 2, 2, '2014-06-21', '2014-06-22', '3', 1, 5, 50, 0, 5, 0, 0, 0, 0, 1, 1, 0, 0, 4, 0); ++INSERT INTO `0_debtor_trans` VALUES(3, 11, 0, 3, 3, '2014-06-21', '0000-00-00', '1', 2, 3, 35.89, 1.79, 0, 0, 0, 37.68, 0, 1.3932, 1, 2, 0, 3, 0); ++INSERT INTO `0_debtor_trans` VALUES(2, 13, 0, 1, 1, '2014-06-21', '2014-06-22', '1', 2, 1, 60.8, 0, 10, 0, 0, 0, 0, 1.6445729799917, 1, 0, 0, 3, 0); ++INSERT INTO `0_debtor_trans` VALUES(3, 13, 1, 2, 2, '2014-06-21', '2014-06-22', 'auto', 1, 2, 50, 2.5, 0, 0, 0, 0, 0, 1, 1, 0, 0, 4, 0); ++INSERT INTO `0_debtor_trans` VALUES(4, 13, 1, 3, 3, '2014-06-21', '2014-07-01', 'auto', 2, 3, 35.89, 1.79, 0, 0, 0, 0, 0, 1.3932, 1, 2, 0, 3, 0); ++INSERT INTO `0_debtor_trans` VALUES(5, 13, 1, 2, 2, '2014-06-21', '2014-06-22', 'auto', 1, 5, 50, 0, 5, 0, 0, 0, 0, 1, 1, 0, 0, 4, 0); -- -------------------------------------------------------- @@@ -1349,8 -1341,8 +1343,8 @@@ CREATE TABLE IF NOT EXISTS `0_purch_ord -- Dumping data for table `0_purch_orders` -- - INSERT INTO `0_purch_orders` VALUES(1, 2, '', '2009-06-01', '1', '', 'DEF', 'Delivery 1\nDelivery 2\nDelivery 3', 0, 0, 0, 0); - INSERT INTO `0_purch_orders` VALUES(2, 3, '', '2009-06-21', '2', '', 'DEF', 'Delivery 1\nDelivery 2\nDelivery 3', 0, 0, 0, 0); -INSERT INTO `0_purch_orders` VALUES(1, 2, '', '2014-06-01', '1', '', 'DEF', 'Delivery 1\nDelivery 2\nDelivery 3', 0, 0); -INSERT INTO `0_purch_orders` VALUES(2, 3, '', '2014-06-21', '2', '', 'DEF', 'Delivery 1\nDelivery 2\nDelivery 3', 0, 0); ++INSERT INTO `0_purch_orders` VALUES(1, 2, '', '2014-06-01', '1', '', 'DEF', 'Delivery 1\nDelivery 2\nDelivery 3', 0, 0, 0, 0); ++INSERT INTO `0_purch_orders` VALUES(2, 3, '', '2014-06-21', '2', '', 'DEF', 'Delivery 1\nDelivery 2\nDelivery 3', 0, 0, 0, 0); -- -------------------------------------------------------- @@@ -1556,11 -1545,11 +1550,11 @@@ CREATE TABLE IF NOT EXISTS `0_sales_ord -- Dumping data for table `0_sales_orders` -- - INSERT INTO `0_sales_orders` VALUES(1, 30, 1, 0, 1, 1, '1', '', '', '2009-06-21', 2, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Beefeater Ltd.', 10, 'DEF', '2009-06-22', 3, 0, 0, 0); - INSERT INTO `0_sales_orders` VALUES(2, 30, 1, 0, 2, 2, '2', '', '', '2009-06-21', 1, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Ghostbusters Corp.', 0, 'DEF', '2009-06-22', 4, 0, 0, 0); - INSERT INTO `0_sales_orders` VALUES(3, 30, 1, 0, 3, 3, '3', '', '', '2009-06-21', 2, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Brezan', 0, 'DEF', '2009-07-01', 3, 0, 0, 0); - INSERT INTO `0_sales_orders` VALUES(4, 30, 0, 0, 1, 1, '4', '', '', '2009-06-21', 2, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Beefeater Ltd.', 0, 'DEF', '2009-06-22', 3, 0, 0, 0); - INSERT INTO `0_sales_orders` VALUES(5, 30, 1, 0, 2, 2, '5', '', '', '2009-06-21', 1, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Ghostbusters Corp.', 5, 'DEF', '2009-06-22', 4, 0, 0, 0); -INSERT INTO `0_sales_orders` VALUES(1, 30, 1, 0, 1, 1, '1', '', '', '2014-06-21', 2, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Beefeater Ltd.', 10, 'DEF', '2014-06-22', 3, 0); -INSERT INTO `0_sales_orders` VALUES(2, 30, 1, 0, 2, 2, '2', '', '', '2014-06-21', 1, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Ghostbusters Corp.', 0, 'DEF', '2014-06-22', 4, 0); -INSERT INTO `0_sales_orders` VALUES(3, 30, 1, 0, 3, 3, '3', '', '', '2014-06-21', 2, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Brezan', 0, 'DEF', '2014-07-01', 3, 0); -INSERT INTO `0_sales_orders` VALUES(4, 30, 0, 0, 1, 1, '4', '', '', '2014-06-21', 2, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Beefeater Ltd.', 0, 'DEF', '2014-06-22', 3, 0); -INSERT INTO `0_sales_orders` VALUES(5, 30, 1, 0, 2, 2, '5', '', '', '2014-06-21', 1, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Ghostbusters Corp.', 5, 'DEF', '2014-06-22', 4, 0); ++INSERT INTO `0_sales_orders` VALUES(1, 30, 1, 0, 1, 1, '1', '', '', '2014-06-21', 2, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Beefeater Ltd.', 10, 'DEF', '2014-06-22', 3, 0, 0, 0); ++INSERT INTO `0_sales_orders` VALUES(2, 30, 1, 0, 2, 2, '2', '', '', '2014-06-21', 1, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Ghostbusters Corp.', 0, 'DEF', '2014-06-22', 4, 0, 0, 0); ++INSERT INTO `0_sales_orders` VALUES(3, 30, 1, 0, 3, 3, '3', '', '', '2014-06-21', 2, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Brezan', 0, 'DEF', '2014-07-01', 3, 0, 0, 0); ++INSERT INTO `0_sales_orders` VALUES(4, 30, 0, 0, 1, 1, '4', '', '', '2014-06-21', 2, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Beefeater Ltd.', 0, 'DEF', '2014-06-22', 3, 0, 0, 0); ++INSERT INTO `0_sales_orders` VALUES(5, 30, 1, 0, 2, 2, '5', '', '', '2014-06-21', 1, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Ghostbusters Corp.', 5, 'DEF', '2014-06-22', 4, 0, 0, 0); -- -------------------------------------------------------- @@@ -1753,10 -1739,10 +1747,10 @@@ CREATE TABLE IF NOT EXISTS `0_stock_cat -- Dumping data for table `0_stock_category` -- -INSERT INTO `0_stock_category` VALUES(1, 'Components', 1, 'each', 'B', '4010', '5010', '1510', '5040', '1530', 0, 0, 0, 0); -INSERT INTO `0_stock_category` VALUES(2, 'Charges', 1, 'each', 'D', '4010', '5010', '1510', '5040', '1530', 0, 0, 0, 0); -INSERT INTO `0_stock_category` VALUES(3, 'Systems', 1, 'each', 'M', '4010', '5010', '1510', '5040', '1530', 0, 0, 0, 0); -INSERT INTO `0_stock_category` VALUES(4, 'Services', 1, 'hr', 'D', '4010', '5010', '1510', '5040', '1530', 0, 0, 0, 0); +INSERT INTO `0_stock_category` VALUES(1, 'Components', 1, 'each', 'B', '4010', '5010', '1510', '5040', '1530', 0, 0, 0, 0, 0); +INSERT INTO `0_stock_category` VALUES(2, 'Charges', 1, 'each', 'D', '4010', '5010', '1510', '5040', '1530', 0, 0, 0, 0, 0); +INSERT INTO `0_stock_category` VALUES(3, 'Systems', 1, 'each', 'M', '4010', '5010', '1510', '5040', '1530', 0, 0, 0, 0, 0); - INSERT INTO `0_stock_category` VALUES(4, 'Services', 1, 'hrs', 'D', '4010', '5010', '1510', '5040', '1530', 0, 0, 0, 0, 0); ++INSERT INTO `0_stock_category` VALUES(4, 'Services', 1, 'hr', 'D', '4010', '5010', '1510', '5040', '1530', 0, 0, 0, 0, 0); -- -------------------------------------------------------- @@@ -1796,11 -1781,11 +1790,11 @@@ CREATE TABLE IF NOT EXISTS `0_stock_mas -- Dumping data for table `0_stock_master` -- - INSERT INTO `0_stock_master` VALUES('102', 1, 1, '17inch VGA Monitor', '', 'ea.', 'B', '4010', '5010', '1510', '5040', '1530', 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0); - INSERT INTO `0_stock_master` VALUES('103', 1, 1, '32MB VGA Card', '', 'ea.', 'B', '4010', '5010', '1510', '5040', '1530', 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0); - INSERT INTO `0_stock_master` VALUES('104', 1, 1, '52x CD Drive', '', 'ea.', 'B', '4010', '5010', '1510', '5040', '1530', 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0); - INSERT INTO `0_stock_master` VALUES('201', 4, 1, 'Assembly Labour', '', 'hrs', 'D', '4010', '5010', '5010', '5040', '1530', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - INSERT INTO `0_stock_master` VALUES('3400', 3, 1, 'P4 Business System', '', 'ea.', 'M', '4010', '5010', '1540', '5040', '1530', 0, 0, 0, 0, 33, 3.9999999999999, 2, 0, 0, 0, 0); -INSERT INTO `0_stock_master` VALUES('102', 1, 1, '17inch VGA Monitor', '', 'each', 'B', '4010', '5010', '1510', '5040', '1530', 0, 0, 0, 0, 10, 0, 0, 0, 0, 0); -INSERT INTO `0_stock_master` VALUES('103', 1, 1, '32MB VGA Card', '', 'each', 'B', '4010', '5010', '1510', '5040', '1530', 0, 0, 0, 0, 11, 0, 0, 0, 0, 0); -INSERT INTO `0_stock_master` VALUES('104', 1, 1, '52x CD Drive', '', 'each', 'B', '4010', '5010', '1510', '5040', '1530', 0, 0, 0, 0, 12, 0, 0, 0, 0, 0); -INSERT INTO `0_stock_master` VALUES('201', 4, 1, 'Assembly Labour', '', 'hr', 'D', '4010', '5010', '5010', '5040', '1530', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); -INSERT INTO `0_stock_master` VALUES('3400', 3, 1, 'P4 Business System', '', 'each', 'M', '4010', '5010', '1540', '5040', '1530', 0, 0, 0, 0, 33, 3.9999999999999, 2, 0, 0, 0); ++INSERT INTO `0_stock_master` VALUES('102', 1, 1, '17inch VGA Monitor', '', 'each', 'B', '4010', '5010', '1510', '5040', '1530', 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0); ++INSERT INTO `0_stock_master` VALUES('103', 1, 1, '32MB VGA Card', '', 'each', 'B', '4010', '5010', '1510', '5040', '1530', 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0); ++INSERT INTO `0_stock_master` VALUES('104', 1, 1, '52x CD Drive', '', 'each', 'B', '4010', '5010', '1510', '5040', '1530', 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0); ++INSERT INTO `0_stock_master` VALUES('201', 4, 1, 'Assembly Labour', '', 'hr', 'D', '4010', '5010', '5010', '5040', '1530', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); ++INSERT INTO `0_stock_master` VALUES('3400', 3, 1, 'P4 Business System', '', 'each', 'M', '4010', '5010', '1540', '5040', '1530', 0, 0, 0, 0, 33, 3.9999999999999, 2, 0, 0, 0, 0); -- -------------------------------------------------------- @@@ -1994,9 -1977,10 +1988,11 @@@ CREATE TABLE IF NOT EXISTS `0_supp_tran `rate` double NOT NULL default '1', `alloc` double NOT NULL default '0', `tax_included` tinyint(1) NOT NULL default '0', + `tax_algorithm` tinyint(1) NOT NULL default '1', PRIMARY KEY (`type`,`trans_no`), - KEY `supplier_id` (`supplier_id`,`supp_reference`), + KEY `supplier_id` (`supplier_id`), + KEY `SupplierID_2` (`supplier_id`,`supp_reference`), + KEY `type` (`type`), KEY `tran_date` (`tran_date`) ) ENGINE=InnoDB; @@@ -2004,9 -1988,9 +2000,9 @@@ -- Dumping data for table `0_supp_trans` -- - INSERT INTO `0_supp_trans` VALUES(7, 20, 2, '1', '5t', '2009-06-21', '2009-07-01', 3300, 0, 165, 1, 3465, 0, 1); - INSERT INTO `0_supp_trans` VALUES(8, 20, 2, '2', 'cc', '2009-06-21', '2009-07-01', 20, 0, 0, 1, 0, 0, 1); - INSERT INTO `0_supp_trans` VALUES(4, 22, 2, '1', '', '2009-06-21', '2009-06-21', -3465, 0, 0, 1, 3465, 0, 1); -INSERT INTO `0_supp_trans` VALUES(7, 20, 2, '1', '5t', '2014-06-21', '2014-07-01', 3300, 0, 165, 1, 3465, 0); -INSERT INTO `0_supp_trans` VALUES(8, 20, 2, '2', 'cc', '2014-06-21', '2014-07-01', 20, 0, 0, 1, 0, 0); -INSERT INTO `0_supp_trans` VALUES(4, 22, 2, '1', '', '2014-06-21', '2014-06-21', -3465, 0, 0, 1, 3465, 0); ++INSERT INTO `0_supp_trans` VALUES(7, 20, 2, '1', '5t', '2014-06-21', '2014-07-01', 3300, 0, 165, 1, 3465, 0, 1); ++INSERT INTO `0_supp_trans` VALUES(8, 20, 2, '2', 'cc', '2014-06-21', '2014-07-01', 20, 0, 0, 1, 0, 0, 1); ++INSERT INTO `0_supp_trans` VALUES(4, 22, 2, '1', '', '2014-06-21', '2014-06-21', -3465, 0, 0, 1, 3465, 0, 1); -- -------------------------------------------------------- @@@ -2341,8 -2321,8 +2337,8 @@@ CREATE TABLE IF NOT EXISTS `0_users` -- Dumping data for table `0_users` -- - INSERT INTO `0_users` VALUES(1, 'admin', '5f4dcc3b5aa765d61d8327deb882cf99', 'Administrator', 2, '', 'adm@adm.com', 'en_US', 0, 0, 0, 0, 'default', 'Letter', 2, 2, 4, 1, 1, 0, 0, '2010-05-11 23:27:46', 10, 1, 1, '1', 1, 0, 'orders', 30, 0); - INSERT INTO `0_users` VALUES(2, 'demouser', '5f4dcc3b5aa765d61d8327deb882cf99', 'Demo User', 9, '999-999-999', 'demo@demo.nu', 'en_US', 0, 0, 0, 0, 'default', 'Letter', 2, 2, 3, 1, 1, 0, 0, '2008-02-06 19:02:35', 10, 1, 1, '1', 1, 0, 'orders', 30, 0); -INSERT INTO `0_users` VALUES(1, 'admin', '5f4dcc3b5aa765d61d8327deb882cf99', 'Administrator', 2, '', 'adm@adm.com', 'en_US', 0, 0, 0, 0, 'default', 'Letter', 2, 2, 4, 1, 1, 0, 0, '2014-05-11 23:27:46', 10, 1, 1, '1', 1, 0, 'orders', 0); -INSERT INTO `0_users` VALUES(2, 'demouser', '5f4dcc3b5aa765d61d8327deb882cf99', 'Demo User', 9, '999-999-999', 'demo@demo.nu', 'en_US', 0, 0, 0, 0, 'default', 'Letter', 2, 2, 3, 1, 1, 0, 0, '2014-02-06 19:02:35', 10, 1, 1, '1', 1, 0, 'orders', 0); ++INSERT INTO `0_users` VALUES(1, 'admin', '5f4dcc3b5aa765d61d8327deb882cf99', 'Administrator', 2, '', 'adm@adm.com', 'en_US', 0, 0, 0, 0, 'default', 'Letter', 2, 2, 4, 1, 1, 0, 0, '2014-05-11 23:27:46', 10, 1, 1, '1', 1, 0, 'orders', 30, 0); ++INSERT INTO `0_users` VALUES(2, 'demouser', '5f4dcc3b5aa765d61d8327deb882cf99', 'Demo User', 9, '999-999-999', 'demo@demo.nu', 'en_US', 0, 0, 0, 0, 'default', 'Letter', 2, 2, 3, 1, 1, 0, 0, '2014-02-06 19:02:35', 10, 1, 1, '1', 1, 0, 'orders', 30, 0); -- -------------------------------------------------------- @@@ -2415,36 -2395,14 +2411,36 @@@ CREATE TABLE IF NOT EXISTS `0_workorder -- Dumping data for table `0_workorders` -- - INSERT INTO `0_workorders` VALUES(1, '1', 'DEF', 10, '3400', '2009-06-21', 0, '2009-06-21', '2009-06-21', 10, 1, 1, 10); - INSERT INTO `0_workorders` VALUES(2, '2', 'DEF', 3, '3400', '2009-06-21', 2, '2009-07-11', '2009-06-21', 2, 0, 1, 0); - INSERT INTO `0_workorders` VALUES(3, '3', 'DEF', 2, '3400', '2009-06-21', 0, '2009-06-21', '2009-06-21', 2, 1, 1, 0); - INSERT INTO `0_workorders` VALUES(4, '4', 'DEF', 4, '3400', '2009-06-21', 0, '2009-06-21', '2009-06-21', 4, 1, 1, 0); - INSERT INTO `0_workorders` VALUES(5, '5', 'DEF', 5, '3400', '2009-06-21', 0, '2009-06-21', '2009-06-21', 5, 1, 1, 10); - INSERT INTO `0_workorders` VALUES(6, '6', 'DEF', -5, '3400', '2009-06-21', 1, '2009-06-21', '2009-06-21', -5, 1, 1, 0); - INSERT INTO `0_workorders` VALUES(7, '7', 'DEF', -2, '3400', '2009-06-21', 1, '2009-06-21', '2009-06-21', -2, 1, 1, 10); + INSERT INTO `0_workorders` VALUES(1, '1', 'DEF', 10, '3400', '2014-06-21', 0, '2014-06-21', '2014-06-21', 10, 1, 1, 10); + INSERT INTO `0_workorders` VALUES(2, '2', 'DEF', 3, '3400', '2014-06-21', 2, '2014-07-11', '2014-06-21', 2, 0, 1, 0); + INSERT INTO `0_workorders` VALUES(3, '3', 'DEF', 2, '3400', '2014-06-21', 0, '2014-06-21', '2014-06-21', 2, 1, 1, 0); + INSERT INTO `0_workorders` VALUES(4, '4', 'DEF', 4, '3400', '2014-06-21', 0, '2014-06-21', '2014-06-21', 4, 1, 1, 0); + INSERT INTO `0_workorders` VALUES(5, '5', 'DEF', 5, '3400', '2014-06-21', 0, '2014-06-21', '2014-06-21', 5, 1, 1, 10); + INSERT INTO `0_workorders` VALUES(6, '6', 'DEF', -5, '3400', '2014-06-21', 1, '2014-06-21', '2014-06-21', -5, 1, 1, 0); + INSERT INTO `0_workorders` VALUES(7, '7', 'DEF', -2, '3400', '2014-06-21', 1, '2014-06-21', '2014-06-21', -2, 1, 1, 10); +-- -------------------------------------------------------- + +-- +-- Table structure for table `0_wo_costing` +-- + +DROP TABLE IF EXISTS `0_wo_costing`; +CREATE TABLE `0_wo_costing` ( + `id` int(11) NOT NULL auto_increment, + `workorder_id` int(11) NOT NULL default '0', + `cost_type` tinyint(1) NOT NULL default '0', + `trans_type` int(11) NOT NULL default '0', + `trans_no` int(11) NOT NULL default '0', + `factor` double NOT NULL default '1', + PRIMARY KEY (`id`) +) ENGINE=InnoDB; + +-- +-- Dumping data for table `0_wo_costing` +-- + + -- -------------------------------------------------------- -- diff --cc sql/en_US-new.sql index ad688605,d0fabd3c..7e77cb89 --- a/sql/en_US-new.sql +++ b/sql/en_US-new.sql @@@ -573,9 -576,9 +573,10 @@@ CREATE TABLE IF NOT EXISTS `0_cust_bran `br_post_address` tinytext NOT NULL, `group_no` int(11) NOT NULL default '0', `notes` tinytext NOT NULL, + `bank_account` varchar(60) DEFAULT NULL, `inactive` tinyint(1) NOT NULL default '0', PRIMARY KEY (`branch_code`,`debtor_no`), + KEY `branch_code` (`branch_code`), KEY `branch_ref` (`branch_ref`), KEY `group_no` (`group_no`) ) ENGINE=MyISAM AUTO_INCREMENT=1 ; @@@ -1565,11 -1554,11 +1562,10 @@@ CREATE TABLE IF NOT EXISTS `0_stock_cat -- Dumping data for table `0_stock_category` -- -INSERT INTO `0_stock_category` VALUES(1, 'Components', 1, 'each', 'B', '4010', '5010', '1510', '5040', '1530', 0, 0, 0, 0); -INSERT INTO `0_stock_category` VALUES(2, 'Charges', 1, 'each', 'D', '4010', '5010', '1510', '5040', '1530', 0, 0, 0, 0); -INSERT INTO `0_stock_category` VALUES(3, 'Systems', 1, 'each', 'M', '4010', '5010', '1510', '5040', '1530', 0, 0, 0, 0); -INSERT INTO `0_stock_category` VALUES(4, 'Services', 1, 'hr', 'D', '4010', '5010', '1510', '5040', '1530', 0, 0, 0, 0); - +INSERT INTO `0_stock_category` VALUES(1, 'Components', 1, 'each', 'B', '4010', '5010', '1510', '5040', '1530', 0, 0, 0, 0, 0); +INSERT INTO `0_stock_category` VALUES(2, 'Charges', 1, 'each', 'D', '4010', '5010', '1510', '5040', '1530', 0, 0, 0, 0, 0); +INSERT INTO `0_stock_category` VALUES(3, 'Systems', 1, 'each', 'M', '4010', '5010', '1510', '5040', '1530', 0, 0, 0, 0, 0); - INSERT INTO `0_stock_category` VALUES(4, 'Services', 1, 'hrs', 'D', '4010', '5010', '1510', '5040', '1530', 0, 0, 0, 0, 0); - ++INSERT INTO `0_stock_category` VALUES(4, 'Services', 1, 'hr', 'D', '4010', '5010', '1510', '5040', '1530', 0, 0, 0, 0, 0); -- -------------------------------------------------------- -- @@@ -1756,9 -1742,10 +1752,11 @@@ CREATE TABLE IF NOT EXISTS `0_supp_tran `rate` double NOT NULL default '1', `alloc` double NOT NULL default '0', `tax_included` tinyint(1) NOT NULL default '0', + `tax_algorithm` tinyint(1) NOT NULL default '1', PRIMARY KEY (`type`,`trans_no`), - KEY `supplier_id` (`supplier_id`,`supp_reference`), + KEY `supplier_id` (`supplier_id`), + KEY `SupplierID_2` (`supplier_id`,`supp_reference`), + KEY `type` (`type`), KEY `tran_date` (`tran_date`) ) ENGINE=InnoDB;