diff --git a/application/config/config.php b/application/config/config.php index f241ddef1..c92010dc7 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -9,7 +9,7 @@ | | */ -$config['application_version'] = '2.3.3'; +$config['application_version'] = '2.3.4'; /* |-------------------------------------------------------------------------- diff --git a/application/language/nl-BE/suppliers_lang.php b/application/language/nl-BE/suppliers_lang.php index e4e2d43ea..df4616e8a 100755 --- a/application/language/nl-BE/suppliers_lang.php +++ b/application/language/nl-BE/suppliers_lang.php @@ -3,7 +3,7 @@ $lang["suppliers_account_number"] = "Btw nummer"; $lang["suppliers_basic_information"] = "Informatie Leverancier"; $lang["suppliers_cannot_be_deleted"] = "De geselecteeerde leveranciers konden niet worden verwijderd. Eén of meerdere leveranciers hebben ordergegevens in de database zitten."; -$lang["suppliers_company_name"] = "Bedrijfsnaam"; +$lang["suppliers_company_name"] = "Leverancier"; $lang["suppliers_company_name_required"] = "Bedrijfsnaam moet ingevuld worden"; $lang["suppliers_agency_name"] = "Agencynaam"; $lang["suppliers_confirm_delete"] = "Bent u zeker dat u de geselecteerde leveranciers wil verwijderen?"; diff --git a/application/views/items/manage.php b/application/views/items/manage.php index 3d902f4c0..7c08ab770 100644 --- a/application/views/items/manage.php +++ b/application/views/items/manage.php @@ -46,11 +46,14 @@ $(document).ready(function() } }); - $(".date_filter").datepicker({onSelect: function(d,i){ + $(".date_filter").datepicker({onSelect: function(d,i) + { if(d !== i.lastVal){ $(this).change(); } - }, dateFormat: "config->item('dateformat'));?>"}).change(function() { + }, dateFormat: 'config->item("dateformat"));?>', + timeFormat: 'config->item("timeformat"));?>' + }).change(function() { do_search(true); return false; }); diff --git a/application/views/sales/manage.php b/application/views/sales/manage.php index 6ef9daaa2..77e03e022 100755 --- a/application/views/sales/manage.php +++ b/application/views/sales/manage.php @@ -40,7 +40,9 @@ $(document).ready(function() if(d !== i.lastVal){ $(this).change(); } - }, dateFormat: "config->item('dateformat'));?>"}).change(function() { + }, dateFormat: "config->item('dateformat'));?>", + timeFormat: "config->item('timeFormat'));?>" + }).change(function() { do_search(true, function(response) { $("#payment_summary").html(response.payment_summary); }); diff --git a/translations/suppliers_lang.csv b/translations/suppliers_lang.csv index de84bd629..ed63dde2e 100644 --- a/translations/suppliers_lang.csv +++ b/translations/suppliers_lang.csv @@ -2,7 +2,7 @@ label,nl-BE,es,en,fr,zh,ru,th,tr,id suppliers_account_number,Btw nummer,Cuenta #,Account #,# Compte,帳號 #,№ счета,บัญชี #,Hesap No,Nomor Akun Pemasok suppliers_basic_information,Informatie Leverancier,Información de Proveedores,Supplier Information,Informations fournisseur,供應商資料,Информация о поставщике,ข้อมูลผู้ผลิต,Sağlayıcı Bilgisi,Informasi Pemasok suppliers_cannot_be_deleted,De geselecteeerde leveranciers konden niet worden verwijderd. Eén of meerdere leveranciers hebben ordergegevens in de database zitten.,No se pudo borrar los proveedores seleccionados. Uno o más de los seleccionados tiene ventas.,"Could not deleted selected suppliers, one or more of the selected suppliers has sales.",Impossible de supprimer le(s) fournisseur(s) sélectionné(s). Un ou plusieurs ont des ventes.,無法刪除所選擇的供應商,選定的供應商中至少有一家已有銷售紀錄。,"Не удалось удалить выбранные поставщиков, один или более из выбранных поставщиков имеет продаж.","ลบผู้ผลิตที่ถูกเลือกไม่ได้, one or more of the selected suppliers has sales.","Sağlayıcı silinemedi, bazı sağlayıcıların satışı var.","Tidak bisa dihapus pemasok yang dipilih, satu atau lebih dari pemasok yang dipilih memiliki penjualan." -suppliers_company_name,Bedrijfsnaam,Nombre de la Compañía,Company Name,Nom d\'Entreprise,公司名稱,Название компании,ชื่อบริษัท,Şirket Adı,Nama Perusahaan +suppliers_company_name,Leverancier,Nombre de la Compañía,Company Name,Nom d\'Entreprise,公司名稱,Название компании,ชื่อบริษัท,Şirket Adı,Nama Perusahaan suppliers_company_name_required,Bedrijfsnaam moet ingevuld worden,Nombre de la Compañía es requerido,Company Name is a required field,Le Nom d\'Entreprise est un champ requis,公司名稱是必填欄位,Название компании является обязательным полем,ชื่อบริษัทต้องกรอก,Şirket Adı zorunlu alandır,Nama Perusahaan wajib diisi suppliers_agency_name,Agencynaam,Nombre de la Agency,Agency Name,Nom d\'Agence, , , , ,Nama suppliers_confirm_delete,Bent u zeker dat u de geselecteerde leveranciers wil verwijderen?,¿Seguro(a) de querer borrar los proveedores seleccionados?,Are you sure you want to delete the selected suppliers?,Etes vous sûr(e) de vouloir supprimer ce(s) fournisseur(s)?,你確定要刪除選定的供應商嗎?,"Вы уверены, что хотите удалить выбранных поставщиков?",แน่ใจหรือไม่ที่จะลบผู้ผลิตที่ถููกเลือก?,Seçili sağlayıcıları düzenlemek istiyor musunuz?,Apakah Anda yakin ingin menghapus pemasok yang dipilih?