From 12ca6125fbd5b9d57c712f4f5ff32027902291f3 Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Sun, 21 Oct 2018 17:21:05 +0100 Subject: [PATCH] Minor fixes --- application/language/en-GB/expenses_lang.php | 1 + application/language/en-US/expenses_lang.php | 2 +- application/language/es/expenses_lang.php | 2 +- application/views/expenses/form.php | 9 +++++---- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/application/language/en-GB/expenses_lang.php b/application/language/en-GB/expenses_lang.php index 1bfdbf8f7..29753a387 100644 --- a/application/language/en-GB/expenses_lang.php +++ b/application/language/en-GB/expenses_lang.php @@ -36,6 +36,7 @@ $lang["expenses_no_expenses_to_display"] = "There are no Expenses to display"; $lang["expenses_none_selected"] = "You have not selected any Expense"; $lang["expenses_one_or_multiple"] = "Expense(s)"; $lang["expenses_payment"] = "Payment Type"; +$lang["expenses_start_typing_supplier_name"] = "Start Typing Supplier's name..."; $lang["expenses_successful_adding"] = "Expense add successful"; $lang["expenses_successful_deleted"] = "Expense delete successful"; $lang["expenses_successful_updating"] = "Expense update successful"; diff --git a/application/language/en-US/expenses_lang.php b/application/language/en-US/expenses_lang.php index 2d6a36d8a..ce1332368 100644 --- a/application/language/en-US/expenses_lang.php +++ b/application/language/en-US/expenses_lang.php @@ -36,6 +36,7 @@ $lang["expenses_no_expenses_to_display"] = "There are no Expenses to display"; $lang["expenses_none_selected"] = "You have not selected any Expense"; $lang["expenses_one_or_multiple"] = "Expense(s)"; $lang["expenses_payment"] = "Payment Type"; +$lang["expenses_start_typing_supplier_name"] = "Start Typing Supplier's name..."; $lang["expenses_successful_adding"] = "Expense add successful"; $lang["expenses_successful_deleted"] = "Expense delete successful"; $lang["expenses_successful_updating"] = "Expense update successful"; @@ -43,4 +44,3 @@ $lang["expenses_supplier_name"] = "Supplier"; $lang["expenses_supplier_tax_code"] = "Tax Code"; $lang["expenses_tax_amount"] = "Tax"; $lang["expenses_update"] = "Update Expense"; -$lang["expenses_start_typing_supplier_name"] = "Start Typing Supplier's name..."; diff --git a/application/language/es/expenses_lang.php b/application/language/es/expenses_lang.php index 2f196adf9..10f9ebe32 100644 --- a/application/language/es/expenses_lang.php +++ b/application/language/es/expenses_lang.php @@ -36,6 +36,7 @@ $lang["expenses_no_expenses_to_display"] = "No hay gastos para mostrar"; $lang["expenses_none_selected"] = "No ha seleccionado ningun gasto"; $lang["expenses_one_or_multiple"] = "Gasto(s)"; $lang["expenses_payment"] = "Tipo de pago"; +$lang["expenses_start_typing_supplier_name"] = "Empieza a escribir el nombre del proveedor..."; $lang["expenses_successful_adding"] = "Gasto aƱadido"; $lang["expenses_successful_deleted"] = "Gasto borrado"; $lang["expenses_successful_updating"] = "Gasto actualizado"; @@ -43,4 +44,3 @@ $lang["expenses_supplier_name"] = "Proveedor"; $lang["expenses_supplier_tax_code"] = "Codigo Imp"; $lang["expenses_tax_amount"] = "Imp"; $lang["expenses_update"] = "Actualizar Gasto"; -$lang["expenses_start_typing_supplier_name"] = "Empieza a escribir el nombre del proveedor..."; diff --git a/application/views/expenses/form.php b/application/views/expenses/form.php index 4e49367cd..6c468dd12 100644 --- a/application/views/expenses/form.php +++ b/application/views/expenses/form.php @@ -171,7 +171,7 @@ $(document).ready(function() } $('#supplier_name').click(function() { - $(this).attr('value',''); + $(this).attr('value', ''); }); $('#supplier_name').autocomplete({ @@ -201,15 +201,16 @@ $(document).ready(function() }); expense_id)) { + if(!empty($expenses_info->expense_id)) + { ?> $('#supplier_id').val('supplier_id ?>'); - $('#supplier_name').val('supplier_name ?>') - .attr('readonly', 'readonly'); + $('#supplier_name').val('supplier_name ?>').attr('readonly', 'readonly'); $('#remove_supplier_button').css('display', 'inline-block'); + $('#expenses_edit_form').validate($.extend({ submitHandler: function(form) { $(form).ajaxSubmit({