Composer Changes

- Changed PHP version to 7.3
- Changed CodeIgniter to 4.1.3

application/config/constants.php

@@ -110,6 +110,7 @@ define('ITEM', 0);
 define('ITEM_KIT', 1);
 define('ITEM_AMOUNT_ENTRY', 2);
 define('ITEM_TEMP', 3);
+define('NEW_ITEM', -1);
 
 define('PRINT_ALL', 0);
 define('PRINT_PRICED', 1);

application/controllers/Attributes.php

@@ -1,6 +1,6 @@
 <?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 
-require_once("Secure_Controller.php");
+require_once('Secure_Controller.php');
 
 class Attributes extends Secure_Controller
 {
@@ -30,10 +30,10 @@ class Attributes extends Secure_Controller
 		$attributes = $this->Attribute->search($search, $limit, $offset, $sort, $order);
 		$total_rows = $this->Attribute->get_found_rows($search);
 
-		$data_rows = array();
+		$data_rows = [];
 		foreach($attributes->result() as $attribute)
 		{
-			$attribute->definition_flags = $this->_get_attributes($attribute->definition_flags);
+			$attribute->definition_flags = $this->get_attributes($attribute->definition_flags);
 			$data_rows[] = get_attribute_definition_data_row($attribute, $this);
 		}
 
@@ -42,16 +42,24 @@ class Attributes extends Secure_Controller
 		echo json_encode(array('total' => $total_rows, 'rows' => $data_rows));
 	}
 
-	public function save_attribute_value($attribute_value)
+	public function save_attribute_value()
 	{
-		$success = $this->Attribute->save_value(urldecode($attribute_value), $this->input->post('definition_id'), $this->input->post('item_id'), $this->input->post('attribute_id'));
+		$success = $this->Attribute->save_value(
+			$this->input->post('attribute_value'),
+			$this->input->post('definition_id'),
+			$this->input->post('item_id'),
+			$this->input->post('attribute_id')
+		);
 
 		echo json_encode(array('success' => $success != 0));
 	}
 
-	public function delete_attribute_value($attribute_value)
+	public function delete_attribute_value()
 	{
-		$success = $this->Attribute->delete_value($attribute_value, $this->input->post('definition_id'));
+		$success = $this->Attribute->delete_value(
+			$this->input->post('attribute_value'),
+			$this->input->post('definition_id')
+		);
 
 		echo json_encode(array('success' => $success));
 	}
@@ -60,7 +68,7 @@ class Attributes extends Secure_Controller
 	{
 		$definition_flags = 0;
 
-		$flags = (empty($this->input->post('definition_flags'))) ? array() : $this->input->post('definition_flags');
+		$flags = (empty($this->input->post('definition_flags'))) ? [] : $this->input->post('definition_flags');
 
 		foreach($flags as $flag)
 		{
@@ -121,15 +129,15 @@ class Attributes extends Secure_Controller
 	public function get_row($row_id)
 	{
 		$attribute_definition_info = $this->Attribute->get_info($row_id);
-		$attribute_definition_info->definition_flags = $this->_get_attributes($attribute_definition_info->definition_flags);
+		$attribute_definition_info->definition_flags = $this->get_attributes($attribute_definition_info->definition_flags);
 		$data_row = $this->xss_clean(get_attribute_definition_data_row($attribute_definition_info));
 
 		echo json_encode($data_row);
 	}
 
-	private function _get_attributes($definition_flags = 0)
+	private function get_attributes($definition_flags = 0)
 	{
-		$definition_flag_names = array();
+		$definition_flag_names = [];
 		foreach (Attribute::get_definition_flags() as $id => $term)
 		{
 			if ($id & $definition_flags)
@@ -155,11 +163,11 @@ class Attributes extends Secure_Controller
 		$data['definition_info'] = $info;
 
 		$show_all = Attribute::SHOW_IN_ITEMS | Attribute::SHOW_IN_RECEIVINGS | Attribute::SHOW_IN_SALES;
-		$data['definition_flags'] = $this->_get_attributes($show_all);
+		$data['definition_flags'] = $this->get_attributes($show_all);
 		$selected_flags = $info->definition_flags === '' ? $show_all : $info->definition_flags;
-		$data['selected_definition_flags'] = $this->_get_attributes($selected_flags);
+		$data['selected_definition_flags'] = $this->get_attributes($selected_flags);
 
-		$this->load->view("attributes/form", $data);
+		$this->load->view('attributes/form', $data);
 	}
 
 	public function delete_value($attribute_id)

application/controllers/Employees.php

@@ -60,6 +60,7 @@ class Employees extends Persons
 			$person_info->$property = $this->xss_clean($value);
 		}
 		$data['person_info'] = $person_info;
+		$data['employee_id'] = $employee_id;
 
 		$modules = array();
 		foreach($this->Module->get_all_modules()->result() as $module)
@@ -190,5 +191,11 @@ class Employees extends Persons
 			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('employees_cannot_be_deleted')));
 		}
 	}
+
+	public function check_username($employee_id)
+	{
+		$exists = $this->Employee->username_exists($employee_id, $this->input->get('username'));
+		echo !$exists ? 'true' : 'false';
+	}
 }
 ?>

application/controllers/Reports.php

@@ -230,6 +230,7 @@ class Reports extends Secure_Controller
 		{
 			$tabular_data[] = $this->xss_clean(array(
 				'item_name' => $row['name'],
+				'category' => $row['category'],
 				'unit_price' => $row['unit_price'],
 				'quantity' => to_quantity_decimals($row['quantity_purchased']),
 				'subtotal' => to_currency($row['subtotal']),

application/helpers/importfile_helper.php

@@ -1,30 +1,20 @@
 <?php if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-/**
- * Generates the header content for the import_items.csv file
- *
- * @return	string						Comma separated headers for the CSV file
- */
 function generate_import_items_csv($stock_locations,$attributes)
 {
-	$csv_headers = pack("CCC",0xef,0xbb,0xbf);	//Encode the Byte-Order Mark (BOM) so that UTF-8 File headers display properly in Microsoft Excel
-	$csv_headers .= 'Barcode,"Item Name",Category,"Supplier ID","Cost Price","Unit Price","Tax 1 Name","Tax 1 Percent","Tax 2 Name","Tax 2 Percent","Reorder Level",Description,"Allow Alt Description","Item has Serial Number",item_image,HSN';
+	$csv_headers = pack('CCC',0xef,0xbb,0xbf);	//Encode the Byte-Order Mark (BOM) so that UTF-8 File headers display properly in Microsoft Excel
+	$csv_headers .= 'Id,Barcode,"Item Name",Category,"Supplier ID","Cost Price","Unit Price","Tax 1 Name","Tax 1 Percent","Tax 2 Name","Tax 2 Percent","Reorder Level",Description,"Allow Alt Description","Item has Serial Number",Image,HSN';
 	$csv_headers .= generate_stock_location_headers($stock_locations);
 	$csv_headers .= generate_attribute_headers($attributes);
 
 	return $csv_headers;
 }
 
-/**
- * Generates a list of stock location names as a string
- *
- * @return string					Comma-separated list of stock location names
- */
 function generate_stock_location_headers($locations)
 {
-	$location_headers = "";
+	$location_headers = '';
 
-	foreach($locations as $location_id => $location_name)
+	foreach($locations as $location_name)
 	{
 		$location_headers .= ',"location_' . $location_name . '"';
 	}
@@ -32,14 +22,9 @@ function generate_stock_location_headers($locations)
 	return $location_headers;
 }
 
-/**
- * Generates a list of attribute names as a string
- *
- * @return string					Comma-separated list of attribute names
- */
 function generate_attribute_headers($attribute_names)
 {
-	$attribute_headers = "";
+	$attribute_headers = '';
 	unset($attribute_names[-1]);
 
 	foreach($attribute_names as $attribute_name)
@@ -50,61 +35,59 @@ function generate_attribute_headers($attribute_names)
 	return $attribute_headers;
 }
 
-/**
- * Read the contents of a given CSV formatted file into a two-dimensional array
- *
- * @param	string				$file_name	Name of the file to read.
- * @return	boolean|array[][]				two-dimensional array with the file contents or FALSE on failure.
- */
 function get_csv_file($file_name)
 {
-	ini_set("auto_detect_line_endings", true);
+//TODO: current implementation reads the entire file in.  This is memory intensive for large files.
+//We may want to rework the CSV import feature to read the file in chunks, process it and continue.
+//It must be done in a way that does not significantly negatively affect performance.
+	ini_set('auto_detect_line_endings', true);
+
+	$csv_rows = FALSE;
 
 	if(($csv_file = fopen($file_name,'r')) !== FALSE)
 	{
+		$CI =& get_instance();
+		$CI->load->helper('security');
+
+		$csv_rows = [];
+
 		//Skip Byte-Order Mark
 		if(bom_exists($csv_file) === TRUE)
 		{
 			fseek($csv_file, 3);
 		}
 
-		while (($data = fgetcsv($csv_file)) !== FALSE)
+		$headers = fgetcsv($csv_file);
+
+		while(($row = fgetcsv($csv_file)) !== FALSE)
 		{
-		//Skip empty lines
-			if(array(null) !== $data)
+			//Skip empty lines
+			if($row !== array(null))
 			{
-				$line_array[] = $data;
+				$csv_rows[] = array_combine($headers, $CI->security->xss_clean($row));
 			}
 		}
-	}
-	else
-	{
-		return FALSE;
+
+		fclose($csv_file);
 	}
 
-	return $line_array;
+	return $csv_rows;
 }
 
-/**
- * Checks the first three characters of a file for the Byte-Order Mark then returns the file position to the first character.
- *
- * @param	object $file_handle	File handle to check
- * @return	bool				Returns TRUE if the BOM exists and FALSE otherwise.
- */
 function bom_exists(&$file_handle)
 {
-	$str = fread($file_handle,3);
+	$result		= FALSE;
+	$candidate	= fread($file_handle, 3);
+
 	rewind($file_handle);
 
-	$bom = pack("CCC", 0xef, 0xbb, 0xbf);
+	$bom = pack('CCC', 0xef, 0xbb, 0xbf);
 
-	if (0 === strncmp($str, $bom, 3))
+	if (0 === strncmp($candidate, $bom, 3))
 	{
-		return TRUE;
-	}
-	else
-	{
-		return FALSE;
+		$result = TRUE;
 	}
+
+	return $result;
 }
 ?>

application/helpers/locale_helper.php

@@ -249,7 +249,7 @@ function get_payment_options()
 	$config = get_instance()->config;
 	$lang = get_instance()->lang;
 
-	$payments = array();
+	$payments = [];
 
 
 	if($config->item('payment_options_order') == 'debitcreditcash')
@@ -388,7 +388,7 @@ function to_quantity_decimals($number)
 	return to_decimals($number, 'quantity_decimals');
 }
 
-function to_decimals($number, $decimals=NULL, $type=\NumberFormatter::DECIMAL)
+function to_decimals($number, $decimals = NULL, $type=\NumberFormatter::DECIMAL)
 {
 	// ignore empty strings and return
 	// NOTE: do not change it to empty otherwise tables will show a 0 with no decimal nor currency symbol
@@ -424,7 +424,6 @@ function parse_tax($number)
 function parse_decimals($number, $decimals = NULL)
 {
 	// ignore empty strings and return
-
 	if(empty($number))
 	{
 		return $number;
@@ -442,7 +441,7 @@ function parse_decimals($number, $decimals = NULL)
 
 	$config = get_instance()->config;
 
-	if($decimals == NULL)
+	if($decimals === NULL)
 	{
 		$decimals = $config->item('currency_decimals');
 	}
@@ -600,12 +599,13 @@ function dateformat_bootstrap($php_format)
 
 function valid_date($date)
 {
-	return preg_match('/^([0-9]{2,4})-([0-1][0-9])-([0-3][0-9])(?:( [0-2][0-9]):([0-5][0-9]):([0-5][0-9]))?$/', $date);
+	$config = get_instance()->Appconfig;
+	return (DateTime::createFromFormat($config->get('dateformat'), $date));
 }
 
 function valid_decimal($decimal)
 {
-	return preg_match('/^(\d*\.)?\d+$/', $decimal);
+	return (preg_match('/^(\d*\.)?\d+$/', $decimal) === 1);
 }
 
 ?>

application/language/en-GB/common_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["common_address_1"] = "Address 1";
 $lang["common_address_2"] = "Address 2";
 $lang["common_city"] = "City";
@@ -28,8 +27,8 @@ $lang["common_gender"] = "Gender";
 $lang["common_gender_female"] = "F";
 $lang["common_gender_male"] = "M";
 $lang["common_gender_undefined"] = "";
-$lang["common_icon"] = "";
-$lang["common_id"] = "Id";
+$lang["common_icon"] = "Icon";
+$lang["common_id"] = "ID";
 $lang["common_import"] = "Import";
 $lang["common_import_change_file"] = "Change";
 $lang["common_import_csv"] = "CSV Import";
@@ -42,8 +41,8 @@ $lang["common_last_name_required"] = "Last Name is a required field";
 $lang["common_last_page"] = "Last";
 $lang["common_learn_about_project"] = "to learn the latest information about the project";
 $lang["common_list_of"] = "List of";
-$lang["common_logo"] = "";
-$lang["common_logo_mark"] = "";
+$lang["common_logo"] = "Logo";
+$lang["common_logo_mark"] = "Mark";
 $lang["common_logout"] = "Logout";
 $lang["common_migration_needed"] = "A database migration to %1 will start after login";
 $lang["common_new"] = "New";
@@ -64,8 +63,8 @@ $lang["common_return_policy"] = "Return Policy";
 $lang["common_search"] = "Search";
 $lang["common_search_options"] = "Search options";
 $lang["common_searched_for"] = "Searched for";
-$lang["common_software_short"] = "";
-$lang["common_software_title"] = "";
+$lang["common_software_short"] = "OSPOS";
+$lang["common_software_title"] = "Open Source Point of Sale";
 $lang["common_state"] = "County";
 $lang["common_submit"] = "Submit";
 $lang["common_total_spent"] = "Total Spent";

application/language/en-GB/config_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["config_address"] = "Company Address";
 $lang["config_address_required"] = "Company Address is a required field";
 $lang["config_all_set"] = "All file permissions are set correctly!";
@@ -127,7 +126,7 @@ $lang["config_financial_year_may"] = "1st of May";
 $lang["config_financial_year_nov"] = "1st of November";
 $lang["config_financial_year_oct"] = "1st of October";
 $lang["config_financial_year_sep"] = "1st of September";
-$lang["config_floating_labels"] = "";
+$lang["config_floating_labels"] = "Floating Labels";
 $lang["config_gcaptcha_enable"] = "Login Page reCAPTCHA";
 $lang["config_gcaptcha_secret_key"] = "reCAPTCHA Secret Key";
 $lang["config_gcaptcha_secret_key_required"] = "reCAPTCHA Secret Key is a required field";
@@ -147,7 +146,7 @@ $lang["config_image_restrictions"] = "Image Upload Restrictions";
 $lang["config_include_hsn"] = "Include Support for HSN Codes";
 $lang["config_info"] = "Information";
 $lang["config_info_configuration"] = "Shop Information";
-$lang["config_input_groups"] = "";
+$lang["config_input_groups"] = "Input Groups";
 $lang["config_integrations"] = "Integrations";
 $lang["config_integrations_configuration"] = "Third Party Integrations";
 $lang["config_invoice"] = "Invoice";
@@ -177,7 +176,7 @@ $lang["config_locale_info"] = "Localisation Configuration Information";
 $lang["config_location"] = "Stock";
 $lang["config_location_configuration"] = "Stock Locations";
 $lang["config_location_info"] = "Location Configuration Information";
-$lang["config_login_form"] = "";
+$lang["config_login_form"] = "Login Form Style";
 $lang["config_logout"] = "Don't you want to make a backup before logging out? Click [OK] to backup, [Cancel] to logout";
 $lang["config_mailchimp"] = "MailChimp";
 $lang["config_mailchimp_api_key"] = "MailChimp API Key";
@@ -292,7 +291,7 @@ $lang["config_tax_decimals"] = "Tax Decimals";
 $lang["config_tax_id"] = "Tax Id";
 $lang["config_tax_included"] = "Tax Included";
 $lang["config_theme"] = "Theme";
-$lang["config_theme_preview"] = "";
+$lang["config_theme_preview"] = "Preview Theme:";
 $lang["config_thousands_separator"] = "Thousands Separator";
 $lang["config_timezone"] = "Timezone";
 $lang["config_timezone_error"] = "OSPOS Timezone is Different from your Local Timezone.";

application/language/en-GB/employees_lang.php

@@ -8,6 +8,7 @@ $lang["employees_confirm_restore"] = "Are you sure you want to restore the selec
 $lang["employees_current_password"] = "Current Password";
 $lang["employees_current_password_invalid"] = "Current Password is invalid";
 $lang["employees_employee"] = "Employee";
+$lang["employees_username_duplicate"] = "Employee username is already in use. Please choose another one.";
 $lang["employees_error_adding_updating"] = "Employee add or update failed";
 $lang["employees_error_deleting_demo_admin"] = "You cannot delete the demo admin user";
 $lang["employees_error_updating_demo_admin"] = "You cannot change the demo admin user";

application/language/en-GB/login_lang.php

@@ -1,13 +1,12 @@
-<?php 
-
+<?php
 $lang["login_gcaptcha"] = "I'm not a robot";
 $lang["login_go"] = "Go";
-$lang["login_invalid_gcaptcha"] = "Invalid I'm not a robot";
+$lang["login_invalid_gcaptcha"] = "Please verify that you are not a robot.";
 $lang["login_invalid_installation"] = "The installation is not correct, check your php.ini file";
-$lang["login_invalid_username_and_password"] = "Invalid Username or Password";
+$lang["login_invalid_username_and_password"] = "Invalid username and/or password.";
 $lang["login_login"] = "Login";
-$lang["login_logout"] = "";
-$lang["login_migration_needed"] = "";
+$lang["login_logout"] = "Logout";
+$lang["login_migration_needed"] = "A database migration to %1 will start after login.";
 $lang["login_password"] = "Password";
 $lang["login_username"] = "Username";
-$lang["login_welcome"] = "";
+$lang["login_welcome"] = "Welcome to %1!";

application/language/en-US/employees_lang.php

@@ -8,6 +8,7 @@ $lang["employees_confirm_restore"] = "Are you sure you want to restore selected
 $lang["employees_current_password"] = "Current Password";
 $lang["employees_current_password_invalid"] = "Current Password is invalid.";
 $lang["employees_employee"] = "Employee";
+$lang["employees_username_duplicate"] = "Employee username is already in use. Please choose another one.";
 $lang["employees_error_adding_updating"] = "Employee add or update failed.";
 $lang["employees_error_deleting_demo_admin"] = "You can not delete the demo admin user.";
 $lang["employees_error_updating_demo_admin"] = "You can not change the demo admin user.";

application/language/es/attributes_lang.php

@@ -4,7 +4,7 @@ $lang["attributes_attribute_value_invalid_chars"] = "El valor del atributo no pu
 $lang["attributes_confirm_delete"] = "¿Está seguro de que desea borrar los atributos seleccionados?";
 $lang["attributes_confirm_restore"] = "¿Está seguro de que desea restaurar los atributos seleccionados?";
 $lang["attributes_definition_cannot_be_deleted"] = "No se han podido borrar los atributos seleccionados";
-$lang["attributes_definition_error_adding_updating"] = "El atributo %1 no pudo ser agregado o actualizado. Por favor compruebe el registro de errores.";
+$lang["attributes_definition_error_adding_updating"] = "El atributo %1 no pudo ser agregado o actulizado. Por favor, compruebe el registro de errores.";
 $lang["attributes_definition_flags"] = "Visibilidad del atributo";
 $lang["attributes_definition_group"] = "Grupo";
 $lang["attributes_definition_id"] = "Id";

application/language/es/bootstrap_tables_lang.php

@@ -4,7 +4,7 @@ $lang["tables_all"] = "Todos";
 $lang["tables_columns"] = "Columnas";
 $lang["tables_hide_show_pagination"] = "Ocultar/Mostrar paginación";
 $lang["tables_loading"] = "Por favor espere...";
-$lang["tables_page_from_to"] = "Mostrando desde {0} hasta {1} de {2} resultados";
-$lang["tables_refresh"] = "Actualizar";
+$lang["tables_page_from_to"] = "Mostrando desde {0} hasta {1} - En total {2} resultados";
+$lang["tables_refresh"] = "Refrescar";
 $lang["tables_rows_per_page"] = "{0} resultados por página";
 $lang["tables_toggle"] = "Ocultar/Mostrar";

application/language/es/cashups_lang.php

@@ -9,8 +9,8 @@ $lang["cashups_close_employee"] = "Cerrado por";
 $lang["cashups_closed_amount_card"] = "Tarjetas";
 $lang["cashups_closed_amount_cash"] = "Efectivo Final";
 $lang["cashups_closed_amount_check"] = "Cheques";
-$lang["cashups_closed_amount_due"] = "Deudado";
-$lang["cashups_closed_amount_total"] = "Total";
+$lang["cashups_closed_amount_due"] = "Cobros pendientes";
+$lang["cashups_closed_amount_total"] = "Balance Total";
 $lang["cashups_closed_date"] = "Fecha de Cierre";
 $lang["cashups_confirm_delete"] = "¿Estás seguro de que quieres borrar el Turno seleccionado?";
 $lang["cashups_confirm_restore"] = "¿Está seguro de que desea restaurar los Turnos seleccionados?";
@@ -24,7 +24,7 @@ $lang["cashups_is_deleted"] = "Borrado";
 $lang["cashups_new"] = "Nuevo Turno";
 $lang["cashups_no_cashups_to_display"] = "No hay Turnos para mostrar";
 $lang["cashups_none_selected"] = "No ha seleccionado ningún Turno";
-$lang["cashups_note"] = "Notas";
+$lang["cashups_note"] = "Nota de pago";
 $lang["cashups_one_or_multiple"] = "Turno(s)";
 $lang["cashups_open_amount_cash"] = "Efectivo Inicial";
 $lang["cashups_open_date"] = "Fecha de Apertura";
@@ -34,5 +34,5 @@ $lang["cashups_successful_adding"] = "Turno agregado con éxito";
 $lang["cashups_successful_deleted"] = "Turno borrado con éxito";
 $lang["cashups_successful_updating"] = "Turno actualizado con éxito";
 $lang["cashups_total"] = "Total";
-$lang["cashups_transfer_amount_cash"] = "Entrada/Salida de Efectivo";
+$lang["cashups_transfer_amount_cash"] = "Salida/Entrada de Efectivo";
 $lang["cashups_update"] = "Actualizar Turno";

application/language/es/common_lang.php

@@ -8,16 +8,16 @@ $lang["common_comments"] = "Comentarios";
 $lang["common_common"] = "Común";
 $lang["common_confirm_search"] = "Has seleccionado una o más filas. Éstas no estarán seleccionadas después de tu búsqueda. ¿Seguro(a) que quieres hacer esta búsqueda?";
 $lang["common_copyrights"] = "© 2010 - %1";
-$lang["common_correct_errors"] = "Por favor corrija los errores identificados antes de guardar";
+$lang["common_correct_errors"] = "Por favor, corrija los errores identificados antes de guardar";
 $lang["common_country"] = "País";
 $lang["common_date"] = "Fecha";
 $lang["common_delete"] = "Borrar";
-$lang["common_det"] = "Detalles";
+$lang["common_det"] = "detalles";
 $lang["common_download_import_template"] = "Descargar Plantilla de Importación de CSV (CSV)";
-$lang["common_edit"] = "Editar";
+$lang["common_edit"] = "editar";
 $lang["common_email"] = "Email";
 $lang["common_email_invalid_format"] = "El correo-e no está en el formato requerido.";
-$lang["common_export_csv"] = "Exportar CSV";
+$lang["common_export_csv"] = "Reporte en CSV";
 $lang["common_export_csv_no"] = "No";
 $lang["common_export_csv_yes"] = "Si";
 $lang["common_fields_required_message"] = "Los campos en rojo son requeridos";
@@ -73,7 +73,7 @@ $lang["common_unknown"] = "Desconocido";
 $lang["common_view_recent_sales"] = "Ver Ventas Recientes";
 $lang["common_website"] = "opensourcepos.org";
 $lang["common_welcome"] = "Bienvenido(a)";
-$lang["common_welcome_message"] = "Bienvenido(a) a OSPOS. Haz click en algún módulo para empezar.";
+$lang["common_welcome_message"] = "Bienvenido(a) a OSPOS. ¡Haz click en algún módulo, para empezar.";
 $lang["common_yes"] = "";
 $lang["common_you_are_using_ospos"] = "Estás usando Open Source Point Of Sale Versión";
 $lang["common_zip"] = "Código Postal";

application/language/es/config_lang.php

@@ -27,14 +27,14 @@ $lang["config_barcode_page_width"] = "Mostrar ancho de página";
 $lang["config_barcode_price"] = "Precio";
 $lang["config_barcode_second_row"] = "Fila 2";
 $lang["config_barcode_third_row"] = "Fila 3";
-$lang["config_barcode_tooltip"] = "Cuidado: esta característica puede causar duplicados ser importados o creados. No lo use si no quiere códigos de barras duplicadas.";
+$lang["config_barcode_tooltip"] = "Cuidado: esta característica puede causar duplicados ser importados o creados, No lo use si no quiere códigos de barras duplicadas.";
 $lang["config_barcode_type"] = "Tipo de Código de Barra";
 $lang["config_barcode_width"] = "Ancho (px)";
 $lang["config_bottom"] = "Abajo";
-$lang["config_cash_decimals"] = "Decimales del efectivo";
+$lang["config_cash_decimals"] = "Decimales del Efectivo";
 $lang["config_cash_decimals_tooltip"] = "Si los decimales del efectivo y del tipo de moneda son los mismos no habrá redondeo de los pagos en efectivo.";
-$lang["config_cash_rounding"] = "Redondeo de efectivo";
-$lang["config_category_dropdown"] = "";
+$lang["config_cash_rounding"] = "Redondeo del Efectivo";
+$lang["config_category_dropdown"] = "Mostrar Categoria como desplegable";
 $lang["config_center"] = "Centro";
 $lang["config_comma"] = "coma";
 $lang["config_company"] = "Nombre del Comercio";
@@ -44,16 +44,16 @@ $lang["config_company_remove_image"] = "Quitar Imagen";
 $lang["config_company_required"] = "Nombre del Comercio es requerido";
 $lang["config_company_select_image"] = "Seleccionar Imagen";
 $lang["config_company_website_url"] = "Sitio Web no es una URL estándar (http://...).";
-$lang["config_country_codes"] = "Codigo de pais";
+$lang["config_country_codes"] = "Código de País";
 $lang["config_country_codes_tooltip"] = "Lista de codigo de paises separado por coma para busqueda de direcciones.";
 $lang["config_currency_code"] = "Código de Moneda";
-$lang["config_currency_decimals"] = "Decimales de moneda";
-$lang["config_currency_symbol"] = "Símbolo de moneda";
-$lang["config_customer_reward"] = "Premio";
+$lang["config_currency_decimals"] = "Decimales del tipo de moneda";
+$lang["config_currency_symbol"] = "Símbolo de la moneda";
+$lang["config_customer_reward"] = "Cat. de Cliente";
 $lang["config_customer_reward_duplicate"] = "La recompensa debe ser única.";
-$lang["config_customer_reward_enable"] = "Activar los premios para los consumidores";
-$lang["config_customer_reward_invalid_chars"] = "El nombre del premio no puede contener el carácter '_'";
-$lang["config_customer_reward_required"] = "El premio es un campo obligatorio";
+$lang["config_customer_reward_enable"] = "Activar recompenza para clientes";
+$lang["config_customer_reward_invalid_chars"] = "El nombre de la recompenza no puede contener el carácter '_'";
+$lang["config_customer_reward_required"] = "El nombre es un campo obligatorio";
 $lang["config_customer_sales_tax_support"] = "Habilitar la gestión de impuestos en las ventas a clientes";
 $lang["config_date_or_time_format"] = "Filtro de fecha y hora";
 $lang["config_datetimeformat"] = "Formato de fecha y hora";
@@ -96,7 +96,7 @@ $lang["config_dinner_table_enable"] = "Activar Mesa de Restaurante";
 $lang["config_dinner_table_invalid_chars"] = "El nombre de la mesa no puede contener '_'.";
 $lang["config_dinner_table_required"] = "La mesa es un campo obligatorio.";
 $lang["config_dot"] = "punto";
-$lang["config_email"] = "Correo-e";
+$lang["config_email"] = "E-mail";
 $lang["config_email_configuration"] = "Configuracion de correo";
 $lang["config_email_mailpath"] = "Ruta a Sendmail";
 $lang["config_email_protocol"] = "Protocolo";
@@ -157,8 +157,8 @@ $lang["config_invoice_email_message"] = "Plantilla de Factura por Email";
 $lang["config_invoice_enable"] = "Activar Facturación";
 $lang["config_invoice_printer"] = "Impresora Facturadora";
 $lang["config_invoice_type"] = "Tipo de Factura";
-$lang["config_is_readable"] = "";
-$lang["config_is_writable"] = "es grabable, pero los permisos son superiores a 750.";
+$lang["config_is_readable"] = "es legible, pero los permisos de lectura son incorrectos. Pongalos en 640 o 660 cargue nuevamente.";
+$lang["config_is_writable"] = "es grabable, pero los permisos de escritura son incorrectos. Pongalos en 750 y cargue nuevamente.";
 $lang["config_jsprintsetup_required"] = "Advertencia!Esta funcionalidad desactivada solo funciona con el addon jsPrintSetup de FireFox instalado. Guardar de todas formas?";
 $lang["config_language"] = "Idioma";
 $lang["config_last_used_invoice_number"] = "Último numero de factura utilizado";
@@ -186,7 +186,7 @@ $lang["config_mailchimp_key_successfully"] = "Clave API correcta.";
 $lang["config_mailchimp_key_unsuccessfully"] = "Clave API incorrecta.";
 $lang["config_mailchimp_lists"] = "Lista(s) de Mailchimp";
 $lang["config_mailchimp_tooltip"] = "Haga clic en el icono de una clave de API.";
-$lang["config_message"] = "Mensaje";
+$lang["config_message"] = "Mensajes SMS";
 $lang["config_message_configuration"] = "Configuracion del mensaje";
 $lang["config_msg_msg"] = "Texto del mensaje guardado";
 $lang["config_msg_msg_placeholder"] = "Si desea usar un formato de SMS guarde su mensaje aquí, en caso contrario deje en blanco.";
@@ -205,18 +205,18 @@ $lang["config_number_locale"] = "Localización";
 $lang["config_number_locale_invalid"] = "Localización ingresada invalida. Revisa el link en el tooltip para encontrar informacion.";
 $lang["config_number_locale_required"] = "Numero localizacion es un campo requerido.";
 $lang["config_number_locale_tooltip"] = "Encontrar una zonificacion adecuada en este enlace.";
-$lang["config_os_timezone"] = "";
+$lang["config_os_timezone"] = "Zona Horaria Local:";
 $lang["config_ospos_info"] = "Información de la Instalación OSPOS";
 $lang["config_payment_options_order"] = "Orden de opciones de pago";
 $lang["config_perm_risk"] = "Permisos superiores a 750 dejan este software en riesgo.";
-$lang["config_phone"] = "Teléfono del Comercio";
+$lang["config_phone"] = "Teléfono comercial";
 $lang["config_phone_required"] = "Teléfono del Comercio es requerido.";
 $lang["config_print_bottom_margin"] = "Margen Inferior";
 $lang["config_print_bottom_margin_number"] = "Margen Inferior debe ser un número.";
 $lang["config_print_bottom_margin_required"] = "Margen Inferior es requerido.";
-$lang["config_print_delay_autoreturn"] = "Devolver automatico a Vender";
-$lang["config_print_delay_autoreturn_number"] = "Tiempo espera para Devolver a la venta es requerido.";
-$lang["config_print_delay_autoreturn_required"] = "Tiempo espera Devolver a la Venta debe ser numero.";
+$lang["config_print_delay_autoreturn"] = "Regresar automaticamente a Vender";
+$lang["config_print_delay_autoreturn_number"] = "Tiempo espera requerido para regresar a ventas.";
+$lang["config_print_delay_autoreturn_required"] = "El tiempo espera debe ser numérico.";
 $lang["config_print_footer"] = "Imprimir el pie de página del navegador";
 $lang["config_print_header"] = "Imprimir el encabezado del navegador";
 $lang["config_print_left_margin"] = "Margen Izquierdo";
@@ -233,7 +233,7 @@ $lang["config_print_silently"] = "Mostrar configuracion pre- impresión";
 $lang["config_print_top_margin"] = "Margen Superior";
 $lang["config_print_top_margin_number"] = "Margen Superior debe ser un número.";
 $lang["config_print_top_margin_required"] = "Margen Superior es requerido.";
-$lang["config_quantity_decimals"] = "Cantidad de decimales";
+$lang["config_quantity_decimals"] = "Decimales de Cantidades";
 $lang["config_quote_default_comments"] = "Comentario inicial de cotizaciones";
 $lang["config_receipt"] = "Recibo";
 $lang["config_receipt_configuration"] = "Parámetros de Impresión";
@@ -254,10 +254,10 @@ $lang["config_receipt_template"] = "Formato de recibo";
 $lang["config_receiving_calculate_average_price"] = "Cal. precio prom. (Recepción)";
 $lang["config_recv_invoice_format"] = "Formato de Factura de Recepción";
 $lang["config_register_mode_default"] = "Modo de registro por defecto";
-$lang["config_report_an_issue"] = "";
-$lang["config_return_policy_required"] = "Política de Devolución es requerida.";
-$lang["config_reward"] = "Premio";
-$lang["config_reward_configuration"] = "Configuración de premios";
+$lang["config_report_an_issue"] = "Informe de algún problema";
+$lang["config_return_policy_required"] = "Política de Devolución requerida.";
+$lang["config_reward"] = "Recompenzas";
+$lang["config_reward_configuration"] = "Configuración de Recompenzas";
 $lang["config_right"] = "Derecha";
 $lang["config_sales_invoice_format"] = "Formato de Facturas de Venta";
 $lang["config_sales_quote_format"] = "Formato de presupuesto de las ventas";
@@ -276,12 +276,12 @@ $lang["config_suggestions_first_column"] = "Columna 1";
 $lang["config_suggestions_layout"] = "Sugerencias de búsqueda";
 $lang["config_suggestions_second_column"] = "Columna 2";
 $lang["config_suggestions_third_column"] = "Columna 3";
-$lang["config_system_conf"] = "Setup & Conf";
+$lang["config_system_conf"] = "Sistema OSPOS";
 $lang["config_system_info"] = "System Info";
 $lang["config_table"] = "Mesa";
 $lang["config_table_configuration"] = "Configuración de Mesa";
 $lang["config_takings_printer"] = "Impresión de retenciones";
-$lang["config_tax"] = "Imp";
+$lang["config_tax"] = "Impuestos";
 $lang["config_tax_category"] = "Categoría impuesto";
 $lang["config_tax_category_duplicate"] = "Categoría de impuesto ingresada ya existe.";
 $lang["config_tax_category_invalid_chars"] = "Categoría de impuesto ingresada es invalida.";
@@ -295,10 +295,10 @@ $lang["config_theme"] = "Tema";
 $lang["config_theme_preview"] = "";
 $lang["config_thousands_separator"] = "Separador de miles";
 $lang["config_timezone"] = "Zona Horaria";
-$lang["config_timezone_error"] = "";
+$lang["config_timezone_error"] = "La zona horaria de OSPOS es diferente de tu zona horaria local.";
 $lang["config_top"] = "Arriba";
 $lang["config_use_destination_based_tax"] = "Usar Impuesto Basado en Destino";
-$lang["config_user_timezone"] = "";
+$lang["config_user_timezone"] = "Zona Horaria OSPOS:";
 $lang["config_website"] = "Sitio Web";
 $lang["config_work_order_enable"] = "Soporte Ordenes de Trabajo";
 $lang["config_work_order_format"] = "Formato Ordenes de trabajo";

application/language/es/item_kits_lang.php

@@ -4,26 +4,26 @@ $lang["item_kits_add_item"] = "Agregar Artículo";
 $lang["item_kits_all"] = "Todo";
 $lang["item_kits_cannot_be_deleted"] = "Borrado de Kit(s) de Artículos fallido.";
 $lang["item_kits_confirm_delete"] = "¿Estás seguro(a) de querer borrar los kits seleccionados?";
-$lang["item_kits_confirm_restore"] = "Esta seguro de quere restaurar lo(s) kit(s) seleccionado(s)?";
-$lang["item_kits_description"] = "Descripción del Kit de Artículos";
+$lang["item_kits_confirm_restore"] = "Esta seguro de quere restaurar los kit seleccionados?";
+$lang["item_kits_description"] = "Descripción";
 $lang["item_kits_discount"] = "Descuento";
 $lang["item_kits_discount_fixed"] = "Descuento Fijo";
 $lang["item_kits_discount_percent"] = "Porcentaje de descuento";
 $lang["item_kits_discount_type"] = "Tipo de Descuento";
 $lang["item_kits_error_adding_updating"] = "Error agregando/actualizando Kit de Artículos.";
-$lang["item_kits_find_kit_item"] = "Kit de Artículo";
-$lang["item_kits_info"] = "Info de Kit de Artículos";
+$lang["item_kits_find_kit_item"] = "Buscar Kit";
+$lang["item_kits_info"] = "Info de Kit";
 $lang["item_kits_item"] = "Artículo";
-$lang["item_kits_item_kit_number"] = "";
-$lang["item_kits_item_kit_number_duplicate"] = "";
+$lang["item_kits_item_kit_number"] = "Código";
+$lang["item_kits_item_number_duplicate"] = "Código de Kit Duplicado";
 $lang["item_kits_item_number"] = "";
 $lang["item_kits_items"] = "Artículos";
-$lang["item_kits_kit"] = "Id Kit";
+$lang["item_kits_kit"] = "Id";
 $lang["item_kits_kit_and_components"] = "Artículos y componentes";
 $lang["item_kits_kit_and_stock"] = "Artículos y stocks";
 $lang["item_kits_kit_only"] = "Solo artículos";
-$lang["item_kits_name"] = "Nombre del Kit de Artículos";
-$lang["item_kits_new"] = "Nuevo Kit de Artículos";
+$lang["item_kits_name"] = "Nombre del Kit";
+$lang["item_kits_new"] = "Nuevo Kit";
 $lang["item_kits_no_item_kits_to_display"] = "Sin kits de artículos para mostrar.";
 $lang["item_kits_none_selected"] = "No has seleccionado Kits de Artículos.";
 $lang["item_kits_one_or_multiple"] = "Kit(s) de Artículos";
@@ -31,7 +31,7 @@ $lang["item_kits_price_option"] = "Opción del precio";
 $lang["item_kits_priced_only"] = "Solo con precio";
 $lang["item_kits_print_option"] = "Opciones de impresión";
 $lang["item_kits_quantity"] = "Cantidad";
-$lang["item_kits_sequence"] = "Secuencia";
+$lang["item_kits_sequence"] = "Orden";
 $lang["item_kits_successful_adding"] = "Has agregado satisfactoriamente un Kit de Artículos";
 $lang["item_kits_successful_deleted"] = "Has borrado satisfactoriamente";
 $lang["item_kits_successful_updating"] = "Has actualizado satisfactoriamente un Kit de Artículos";

application/language/es/sales_lang.php

@@ -15,18 +15,18 @@ $lang["sales_cash_deposit"] = "Deposito Efectivo";
 $lang["sales_cash_filter"] = "Efectivo";
 $lang["sales_change_due"] = "Cambio";
 $lang["sales_change_price"] = "Cambiar el precio de venta";
-$lang["sales_check"] = "Comprobación de ventas";
+$lang["sales_check"] = "Cheque";
 $lang["sales_check_balance"] = "Balance de Cheque";
-$lang["sales_check_filter"] = "Comprobar";
+$lang["sales_check_filter"] = "Cheque";
 $lang["sales_comment"] = "Comentario";
 $lang["sales_comments"] = "Comentarios";
 $lang["sales_complete_sale"] = "Completar Venta";
-$lang["sales_confirm_cancel_sale"] = "¿Seguro(a) de querer limpiar esta venta? Todos los artículos serán limpiados.";
-$lang["sales_confirm_delete"] = "¿Seguro(a) de querer borrar las ventas seleccionadas?";
+$lang["sales_confirm_cancel_sale"] = "¿Seguro quiere cancelar esta venta? Todos los artículos serán eliminados.";
+$lang["sales_confirm_delete"] = "¿Seguro quiere borrar las ventas seleccionadas?";
 $lang["sales_confirm_restore"] = "Esta seguro de querer restaurar la(s) venta(s) seleccionada(s)?";
 $lang["sales_credit"] = "Tarjeta de Crédito";
 $lang["sales_credit_deposit"] = "Deposito Credito";
-$lang["sales_credit_filter"] = "";
+$lang["sales_credit_filter"] = "Tarjeta de Crédito";
 $lang["sales_customer"] = "cliente";
 $lang["sales_customer_address"] = "Direccion";
 $lang["sales_customer_discount"] = "Descuento";
@@ -41,8 +41,9 @@ $lang["sales_date_range"] = "Rango de Fecha";
 $lang["sales_date_required"] = "Una fecha correcta debe ser ingresada.";
 $lang["sales_date_type"] = "Campo de Fecha es requerido.";
 $lang["sales_debit"] = "Tarjeta de Débito";
+$lang["sales_debit_filter"] = "Tarjeta de Débito";
 $lang["sales_delete"] = "Permitir borrar";
-$lang["sales_delete_confirmation"] = "¿Seguro(a) de querer borrar esta venta? Esta acción no se puede deshacer.";
+$lang["sales_delete_confirmation"] = "¿Seguro quiere borrar esta venta? Esta acción no se puede deshacer.";
 $lang["sales_delete_entire_sale"] = "Borrar la venta completa";
 $lang["sales_delete_successful"] = "Venta borrada correctamente.";
 $lang["sales_delete_unsuccessful"] = "Venta no borrada, fallida.";
@@ -52,8 +53,8 @@ $lang["sales_discard_quote"] = "Descartar";
 $lang["sales_discount"] = "Descuento";
 $lang["sales_discount_included"] = "% Descuento";
 $lang["sales_discount_short"] = "%";
-$lang["sales_due"] = "Deudado";
-$lang["sales_due_filter"] = "Deudado";
+$lang["sales_due"] = "Adeudado";
+$lang["sales_due_filter"] = "Adeudado";
 $lang["sales_edit"] = "Editar";
 $lang["sales_edit_item"] = "Editar Artículo";
 $lang["sales_edit_sale"] = "Editar Venta";
@@ -162,7 +163,7 @@ $lang["sales_tax"] = "Imp";
 $lang["sales_tax_id"] = "Identificador del Impuesto";
 $lang["sales_tax_invoice"] = "Impuesto de la Factura";
 $lang["sales_tax_percent"] = "% de Imp";
-$lang["sales_taxed_ind"] = "I";
+$lang["sales_taxed_ind"] = "Ventas gravadas";
 $lang["sales_total"] = "Total";
 $lang["sales_total_tax_exclusive"] = "Sin impuesto";
 $lang["sales_transaction_failed"] = "La transacción de venta falló.";

application/language/es_MX/employees_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["employees_basic_information"] = "Información";
 $lang["employees_cannot_be_deleted"] = "No se puede borrar los empleados seleccionados, uno o más de ellos tienen ventas registradas ó intentas borrar tu propia cuenta.";
 $lang["employees_change_password"] = "Cambiar contraseña";
@@ -35,3 +34,4 @@ $lang["employees_update"] = "Actualizar Empleado";
 $lang["employees_username"] = "Nombre de Usuario";
 $lang["employees_username_minlength"] = "Nombre de usuario debe tener por lo menos 5 letras.";
 $lang["employees_username_required"] = "Es necesario el nombre de usuario.";
+$lang["employees_username_duplicate"] = "El usuario del empleado ya esta en uso. Favor de escoger otro.";

application/language/es_MX/item_kits_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["item_kits_add_item"] = "Agregar Artículo";
 $lang["item_kits_all"] = "Todo";
 $lang["item_kits_cannot_be_deleted"] = "Borrado de Kit(s) de Artículos fallido.";
@@ -7,7 +6,7 @@ $lang["item_kits_confirm_delete"] = "¿Estás seguro(a) de querer borrar los kit
 $lang["item_kits_confirm_restore"] = "¿Está seguro de querer restaurar lo(s) kit(s) seleccionado(s)?";
 $lang["item_kits_description"] = "Descripción del Kit de Artículos";
 $lang["item_kits_discount"] = "Descuento";
-$lang["item_kits_discount_fixed"] = "";
+$lang["item_kits_discount_fixed"] = "Descuento Fijo";
 $lang["item_kits_discount_percent"] = "Porcentaje de descuento";
 $lang["item_kits_discount_type"] = "Tipo de Descuento";
 $lang["item_kits_error_adding_updating"] = "Error agregando/actualizando Kit de Artículos.";

application/language/es_MX/items_lang.php

@@ -1,19 +1,18 @@
-<?php 
-
-$lang["items_add_minus"] = "";
-$lang["items_allow_alt_description"] = "";
-$lang["items_amount_entry"] = "";
-$lang["items_bulk_edit"] = "";
-$lang["items_buy_price_required"] = "";
-$lang["items_cannot_be_deleted"] = "";
-$lang["items_cannot_find_item"] = "";
-$lang["items_category"] = "";
-$lang["items_category_required"] = "";
-$lang["items_change_all_to_allow_alt_desc"] = "";
-$lang["items_change_all_to_not_allow_allow_desc"] = "";
-$lang["items_change_all_to_serialized"] = "";
-$lang["items_change_all_to_unserialized"] = "";
-$lang["items_change_image"] = "";
+<?php
+$lang["items_add_minus"] = "Inventario a agregar o disminuir.";
+$lang["items_allow_alt_description"] = "Permitir Descripción Alternativa";
+$lang["items_amount_entry"] = "Ingrese Cantidad";
+$lang["items_bulk_edit"] = "Edición Masiva";
+$lang["items_buy_price_required"] = "Precio de Compra es un campo requerido.";
+$lang["items_cannot_be_deleted"] = "No se puede borrar el item(s) seleccionado, uno a mas de los items seleccionados tienen ventas.";
+$lang["items_cannot_find_item"] = "Articulo no encontrado.";
+$lang["items_category"] = "Categoría";
+$lang["items_category_required"] = "Categoría es un campo requerido.";
+$lang["items_change_all_to_allow_alt_desc"] = "Permitir Descripción Alternativa para todo.";
+$lang["items_change_all_to_not_allow_allow_desc"] = "No permitir Descripción Alternativa para todo.";
+$lang["items_change_all_to_serialized"] = "Cambiar todo a Serializado";
+$lang["items_change_all_to_unserialized"] = "Cambiar todo a No-Serializado";
+$lang["items_change_image"] = "Cambiar Imagen";
 $lang["items_confirm_bulk_edit"] = "";
 $lang["items_confirm_bulk_edit_wipe_taxes"] = "";
 $lang["items_confirm_delete"] = "";

application/language/es_MX/login_lang.php

@@ -1,13 +1,12 @@
-<?php 
-
-$lang["login_gcaptcha"] = "";
-$lang["login_go"] = "";
-$lang["login_invalid_gcaptcha"] = "";
-$lang["login_invalid_installation"] = "";
-$lang["login_invalid_username_and_password"] = "";
-$lang["login_login"] = "";
-$lang["login_logout"] = "";
-$lang["login_migration_needed"] = "";
-$lang["login_password"] = "";
-$lang["login_username"] = "";
-$lang["login_welcome"] = "";
+<?php
+$lang["login_gcaptcha"] = "No soy un robot.";
+$lang["login_go"] = "Entrar";
+$lang["login_invalid_gcaptcha"] = "Por favor compruebe que usted no es un robot.";
+$lang["login_invalid_installation"] = "La instalacion no es correcta, revise el archivo php.ini.";
+$lang["login_invalid_username_and_password"] = "Usuario y/o Password Invalido.";
+$lang["login_login"] = "Login";
+$lang["login_logout"] = "Salir";
+$lang["login_migration_needed"] = "Una migración de base de datos a %1 empezara después de entrar.";
+$lang["login_password"] = "Contraseña";
+$lang["login_username"] = "Usuario";
+$lang["login_welcome"] = "Bienvenido a %1!";

application/language/es_MX/messages_lang.php

@@ -1,14 +1,13 @@
-<?php 
-
-$lang["messages_first_name"] = "";
-$lang["messages_last_name"] = "";
-$lang["messages_message"] = "";
-$lang["messages_message_placeholder"] = "";
-$lang["messages_message_required"] = "";
-$lang["messages_multiple_phones"] = "";
-$lang["messages_phone"] = "";
-$lang["messages_phone_number_required"] = "";
-$lang["messages_phone_placeholder"] = "";
-$lang["messages_sms_send"] = "";
-$lang["messages_successfully_sent"] = "";
-$lang["messages_unsuccessfully_sent"] = "";
+<?php
+$lang["messages_first_name"] = "Nombre(s)";
+$lang["messages_last_name"] = "Apellido(s)";
+$lang["messages_message"] = "Mensaje";
+$lang["messages_message_placeholder"] = "Tu mensaje aquí...";
+$lang["messages_message_required"] = "Requiere mensaje";
+$lang["messages_multiple_phones"] = "(En caso de varios destinatarios, ingrese los números de teléfono separado por comas)";
+$lang["messages_phone"] = "Número de teléfono";
+$lang["messages_phone_number_required"] = "Requiere de número telefónico";
+$lang["messages_phone_placeholder"] = "Números de teléfonos celulares aquí...";
+$lang["messages_sms_send"] = "Enviar SMS";
+$lang["messages_successfully_sent"] = "Mensaje enviado exitosamente a: ";
+$lang["messages_unsuccessfully_sent"] = "Mensaje no enviado a: ";

application/language/es_MX/module_lang.php

@@ -1,19 +1,18 @@
-<?php 
-
-$lang["module_attributes"] = "";
-$lang["module_attributes_desc"] = "";
-$lang["module_both"] = "";
-$lang["module_cashups"] = "";
-$lang["module_cashups_desc"] = "";
-$lang["module_config"] = "";
-$lang["module_config_desc"] = "";
-$lang["module_customers"] = "";
-$lang["module_customers_desc"] = "";
-$lang["module_employees"] = "";
-$lang["module_employees_desc"] = "";
-$lang["module_expenses"] = "";
-$lang["module_expenses_categories"] = "";
-$lang["module_expenses_categories_desc"] = "";
+<?php
+$lang["module_attributes"] = "Atributos";
+$lang["module_attributes_desc"] = "Agregar, Actualizar, Borrar y Buscar atributos.";
+$lang["module_both"] = "Ambos";
+$lang["module_cashups"] = "Corte de Caja";
+$lang["module_cashups_desc"] = "Agregar, Actualizar, Borrar y Buscar Cortes de Caja.";
+$lang["module_config"] = "Configuración";
+$lang["module_config_desc"] = "Cambiar Configuracion de OSPOS.";
+$lang["module_customers"] = "Clientes";
+$lang["module_customers_desc"] = "Agregar, Actualizar, Borrar y Buscar Clientes.";
+$lang["module_employees"] = "Empleados";
+$lang["module_employees_desc"] = "Agregar, Actualizar, Borrar y Buscar Empleados.";
+$lang["module_expenses"] = "Gastos";
+$lang["module_expenses_categories"] = "Categorías de Gastos";
+$lang["module_expenses_categories_desc"] = "Agregar, Actualizar, y Borrar Categorías de Gastos.";
 $lang["module_expenses_desc"] = "";
 $lang["module_giftcards"] = "";
 $lang["module_giftcards_desc"] = "";

application/language/es_MX/receivings_lang.php

@@ -1,54 +1,53 @@
-<?php 
-
-$lang["receivings_cancel_receiving"] = "";
-$lang["receivings_cannot_be_deleted"] = "";
-$lang["receivings_comments"] = "";
-$lang["receivings_complete_receiving"] = "";
-$lang["receivings_confirm_cancel_receiving"] = "";
-$lang["receivings_confirm_delete"] = "";
-$lang["receivings_confirm_finish_receiving"] = "";
-$lang["receivings_cost"] = "";
-$lang["receivings_date"] = "";
-$lang["receivings_date_required"] = "";
-$lang["receivings_date_type"] = "";
-$lang["receivings_delete_entire_sale"] = "";
-$lang["receivings_discount"] = "";
-$lang["receivings_edit"] = "";
-$lang["receivings_edit_sale"] = "";
-$lang["receivings_employee"] = "";
-$lang["receivings_error_editing_item"] = "";
-$lang["receivings_error_requisition"] = "";
-$lang["receivings_find_or_scan_item"] = "";
-$lang["receivings_find_or_scan_item_or_receipt"] = "";
-$lang["receivings_id"] = "";
-$lang["receivings_item_name"] = "";
-$lang["receivings_mode"] = "";
-$lang["receivings_new_supplier"] = "";
-$lang["receivings_one_or_multiple"] = "";
-$lang["receivings_print_after_sale"] = "";
-$lang["receivings_quantity"] = "";
-$lang["receivings_receipt"] = "";
-$lang["receivings_receipt_number"] = "";
-$lang["receivings_receiving"] = "";
-$lang["receivings_reference"] = "";
-$lang["receivings_register"] = "";
-$lang["receivings_requisition"] = "";
-$lang["receivings_return"] = "";
-$lang["receivings_select_supplier"] = "";
-$lang["receivings_ship_pack"] = "";
-$lang["receivings_start_typing_supplier_name"] = "";
-$lang["receivings_stock"] = "";
-$lang["receivings_stock_destination"] = "";
-$lang["receivings_stock_locaiton"] = "";
-$lang["receivings_stock_source"] = "";
-$lang["receivings_successfully_deleted"] = "";
-$lang["receivings_successfully_updated"] = "";
-$lang["receivings_supplier"] = "";
-$lang["receivings_supplier_address"] = "";
-$lang["receivings_supplier_email"] = "";
-$lang["receivings_supplier_location"] = "";
-$lang["receivings_total"] = "";
-$lang["receivings_transaction_failed"] = "";
-$lang["receivings_unable_to_add_item"] = "";
-$lang["receivings_unsuccessfully_updated"] = "";
-$lang["receivings_update"] = "";
+<?php
+$lang["receivings_cancel_receiving"] = "Cancelar";
+$lang["receivings_cannot_be_deleted"] = "Falló al borrar Entrada(s).";
+$lang["receivings_comments"] = "Comentarios";
+$lang["receivings_complete_receiving"] = "Completado";
+$lang["receivings_confirm_cancel_receiving"] = "Esta seguro que quiere eliminar esta recepción? Todos los items se borraran.";
+$lang["receivings_confirm_delete"] = "Esta seguro que quiere borrar esta recepción? Esta acción no se puede deshacer.";
+$lang["receivings_confirm_finish_receiving"] = "Esta seguro que quiere enviar esta recepción? Esto no se puede deshacer.";
+$lang["receivings_cost"] = "Costo";
+$lang["receivings_date"] = "Fecha de Recibido";
+$lang["receivings_date_required"] = "Se debe de agregar la fecha correcta.";
+$lang["receivings_date_type"] = "Fecha es un campo obligatorio.";
+$lang["receivings_delete_entire_sale"] = "Borrar Venta Completa";
+$lang["receivings_discount"] = "Descuento";
+$lang["receivings_edit"] = "Editar";
+$lang["receivings_edit_sale"] = "Editar Recepción";
+$lang["receivings_employee"] = "Empleado";
+$lang["receivings_error_editing_item"] = "Fallo la edición del item.";
+$lang["receivings_error_requisition"] = "No se puede mover el inventario desde o hacia la misma Ubicación.";
+$lang["receivings_find_or_scan_item"] = "Encontrar o Escanear Articulo";
+$lang["receivings_find_or_scan_item_or_receipt"] = "Encontrar o Escanear Articulo o Recibo";
+$lang["receivings_id"] = "ID de Recepción";
+$lang["receivings_item_name"] = "Nombre del Articulo";
+$lang["receivings_mode"] = "Modo de Recepción";
+$lang["receivings_new_supplier"] = "Nuevo Proveedor";
+$lang["receivings_one_or_multiple"] = "recepción(es)";
+$lang["receivings_print_after_sale"] = "Imprimir después de la Venta";
+$lang["receivings_quantity"] = "Cant.";
+$lang["receivings_receipt"] = "Recibo de Recepcion";
+$lang["receivings_receipt_number"] = "Recepción #";
+$lang["receivings_receiving"] = "Recibir";
+$lang["receivings_reference"] = "Referencia";
+$lang["receivings_register"] = "Recepción de Artículos";
+$lang["receivings_requisition"] = "Requisición";
+$lang["receivings_return"] = "Devolución";
+$lang["receivings_select_supplier"] = "Seleccionar Proveedor (Opcional)";
+$lang["receivings_ship_pack"] = "Empaque de Envio";
+$lang["receivings_start_typing_supplier_name"] = "Empiece a escribir el nombre del Proveedor...";
+$lang["receivings_stock"] = "Inventario";
+$lang["receivings_stock_destination"] = "Destino del Inventario";
+$lang["receivings_stock_locaiton"] = "Ubicación del Inventario";
+$lang["receivings_stock_source"] = "Origen del Inventario";
+$lang["receivings_successfully_deleted"] = "Se ha borrado exitosamente";
+$lang["receivings_successfully_updated"] = "Recepción actualizada exitosamente";
+$lang["receivings_supplier"] = "Proveedor";
+$lang["receivings_supplier_address"] = "Dirección";
+$lang["receivings_supplier_email"] = "Email";
+$lang["receivings_supplier_location"] = "Ubicación";
+$lang["receivings_total"] = "Total";
+$lang["receivings_transaction_failed"] = "Transacción de Recepción falló.";
+$lang["receivings_unable_to_add_item"] = "Agregar Articulo a Recepción falló.";
+$lang["receivings_unsuccessfully_updated"] = "Actualización de Recepción falló.";
+$lang["receivings_update"] = "Actualizar";

application/language/es_MX/reports_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["reports_all"] = "Todas";
 $lang["reports_authority"] = "Autoridad";
 $lang["reports_canceled"] = "Cancelado";
@@ -11,10 +10,10 @@ $lang["reports_code_invoice"] = "INV";
 $lang["reports_code_pos"] = "POS";
 $lang["reports_code_quote"] = "Q";
 $lang["reports_code_return"] = "RET";
-$lang["reports_code_type"] = "";
-$lang["reports_code_work_order"] = "";
-$lang["reports_comments"] = "";
-$lang["reports_complete"] = "";
+$lang["reports_code_type"] = "Tipo";
+$lang["reports_code_work_order"] = "OT";
+$lang["reports_comments"] = "Comentarios";
+$lang["reports_complete"] = "Ventas y Devoluciones Completadas";
 $lang["reports_completed_sales"] = "";
 $lang["reports_confirm_delete"] = "";
 $lang["reports_confirm_restore"] = "";

application/language/nl/common_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["common_address_1"] = "Adres 1";
 $lang["common_address_2"] = "Adres 2";
 $lang["common_city"] = "Plaats";
@@ -28,8 +27,8 @@ $lang["common_gender"] = "Geslacht";
 $lang["common_gender_female"] = "V";
 $lang["common_gender_male"] = "M";
 $lang["common_gender_undefined"] = "";
-$lang["common_icon"] = "";
-$lang["common_id"] = "Id";
+$lang["common_icon"] = "Icoon";
+$lang["common_id"] = "ID";
 $lang["common_import"] = "Importeren";
 $lang["common_import_change_file"] = "Wijzigen";
 $lang["common_import_csv"] = "CSV importeren";
@@ -42,7 +41,7 @@ $lang["common_last_name_required"] = "Achternaam is een vereist veld.";
 $lang["common_last_page"] = "Laatste";
 $lang["common_learn_about_project"] = "om de laatste informatie over het project te bekijken.";
 $lang["common_list_of"] = "Lijst van";
-$lang["common_logo"] = "";
+$lang["common_logo"] = "Logo";
 $lang["common_logo_mark"] = "";
 $lang["common_logout"] = "Afmelden";
 $lang["common_migration_needed"] = "Een databasemigratie naar %1 zal starten na aanmelding.";

application/language/nl/config_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["config_address"] = "Bedrijfsadres";
 $lang["config_address_required"] = "Bedrijfsadres is een vereist veld.";
 $lang["config_all_set"] = "Alle bestandsmachtigingen zijn juist ingesteld!";
@@ -177,7 +176,7 @@ $lang["config_locale_info"] = "Lokalisatie configuratie informatie";
 $lang["config_location"] = "Voorraad";
 $lang["config_location_configuration"] = "Voorraadlocaties";
 $lang["config_location_info"] = "Locatie configuratie informatie";
-$lang["config_login_form"] = "";
+$lang["config_login_form"] = "Stijl aanmeldformulier";
 $lang["config_logout"] = "Wilt u een reservekopie maken voor het afmelden? Klik op [OK] om te bevestigen of op [Annuleren] om toch af te melden.";
 $lang["config_mailchimp"] = "MailChimp";
 $lang["config_mailchimp_api_key"] = "MailChimp API-sleutel";
@@ -292,7 +291,7 @@ $lang["config_tax_decimals"] = "Belasting decimalen";
 $lang["config_tax_id"] = "Belasting ID";
 $lang["config_tax_included"] = "Inclusief belasting";
 $lang["config_theme"] = "Thema";
-$lang["config_theme_preview"] = "";
+$lang["config_theme_preview"] = "Thema voorbeeld:";
 $lang["config_thousands_separator"] = "Duizenden scheidingsteken";
 $lang["config_timezone"] = "Tijdzone";
 $lang["config_timezone_error"] = "OSPOS tijdzone is anders dan uw lokale tijdzone.";

application/language/nl/login_lang.php

@@ -1,13 +1,12 @@
-<?php 
-
+<?php
 $lang["login_gcaptcha"] = "Ik ben geen robot.";
 $lang["login_go"] = "Aanmelden";
 $lang["login_invalid_gcaptcha"] = "Bewijs dat je geen robot bent.";
 $lang["login_invalid_installation"] = "De installatie is niet juist, controleer uw php.ini bestand.";
-$lang["login_invalid_username_and_password"] = "Ongeldige gebruikersnaam of wachtwoord.";
+$lang["login_invalid_username_and_password"] = "Ongeldige gebruikersnaam en/of wachtwoord.";
 $lang["login_login"] = "Aanmelden";
-$lang["login_logout"] = "";
-$lang["login_migration_needed"] = "";
+$lang["login_logout"] = "Afmelden";
+$lang["login_migration_needed"] = "Een databasemigratie naar %1 zal starten na aanmelding.";
 $lang["login_password"] = "Wachtwoord";
 $lang["login_username"] = "Gebruikersnaam";
-$lang["login_welcome"] = "";
+$lang["login_welcome"] = "Welkom bij %1!";

application/language/pl/attributes_lang.php

@@ -1,6 +1,6 @@
 <?php 
 
-$lang["attributes_attribute_value_invalid_chars"] = "Wartość atrybutu nie może zawierać \\"_\\" lub \\"|\\"";
+$lang["attributes_attribute_value_invalid_chars"] = "Wartość atrybutu nie może zawierać'_' lub '|'";
 $lang["attributes_confirm_delete"] = "";
 $lang["attributes_confirm_restore"] = "";
 $lang["attributes_definition_cannot_be_deleted"] = "";

application/language/ta/attributes_lang.php

@@ -1,8 +1,7 @@
-<?php 
-
-$lang["attributes_attribute_value_invalid_chars"] = "Attribute value cannot contain '_' or '|'";
-$lang["attributes_confirm_delete"] = "Are you sure you want to delete the selected attribute(s)?";
-$lang["attributes_confirm_restore"] = "Are you sure you want to restore the selected attribute(s)?";
+<?php
+$lang["attributes_attribute_value_invalid_chars"] = "பண்புக்கூறு மதிப்பு '_' அல்லது '|' கொண்டிருக்கக்கூடாது";
+$lang["attributes_confirm_delete"] = "தேர்ந்தெடுக்கப்பட்ட பண்புக்கூறு (களை) நீக்க விரும்புகிறீர்களா?";
+$lang["attributes_confirm_restore"] = "தேர்ந்தெடுக்கப்பட்ட பண்புக்கூறுகளை (களை) மீட்டெடுக்க விரும்புகிறீர்களா?";
 $lang["attributes_definition_cannot_be_deleted"] = "Could not delete selected attribute(s)";
 $lang["attributes_definition_error_adding_updating"] = "Attribute %1 could not be added or updated. Please check the error log.";
 $lang["attributes_definition_flags"] = "Attribute Visibility";

application/language/ta/common_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["common_address_1"] = "முகவரி 1";
 $lang["common_address_2"] = "முகவரி 2";
 $lang["common_city"] = "நகரம்";
@@ -28,12 +27,12 @@ $lang["common_gender"] = "பாலினம்";
 $lang["common_gender_female"] = "பெண்";
 $lang["common_gender_male"] = "ஆண்";
 $lang["common_gender_undefined"] = "";
-$lang["common_icon"] = "";
-$lang["common_id"] = "இலக்கம்";
+$lang["common_icon"] = "உருவம்";
+$lang["common_id"] = "அடையாளம்";
 $lang["common_import"] = "தரவேற்று";
 $lang["common_import_change_file"] = "மாற்று";
 $lang["common_import_csv"] = "CSV தரவிறக்கு";
-$lang["common_import_full_path"] = "csv கோப்பிற்கான முழு பாதை தேவை";
+$lang["common_import_full_path"] = "CSV கோப்பிற்கான முழு பாதை தேவை";
 $lang["common_import_remove_file"] = "அகற்று";
 $lang["common_import_select_file"] = "கோப்பைத் தேர்ந்தெடுக்கவும்";
 $lang["common_inv"] = "அழைப்பிதழ்";
@@ -42,8 +41,8 @@ $lang["common_last_name_required"] = "குடும்ப பெயர் அ
 $lang["common_last_page"] = "கடை";
 $lang["common_learn_about_project"] = "திட்டத்தைப் பற்றிய சமீபத்திய தகவல்களை அறிய.";
 $lang["common_list_of"] = "பட்டியல்";
-$lang["common_logo"] = "";
-$lang["common_logo_mark"] = "";
+$lang["common_logo"] = "முத்திரை";
+$lang["common_logo_mark"] = "குறி";
 $lang["common_logout"] = "வெளியேறு";
 $lang["common_migration_needed"] = "% 1 க்கு தரவுத்தள மாற்றம் உள்நுழைந்த பிறகு தொடங்கும்.";
 $lang["common_new"] = "புதியது";
@@ -64,8 +63,8 @@ $lang["common_return_policy"] = "திரும்ப பெரும் கொ
 $lang["common_search"] = "தேடல்";
 $lang["common_search_options"] = "தேடல் விருப்பங்கள்";
 $lang["common_searched_for"] = "தேடியது";
-$lang["common_software_short"] = "";
-$lang["common_software_title"] = "";
+$lang["common_software_short"] = "OSPOS";
+$lang["common_software_title"] = "Open Source Point of Sale";
 $lang["common_state"] = "மாநிலம்";
 $lang["common_submit"] = "சமர்ப்பிக்கவும்";
 $lang["common_total_spent"] = "மொத்த செலவு";

application/language/ta/config_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["config_address"] = "Company Address";
 $lang["config_address_required"] = "Company address is a required field.";
 $lang["config_all_set"] = "All file permissions are set correctly!";
@@ -27,7 +26,7 @@ $lang["config_barcode_page_width"] = "Display page width";
 $lang["config_barcode_price"] = "Price";
 $lang["config_barcode_second_row"] = "Row 2";
 $lang["config_barcode_third_row"] = "Row 3";
-$lang["config_barcode_tooltip"] = "Warning: This feature can cause duplicate items to be imported or created.  Do not use if you do not want duplicate barcodes.";
+$lang["config_barcode_tooltip"] = "எச்சரிக்கை: இந்த அம்சம் நகல் உருப்படிகளை இறக்குமதி செய்ய அல்லது உருவாக்க காரணமாக இருக்கலாம். நீங்கள் நகல் பட்டைக்குறியீடுகளை விரும்பவில்லை என்றால் பயன்படுத்த வேண்டாம்.";
 $lang["config_barcode_type"] = "Barcode Type";
 $lang["config_barcode_width"] = "Width (px)";
 $lang["config_bottom"] = "Bottom";
@@ -179,12 +178,12 @@ $lang["config_location_configuration"] = "Stock Locations";
 $lang["config_location_info"] = "Location Configuration Information";
 $lang["config_login_form"] = "";
 $lang["config_logout"] = "Do you want to make a backup before logging out? Click [OK] to backup or [Cancel] to logout.";
-$lang["config_mailchimp"] = "Mailchimp";
-$lang["config_mailchimp_api_key"] = "Mailchimp API Key";
-$lang["config_mailchimp_configuration"] = "Mailchimp Configuration";
+$lang["config_mailchimp"] = "மெயில்சிம்ப்";
+$lang["config_mailchimp_api_key"] = "மெயில்சிம்ப் API விசை";
+$lang["config_mailchimp_configuration"] = "மெயில்சிம்ப் அமைப்பு";
 $lang["config_mailchimp_key_successfully"] = "API Key is valid.";
 $lang["config_mailchimp_key_unsuccessfully"] = "API Key is invalid.";
-$lang["config_mailchimp_lists"] = "Mailchimp List(s)";
+$lang["config_mailchimp_lists"] = "மெயில்சிம்ப் பட்டியல்(கள்)";
 $lang["config_mailchimp_tooltip"] = "Click the icon for an API Key.";
 $lang["config_message"] = "Message";
 $lang["config_message_configuration"] = "Message Configuration";

application/language/ta/customers_lang.php

@@ -32,7 +32,7 @@ $lang["customers_mailchimp_activity_open"] = "மின்னஞ்சல் த
 $lang["customers_mailchimp_activity_total"] = "மின்னஞ்சல் அனுப்பப்பட்டது";
 $lang["customers_mailchimp_activity_unopen"] = "மின்னஞ்சல் திறக்கப்படவில்லை";
 $lang["customers_mailchimp_email_client"] = "மின்னஞ்சல் வாடிக்கையாளர்";
-$lang["customers_mailchimp_info"] = "அஞ்சல்சிம்ப்";
+$lang["customers_mailchimp_info"] = "மெயில்சிம்ப்";
 $lang["customers_mailchimp_member_rating"] = "மதிப்பீடு";
 $lang["customers_mailchimp_status"] = "நிலை";
 $lang["customers_mailchimp_vip"] = "வி.ஐ.பி.";

application/language/ta/expenses_lang.php

@@ -1,46 +1,45 @@
-<?php 
-
-$lang["expenses_add_item"] = "Add Expense";
-$lang["expenses_amount"] = "Amount";
-$lang["expenses_amount_number"] = "Amount must be a number";
-$lang["expenses_amount_required"] = "Expense Amount required";
-$lang["expenses_by_category"] = "Category";
-$lang["expenses_cannot_be_deleted"] = "Could not delete Category Expense(s)";
-$lang["expenses_cash"] = "Cash";
-$lang["expenses_cash_filter"] = "Cash";
-$lang["expenses_categories_name"] = "Category";
-$lang["expenses_category_required"] = "category is a required field";
-$lang["expenses_check"] = "Check";
-$lang["expenses_check_filter"] = "Check";
-$lang["expenses_confirm_delete"] = "Are you sure you want to delete the selected Expense?";
-$lang["expenses_confirm_restore"] = "Are you sure you want to restore the selected Expenses(s)?";
-$lang["expenses_credit"] = "Credit Card";
-$lang["expenses_credit_filter"] = "Credit Card";
-$lang["expenses_date"] = "Date";
-$lang["expenses_date_number"] = "date must be a number";
-$lang["expenses_date_required"] = "date is a required field";
-$lang["expenses_debit"] = "Debit Card";
-$lang["expenses_debit_filter"] = "Debit Card";
-$lang["expenses_description"] = "Description";
-$lang["expenses_due"] = "Due";
-$lang["expenses_due_filter"] = "Due";
-$lang["expenses_employee"] = "Created By";
-$lang["expenses_error_adding_updating"] = "Error adding/updating Expense";
-$lang["expenses_expense_id"] = "Id";
-$lang["expenses_expenses_employee"] = "Employee";
-$lang["expenses_info"] = "Expense Info";
-$lang["expenses_is_deleted"] = "Deleted";
-$lang["expenses_name_required"] = "Expense Name required";
-$lang["expenses_new"] = "New Expense";
-$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";
-$lang["expenses_supplier_name"] = "Supplier";
-$lang["expenses_supplier_tax_code"] = "Tax Code";
-$lang["expenses_tax_amount"] = "Tax";
-$lang["expenses_update"] = "Update Expense";
+<?php
+$lang["expenses_add_item"] = "செலவை சேர்க்கவும்";
+$lang["expenses_amount"] = "தொகை";
+$lang["expenses_amount_number"] = "தொகை ஒரு எண்ணாக இருக்க வேண்டும்";
+$lang["expenses_amount_required"] = "செலவுத் தொகை தேவை";
+$lang["expenses_by_category"] = "வகை";
+$lang["expenses_cannot_be_deleted"] = "செலவு(களு)க்கான வகையை நீக்க முடியவில்லை";
+$lang["expenses_cash"] = "பணம்";
+$lang["expenses_cash_filter"] = "பணம்";
+$lang["expenses_categories_name"] = "வகை";
+$lang["expenses_category_required"] = "வகை என்பது தேவையான புலம்";
+$lang["expenses_check"] = "சரிபார்";
+$lang["expenses_check_filter"] = "சரிபார்";
+$lang["expenses_confirm_delete"] = "தேர்ந்தெடுக்கப்பட்ட செலவு(களை) நீக்க விரும்புகிறீர்களா?";
+$lang["expenses_confirm_restore"] = "தேர்ந்தெடுக்கப்பட்ட செலவு(களை) மீட்டெடுக்க விரும்புகிறீர்களா?";
+$lang["expenses_credit"] = "கடன் அட்டை";
+$lang["expenses_credit_filter"] = "கடன் அட்டை";
+$lang["expenses_date"] = "தேதி";
+$lang["expenses_date_number"] = "தேதி ஒரு எண்ணாக இருக்க வேண்டும்";
+$lang["expenses_date_required"] = "தேதி என்பது ஒரு தேவையான புலம்";
+$lang["expenses_debit"] = "பற்று அட்டை";
+$lang["expenses_debit_filter"] = "பற்று அட்டை";
+$lang["expenses_description"] = "விளக்கம்";
+$lang["expenses_due"] = "கொடுக்க வேண்டிய";
+$lang["expenses_due_filter"] = "கொடுக்க வேண்டிய";
+$lang["expenses_employee"] = "உருவாக்கியவர்";
+$lang["expenses_error_adding_updating"] = "செலவைச் சேர்ப்பதில் / புதுப்பிப்பதில் பிழை";
+$lang["expenses_expense_id"] = "அடையாளம்";
+$lang["expenses_expenses_employee"] = "பணியாளர்";
+$lang["expenses_info"] = "செலவு தகவல்";
+$lang["expenses_is_deleted"] = "நீக்கப்பட்டது";
+$lang["expenses_name_required"] = "செலவுக்கான பெயர் தேவை";
+$lang["expenses_new"] = "புதிய செலவு";
+$lang["expenses_no_expenses_to_display"] = "காண்பிக்க செலவுகள் எதுவும் இல்லை";
+$lang["expenses_none_selected"] = "நீங்கள் எந்த செலவையும் தேர்ந்தெடுக்கவில்லை";
+$lang["expenses_one_or_multiple"] = "செலவு(கள்)";
+$lang["expenses_payment"] = "கட்டண வகை";
+$lang["expenses_start_typing_supplier_name"] = "வழங்குபவரின் பெயரைத் தட்டச்சு செய்யத் தொடங்குங்கள் ...";
+$lang["expenses_successful_adding"] = "செலவு வெற்றிகரமாக சேர்க்கிறது";
+$lang["expenses_successful_deleted"] = "செலவு வெற்றிகரமாக நீக்கப்பட்டது";
+$lang["expenses_successful_updating"] = "செலவு வெற்றிகரமாக புதுப்பிக்கப்படுகிறது";
+$lang["expenses_supplier_name"] = "வழங்குபவர்";
+$lang["expenses_supplier_tax_code"] = "வரி குறியீடு";
+$lang["expenses_tax_amount"] = "வரி";
+$lang["expenses_update"] = "செலவுகள் புதுப்பிப்பு";

application/language/ta/items_lang.php

@@ -80,7 +80,7 @@ $lang["items_remove_image"] = "Remove Image";
 $lang["items_reorder_level"] = "Reorder Level";
 $lang["items_reorder_level_number"] = "Reorder Level must be a number.";
 $lang["items_reorder_level_required"] = "Reorder Level is a required field.";
-$lang["items_retrive_item_info"] = "Retrive Item Info";
+$lang["items_retrive_item_info"] = "உருப்படி தகவலை மீட்டெடுக்கவும்";
 $lang["items_sales_tax_1"] = "Sales Tax";
 $lang["items_sales_tax_2"] = "Sales Tax 2";
 $lang["items_search_attributes"] = "Search Attributes";

application/language/ta/login_lang.php

@@ -1,13 +1,12 @@
-<?php 
-
+<?php
 $lang["login_gcaptcha"] = "ரோபோ ஸ்கிரிப்ட்கள் அல்ல.";
 $lang["login_go"] = "செல்";
-$lang["login_invalid_gcaptcha"] = "ரோபோ ஸ்கிரிப்ட்கள் அல்ல.";
+$lang["login_invalid_gcaptcha"] = "நீங்கள் தானியங்கி அல்ல என்பதை உறுதி செய்யவும்.";
 $lang["login_invalid_installation"] = "நிறுவியத்தில் தவறு , php.ini கோப்பை சரி பார்க்கவும் .";
 $lang["login_invalid_username_and_password"] = "பயனர்பெயர் அல்லது கடவுச்சொல் தவறு.";
 $lang["login_login"] = "உள்நுழைய";
-$lang["login_logout"] = "";
-$lang["login_migration_needed"] = "";
+$lang["login_logout"] = "விடுபதிகை";
+$lang["login_migration_needed"] = "% 1 க்கு தரவுத்தள இடம்பெயர்வு உள்நுழைந்த பிறகு தொடங்கும்.";
 $lang["login_password"] = "கடவுச்சொல்";
 $lang["login_username"] = "பயனர்பெயர்";
-$lang["login_welcome"] = "";
+$lang["login_welcome"] = "% 1 க்கு வருக!";

application/language/ta/receivings_lang.php

@@ -1,6 +1,5 @@
-<?php 
-
-$lang["receivings_cancel_receiving"] = "Cancel";
+<?php
+$lang["receivings_cancel_receiving"] = "ரத்து செய்";
 $lang["receivings_cannot_be_deleted"] = "Receiving(s) delete failed.";
 $lang["receivings_comments"] = "Comments";
 $lang["receivings_complete_receiving"] = "Finish";

application/language/ta/reports_lang.php

@@ -1,11 +1,10 @@
-<?php 
-
-$lang["reports_all"] = "All";
-$lang["reports_authority"] = "Authority";
-$lang["reports_canceled"] = "Canceled";
-$lang["reports_categories"] = "Categories";
-$lang["reports_categories_summary_report"] = "Categories Summary Report";
-$lang["reports_category"] = "Category";
+<?php
+$lang["reports_all"] = "அனைத்தும்";
+$lang["reports_authority"] = "அதிகாரம்";
+$lang["reports_canceled"] = "ரத்து செய்யப்பட்டது";
+$lang["reports_categories"] = "வகைகள்";
+$lang["reports_categories_summary_report"] = "வகைகளின் சுருக்க அறிக்கை";
+$lang["reports_category"] = "வகை";
 $lang["reports_code_canceled"] = "CNL";
 $lang["reports_code_invoice"] = "INV";
 $lang["reports_code_pos"] = "POS";
@@ -13,66 +12,66 @@ $lang["reports_code_quote"] = "Q";
 $lang["reports_code_return"] = "RET";
 $lang["reports_code_type"] = "Type";
 $lang["reports_code_work_order"] = "W/O";
-$lang["reports_comments"] = "Comments";
+$lang["reports_comments"] = "கருத்துரைகள்";
 $lang["reports_complete"] = "Completed Sales and Returns";
-$lang["reports_completed_sales"] = "Completed Sales";
-$lang["reports_confirm_delete"] = "Are you sure you want to delete selected entry(s)?";
-$lang["reports_confirm_restore"] = "Are you sure you want to restore selected entry(s)?";
-$lang["reports_cost"] = "Wholesale";
-$lang["reports_cost_price"] = "Wholesale Price";
-$lang["reports_count"] = "Count";
-$lang["reports_customer"] = "Customer";
-$lang["reports_customers"] = "Customers";
-$lang["reports_customers_summary_report"] = "Customers Summary Report";
+$lang["reports_completed_sales"] = "முடிந்த விற்பனைகள்";
+$lang["reports_confirm_delete"] = "தேர்ந்தெடுக்கப்பட்ட நுழைவு(களை) நீக்க விரும்புகிறீர்களா?";
+$lang["reports_confirm_restore"] = "தேர்ந்தெடுக்கப்பட்ட நுழைவு(களை) மீட்டமைக்க விரும்புகிறீர்களா?";
+$lang["reports_cost"] = "மொத்த விற்பனை";
+$lang["reports_cost_price"] = "மொத்த விற்பனை விலை";
+$lang["reports_count"] = "எண்ணிக்கை";
+$lang["reports_customer"] = "வாடிக்கையாளர்";
+$lang["reports_customers"] = "வாடிக்கையாளர்கள்";
+$lang["reports_customers_summary_report"] = "வாடிக்கையாளர்களின் சுருக்க அறிக்கை";
 $lang["reports_date"] = "Date";
-$lang["reports_date_range"] = "Date Range";
+$lang["reports_date_range"] = "தேதி வரம்பு";
 $lang["reports_description"] = "Description";
-$lang["reports_detailed_receivings_report"] = "Detailed Receivings Report";
-$lang["reports_detailed_reports"] = "Detailed Reports";
+$lang["reports_detailed_receivings_report"] = "விரிவான பெறுதல் அறிக்கை";
+$lang["reports_detailed_reports"] = "விரிவான அறிக்கைகள்";
 $lang["reports_detailed_requisition_report"] = "";
-$lang["reports_detailed_sales_report"] = "Detailed Transactions Report";
-$lang["reports_discount"] = "Discount";
-$lang["reports_discount_fixed"] = "Fixed Discount";
-$lang["reports_discount_percent"] = "Discount Percent";
-$lang["reports_discount_type"] = "Discount Type";
-$lang["reports_discounts"] = "Discounts";
-$lang["reports_discounts_summary_report"] = "Discounts Summary Report";
-$lang["reports_earned"] = "Points Earned";
-$lang["reports_employee"] = "Employee";
-$lang["reports_employees"] = "Employees";
-$lang["reports_employees_summary_report"] = "Employees Summary Report";
-$lang["reports_expenses"] = "Expenses";
-$lang["reports_expenses_amount"] = "Amount";
-$lang["reports_expenses_categories"] = "Expenses";
-$lang["reports_expenses_categories_summary_report"] = "Expense Categories Summary Report";
-$lang["reports_expenses_category"] = "Category";
-$lang["reports_expenses_tax_amount"] = "Tax";
-$lang["reports_expenses_total_amount"] = "Total Amount";
-$lang["reports_expenses_total_tax_amount"] = "Total Tax";
-$lang["reports_graphical_reports"] = "Graphical Reports";
-$lang["reports_inventory"] = "Inventory";
-$lang["reports_inventory_low"] = "Low Inventory";
-$lang["reports_inventory_low_report"] = "Low Inventory Report";
-$lang["reports_inventory_reports"] = "Inventory Reports";
-$lang["reports_inventory_summary"] = "Inventory Summary";
-$lang["reports_inventory_summary_report"] = "Inventory Summary Report";
+$lang["reports_detailed_sales_report"] = "விரிவான பரிவர்த்தனை அறிக்கை";
+$lang["reports_discount"] = "தள்ளுபடி";
+$lang["reports_discount_fixed"] = "நிலையான தள்ளுபடி";
+$lang["reports_discount_percent"] = "தள்ளுபடி சதவீதம்";
+$lang["reports_discount_type"] = "தள்ளுபடி வகை";
+$lang["reports_discounts"] = "தள்ளுபடிகள்";
+$lang["reports_discounts_summary_report"] = "தள்ளுபடிகளுக்கான சுருக்கமான அறிக்கை";
+$lang["reports_earned"] = "சம்பாதித்த புள்ளிகள்";
+$lang["reports_employee"] = "ஊழியர்";
+$lang["reports_employees"] = "ஊழியர்கள்";
+$lang["reports_employees_summary_report"] = "ஊழியர்களின் சுருக்க அறிக்கை";
+$lang["reports_expenses"] = "செலவுகள்";
+$lang["reports_expenses_amount"] = "தொகை";
+$lang["reports_expenses_categories"] = "செலவுகள்";
+$lang["reports_expenses_categories_summary_report"] = "செலவு வகைகளின் சுருக்க அறிக்கை";
+$lang["reports_expenses_category"] = "வகை";
+$lang["reports_expenses_tax_amount"] = "வரி";
+$lang["reports_expenses_total_amount"] = "மொத்த தொகை";
+$lang["reports_expenses_total_tax_amount"] = "மொத்த வரி";
+$lang["reports_graphical_reports"] = "வரைகலை அறிக்கைகள்";
+$lang["reports_inventory"] = "சரக்கு";
+$lang["reports_inventory_low"] = "குறைந்த சரக்கு";
+$lang["reports_inventory_low_report"] = "குறைந்த சரக்கு அறிக்கை";
+$lang["reports_inventory_reports"] = "சரக்கு அறிக்கைகள்";
+$lang["reports_inventory_summary"] = "சரக்கு சுருக்கம்";
+$lang["reports_inventory_summary_report"] = "சரக்கு சுருக்க அறிக்கை";
 $lang["reports_item"] = "Item";
-$lang["reports_item_count"] = "Filter Item Count";
+$lang["reports_item_count"] = "உருப்படி எண்ணிக்கையை வடிகட்டவும்";
 $lang["reports_item_name"] = "Item Name";
-$lang["reports_item_number"] = "Barcode";
+$lang["reports_item_number"] = "அடையாளக் குறியீடு";
 $lang["reports_items"] = "Items";
-$lang["reports_items_purchased"] = "Items Purchased";
-$lang["reports_items_received"] = "Items Received";
-$lang["reports_items_summary_report"] = "Items Summary Report";
-$lang["reports_jurisdiction"] = "Jurisdiction";
+$lang["reports_items_purchased"] = "வாங்கிய பொருட்கள்";
+$lang["reports_items_received"] = "பெறப்பட்ட பொருட்கள்";
+$lang["reports_items_summary_report"] = "உருப்படிகளின் சுருக்க அறிக்கை";
+$lang["reports_jurisdiction"] = "அதிகார எல்லை";
 $lang["reports_low_inventory"] = "";
 $lang["reports_low_inventory_report"] = "";
-$lang["reports_low_sell_quantity"] = "Low Sell Qty";
-$lang["reports_more_than_zero"] = "More than zero";
+$lang["reports_low_sell_quantity"] = "குறைந்த விற்பனை அளவு";
+$lang["reports_more_than_zero"] = "சுழியத்தைவிட அதிகம்";
 $lang["reports_name"] = "Name";
-$lang["reports_no_reports_to_display"] = "No Items to display.";
-$lang["reports_payment_type"] = "Payment Type";
-$lang["reports_payments"] = "Payments";
+$lang["reports_no_reports_to_display"] = "காண்பிக்க உருப்படிகள் இல்லை.";
+$lang["reports_payment_type"] = "கட்டண வகை";
+$lang["reports_payments"] = "கட்டணங்கள்";
 $lang["reports_payments_summary_report"] = "Payments Summary Report";
 $lang["reports_profit"] = "Profit";
 $lang["reports_quantity"] = "Quantity";

application/language/ta/sales_lang.php

@@ -15,9 +15,9 @@ $lang["sales_cash_deposit"] = "பண வைப்பு";
 $lang["sales_cash_filter"] = "பணம்";
 $lang["sales_change_due"] = "நிலுவை";
 $lang["sales_change_price"] = "விற்பனை விலையை மாற்றவும்";
-$lang["sales_check"] = "Check";
-$lang["sales_check_balance"] = "Check remainder";
-$lang["sales_check_filter"] = "Check";
+$lang["sales_check"] = "சோதி";
+$lang["sales_check_balance"] = "மீதமுள்ளதை சோதி";
+$lang["sales_check_filter"] = "சோதி";
 $lang["sales_comment"] = "குறிப்புரை";
 $lang["sales_comments"] = "குறிப்புரைகள்";
 $lang["sales_complete_sale"] = "நிறைவுறு";
@@ -62,7 +62,7 @@ $lang["sales_employee"] = "ஊழியர்";
 $lang["sales_entry"] = "உள்ளீடு";
 $lang["sales_error_editing_item"] = "பொருளை திருத்துவதில் பிழை";
 $lang["sales_find_or_scan_item"] = "பொருளைக் தேடு அல்லது ஸ்கேன் செய்யுங்கள்";
-$lang["sales_find_or_scan_item_or_receipt"] = "பொருள் அல்லது ரசீதைக் தேடு  அல்லது ஸ்கேன் செய்யுங்கள்";
+$lang["sales_find_or_scan_item_or_receipt"] = "தேடு அல்லது பொருளை வருடு அல்லது ரசீது";
 $lang["sales_giftcard"] = "பரிசு அட்டை";
 $lang["sales_giftcard_balance"] = "பரிசு அட்டை இருப்பு";
 $lang["sales_giftcard_number"] = "பரிசு அட்டை எண்";
@@ -96,54 +96,54 @@ $lang["sales_must_enter_numeric_giftcard"] = "பரிசு அட்டை
 $lang["sales_new_customer"] = "புது வாடிக்கையாளர்";
 $lang["sales_new_item"] = "புதிய பொருள்";
 $lang["sales_no_description"] = "No description";
-$lang["sales_no_filter"] = "All";
-$lang["sales_no_items_in_cart"] = "There are no Items in the cart.";
-$lang["sales_no_sales_to_display"] = "No Sales to display.";
-$lang["sales_none_selected"] = "You have not selected any Sale(s) to delete.";
+$lang["sales_no_filter"] = "அனைத்தும்";
+$lang["sales_no_items_in_cart"] = "வண்டியில் எந்த பொருட்களும் இல்லை.";
+$lang["sales_no_sales_to_display"] = "காண்பிக்க எந்த விற்பனையும் இல்லை.";
+$lang["sales_none_selected"] = "விற்பனை(களை) நீக்க நீங்கள் எந்தப் பொருட்களையும் தேர்ந்தெடுக்கவில்லை.";
 $lang["sales_nontaxed_ind"] = " ";
-$lang["sales_not_authorized"] = "This action is not authorized.";
-$lang["sales_one_or_multiple"] = "Sale(s)";
-$lang["sales_payment"] = "Payment Type";
-$lang["sales_payment_amount"] = "Amount";
-$lang["sales_payment_not_cover_total"] = "Payment Amount must be greater than or equal to Total.";
+$lang["sales_not_authorized"] = "இந்த செயலுக்கு அங்கீகாரம் இல்லை.";
+$lang["sales_one_or_multiple"] = "விற்பனை(கள்)";
+$lang["sales_payment"] = "கட்டண வகை";
+$lang["sales_payment_amount"] = "தொகை";
+$lang["sales_payment_not_cover_total"] = "கட்டண தொகை மொத்தத்தை விட அதிகமாகவோ அல்லது சமமாகவோ இருக்க வேண்டும்.";
 $lang["sales_payment_type"] = "Type";
-$lang["sales_payments_total"] = "Payments Total";
-$lang["sales_price"] = "Price";
-$lang["sales_print_after_sale"] = "Print after Sale";
-$lang["sales_quantity"] = "Quantity";
-$lang["sales_quantity_less_than_reorder_level"] = "Warning: Desired Quantity is below Reorder Level for that Item.";
-$lang["sales_quantity_less_than_zero"] = "Warning: Desired Quantity is insufficient. You can still process the sale, but audit your inventory.";
-$lang["sales_quantity_of_items"] = "Quantity of %1 Items";
-$lang["sales_quote"] = "Quote";
-$lang["sales_quote_number"] = "Quote Number";
-$lang["sales_quote_number_duplicate"] = "Quote Number must be unique.";
-$lang["sales_quote_sent"] = "Quote sent to";
-$lang["sales_quote_unsent"] = "Quote failed to be sent to";
-$lang["sales_receipt"] = "Sales Receipt";
-$lang["sales_receipt_no_email"] = "This customer does not have a valid email address.";
-$lang["sales_receipt_number"] = "Sale #";
-$lang["sales_receipt_sent"] = "Receipt sent to";
-$lang["sales_receipt_unsent"] = "Receipt failed to be sent to";
-$lang["sales_refund"] = "Refund Type";
-$lang["sales_register"] = "Sales Register";
-$lang["sales_remove_customer"] = "Remove Customer";
+$lang["sales_payments_total"] = "மொத்தக் கட்டணம்";
+$lang["sales_price"] = "விலை";
+$lang["sales_print_after_sale"] = "விற்பனைக்குப் பிறகு அச்சிடு";
+$lang["sales_quantity"] = "அளவு";
+$lang["sales_quantity_less_than_reorder_level"] = "எச்சரிக்கை: விரும்பிய அளவு அந்த உருப்படிக்கான மறுவரிசை நிலைக்கு கீழே உள்ளது.";
+$lang["sales_quantity_less_than_zero"] = "எச்சரிக்கை: விரும்பிய அளவு போதுமானதாக இல்லை. இருப்பினும் நீங்கள் விற்பனையைச் செயல்படுத்தலாம், ஆனால் உங்கள் சரக்குகளைத் தணிக்கை செய்யுங்கள்.";
+$lang["sales_quantity_of_items"] = "% 1 பொருட்களின் அளவு";
+$lang["sales_quote"] = "விலைப்புள்ளி";
+$lang["sales_quote_number"] = "விலைப்புள்ளி எண்";
+$lang["sales_quote_number_duplicate"] = "விலைப்புள்ளி எண் தனித்துவமாக இருக்க வேண்டும்.";
+$lang["sales_quote_sent"] = "விலைப்புள்ளி அனுப்பப்பட்டது";
+$lang["sales_quote_unsent"] = "விலைப்புள்ளியை அனுப்ப இயலவில்லை";
+$lang["sales_receipt"] = "விற்பனை ரசீது";
+$lang["sales_receipt_no_email"] = "இந்த வாடிக்கையாளருக்கு சரியான மின்னஞ்சல் முகவரி இல்லை.";
+$lang["sales_receipt_number"] = "விற்பனை #";
+$lang["sales_receipt_sent"] = "ரசீது அனுப்பப்பட்டது";
+$lang["sales_receipt_unsent"] = "ரசீதை அனுப்ப இயலவில்லை";
+$lang["sales_refund"] = "பணத்தைத் திரும்பப்பெறுதல் வகை";
+$lang["sales_register"] = "விற்பனை பதிவு";
+$lang["sales_remove_customer"] = "வாடிக்கையாளரை அகற்று";
 $lang["sales_return"] = "Return";
-$lang["sales_rewards"] = "Reward Points";
-$lang["sales_rewards_balance"] = "Reward Points Balance";
-$lang["sales_sale"] = "Sale";
-$lang["sales_sale_by_invoice"] = "Sale by Invoice";
-$lang["sales_sale_for_customer"] = "Customer:";
-$lang["sales_sale_time"] = "Time";
-$lang["sales_sales_tax"] = "Sales Tax";
-$lang["sales_select_customer"] = "Select Customer";
-$lang["sales_send_invoice"] = "Send Invoice";
-$lang["sales_send_quote"] = "Send Quote";
-$lang["sales_send_receipt"] = "Send Receipt";
-$lang["sales_send_work_order"] = "Send Work Order";
-$lang["sales_serial"] = "Serial";
-$lang["sales_show_invoice"] = "Show Invoice";
-$lang["sales_show_receipt"] = "Show Receipt";
-$lang["sales_start_typing_customer_name"] = "Start typing customer details...";
+$lang["sales_rewards"] = "வெகுமதி புள்ளிகள்";
+$lang["sales_rewards_balance"] = "வெகுமதி புள்ளிகள் இருப்பு";
+$lang["sales_sale"] = "விற்பனை";
+$lang["sales_sale_by_invoice"] = "விலைப்பட்டியல் மூலம் விற்பனை";
+$lang["sales_sale_for_customer"] = "வாடிக்கையாளர்:";
+$lang["sales_sale_time"] = "நேரம்";
+$lang["sales_sales_tax"] = "விற்பனை வரி";
+$lang["sales_select_customer"] = "வாடிக்கையாளரைத் தேர்ந்தெடு";
+$lang["sales_send_invoice"] = "விலைப்பட்டியல் அனுப்பு";
+$lang["sales_send_quote"] = "விலைப்புள்ளியை அனுப்பு";
+$lang["sales_send_receipt"] = "ரசீதை அனுப்பு";
+$lang["sales_send_work_order"] = "பணி ஆணையை அனுப்பவும்";
+$lang["sales_serial"] = "வரிசை";
+$lang["sales_show_invoice"] = "விலைப்பட்டியலைக் காட்டு";
+$lang["sales_show_receipt"] = "ரசீதைக் காட்டு";
+$lang["sales_start_typing_customer_name"] = "வாடிக்கையாளர் விவரங்களைத் தட்டச்சு செய்யத் தொடங்கு...";
 $lang["sales_start_typing_item_name"] = "Start typing Item Name or scan Barcode...";
 $lang["sales_stock"] = "Stock";
 $lang["sales_stock_location"] = "Stock Location";

application/language/th/common_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["common_address_1"] = "ที่อยู่";
 $lang["common_address_2"] = "ที่อยู่ (เพิ่มเติม)";
 $lang["common_city"] = "อำเภอ";
@@ -28,8 +27,8 @@ $lang["common_gender"] = "เพศ";
 $lang["common_gender_female"] = "หญิง";
 $lang["common_gender_male"] = "ชาย";
 $lang["common_gender_undefined"] = "";
-$lang["common_icon"] = "";
-$lang["common_id"] = "ID";
+$lang["common_icon"] = "ไอคอน";
+$lang["common_id"] = "ไอดี";
 $lang["common_import"] = "นำเข้า";
 $lang["common_import_change_file"] = "เปลี่ยน";
 $lang["common_import_csv"] = "นำเข้าไฟล์ CSV";
@@ -42,8 +41,8 @@ $lang["common_last_name_required"] = "นามสกุล จำเป็น
 $lang["common_last_page"] = "ลำดับสุดท้าย";
 $lang["common_learn_about_project"] = "เพื่อศึกษาข้อมูลล่าสุดของโครงการ";
 $lang["common_list_of"] = "รายการ";
-$lang["common_logo"] = "";
-$lang["common_logo_mark"] = "";
+$lang["common_logo"] = "โลโก้";
+$lang["common_logo_mark"] = "เครื่องหมาย";
 $lang["common_logout"] = "ออกจากระบบ";
 $lang["common_migration_needed"] = "การย้ายฐานข้อมูลไปยัง %1 จะเริ่มขึ้นหลังจากเข้าสู่ระบบ";
 $lang["common_new"] = "สร้างใหม่";
@@ -64,8 +63,8 @@ $lang["common_return_policy"] = "นโยบายคืนสินค้า";
 $lang["common_search"] = "ค้นหา";
 $lang["common_search_options"] = "ตัวเลือกการค้นหา";
 $lang["common_searched_for"] = "การค้นหา";
-$lang["common_software_short"] = "";
-$lang["common_software_title"] = "";
+$lang["common_software_short"] = "โอเอสพีโอเอส";
+$lang["common_software_title"] = "โอเพ่นซอร์สพอยออฟเซล";
 $lang["common_state"] = "จังหวัด";
 $lang["common_submit"] = "ส่งข้อมูล";
 $lang["common_total_spent"] = "ยอดสั่งซื้อทั้งหมด";

application/language/th/config_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["config_address"] = "ที่อยู่";
 $lang["config_address_required"] = "ที่อยู่ต้องกรอก";
 $lang["config_all_set"] = "การตั้งค่าอนุญาตไฟล์ทั้งหมดถูกต้อง!";
@@ -127,7 +126,7 @@ $lang["config_financial_year_may"] = "วันที่ 1 พฤษภาคม
 $lang["config_financial_year_nov"] = "วันที่ 1 พฤศจิกายน";
 $lang["config_financial_year_oct"] = "วันที่ 1 ตุลาคม";
 $lang["config_financial_year_sep"] = "วันที่ 1 กันยายน";
-$lang["config_floating_labels"] = "";
+$lang["config_floating_labels"] = "Floating Labels";
 $lang["config_gcaptcha_enable"] = "ขอรหัสยืนยันใหม่ เพื่อเข้าระบบ";
 $lang["config_gcaptcha_secret_key"] = "รหัสลับ สำหรับรหัสยืนยัน";
 $lang["config_gcaptcha_secret_key_required"] = "จำเป็นต้องระบุ รหัสลับ สำหรับรหัสยืนยัน";
@@ -147,7 +146,7 @@ $lang["config_image_restrictions"] = "ข้อจำกัดของไฟล
 $lang["config_include_hsn"] = "เพิ่มการรองรับ HSN Codes";
 $lang["config_info"] = "ข้อมูลร้านค้า";
 $lang["config_info_configuration"] = "ข้อมูลร้านค้า";
-$lang["config_input_groups"] = "";
+$lang["config_input_groups"] = "Input Groups";
 $lang["config_integrations"] = "การเข้าร่วม";
 $lang["config_integrations_configuration"] = "การเข้าร่วมกับบุคคลภายนอก";
 $lang["config_invoice"] = "ใบแจ้งหนี้";
@@ -177,7 +176,7 @@ $lang["config_locale_info"] = "ข้อมูลเขตพื้นที่"
 $lang["config_location"] = "สินค้าคงคลัง";
 $lang["config_location_configuration"] = "ตำแหน่งสินค้าคงคลัง";
 $lang["config_location_info"] = "ข้อมูลตำแหน่งสินค้าคงคลัง";
-$lang["config_login_form"] = "";
+$lang["config_login_form"] = "รูปแบบแบบฟอร์มการเข้าระบบ";
 $lang["config_logout"] = "ต้องการสำรองข้อมูลก่อนออกจากระบบหรือไม่? [OK] สำรองข้อมูล / [Cancel] ออกจากระบบ";
 $lang["config_mailchimp"] = "ระบบส่งอีเมล์เมล์ชิม";
 $lang["config_mailchimp_api_key"] = "API Key สำหรับระบบส่งอีเมล์เมล์ชิม";
@@ -292,7 +291,7 @@ $lang["config_tax_decimals"] = "จำนวนทศนิยมภาษี";
 $lang["config_tax_id"] = "เลขประจำตัวผู้เสียภาษี";
 $lang["config_tax_included"] = "รวมภาษีแล้ว";
 $lang["config_theme"] = "Theme";
-$lang["config_theme_preview"] = "";
+$lang["config_theme_preview"] = "ดูตัวอย่างธีม:";
 $lang["config_thousands_separator"] = "ตัวคั่นหลักพัน";
 $lang["config_timezone"] = "โซนเวลา";
 $lang["config_timezone_error"] = "เขตเวลาของระบบ OSPOS แตกต่างกับเขตเวลาปัจจุบันของคุณ";

application/language/th/login_lang.php

@@ -1,13 +1,12 @@
-<?php 
-
+<?php
 $lang["login_gcaptcha"] = "ฉันไม่ใช่หุ่นยนต์";
 $lang["login_go"] = "ไป";
 $lang["login_invalid_gcaptcha"] = "กรุณาแสดงตัวตนว่าคุณไม่ใช่หุ่นยนต์";
 $lang["login_invalid_installation"] = "การติดตั้งไม่ถูกต้องตรวจสอบการตั้งค่าที่ไฟล์ php.ini ของคุณ";
-$lang["login_invalid_username_and_password"] = "ชื่อผู้ใช้/รหัส ไม่ถูกต้อง";
+$lang["login_invalid_username_and_password"] = "ชื่อผู้ใช้งานและ/หรือรหัสผ่านเข้าระบบไม่ถูกต้อง";
 $lang["login_login"] = "ลงชื่อเข้าใช้";
-$lang["login_logout"] = "";
-$lang["login_migration_needed"] = "";
+$lang["login_logout"] = "ออกจากระบบ";
+$lang["login_migration_needed"] = "การย้ายฐานข้อมูลไปยัง %1 จะเริ่มต้นหลังจากเข้าสู่ระบบ";
 $lang["login_password"] = "รหัสผ่าน";
 $lang["login_username"] = "ชื่อผู้ใช้";
-$lang["login_welcome"] = "";
+$lang["login_welcome"] = "ยินดีต้อนรับสู่ %1!";

application/language/tr/common_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["common_address_1"] = "Adres 1";
 $lang["common_address_2"] = "Adres 2";
 $lang["common_city"] = "Şehir";
@@ -28,12 +27,12 @@ $lang["common_gender"] = "Cinsiyet";
 $lang["common_gender_female"] = "K";
 $lang["common_gender_male"] = "E";
 $lang["common_gender_undefined"] = "";
-$lang["common_icon"] = "";
+$lang["common_icon"] = "Simge";
 $lang["common_id"] = "Kimlik";
 $lang["common_import"] = "Aktar";
 $lang["common_import_change_file"] = "Değiştir";
 $lang["common_import_csv"] = "CSV İçe Aktarım";
-$lang["common_import_full_path"] = "CSV dosyası yeri";
+$lang["common_import_full_path"] = "CSV dosyasının tam yolu gerekli";
 $lang["common_import_remove_file"] = "Kaldır";
 $lang["common_import_select_file"] = "Dosya seç";
 $lang["common_inv"] = "Stok";
@@ -42,8 +41,8 @@ $lang["common_last_name_required"] = "Soyad zorunlu alandır.";
 $lang["common_last_page"] = "Son";
 $lang["common_learn_about_project"] = "Proje hakkında en son bilgileri öğren.";
 $lang["common_list_of"] = "Liste";
-$lang["common_logo"] = "";
-$lang["common_logo_mark"] = "";
+$lang["common_logo"] = "Logo";
+$lang["common_logo_mark"] = "İm";
 $lang["common_logout"] = "Çıkış";
 $lang["common_migration_needed"] = "Giriş yapılınca %1 veritabanına geçiş başlar.";
 $lang["common_new"] = "Yeni";
@@ -64,8 +63,8 @@ $lang["common_return_policy"] = "İade Politikası";
 $lang["common_search"] = "Arama";
 $lang["common_search_options"] = "Arama seçenekleri";
 $lang["common_searched_for"] = "Şu arandı:";
-$lang["common_software_short"] = "";
-$lang["common_software_title"] = "";
+$lang["common_software_short"] = "OSPOS";
+$lang["common_software_title"] = "Açık Kaynaklı Satış Noktası";
 $lang["common_state"] = "Bölge";
 $lang["common_submit"] = "Onayla";
 $lang["common_total_spent"] = "Toplam Harcama";

application/language/tr/config_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["config_address"] = "Şirket Adresi";
 $lang["config_address_required"] = "Şirket Adresi zorunlu alandır.";
 $lang["config_all_set"] = "Tüm dosya izinleri düzgün belirlendi!";
@@ -115,19 +114,19 @@ $lang["config_enforce_privacy_tooltip"] = "Müşteriler bilgilerini gizliliğini
 $lang["config_fax"] = "Faks";
 $lang["config_file_perm"] = "Dosya izinleriyle ilgili sorunlar var, lütfen giderin ve bu sayfayı yeniden yükleyin.";
 $lang["config_financial_year"] = "Mali Yıl Başlat";
-$lang["config_financial_year_apr"] = "Nisan 1";
-$lang["config_financial_year_aug"] = "Ağustos 1";
-$lang["config_financial_year_dec"] = "Aralık ayının 1";
+$lang["config_financial_year_apr"] = "1 Nisan";
+$lang["config_financial_year_aug"] = "1 Ağustos";
+$lang["config_financial_year_dec"] = "1 Aralık";
 $lang["config_financial_year_feb"] = "1 Şubat";
-$lang["config_financial_year_jan"] = "Ocak 1";
-$lang["config_financial_year_jul"] = "Temmuz 1";
-$lang["config_financial_year_jun"] = "Haziran 1";
-$lang["config_financial_year_mar"] = "Mart'ın 1'i";
+$lang["config_financial_year_jan"] = "1 Ocak";
+$lang["config_financial_year_jul"] = "1 Temmuz";
+$lang["config_financial_year_jun"] = "1 Haziran";
+$lang["config_financial_year_mar"] = "1 Mart";
 $lang["config_financial_year_may"] = "1 Mayıs";
-$lang["config_financial_year_nov"] = "Kasım 1";
-$lang["config_financial_year_oct"] = "Ekim ayının 1";
-$lang["config_financial_year_sep"] = "Eylül 1";
-$lang["config_floating_labels"] = "";
+$lang["config_financial_year_nov"] = "1 Kasım";
+$lang["config_financial_year_oct"] = "1 Ekim";
+$lang["config_financial_year_sep"] = "1 Eylül";
+$lang["config_floating_labels"] = "Yüzen Etiketler";
 $lang["config_gcaptcha_enable"] = "Giriş Sayfası reCAPTCHA";
 $lang["config_gcaptcha_secret_key"] = "ReCAPTCHA Gizli Anahtar";
 $lang["config_gcaptcha_secret_key_required"] = "ReCAPTCHA Gizli Anahtar zorunlu bir alandır";
@@ -144,19 +143,19 @@ $lang["config_image_max_height_tooltip"] = "Görüntü yüklemelerinde piksel (p
 $lang["config_image_max_size_tooltip"] = "Görüntü yüklemelerinde kilobayt (kb) türünde izin verilen azami dosya boyutu.";
 $lang["config_image_max_width_tooltip"] = "Görüntü yüklemelerinde piksel (px) türünde izin verilen azami genişlik.";
 $lang["config_image_restrictions"] = "Görsel Yükleme Kısıtları";
-$lang["config_include_hsn"] = "HSN Kodları Desteğini Dahil Et";
-$lang["config_info"] = "Mağaza yapılandırma bilgisi";
-$lang["config_info_configuration"] = "Mağaza yapılandırma bilgisi";
-$lang["config_input_groups"] = "";
-$lang["config_integrations"] = "Entegrasyonları";
-$lang["config_integrations_configuration"] = "Üçüncü Parti Entegrasyonları";
+$lang["config_include_hsn"] = "HSN Kodları Desteğini İçer";
+$lang["config_info"] = "Bilgi";
+$lang["config_info_configuration"] = "Mağaza Bilgisi";
+$lang["config_input_groups"] = "Girdi Kümeleri";
+$lang["config_integrations"] = "Tümleşimler";
+$lang["config_integrations_configuration"] = "Üçüncü Taraf Tümleşimler";
 $lang["config_invoice"] = "Fatura";
 $lang["config_invoice_configuration"] = "Fatura Yazdırma Ayarları";
 $lang["config_invoice_default_comments"] = "Ön Tanımlı Fatura Yorumları";
 $lang["config_invoice_email_message"] = "Fatura E-Posta Şablonu";
 $lang["config_invoice_enable"] = "Faturalandırmayı Etkinleştir";
 $lang["config_invoice_printer"] = "Fatura Yazıcısı";
-$lang["config_invoice_type"] = "Fatura türü";
+$lang["config_invoice_type"] = "Fatura Türü";
 $lang["config_is_readable"] = "okunabilirdir ama izinleri yanlış belirlenmiştir. Lütfen 640'a veya 660'a ayarlayın ve tazeleyin.";
 $lang["config_is_writable"] = "yazılabilirdir ama izinleri yanlış belirlenmiştir. Lütfen 750'ye ayarlayın ve tazeleyin.";
 $lang["config_jsprintsetup_required"] = "Uyarı: Bu işlev yalnızca FireFox jsPrintSetup eklentisi kuruluysa çalışacaktır. Yine de kaydedilsin mi?";
@@ -177,14 +176,14 @@ $lang["config_locale_info"] = "Yerelleştirme Yapılandırması Bilgisi";
 $lang["config_location"] = "Stok";
 $lang["config_location_configuration"] = "Stok Konumları";
 $lang["config_location_info"] = "Konum Yapılandırma Bilgisi";
-$lang["config_login_form"] = "";
+$lang["config_login_form"] = "Giriş Form Biçimi";
 $lang["config_logout"] = "Çıkış yapmadan önce bir yedekleme yapmak ister misiniz? Yedeklemek için [Tamam] 'a veya oturumu kapatmak için [İptal]' e tıklayın.";
-$lang["config_mailchimp"] = "Mail chimp";
-$lang["config_mailchimp_api_key"] = "Mailchimp API Anahtarı";
-$lang["config_mailchimp_configuration"] = "Mailchimp Ayarları";
+$lang["config_mailchimp"] = "MailChimp";
+$lang["config_mailchimp_api_key"] = "MailChimp API Anahtarı";
+$lang["config_mailchimp_configuration"] = "MailChimp Yapılandırması";
 $lang["config_mailchimp_key_successfully"] = "API Anahtarı geçerlidir.";
 $lang["config_mailchimp_key_unsuccessfully"] = "API Anahtarı geçersiz.";
-$lang["config_mailchimp_lists"] = "Mailchimp liste (ler) i";
+$lang["config_mailchimp_lists"] = "MailChimp Listeleri";
 $lang["config_mailchimp_tooltip"] = "API Anahtarı için simgeye tıklayın.";
 $lang["config_message"] = "Mesaj";
 $lang["config_message_configuration"] = "İleti Yapılandırması";
@@ -292,7 +291,7 @@ $lang["config_tax_decimals"] = "Vergi Ondalık";
 $lang["config_tax_id"] = "Vergi numarası";
 $lang["config_tax_included"] = "Vergi Dahil";
 $lang["config_theme"] = "Gövde";
-$lang["config_theme_preview"] = "";
+$lang["config_theme_preview"] = "Temayı Ön İzle:";
 $lang["config_thousands_separator"] = "Binlik Ayırıcı";
 $lang["config_timezone"] = "Saat Dilimi";
 $lang["config_timezone_error"] = "OSPOS Saat Dilimi, yerel Saat Diliminizden farklı.";

application/language/tr/customers_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["customers_account_number"] = "Hesap No";
 $lang["customers_account_number_duplicate"] = "Bu hesap numarası zaten var.";
 $lang["customers_available_points"] = "Var Olan Puanlar";
@@ -20,9 +19,9 @@ $lang["customers_customer"] = "Müşteri";
 $lang["customers_date"] = "Tarih";
 $lang["customers_discount"] = "İndirim";
 $lang["customers_discount_fixed"] = "Sabit İndirim";
-$lang["customers_discount_percent"] = "Yüzde indirim";
-$lang["customers_discount_type"] = "İndirim türü";
-$lang["customers_email_duplicate"] = "E-posta adresi zaten veritabanında mevcut.";
+$lang["customers_discount_percent"] = "Yüzde İndirim";
+$lang["customers_discount_type"] = "İndirim Türü";
+$lang["customers_email_duplicate"] = "E-posta Adresi zaten veri tabanında var.";
 $lang["customers_employee"] = "Personel";
 $lang["customers_error_adding_updating"] = "Müşteri ekleme/güncelleme hatası.";
 $lang["customers_import_items_csv"] = "Müşterileri CSV sayfasından aktar";
@@ -32,7 +31,7 @@ $lang["customers_mailchimp_activity_open"] = "E-posta aç";
 $lang["customers_mailchimp_activity_total"] = "E-posta gönder";
 $lang["customers_mailchimp_activity_unopen"] = "E-posta açılmadı";
 $lang["customers_mailchimp_email_client"] = "E-posta istemcisi";
-$lang["customers_mailchimp_info"] = "Mail chimp";
+$lang["customers_mailchimp_info"] = "MailChimp";
 $lang["customers_mailchimp_member_rating"] = "Değerlendirme";
 $lang["customers_mailchimp_status"] = "Durum";
 $lang["customers_mailchimp_vip"] = "VİP";

application/language/tr/employees_lang.php

@@ -1,12 +1,11 @@
-<?php 
-
+<?php
 $lang["employees_basic_information"] = "Personel Temel Bilgileri";
 $lang["employees_cannot_be_deleted"] = "Seçili personel silinemedi, personellerin satışları var yada kendinizi silmeye çalışıyorsunuz.";
-$lang["employees_change_password"] = "Şifre değiştir";
+$lang["employees_change_password"] = "Parolayı Değiştir";
 $lang["employees_confirm_delete"] = "Seçili personelleri silmek istediğinize emin misiniz?";
 $lang["employees_confirm_restore"] = "Seçili çalışanları geri yüklemek istediğinizden emin misiniz?";
-$lang["employees_current_password"] = "Şimdiki Şifre";
-$lang["employees_current_password_invalid"] = "Geçerli Şifre geçersiz.";
+$lang["employees_current_password"] = "Var Olan Parola";
+$lang["employees_current_password_invalid"] = "Var Olan Parola geçersiz.";
 $lang["employees_employee"] = "Personel";
 $lang["employees_error_adding_updating"] = "Personel ekleme/güncelleme hatası.";
 $lang["employees_error_deleting_demo_admin"] = "Admin güncellenemez.";
@@ -16,17 +15,17 @@ $lang["employees_login_info"] = "Personel Giriş Bilgileri";
 $lang["employees_new"] = "Yeni Personel";
 $lang["employees_none_selected"] = "Silmek için çalışan seçmediniz.";
 $lang["employees_one_or_multiple"] = "personel";
-$lang["employees_password"] = "Şifre";
-$lang["employees_password_minlength"] = "Şifre en az 8 karakter olmalıdır.";
-$lang["employees_password_must_match"] = "Şifreler uyuşmuyor.";
-$lang["employees_password_not_must_match"] = "Mevcut şifre ve yeni şifre benzersiz olmalıdır.";
-$lang["employees_password_required"] = "Şifre zorunlu alandır.";
+$lang["employees_password"] = "Parola";
+$lang["employees_password_minlength"] = "Parola en az 8 karakter olmalıdır.";
+$lang["employees_password_must_match"] = "Parolalar uyuşmuyor.";
+$lang["employees_password_not_must_match"] = "Geçerli parola ve yeni parola benzersiz olmalıdır.";
+$lang["employees_password_required"] = "Parola zorunludur.";
 $lang["employees_permission_desc"] = "Modül yetkisi vermek için kutuları işaretleyin.";
 $lang["employees_permission_info"] = "Personel İzin ve Yetkileri";
-$lang["employees_repeat_password"] = "Şifre (Tekrar)";
+$lang["employees_repeat_password"] = "Parola Yeniden";
 $lang["employees_subpermission_required"] = "Her bir birim için en az bir izin ekle.";
 $lang["employees_successful_adding"] = "Personel eklendi.";
-$lang["employees_successful_change_password"] = "Şifre değişikliği başarılı.";
+$lang["employees_successful_change_password"] = "Parola değişikliği başarılı.";
 $lang["employees_successful_deleted"] = "Silme başarılı";
 $lang["employees_successful_updating"] = "Personel güncellendi";
 $lang["employees_system_language"] = "Sistem dili";

application/language/tr/expenses_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["expenses_add_item"] = "Gider ekle";
 $lang["expenses_amount"] = "Miktar";
 $lang["expenses_amount_number"] = "Miktar değeri sayı olmalı";
@@ -12,8 +11,8 @@ $lang["expenses_categories_name"] = "Kategori";
 $lang["expenses_category_required"] = "Kaetgori gerekli bir alandır";
 $lang["expenses_check"] = "Çek";
 $lang["expenses_check_filter"] = "Çek";
-$lang["expenses_confirm_delete"] = "Seçilen Gideri silmek istediğiniden emin misiniz?";
-$lang["expenses_confirm_restore"] = "Seçilen Gideri onarmak istediğiniden emin misiniz?";
+$lang["expenses_confirm_delete"] = "Seçilen Gider(ler)i silmek istediğinizden emin misiniz?";
+$lang["expenses_confirm_restore"] = "Seçilen Gider(ler)i onarmak istediğinizden emin misiniz?";
 $lang["expenses_credit"] = "Kredi Kartı";
 $lang["expenses_credit_filter"] = "Kredi Kartı";
 $lang["expenses_date"] = "Tarih";

application/language/tr/giftcards_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["giftcards_add_minus"] = "Eklenen/Çıkarılan Adet.";
 $lang["giftcards_allow_alt_description"] = "Dip Nota izin ver";
 $lang["giftcards_bulk_edit"] = "Çoklu Düzenleme";
@@ -18,7 +17,7 @@ $lang["giftcards_confirm_restore"] = "Seçili Hediye Çeklerini onarmak istediğ
 $lang["giftcards_cost_price"] = "Maliyet Fiyatı";
 $lang["giftcards_count"] = "Stoğu Güncelle";
 $lang["giftcards_csv_import_failed"] = "CSV içe aktarma başarısız.";
-$lang["giftcards_current_quantity"] = "Mevcut Miktar";
+$lang["giftcards_current_quantity"] = "Var Olan Miktar";
 $lang["giftcards_description"] = "Açıklama";
 $lang["giftcards_details_count"] = "Stok Sayım Ayrıntıları";
 $lang["giftcards_do_nothing"] = "Bir Şey Yapma";

application/language/tr/index.html

@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<title>403 Forbidden</title>
+	<title>403 Yasaklı</title>
 </head>
 <body>
 
-<p>Directory access is forbidden.</p>
+<p>Dizin erişimi yasaktır.</p>
 
 </body>
-</html>
+</html>

application/language/tr/item_kits_lang.php

@@ -1,38 +1,37 @@
-<?php 
-
+<?php
 $lang["item_kits_add_item"] = "Ürün Ekle";
-$lang["item_kits_all"] = "Hepsi";
-$lang["item_kits_cannot_be_deleted"] = "Ürün seti silinemedi.";
-$lang["item_kits_confirm_delete"] = "Seçili ürün setini silmek istediğinize emin misiniz?";
-$lang["item_kits_confirm_restore"] = "Seçilen Öge Kitlerini geri yüklemek istediğinizden emin misiniz?";
-$lang["item_kits_description"] = "Ürün Seti Tanımı";
+$lang["item_kits_all"] = "Tümü";
+$lang["item_kits_cannot_be_deleted"] = "Ürün Takım(lar)ı silinemedi.";
+$lang["item_kits_confirm_delete"] = "Seçili Ürün Takım(lar)ını silmek istediğinize emin misiniz?";
+$lang["item_kits_confirm_restore"] = "Seçilen Ürün Takım(lar)ını geri yüklemek istediğinizden emin misiniz?";
+$lang["item_kits_description"] = "Ürün Takımı Tanımı";
 $lang["item_kits_discount"] = "İndirim";
 $lang["item_kits_discount_fixed"] = "Sabit İndirim";
 $lang["item_kits_discount_percent"] = "İndirim Yüzdesi";
-$lang["item_kits_discount_type"] = "İndirim türü";
-$lang["item_kits_error_adding_updating"] = "Ürün seti ekleme/güncelleme hatası.";
-$lang["item_kits_find_kit_item"] = "Ürün Seti";
-$lang["item_kits_info"] = "Ürün Seti Bilgisi";
+$lang["item_kits_discount_type"] = "İndirim Türü";
+$lang["item_kits_error_adding_updating"] = "Ürün Takımı ekleme/güncelleme hatası.";
+$lang["item_kits_find_kit_item"] = "Takım Ürünü";
+$lang["item_kits_info"] = "Ürün Takımı Bilgisi";
 $lang["item_kits_item"] = "Ürün";
-$lang["item_kits_item_kit_number"] = "";
-$lang["item_kits_item_kit_number_duplicate"] = "";
+$lang["item_kits_item_kit_number"] = "Barkod";
+$lang["item_kits_item_kit_number_duplicate"] = "Ürün Takımı Numarası veri tabanında zaten var.";
 $lang["item_kits_item_number"] = "";
 $lang["item_kits_items"] = "Ürünler";
-$lang["item_kits_kit"] = "Set Kimliği";
-$lang["item_kits_kit_and_components"] = "Kit ve Bileşenler";
-$lang["item_kits_kit_and_stock"] = "Ürün Seti ve Stok";
-$lang["item_kits_kit_only"] = "Yalnızca Ürün Seti";
-$lang["item_kits_name"] = "Ürün Seti İsmi";
-$lang["item_kits_new"] = "Yeni Ürün Seti";
-$lang["item_kits_no_item_kits_to_display"] = "Gösterecek ürün seti yok.";
-$lang["item_kits_none_selected"] = "Ürün seti seçmediniz.";
-$lang["item_kits_one_or_multiple"] = "Ürün Seti";
+$lang["item_kits_kit"] = "Takım Kimliği";
+$lang["item_kits_kit_and_components"] = "Takım ve Bileşenler";
+$lang["item_kits_kit_and_stock"] = "Ürün Takımı ve Stok";
+$lang["item_kits_kit_only"] = "Yalnızca Ürün Takımı";
+$lang["item_kits_name"] = "Ürün Takımı Adı";
+$lang["item_kits_new"] = "Yeni Ürün Takımı";
+$lang["item_kits_no_item_kits_to_display"] = "Gösterecek Ürün Takımı yok.";
+$lang["item_kits_none_selected"] = "Ürün Takımı seçmediniz.";
+$lang["item_kits_one_or_multiple"] = "Ürün Takım(lar)ı";
 $lang["item_kits_price_option"] = "Fiyat Seçeneği";
 $lang["item_kits_priced_only"] = "Yalnızca Fiyatlandırılmış";
 $lang["item_kits_print_option"] = "Yazdırma Seçeneği";
 $lang["item_kits_quantity"] = "Adet";
 $lang["item_kits_sequence"] = "Sıra";
-$lang["item_kits_successful_adding"] = "Ürün seti eklendi";
-$lang["item_kits_successful_deleted"] = "Silme başarılı";
-$lang["item_kits_successful_updating"] = "Ürün seti güncellendi";
-$lang["item_kits_update"] = "Ürün Setini Güncelle";
+$lang["item_kits_successful_adding"] = "Ürün Takımını başarıyla eklediniz";
+$lang["item_kits_successful_deleted"] = "Başarıyla sildiniz";
+$lang["item_kits_successful_updating"] = "Ürün Takımını başarıyla güncellediniz";
+$lang["item_kits_update"] = "Ürün Takımını Güncelle";

application/language/tr/items_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["items_add_minus"] = "Eklenen/Çıkarılan Adet.";
 $lang["items_allow_alt_description"] = "Dip Nota izin ver";
 $lang["items_amount_entry"] = "Miktar Girişi";
@@ -26,7 +25,7 @@ $lang["items_csv_import_failed"] = "CSV aktarım hatası";
 $lang["items_csv_import_nodata_wrongformat"] = "Yüklenen dosya herhangi bir veri içermiyor veya hatalı formatta.";
 $lang["items_csv_import_partially_failed"] = "Bazı ürünler aktarılamadı. Aktarılamayanlar listesi.";
 $lang["items_csv_import_success"] = "Ürün aktarımı başarılı.";
-$lang["items_current_quantity"] = "Mevcut Adet";
+$lang["items_current_quantity"] = "Var Olan Adet";
 $lang["items_default_pack_name"] = "Her biri";
 $lang["items_description"] = "Tanım";
 $lang["items_details_count"] = "Stok Hareket Detayları";

application/language/tr/login_lang.php

@@ -1,13 +1,12 @@
-<?php 
-
+<?php
 $lang["login_gcaptcha"] = "Ben robot değilim.";
 $lang["login_go"] = "Giriş";
-$lang["login_invalid_gcaptcha"] = "Robot olmadığınızı kanıtlayamadınız.";
+$lang["login_invalid_gcaptcha"] = "Robot olmadığınızı kanıtlayınız.";
 $lang["login_invalid_installation"] = "Yükleme doğru değil, php.ini dosyanızı gözden geçirin.";
-$lang["login_invalid_username_and_password"] = "Geçersiz Kullanıcı Adı veya Parola.";
+$lang["login_invalid_username_and_password"] = "Geçersiz kullanıcı adı ve/veya parola.";
 $lang["login_login"] = "Giriş";
-$lang["login_logout"] = "";
-$lang["login_migration_needed"] = "";
+$lang["login_logout"] = "Çıkış";
+$lang["login_migration_needed"] = "Girişten sonra %1 veri tabanına göç başlayacak.";
 $lang["login_password"] = "Parola";
 $lang["login_username"] = "Kullanıcı Adı";
-$lang["login_welcome"] = "";
+$lang["login_welcome"] = "%1'e Hoş Geldiniz!";

application/language/tr/reports_lang.php

@@ -1,6 +1,5 @@
-<?php 
-
-$lang["reports_all"] = "Hepsi";
+<?php
+$lang["reports_all"] = "Tümü";
 $lang["reports_authority"] = "Yetki";
 $lang["reports_canceled"] = "İptal edildi";
 $lang["reports_categories"] = "Kategoriler";

application/language/tr/sales_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["customers_available_points"] = "Var Olan Puanlar";
 $lang["rewards_package"] = "Ödüller";
 $lang["rewards_remaining_balance"] = "Ödül Puanı kalan değeri ";
@@ -10,7 +9,7 @@ $lang["sales_amount_tendered"] = "Ödenen Tutar";
 $lang["sales_authorized_signature"] = "Yetkili İmza";
 $lang["sales_cancel_sale"] = "İptal Et";
 $lang["sales_cash"] = "Nakit";
-$lang["sales_cash_adjustment"] = "";
+$lang["sales_cash_adjustment"] = "Nakit Düzeltimi";
 $lang["sales_cash_deposit"] = "Nakit Depozito";
 $lang["sales_cash_filter"] = "Nakit";
 $lang["sales_change_due"] = "Para Üstü";
@@ -26,13 +25,13 @@ $lang["sales_confirm_delete"] = "Seçilen satışları silmek istediğinize emin
 $lang["sales_confirm_restore"] = "Seçilen satışları kurtarmak istediğinize emin misiniz?";
 $lang["sales_credit"] = "Kredi Kartı";
 $lang["sales_credit_deposit"] = "Kredi Depozito";
-$lang["sales_credit_filter"] = "";
+$lang["sales_credit_filter"] = "Kredi Kartı";
 $lang["sales_customer"] = "Müşteri";
 $lang["sales_customer_address"] = "Customer Address";
 $lang["sales_customer_discount"] = "İskonto";
 $lang["sales_customer_email"] = "E-Posta";
 $lang["sales_customer_location"] = "Konum";
-$lang["sales_customer_mailchimp_status"] = "Mailchimp durumu";
+$lang["sales_customer_mailchimp_status"] = "MailChimp durumu";
 $lang["sales_customer_optional"] = "(Geciken Ödemeler İçin Gerekli)";
 $lang["sales_customer_required"] = "(Gerekli)";
 $lang["sales_customer_total"] = "Total";
@@ -162,7 +161,7 @@ $lang["sales_tax"] = "Vergi";
 $lang["sales_tax_id"] = "Vergi Numarası";
 $lang["sales_tax_invoice"] = "Vergi Faturası";
 $lang["sales_tax_percent"] = "Vergi %";
-$lang["sales_taxed_ind"] = "T";
+$lang["sales_taxed_ind"] = "V";
 $lang["sales_total"] = "Toplam";
 $lang["sales_total_tax_exclusive"] = "Vergi hariç";
 $lang["sales_transaction_failed"] = "Satış işlemi hatası.";

application/language/zh-Hant/common_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["common_address_1"] = "地址 1";
 $lang["common_address_2"] = "地址 2";
 $lang["common_city"] = "城市";
@@ -28,8 +27,8 @@ $lang["common_gender"] = "性別";
 $lang["common_gender_female"] = "女";
 $lang["common_gender_male"] = "男";
 $lang["common_gender_undefined"] = "";
-$lang["common_icon"] = "";
-$lang["common_id"] = "Id";
+$lang["common_icon"] = "圖標";
+$lang["common_id"] = "ID";
 $lang["common_import"] = "匯入";
 $lang["common_import_change_file"] = "變更";
 $lang["common_import_csv"] = "CSV匯入";
@@ -42,8 +41,8 @@ $lang["common_last_name_required"] = "姓氏為必填。";
 $lang["common_last_page"] = "最後一頁";
 $lang["common_learn_about_project"] = "了解系統開展進度.";
 $lang["common_list_of"] = "列表";
-$lang["common_logo"] = "";
-$lang["common_logo_mark"] = "";
+$lang["common_logo"] = "商標";
+$lang["common_logo_mark"] = "標記";
 $lang["common_logout"] = "登出";
 $lang["common_migration_needed"] = "登錄後將啟動到％1的數據庫遷移.";
 $lang["common_new"] = "新";
@@ -64,8 +63,8 @@ $lang["common_return_policy"] = "退貨政策";
 $lang["common_search"] = "搜尋";
 $lang["common_search_options"] = "搜尋選項";
 $lang["common_searched_for"] = "查找";
-$lang["common_software_short"] = "";
-$lang["common_software_title"] = "";
+$lang["common_software_short"] = "開源銷售點";
+$lang["common_software_title"] = "開源銷售點";
 $lang["common_state"] = "州";
 $lang["common_submit"] = "送出";
 $lang["common_total_spent"] = "總花費";

application/language/zh-Hant/config_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["config_address"] = "公司地址";
 $lang["config_address_required"] = "公司地址為必填.";
 $lang["config_all_set"] = "所有文件權限設置正確！";
@@ -51,11 +50,11 @@ $lang["config_currency_decimals"] = "貨幣小數";
 $lang["config_currency_symbol"] = "貨幣符號";
 $lang["config_customer_reward"] = "報酬";
 $lang["config_customer_reward_duplicate"] = "獎勵必須是唯一的。";
-$lang["config_customer_reward_enable"] = "";
-$lang["config_customer_reward_invalid_chars"] = "";
-$lang["config_customer_reward_required"] = "";
+$lang["config_customer_reward_enable"] = "啟用客戶獎勵";
+$lang["config_customer_reward_invalid_chars"] = "獎勵不能包含“_”";
+$lang["config_customer_reward_required"] = "獎勵是必填字段";
 $lang["config_customer_sales_tax_support"] = "";
-$lang["config_date_or_time_format"] = "";
+$lang["config_date_or_time_format"] = "日期和時間過濾器";
 $lang["config_datetimeformat"] = "日期時間格式";
 $lang["config_decimal_point"] = "小數點位數";
 $lang["config_default_barcode_font_size_number"] = "默認條形碼字體大小必須是數字。";
@@ -70,26 +69,26 @@ $lang["config_default_barcode_page_width_number"] = "默認條形碼頁面寬度
 $lang["config_default_barcode_page_width_required"] = "默認條碼頁面寬度為必填字段.";
 $lang["config_default_barcode_width_number"] = "默認條碼寬度必須是數字。";
 $lang["config_default_barcode_width_required"] = "默認條碼寬度是必填字段。";
-$lang["config_default_item_columns"] = "";
-$lang["config_default_origin_tax_code"] = "";
-$lang["config_default_receivings_discount"] = "";
-$lang["config_default_receivings_discount_number"] = "";
-$lang["config_default_receivings_discount_required"] = "";
+$lang["config_default_item_columns"] = "默認可見項目列";
+$lang["config_default_origin_tax_code"] = "默認原產地稅碼";
+$lang["config_default_receivings_discount"] = "默認收款折扣";
+$lang["config_default_receivings_discount_number"] = "默認收款折扣必須是一個數字。";
+$lang["config_default_receivings_discount_required"] = "默認收款折扣是必填字段。";
 $lang["config_default_sales_discount"] = "Default Sales Discount %";
 $lang["config_default_sales_discount_number"] = "默認銷售折扣必須是數字。";
 $lang["config_default_sales_discount_required"] = "默認銷售折扣是必填字段.";
-$lang["config_default_tax_category"] = "";
-$lang["config_default_tax_code"] = "";
-$lang["config_default_tax_jurisdiction"] = "";
-$lang["config_default_tax_name_number"] = "";
+$lang["config_default_tax_category"] = "默認稅種";
+$lang["config_default_tax_code"] = "默認稅碼";
+$lang["config_default_tax_jurisdiction"] = "默認稅收管轄權";
+$lang["config_default_tax_name_number"] = "默認稅名必須是字符串。";
 $lang["config_default_tax_name_required"] = "The default tax name is a required field.";
 $lang["config_default_tax_rate"] = "預設稅率 %";
 $lang["config_default_tax_rate_1"] = "稅率 1";
 $lang["config_default_tax_rate_2"] = "稅率 2";
 $lang["config_default_tax_rate_number"] = "預設稅率必需為數字.";
 $lang["config_default_tax_rate_required"] = "預設稅率為必填.";
-$lang["config_derive_sale_quantity"] = "";
-$lang["config_derive_sale_quantity_tooltip"] = "";
+$lang["config_derive_sale_quantity"] = "允許派生銷售數量";
+$lang["config_derive_sale_quantity_tooltip"] = "如果選中，則將為按擴展金額訂購的商品提供新的商品類型";
 $lang["config_dinner_table"] = "餐桌";
 $lang["config_dinner_table_duplicate"] = "餐桌必須唯一.";
 $lang["config_dinner_table_enable"] = "啟用餐桌";
@@ -100,18 +99,18 @@ $lang["config_email"] = "郵箱";
 $lang["config_email_configuration"] = "Email Configuration";
 $lang["config_email_mailpath"] = "發送郵件的路徑";
 $lang["config_email_protocol"] = "Protocol";
-$lang["config_email_receipt_check_behaviour"] = "";
-$lang["config_email_receipt_check_behaviour_always"] = "";
-$lang["config_email_receipt_check_behaviour_last"] = "";
-$lang["config_email_receipt_check_behaviour_never"] = "";
+$lang["config_email_receipt_check_behaviour"] = "電子郵件收據複選框";
+$lang["config_email_receipt_check_behaviour_always"] = "始終檢查";
+$lang["config_email_receipt_check_behaviour_last"] = "記住上次選擇";
+$lang["config_email_receipt_check_behaviour_never"] = "始終未選中";
 $lang["config_email_smtp_crypto"] = "SMTP 加密";
 $lang["config_email_smtp_host"] = "SMTP Server";
 $lang["config_email_smtp_pass"] = "SMTP Password";
 $lang["config_email_smtp_port"] = "SMTP Port";
 $lang["config_email_smtp_timeout"] = "SMTP 逾時";
 $lang["config_email_smtp_user"] = "SMTP 用戶名";
-$lang["config_enforce_privacy"] = "";
-$lang["config_enforce_privacy_tooltip"] = "";
+$lang["config_enforce_privacy"] = "保護隱私";
+$lang["config_enforce_privacy_tooltip"] = "保護客戶隱私，在他們的數據被刪除的情況下強制執行數據擾亂";
 $lang["config_fax"] = "傳真";
 $lang["config_file_perm"] = "檔案權限有問題，請修正後重刷網頁.";
 $lang["config_financial_year"] = "財務年起始";
@@ -127,12 +126,12 @@ $lang["config_financial_year_may"] = "5月1日";
 $lang["config_financial_year_nov"] = "11月1日";
 $lang["config_financial_year_oct"] = "10月1日";
 $lang["config_financial_year_sep"] = "9月1日";
-$lang["config_floating_labels"] = "";
+$lang["config_floating_labels"] = "浮動標籤";
 $lang["config_gcaptcha_enable"] = "登入檢核碼(reCAPTCHA)";
-$lang["config_gcaptcha_secret_key"] = "";
-$lang["config_gcaptcha_secret_key_required"] = "";
-$lang["config_gcaptcha_site_key"] = "";
-$lang["config_gcaptcha_site_key_required"] = "";
+$lang["config_gcaptcha_secret_key"] = "reCAPTCHA 密鑰";
+$lang["config_gcaptcha_secret_key_required"] = "reCAPTCHA 密鑰是必填字段";
+$lang["config_gcaptcha_site_key"] = "reCAPTCHA 站點密鑰";
+$lang["config_gcaptcha_site_key_required"] = "reCAPTCHA 站點密鑰是必填字段";
 $lang["config_gcaptcha_tooltip"] = "登入使用Google reCAPTCHA保護，點選圖標進行 API key 配對.";
 $lang["config_general"] = "一般";
 $lang["config_general_configuration"] = "一般設定";
@@ -144,10 +143,10 @@ $lang["config_image_max_height_tooltip"] = "上傳圖檔最大高度(px).";
 $lang["config_image_max_size_tooltip"] = "上傳圖檔大小上限(kb).";
 $lang["config_image_max_width_tooltip"] = "上傳圖檔最大寬度(px).";
 $lang["config_image_restrictions"] = "上傳圖檔限制";
-$lang["config_include_hsn"] = "";
+$lang["config_include_hsn"] = "包括對 HSN 代碼的支持";
 $lang["config_info"] = "儲存組態";
 $lang["config_info_configuration"] = "儲存組態";
-$lang["config_input_groups"] = "";
+$lang["config_input_groups"] = "輸入組";
 $lang["config_integrations"] = "整合";
 $lang["config_integrations_configuration"] = "第三方整合";
 $lang["config_invoice"] = "發票";
@@ -156,18 +155,18 @@ $lang["config_invoice_default_comments"] = "默認發票註釋";
 $lang["config_invoice_email_message"] = "發票電子郵件模板";
 $lang["config_invoice_enable"] = "啟用發票";
 $lang["config_invoice_printer"] = "發票打印機";
-$lang["config_invoice_type"] = "";
+$lang["config_invoice_type"] = "發票類型";
 $lang["config_is_readable"] = "可讀取但權限不正確，請設定為 640 或 660 後重整.";
-$lang["config_is_writable"] = "is writable, but the permissions are higher than 750.";
+$lang["config_is_writable"] = "可寫，但權限設置不正確。請將其設置為 750 並刷新。";
 $lang["config_jsprintsetup_required"] = "Warning! This disabled functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?";
 $lang["config_language"] = "語言";
-$lang["config_last_used_invoice_number"] = "";
-$lang["config_last_used_quote_number"] = "";
-$lang["config_last_used_work_order_number"] = "";
+$lang["config_last_used_invoice_number"] = "上次使用的發票編號";
+$lang["config_last_used_quote_number"] = "上次使用的報價編號";
+$lang["config_last_used_work_order_number"] = "上次使用的 W / O 編號";
 $lang["config_left"] = "剩下";
 $lang["config_license"] = "許可証";
 $lang["config_license_configuration"] = "許可聲明";
-$lang["config_line_sequence"] = "";
+$lang["config_line_sequence"] = "行序";
 $lang["config_lines_per_page"] = "Lines Per Page";
 $lang["config_lines_per_page_number"] = "每頁行數必須是數字。";
 $lang["config_lines_per_page_required"] = "每頁行數是必填字段。";
@@ -177,15 +176,15 @@ $lang["config_locale_info"] = "Localisation Configuration Information";
 $lang["config_location"] = "庫存";
 $lang["config_location_configuration"] = "庫存位置";
 $lang["config_location_info"] = "位置配置信息";
-$lang["config_login_form"] = "";
+$lang["config_login_form"] = "登錄表單樣式";
 $lang["config_logout"] = "是否要在註銷前進行備份？點擊【確定】進行備份，點擊【取消】退出。";
-$lang["config_mailchimp"] = "";
-$lang["config_mailchimp_api_key"] = "";
-$lang["config_mailchimp_configuration"] = "";
-$lang["config_mailchimp_key_successfully"] = "";
-$lang["config_mailchimp_key_unsuccessfully"] = "";
-$lang["config_mailchimp_lists"] = "";
-$lang["config_mailchimp_tooltip"] = "";
+$lang["config_mailchimp"] = "郵件黑猩猩";
+$lang["config_mailchimp_api_key"] = "黑猩猩 API 密鑰";
+$lang["config_mailchimp_configuration"] = "黑猩猩配置";
+$lang["config_mailchimp_key_successfully"] = "API 密鑰有效。";
+$lang["config_mailchimp_key_unsuccessfully"] = "無效的 API 密鑰.";
+$lang["config_mailchimp_lists"] = "MailChimp 列表";
+$lang["config_mailchimp_tooltip"] = "單擊 API 密鑰的圖標。";
 $lang["config_message"] = "Message";
 $lang["config_message_configuration"] = "Message Configuration";
 $lang["config_msg_msg"] = "保存的短信";
@@ -196,7 +195,7 @@ $lang["config_msg_src"] = "SMS-API 發件人 ID";
 $lang["config_msg_src_required"] = "SMS-API 發件人 ID 是必填字段";
 $lang["config_msg_uid"] = "SMS-API 用戶名";
 $lang["config_msg_uid_required"] = "SMS-API 用戶名是必填字段";
-$lang["config_multi_pack_enabled"] = "";
+$lang["config_multi_pack_enabled"] = "每件物品多個包裹";
 $lang["config_no_risk"] = "沒有安全/漏洞風險。";
 $lang["config_none"] = "none";
 $lang["config_notify_alignment"] = "通知彈出位置";
@@ -205,27 +204,27 @@ $lang["config_number_locale"] = "Localisation";
 $lang["config_number_locale_invalid"] = "輸入的區域設置無效。檢查工具提示中的鏈接以查找有效的語言環境。";
 $lang["config_number_locale_required"] = "數字語言是必填字段。";
 $lang["config_number_locale_tooltip"] = "通過此鏈接找到合適的語言環境。";
-$lang["config_os_timezone"] = "";
-$lang["config_ospos_info"] = "";
+$lang["config_os_timezone"] = "OSPOS 時區：";
+$lang["config_ospos_info"] = "OSPOS 安裝信息";
 $lang["config_payment_options_order"] = "付款選項訂單";
-$lang["config_perm_risk"] = "Permissions higher than 750 leaves this software at risk.";
+$lang["config_perm_risk"] = "不正確的權限使該軟件面臨風險。";
 $lang["config_phone"] = "電話";
 $lang["config_phone_required"] = "公司電話為必填.";
 $lang["config_print_bottom_margin"] = "保證金底部";
 $lang["config_print_bottom_margin_number"] = "底部邊距必須是數字。";
 $lang["config_print_bottom_margin_required"] = "底部邊距是必填字段。";
-$lang["config_print_delay_autoreturn"] = "";
-$lang["config_print_delay_autoreturn_number"] = "";
-$lang["config_print_delay_autoreturn_required"] = "";
+$lang["config_print_delay_autoreturn"] = "自動返回銷售延遲";
+$lang["config_print_delay_autoreturn_number"] = "自動返回銷售延遲是必填字段。";
+$lang["config_print_delay_autoreturn_required"] = "自動返回銷售延遲必須是一個數字。";
 $lang["config_print_footer"] = "打印瀏覽器頁腳";
 $lang["config_print_header"] = "打印瀏覽器標題";
 $lang["config_print_left_margin"] = "左邊界";
 $lang["config_print_left_margin_number"] = "左邊距必須是一個數字。";
 $lang["config_print_left_margin_required"] = "左邊距是必填字段。";
-$lang["config_print_receipt_check_behaviour"] = "";
-$lang["config_print_receipt_check_behaviour_always"] = "";
-$lang["config_print_receipt_check_behaviour_last"] = "";
-$lang["config_print_receipt_check_behaviour_never"] = "";
+$lang["config_print_receipt_check_behaviour"] = "打印收據複選框";
+$lang["config_print_receipt_check_behaviour_always"] = "始終檢查";
+$lang["config_print_receipt_check_behaviour_last"] = "記住上次選擇";
+$lang["config_print_receipt_check_behaviour_never"] = "始終未選中";
 $lang["config_print_right_margin"] = "右邊界";
 $lang["config_print_right_margin_number"] = "邊距右邊必須是一個數字。";
 $lang["config_print_right_margin_required"] = "右邊距是必填字段。";
@@ -234,54 +233,54 @@ $lang["config_print_top_margin"] = "上邊界";
 $lang["config_print_top_margin_number"] = "邊距頂部必須是一個數字。";
 $lang["config_print_top_margin_required"] = "邊距頂部是必填字段。";
 $lang["config_quantity_decimals"] = "數量小數";
-$lang["config_quote_default_comments"] = "";
+$lang["config_quote_default_comments"] = "默認報價註釋";
 $lang["config_receipt"] = "收據";
 $lang["config_receipt_configuration"] = "收據打印設置";
 $lang["config_receipt_default"] = "Default";
 $lang["config_receipt_font_size"] = "字體大小";
-$lang["config_receipt_font_size_number"] = "";
-$lang["config_receipt_font_size_required"] = "";
+$lang["config_receipt_font_size_number"] = "字體大小必須是數字。";
+$lang["config_receipt_font_size_required"] = "字體大小是必填字段。";
 $lang["config_receipt_info"] = "收據配置信息";
 $lang["config_receipt_printer"] = "票據打印機";
 $lang["config_receipt_short"] = "簡短";
 $lang["config_receipt_show_company_name"] = "顯示公司名稱";
 $lang["config_receipt_show_description"] = "顯示說明";
 $lang["config_receipt_show_serialnumber"] = "顯示序列號";
-$lang["config_receipt_show_tax_ind"] = "";
+$lang["config_receipt_show_tax_ind"] = "顯示稅收指標";
 $lang["config_receipt_show_taxes"] = "顯示稅金";
 $lang["config_receipt_show_total_discount"] = "顯示總折扣";
 $lang["config_receipt_template"] = "收據模板";
 $lang["config_receiving_calculate_average_price"] = "計算平均值價格（收貨）";
 $lang["config_recv_invoice_format"] = "收據發票格式";
-$lang["config_register_mode_default"] = "";
+$lang["config_register_mode_default"] = "默認註冊模式";
 $lang["config_report_an_issue"] = "問題回報";
 $lang["config_return_policy_required"] = "退換貨政策為必填.";
-$lang["config_reward"] = "";
-$lang["config_reward_configuration"] = "";
+$lang["config_reward"] = "獎勵";
+$lang["config_reward_configuration"] = "獎勵配置";
 $lang["config_right"] = "Right";
 $lang["config_sales_invoice_format"] = "銷售發票格式";
-$lang["config_sales_quote_format"] = "";
+$lang["config_sales_quote_format"] = "銷售報價格式";
 $lang["config_saved_successfully"] = "組態設置儲存成功.";
 $lang["config_saved_unsuccessfully"] = "組態設置儲存失敗.";
 $lang["config_security_issue"] = "安全漏洞警告";
 $lang["config_server_notice"] = "請使用以下信息進行問題報告。";
-$lang["config_show_office_group"] = "";
+$lang["config_show_office_group"] = "顯示辦公室圖標";
 $lang["config_statistics"] = "Send statistics";
 $lang["config_statistics_tooltip"] = "發送統計數據用於開發和功能改進目的。";
 $lang["config_stock_location"] = "倉庫地址";
 $lang["config_stock_location_duplicate"] = "庫存位置必須是唯一的。";
 $lang["config_stock_location_invalid_chars"] = "庫存位置不能包含“_”。";
 $lang["config_stock_location_required"] = "庫存位置是必填字段。";
-$lang["config_suggestions_first_column"] = "";
-$lang["config_suggestions_layout"] = "";
-$lang["config_suggestions_second_column"] = "";
-$lang["config_suggestions_third_column"] = "";
+$lang["config_suggestions_first_column"] = "第 1 欄";
+$lang["config_suggestions_layout"] = "搜索建議佈局";
+$lang["config_suggestions_second_column"] = "第 2 欄";
+$lang["config_suggestions_third_column"] = "第 3 欄";
 $lang["config_system_conf"] = "設置和配置";
 $lang["config_system_info"] = "System Info";
-$lang["config_table"] = "";
-$lang["config_table_configuration"] = "";
+$lang["config_table"] = "桌子";
+$lang["config_table_configuration"] = "表配置";
 $lang["config_takings_printer"] = "Takings Printer";
-$lang["config_tax"] = "";
+$lang["config_tax"] = "稅";
 $lang["config_tax_category"] = "";
 $lang["config_tax_category_duplicate"] = "";
 $lang["config_tax_category_invalid_chars"] = "";

application/language/zh-Hant/items_lang.php

@@ -54,10 +54,10 @@ $lang["items_is_serialized"] = "產品有序號";
 $lang["items_item"] = "產品";
 $lang["items_item_number"] = "UPC/EAN/ISBN";
 $lang["items_item_number_duplicate"] = "項目編號已存在於數據庫中。";
-$lang["items_kit"] = "";
+$lang["items_kit"] = "成套工具";
 $lang["items_location"] = "位置";
 $lang["items_low_inventory_items"] = "低庫存產品";
-$lang["items_low_sell_item"] = "";
+$lang["items_low_sell_item"] = "低價商品";
 $lang["items_manually_editing_of_quantity"] = "手動編輯數量";
 $lang["items_name"] = "產品名稱";
 $lang["items_name_required"] = "產品名稱為必填.";
@@ -66,12 +66,12 @@ $lang["items_no_description_items"] = "產品沒有說明";
 $lang["items_no_items_to_display"] = "沒有產品可以顯示.";
 $lang["items_none"] = "無";
 $lang["items_none_selected"] = "您還沒有選擇任何產品進行編輯";
-$lang["items_nonstock"] = "";
+$lang["items_nonstock"] = "無庫存";
 $lang["items_number_information"] = "產品編號";
 $lang["items_number_required"] = "條形碼是必填字段。";
 $lang["items_one_or_multiple"] = "產品";
-$lang["items_pack_name"] = "";
-$lang["items_qty_per_pack"] = "";
+$lang["items_pack_name"] = "包裝名稱";
+$lang["items_qty_per_pack"] = "每包數量";
 $lang["items_quantity"] = "數量";
 $lang["items_quantity_number"] = "數量必需是數值.";
 $lang["items_quantity_required"] = "數量為必填欄位.";
@@ -86,10 +86,10 @@ $lang["items_sales_tax_2"] = "營業稅 2";
 $lang["items_search_attributes"] = "Search Custom Fields";
 $lang["items_select_image"] = "選擇圖像";
 $lang["items_serialized_items"] = "序列化產品";
-$lang["items_standard"] = "";
-$lang["items_stock"] = "";
+$lang["items_standard"] = "標準";
+$lang["items_stock"] = "庫存";
 $lang["items_stock_location"] = "倉庫地址";
-$lang["items_stock_type"] = "";
+$lang["items_stock_type"] = "股票類型";
 $lang["items_successful_adding"] = "已成功新增產品";
 $lang["items_successful_bulk_edit"] = "您已成功更新所選產品";
 $lang["items_successful_deleted"] = "刪除成功";
@@ -97,13 +97,13 @@ $lang["items_successful_updating"] = "已成功更新產品";
 $lang["items_supplier"] = "供貨商";
 $lang["items_tax_1"] = "稅額 1";
 $lang["items_tax_2"] = "稅額 2";
-$lang["items_tax_category"] = "";
+$lang["items_tax_category"] = "稅種";
 $lang["items_tax_percent"] = "稅率";
-$lang["items_tax_percent_number"] = "";
+$lang["items_tax_percent_number"] = "稅收百分比必須是數值";
 $lang["items_tax_percent_required"] = "稅率為必填欄位.";
 $lang["items_tax_percents"] = "稅率 %";
-$lang["items_temp"] = "";
-$lang["items_type"] = "";
+$lang["items_temp"] = "臨時";
+$lang["items_type"] = "物品種類";
 $lang["items_unit_price"] = "單價";
 $lang["items_unit_price_number"] = "單價必需是數值.";
 $lang["items_unit_price_required"] = "單價為必填欄位.";

application/language/zh-Hant/login_lang.php

@@ -1,13 +1,12 @@
-<?php 
-
+<?php
 $lang["login_gcaptcha"] = "我不是機器人。";
 $lang["login_go"] = "登入";
 $lang["login_invalid_gcaptcha"] = "請確認您不是機器人。";
 $lang["login_invalid_installation"] = "安裝不正確，請檢查您的php.ini文件。";
 $lang["login_invalid_username_and_password"] = "帳號或密碼錯誤。";
 $lang["login_login"] = "登入";
-$lang["login_logout"] = "";
-$lang["login_migration_needed"] = "";
+$lang["login_logout"] = "登出";
+$lang["login_migration_needed"] = "登錄後將開始向 %1 的數據庫遷移。";
 $lang["login_password"] = "密碼";
 $lang["login_username"] = "帳號";
-$lang["login_welcome"] = "";
+$lang["login_welcome"] = "歡迎來到 %1！";

application/language/zh-Hant/reports_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["reports_all"] = "全部";
 $lang["reports_authority"] = "機關";
 $lang["reports_canceled"] = "取消";
@@ -64,10 +63,10 @@ $lang["reports_items"] = "產品";
 $lang["reports_items_purchased"] = "銷售產品";
 $lang["reports_items_received"] = "進貨產品";
 $lang["reports_items_summary_report"] = "產品摘要報告";
-$lang["reports_jurisdiction"] = "";
+$lang["reports_jurisdiction"] = "管轄權";
 $lang["reports_low_inventory"] = "";
 $lang["reports_low_inventory_report"] = "";
-$lang["reports_low_sell_quantity"] = "";
+$lang["reports_low_sell_quantity"] = "低銷售量";
 $lang["reports_more_than_zero"] = "大於零";
 $lang["reports_name"] = "名稱";
 $lang["reports_no_reports_to_display"] = "沒有產品可以顯示.";
@@ -77,10 +76,10 @@ $lang["reports_payments_summary_report"] = "收入報告摘要";
 $lang["reports_profit"] = "利潤";
 $lang["reports_quantity"] = "數量";
 $lang["reports_quantity_purchased"] = "銷售金額";
-$lang["reports_quotes"] = "";
+$lang["reports_quotes"] = "引號";
 $lang["reports_received_by"] = "收款人";
-$lang["reports_receiving_id"] = "";
-$lang["reports_receiving_type"] = "";
+$lang["reports_receiving_id"] = "接收ID";
+$lang["reports_receiving_type"] = "接收類型";
 $lang["reports_receivings"] = "應付款";
 $lang["reports_reorder_level"] = "補貨點";
 $lang["reports_report"] = "報表";
@@ -94,7 +93,7 @@ $lang["reports_requisition_item_quantity"] = "";
 $lang["reports_requisition_related_item"] = "";
 $lang["reports_requisition_related_item_total_quantity"] = "";
 $lang["reports_requisition_related_item_unit_quantity"] = "";
-$lang["reports_requisitions"] = "";
+$lang["reports_requisitions"] = "請購單";
 $lang["reports_returns"] = "返回";
 $lang["reports_revenue"] = "收入";
 $lang["reports_sale_id"] = "銷售編號";
@@ -102,12 +101,12 @@ $lang["reports_sale_type"] = "銷售類型";
 $lang["reports_sales"] = "銷售";
 $lang["reports_sales_amount"] = "總銷售額";
 $lang["reports_sales_summary_report"] = "銷售摘要報告";
-$lang["reports_sales_taxes"] = "";
-$lang["reports_sales_taxes_summary_report"] = "";
+$lang["reports_sales_taxes"] = "銷售稅";
+$lang["reports_sales_taxes_summary_report"] = "銷售稅匯總報告";
 $lang["reports_serial_number"] = "序號 #";
 $lang["reports_sold_by"] = "銷售人";
 $lang["reports_sold_to"] = "購買人";
-$lang["reports_stock_location"] = "";
+$lang["reports_stock_location"] = "庫存位置";
 $lang["reports_sub_total_value"] = "小計";
 $lang["reports_subtotal"] = "小計";
 $lang["reports_summary_reports"] = "摘要報表";
@@ -116,26 +115,26 @@ $lang["reports_supplier"] = "供應商";
 $lang["reports_suppliers"] = "供應商";
 $lang["reports_suppliers_summary_report"] = "供應商摘要報告";
 $lang["reports_tax"] = "稅額";
-$lang["reports_tax_category"] = "";
+$lang["reports_tax_category"] = "稅種";
 $lang["reports_tax_percent"] = "稅率";
-$lang["reports_tax_rate"] = "";
+$lang["reports_tax_rate"] = "稅率";
 $lang["reports_taxes"] = "稅額";
 $lang["reports_taxes_summary_report"] = "稅金摘要報告";
 $lang["reports_total"] = "總計";
 $lang["reports_total_inventory_value"] = "總庫存價值";
-$lang["reports_total_low_sell_quantity"] = "";
+$lang["reports_total_low_sell_quantity"] = "總低銷售量";
 $lang["reports_total_quantity"] = "總數量";
 $lang["reports_total_retail"] = "總投資額零售價";
-$lang["reports_trans_amount"] = "";
-$lang["reports_trans_due"] = "";
-$lang["reports_trans_group"] = "";
-$lang["reports_trans_nopay_sales"] = "";
-$lang["reports_trans_payments"] = "";
-$lang["reports_trans_refunded"] = "";
-$lang["reports_trans_sales"] = "";
-$lang["reports_trans_type"] = "";
+$lang["reports_trans_amount"] = "交易金額";
+$lang["reports_trans_due"] = "到期";
+$lang["reports_trans_group"] = "交易組";
+$lang["reports_trans_nopay_sales"] = "沒有付款的銷售";
+$lang["reports_trans_payments"] = "付款";
+$lang["reports_trans_refunded"] = "已退款";
+$lang["reports_trans_sales"] = "銷售";
+$lang["reports_trans_type"] = "交易類型";
 $lang["reports_type"] = "類型";
 $lang["reports_unit_price"] = "單價";
-$lang["reports_used"] = "";
-$lang["reports_work_orders"] = "";
+$lang["reports_used"] = "使用點數";
+$lang["reports_work_orders"] = "工作訂單";
 $lang["reports_zero_and_less"] = "零和更少";

application/language/zh-Hant/taxes_lang.php

@@ -51,20 +51,20 @@ $lang["taxes_tax_code_type"] = "稅碼類型";
 $lang["taxes_tax_codes"] = "統編(Tax Code)";
 $lang["taxes_tax_codes_configuration"] = "統編(Tax Code)設定";
 $lang["taxes_tax_codes_saved_successfully"] = "稅碼更改已保存";
-$lang["taxes_tax_codes_saved_unsuccessfully"] = "";
+$lang["taxes_tax_codes_saved_unsuccessfully"] = "稅碼更改未保存";
 $lang["taxes_tax_excluded"] = "不含稅";
-$lang["taxes_tax_group"] = "";
-$lang["taxes_tax_group_not_unique"] = "";
-$lang["taxes_tax_group_sequence"] = "";
+$lang["taxes_tax_group"] = "稅務集團";
+$lang["taxes_tax_group_not_unique"] = "稅組 %1 不是唯一的";
+$lang["taxes_tax_group_sequence"] = "稅組序列";
 $lang["taxes_tax_included"] = "含稅";
-$lang["taxes_tax_jurisdiction"] = "";
-$lang["taxes_tax_jurisdiction_duplicate"] = "";
-$lang["taxes_tax_jurisdiction_invalid_chars"] = "";
-$lang["taxes_tax_jurisdiction_required"] = "";
-$lang["taxes_tax_jurisdictions"] = "";
-$lang["taxes_tax_jurisdictions_configuration"] = "";
-$lang["taxes_tax_jurisdictions_saved_successfully"] = "";
-$lang["taxes_tax_jurisdictions_saved_unsuccessfully"] = "";
+$lang["taxes_tax_jurisdiction"] = "稅收管轄權";
+$lang["taxes_tax_jurisdiction_duplicate"] = "重複稅收管轄權";
+$lang["taxes_tax_jurisdiction_invalid_chars"] = "轄區名稱中的無效字符";
+$lang["taxes_tax_jurisdiction_required"] = "需要稅收管轄權";
+$lang["taxes_tax_jurisdictions"] = "稅務管轄區";
+$lang["taxes_tax_jurisdictions_configuration"] = "稅務管轄區配置";
+$lang["taxes_tax_jurisdictions_saved_successfully"] = "稅務管轄區更改已保存";
+$lang["taxes_tax_jurisdictions_saved_unsuccessfully"] = "稅務管轄區更改未保存";
 $lang["taxes_tax_rate"] = "稅率";
 $lang["taxes_tax_rate_configuration"] = "稅率設定";
 $lang["taxes_tax_rate_error_adding_updating"] = "稅率新增或修改失敗";
@@ -74,7 +74,7 @@ $lang["taxes_tax_rate_successful_updated"] = "修改完成";
 $lang["taxes_tax_rate_successfully_added"] = "新增完成";
 $lang["taxes_tax_rates"] = "稅率";
 $lang["taxes_tax_rates_configuration"] = "稅率設定";
-$lang["taxes_tax_rounding"] = "";
-$lang["taxes_tax_type"] = "";
+$lang["taxes_tax_rounding"] = "稅收四捨五入";
+$lang["taxes_tax_type"] = "稅種";
 $lang["taxes_update"] = "修改稅率";
 $lang["taxes_vat_tax"] = "增值稅";

application/migrations/20210714140000_move_expenses_categories.php

@@ -0,0 +1,18 @@
+<?php
+
+class Migration_move_expenses_categories extends CI_Migration {
+
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+	public function up()
+	{
+		error_log('Migrating expense categories module');
+
+		$this->db->simple_query("UPDATE ospos_grants SET menu_group = 'office' WHERE permission_id = 'expenses_categories'");
+
+		error_log('Migrating expense categories module completed');
+	}
+}

application/models/Attribute.php

@@ -21,18 +21,24 @@ class Attribute extends CI_Model
 	 */
 	public function exists($definition_id, $deleted = FALSE)
 	{
-		$this->db->from('attribute_definitions');
 		$this->db->where('definition_id', $definition_id);
 		$this->db->where('deleted', $deleted);
 
-		return ($this->db->get()->num_rows() == 1);
+		return ($this->db->get('attribute_definitions')->num_rows() == 1);
 	}
 
+	/**
+	 * Returns whether an attribute_link row exists given an item_id and optionally a definition_id
+	 * @param	int		$item_id
+	 * @param	boolean	$definition_id
+	 * @return	boolean					TRUE if at least one attribute_link exists or FALSE if no attributes exist.
+	 */
 	public function link_exists($item_id, $definition_id = FALSE)
 	{
+		$this->db->where('item_id', $item_id);
 		$this->db->where('sale_id');
 		$this->db->where('receiving_id');
-		$this->db->from('attribute_links');
+
 		if(empty($definition_id))
 		{
 			$this->db->where('definition_id <>');
@@ -43,25 +49,38 @@ class Attribute extends CI_Model
 			$this->db->where('definition_id', $definition_id);
 		}
 
-		$this->db->where('item_id', $item_id);
-
-		return ($this->db->get()->num_rows() > 0);
+		return ($this->db->get('attribute_links')->num_rows() > 0);
 	}
 
 	/*
-	 Determines if a given attribute_value exists in the attribute_values table and returns the attribute_id if it does
+	 * Determines if a given attribute_value exists in the attribute_values table and returns the attribute_id if it does
 	 */
-	public function value_exists($attribute_value)
+	public function value_exists($attribute_value, $definition_type = TEXT)
 	{
-		$this->db->distinct('attribute_id');
-		$this->db->from('attribute_values');
-		$this->db->where('attribute_value', $attribute_value);
+		switch($definition_type)
+		{
+			case DATE:
+				$data_type				= 'date';
+				$attribute_date_value	= DateTime::createFromFormat($this->Appconfig->get('dateformat'), $attribute_value);
+				$attribute_value		= $attribute_date_value->format('Y-m-d');
+				break;
+			case DECIMAL:
+				$data_type = 'decimal';
+				break;
+			default:
+				$data_type = 'value';
+				break;
+		}
 
-		$query = $this->db->get();
-		if ($query->num_rows() > 0)
+		$this->db->select('attribute_id');
+		$this->db->where("attribute_$data_type", $attribute_value);
+		$query = $this->db->get('attribute_values');
+
+		if($query->num_rows() > 0)
 		{
 			return $query->row()->attribute_id;
 		}
+
 		return FALSE;
 	}
 
@@ -86,7 +105,7 @@ class Attribute extends CI_Model
 			//Get empty base parent object, as $item_id is NOT an item
 			$item_obj = new stdClass();
 
-			//Get all the fields from items table
+			//Get all the fields from attribute_definitions table
 			foreach($this->db->list_fields('attribute_definitions') as $field)
 			{
 				$item_obj->$field = '';
@@ -106,9 +125,10 @@ class Attribute extends CI_Model
 		$this->db->join('attribute_definitions AS parent_definition', 'parent_definition.definition_id = definition.definition_fk', 'left');
 
 		$this->db->group_start();
-		$this->db->like('definition.definition_name', $search);
-		$this->db->or_like('definition.definition_type', $search);
+			$this->db->like('definition.definition_name', $search);
+			$this->db->or_like('definition.definition_type', $search);
 		$this->db->group_end();
+
 		$this->db->where('definition.deleted', 0);
 		$this->db->order_by($sort, $order);
 
@@ -122,68 +142,63 @@ class Attribute extends CI_Model
 
 	public function get_attributes_by_item($item_id)
 	{
-		$this->db->from('attribute_definitions');
 		$this->db->join('attribute_links', 'attribute_links.definition_id = attribute_definitions.definition_id');
 		$this->db->where('item_id', $item_id);
-		$this->db->where('receiving_id');
 		$this->db->where('sale_id');
+		$this->db->where('receiving_id');
 		$this->db->where('deleted', 0);
-		$this->db->order_by('definition_name','ASC');
+		$this->db->order_by('definition_name', 'ASC');
 
-		$results = $this->db->get()->result_array();
+		$results = $this->db->get('attribute_definitions')->result_array();
 
-		return $this->_to_array($results, 'definition_id');
+		return $this->to_array($results, 'definition_id');
 	}
 
 	public function get_values_by_definitions($definition_ids)
 	{
 		if(count($definition_ids ? : []))
 		{
-			$this->db->from('attribute_definitions');
-
 			$this->db->group_start();
-			$this->db->where_in('definition_fk', array_keys($definition_ids));
-			$this->db->or_where_in('definition_id', array_keys($definition_ids));
-			$this->db->where('definition_type !=', GROUP);
+				$this->db->where_in('definition_fk', array_keys($definition_ids));
+				$this->db->or_where_in('definition_id', array_keys($definition_ids));
+				$this->db->where('definition_type !=', GROUP);
 			$this->db->group_end();
 
 			$this->db->where('deleted', 0);
 
-			$results = $this->db->get()->result_array();
+			$results = $this->db->get('attribute_definitions')->result_array();
 
-			return $this->_to_array($results, 'definition_id');
+			return $this->to_array($results, 'definition_id');
 		}
 
-		return array();
+		return [];
 	}
 
 	public function get_definitions_by_type($attribute_type, $definition_id = NO_DEFINITION_ID)
 	{
-		$this->db->from('attribute_definitions');
 		$this->db->where('definition_type', $attribute_type);
 		$this->db->where('deleted', 0);
+		$this->db->where('definition_fk');
 
 		if($definition_id != CATEGORY_DEFINITION_ID)
 		{
-			$this->db->where('definition_id != ', $definition_id);
+			$this->db->where('definition_id <>', $definition_id);
 		}
 
-		$this->db->where('definition_fk');
-		$results = $this->db->get()->result_array();
+		$results = $this->db->get('attribute_definitions')->result_array();
 
-		return $this->_to_array($results, 'definition_id', 'definition_name');
+		return $this->to_array($results, 'definition_id', 'definition_name');
 	}
 
 	public function get_definitions_by_flags($definition_flags)
 	{
-		$this->db->from('attribute_definitions');
 		$this->db->where('definition_flags &', $definition_flags);
 		$this->db->where('deleted', 0);
 		$this->db->where('definition_type <>', GROUP);
 		$this->db->order_by('definition_id');
-		$results = $this->db->get()->result_array();
+		$results = $this->db->get('attribute_definitions')->result_array();
 
-		return $this->_to_array($results, 'definition_id', 'definition_name');
+		return $this->to_array($results, 'definition_id', 'definition_name');
 	}
 
 	/**
@@ -194,7 +209,6 @@ class Attribute extends CI_Model
 	 */
 	public function get_definition_names($groups = TRUE)
 	{
-		$this->db->from('attribute_definitions');
 		$this->db->where('deleted', 0);
 		$this->db->order_by('definition_name','ASC');
 
@@ -203,11 +217,10 @@ class Attribute extends CI_Model
 			$this->db->where_not_in('definition_type',GROUP);
 		}
 
-		$results = $this->db->get()->result_array();
-
+		$results = $this->db->get('attribute_definitions')->result_array();
 		$definition_name = array(-1 => $this->lang->line('common_none_selected_text'));
 
-		return $definition_name + $this->_to_array($results, 'definition_id', 'definition_name');
+		return $definition_name + $this->to_array($results, 'definition_id', 'definition_name');
 	}
 
 	public function get_definition_values($definition_id)
@@ -216,23 +229,22 @@ class Attribute extends CI_Model
 
 		if($definition_id > 0 || $definition_id == CATEGORY_DEFINITION_ID)
 		{
-			$this->db->from('attribute_links');
 			$this->db->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id');
-			$this->db->where('definition_id', $definition_id);
 			$this->db->where('item_id');
+			$this->db->where('definition_id', $definition_id);
 			$this->db->order_by('attribute_value','ASC');
 
-			$results = $this->db->get()->result_array();
+			$results = $this->db->get('attribute_links')->result_array();
 
-			return $this->_to_array($results, 'attribute_id', 'attribute_value');
+			return $this->to_array($results, 'attribute_id', 'attribute_value');
 		}
 
 		return $attribute_values;
 	}
 
-	private function _to_array($results, $key, $value = '')
+	private function to_array($results, $key, $value = '')
 	{
-		return array_column(array_map(function($result) use ($key, $value) {
+		return array_column(array_map(function($result) use ($key, $value){
 			return [$result[$key], empty($value) ? $result : $result[$value]];
 		}, $results), 1, 0);
 	}
@@ -242,10 +254,9 @@ class Attribute extends CI_Model
 	 */
 	public function get_total_rows()
 	{
-		$this->db->from('attribute_definitions');
 		$this->db->where('deleted', 0);
 
-		return $this->db->count_all_results();
+		return $this->db->count_all_results('attribute_definitions');
 	}
 
 	/*
@@ -256,73 +267,83 @@ class Attribute extends CI_Model
 		return $this->search($search)->num_rows();
 	}
 
-	private function check_data_validity($definition, $from, $to)
+	private function check_data_validity($definition_id, $from, $to)
 	{
 		$success = FALSE;
 
 		if($from === TEXT)
 		{
-			$this->db->select('item_id,attribute_value');
-			$this->db->from('attribute_values');
-			$this->db->join('attribute_links', 'attribute_values.attribute_id = attribute_links.attribute_id');
-			$this->db->where('definition_id',$definition);
 			$success = TRUE;
 
-			if($to === DATE)
+			$this->db->distinct()->select('attribute_value');
+			$this->db->join('attribute_links', 'attribute_values.attribute_id = attribute_links.attribute_id');
+			$this->db->where('definition_id', $definition_id);
+
+			foreach($this->db->get('attribute_values')->result() as $attribute)
 			{
-				foreach($this->db->get()->result_array() as $row)
+				switch($to)
 				{
-					if(valid_date($row['attribute_value']) === FALSE)
-					{
-						log_message('ERROR', 'item_id: ' . $row['item_id'] . ' with attribute_value: ' . $row['attribute_value'] . ' cannot be converted to datetime');
-						$success = FALSE;
-					}
+					case DATE:
+							$success = valid_date($attribute->attribute_value);
+						break;
+					case DECIMAL:
+							$success = valid_decimal($attribute->attribute_value);
+						break;
 				}
-			}
-			else if($to === DECIMAL)
-			{
-				foreach($this->db->get()->result_array() as $row)
+
+				if($success === FALSE)
 				{
-					if(valid_decimal($row['attribute_value']) === FALSE)
+					$affected_items = $this->get_items_by_value($attribute->attribute_value, $definition_id);
+					foreach($affected_items as $affected_item)
 					{
-						log_message('ERROR', 'item_id: ' . $row['item_id'] . ' with attribute_value: ' . $row['attribute_value'] . ' cannot be converted to decimal');
-						$success = FALSE;
+						$affected_items[] = $affected_item['item_id'];
 					}
+
+					log_message('ERROR', "Attribute_value: '$attribute->attribute_value' cannot be converted to $to. Affected Items: ". implode(',', $affected_items));
+					unset($affected_items);
 				}
 			}
 		}
 		return $success;
 	}
 
-	private function convert_definition_type($definition_id, $from_type, $to_type)
+	/**
+	 * Returns all item_ids with a specific attribute_value and attribute_definition
+	 * @param string $attribute_value
+	 * @param int $definition_id
+	 * @return array
+	 */
+	private function get_items_by_value($attribute_value, $definition_id)
+	{
+		$this->db->select('item_id');
+		$this->db->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id');
+		$this->db->where('definition_id', $definition_id);
+		$this->db->where('attribute_value', $attribute_value);
+		return $this->db->get('attribute_links')->result_array();
+	}
+
+
+	/**
+	 * Converts data in attribute_values and attribute_links tables associated with the conversion of one attribute type to another.
+	 * @param int $definition_id
+	 * @param 	string	$from_type
+	 * @param 	string	$to_type
+	 * @return boolean
+	 */
+	private function convert_definition_data($definition_id, $from_type, $to_type)
 	{
 		$success = FALSE;
 
-	//From TEXT
 		if($from_type === TEXT)
 		{
-		//To DATETIME or DECIMAL
 			if(in_array($to_type, [DATE, DECIMAL], TRUE))
 			{
-				$field = ($to_type === DATE ? 'attribute_date' : 'attribute_decimal');
-
 				if($this->check_data_validity($definition_id, $from_type, $to_type))
 				{
-					$this->db->trans_start();
-
-					$query = 'UPDATE ospos_attribute_values ';
-					$query .= 'INNER JOIN ospos_attribute_links ';
-					$query .= 'ON ospos_attribute_values.attribute_id = ospos_attribute_links.attribute_id ';
-					$query .= 'SET '. $field .'= attribute_value, ';
-					$query .= 'attribute_value = NULL ';
-					$query .= 'WHERE definition_id = ' . $this->db->escape($definition_id);
-					$success = $this->db->query($query);
-
-					$this->db->trans_complete();
+					$attributes_to_convert = $this->get_attributes_by_definition($definition_id);
+					$success = $this->attribute_cleanup($attributes_to_convert, $definition_id, $to_type);
 				}
 			}
-
-		//To DROPDOWN or CHECKBOX
 			else if($to_type === DROPDOWN)
 			{
 				$success = TRUE;
@@ -333,57 +354,44 @@ class Attribute extends CI_Model
 
 				$this->db->trans_start();
 
-				$query = 'UPDATE ospos_attribute_values values ';
-				$query .= 'INNER JOIN ospos_attribute_links links ';
-				$query .= 'ON values.attribute_id = links.attribute_id ';
-				$query .= "SET links.attribute_id = IF((values.attribute_value IN('FALSE','0','') OR (values.attribute_value IS NULL)), $checkbox_attribute_values[0], $checkbox_attribute_values[1]) ";
-				$query .= 'WHERE definition_id = ' . $this->db->escape($definition_id);
+				$query = 'UPDATE '. $this->db->dbprefix('attribute_links') .' links ';
+				$query .= 'JOIN '. $this->db->dbprefix('attribute_values') .' vals ';
+				$query .= 'ON vals.attribute_id = links.attribute_id ';
+				$query .= "SET links.attribute_id = IF((attribute_value IN('FALSE','0','') OR (attribute_value IS NULL)), $checkbox_attribute_values[0], $checkbox_attribute_values[1]) ";
+				$query .= 'WHERE definition_id = '. $this->db->escape($definition_id);
 				$success = $this->db->query($query);
 
 				$this->db->trans_complete();
 			}
 		}
-
-	//From DROPDOWN
 		else if($from_type === DROPDOWN)
 		{
-			//To TEXT
 			if(in_array($to_type, [TEXT, CHECKBOX], TRUE))
 			{
-				$this->db->trans_start();
-
-				$this->db->from('ospos_attribute_links');
-				$this->db->where('definition_id',$definition_id);
-				$this->db->where('item_id', NULL);
-				$success = $this->db->delete();
-
-				$this->db->trans_complete();
-
-				//To CHECKBOX
 				if($to_type === CHECKBOX)
 				{
 					$checkbox_attribute_values = $this->checkbox_attribute_values($definition_id);
 
 					$this->db->trans_start();
 
-					$query = 'UPDATE ospos_attribute_values vals ';
-					$query .= 'INNER JOIN ospos_attribute_links links ';
+					$query = 'UPDATE '. $this->db->dbprefix('attribute_links') .' links ';
+					$query .= 'JOIN '. $this->db->dbprefix('attribute_values') .' vals ';
 					$query .= 'ON vals.attribute_id = links.attribute_id ';
-					$query .= "SET links.attribute_id = IF((vals.attribute_value IN('FALSE','0','') OR (vals.attribute_value IS NULL)), $checkbox_attribute_values[0], $checkbox_attribute_values[1]) ";
-					$query .= 'WHERE links.definition_id = ' . $this->db->escape($definition_id);
+					$query .= "SET links.attribute_id = IF((attribute_value IN('FALSE','0','') OR (attribute_value IS NULL)), $checkbox_attribute_values[0], $checkbox_attribute_values[1]) ";
+					$query .= 'WHERE definition_id = '. $this->db->escape($definition_id);
 					$success = $this->db->query($query);
 
 					$this->db->trans_complete();
 				}
 			}
 		}
-
-		//From any other type
 		else
 		{
 			$success = TRUE;
 		}
 
+		$this->delete_orphaned_links($definition_id);
+		$this->delete_orphaned_values();
 		return $success;
 	}
 
@@ -410,7 +418,6 @@ class Attribute extends CI_Model
 	 */
 	public function save_definition(&$definition_data, $definition_id = NO_DEFINITION_ID)
 	{
-		//Run these queries as a transaction, we want to make sure we do all or nothing
 		$this->db->trans_start();
 
 		//Definition doesn't exist
@@ -418,7 +425,7 @@ class Attribute extends CI_Model
 		{
 			if($this->exists($definition_id,TRUE))
 			{
-				$success = $this->undelete($definition_id);
+				$success = $this->undelete_definition($definition_id);
 			}
 			else
 			{
@@ -430,26 +437,27 @@ class Attribute extends CI_Model
 		//Definition already exists
 		else
 		{
-			$this->db->select('definition_type, definition_name');
-			$this->db->from('attribute_definitions');
+			//Get current definition type and name
+			$this->db->select('definition_type');
 			$this->db->where('definition_id', $definition_id);
 
-			$row = $this->db->get()->row();
+			$row = $this->db->get('attribute_definitions')->row();
 			$from_definition_type = $row->definition_type;
-			$from_definition_name = $row->definition_name;
 			$to_definition_type = $definition_data['definition_type'];
 
+			//Update the definition values
+			$this->db->where('definition_id', $definition_id);
+
+			$success = $this->db->update('attribute_definitions', $definition_data);
+			$definition_data['definition_id'] = $definition_id;
+
 			if($from_definition_type !== $to_definition_type)
 			{
-				if(!$this->convert_definition_type($definition_id,$from_definition_type,$to_definition_type))
+				if($this->convert_definition_data($definition_id, $from_definition_type, $to_definition_type) === FALSE)
 				{
 					return FALSE;
 				}
 			}
-
-			$this->db->where('definition_id', $definition_id);
-			$success = $this->db->update('attribute_definitions', $definition_data);
-			$definition_data['definition_id'] = $definition_id;
 		}
 
 		$this->db->trans_complete();
@@ -461,14 +469,14 @@ class Attribute extends CI_Model
 
 	public function get_definition_by_name($definition_name, $definition_type = FALSE)
 	{
-		$this->db->from('attribute_definitions');
 		$this->db->where('definition_name', $definition_name);
+
 		if($definition_type != FALSE)
 		{
 			$this->db->where('definition_type', $definition_type);
 		}
 
-		return $this->db->get()->result_array();
+		return $this->db->get('attribute_definitions')->result_array();
 	}
 
 	public function save_link($item_id, $definition_id, $attribute_id)
@@ -485,7 +493,10 @@ class Attribute extends CI_Model
 		}
 		else
 		{
-			$this->db->insert('attribute_links', array('attribute_id' => $attribute_id, 'item_id' => $item_id, 'definition_id' => $definition_id));
+			$this->db->insert('attribute_links', array(
+					'attribute_id' => $attribute_id,
+					'item_id' => $item_id,
+					'definition_id' => $definition_id));
 		}
 
 		$this->db->trans_complete();
@@ -493,20 +504,30 @@ class Attribute extends CI_Model
 		return $this->db->trans_status();
 	}
 
-	public function delete_link($item_id)
+	public function delete_link($item_id, $definition_id = FALSE)
 	{
+		$delete_data = array('item_id' => $item_id);
+
+		//Exclude rows where sale_id or receiving_id has a value
 		$this->db->where('sale_id');
 		$this->db->where('receiving_id');
 
-		return $this->db->delete('attribute_links', array('item_id' => $item_id));
+		if(!empty($definition_id))
+		{
+			$delete_data += ['definition_id' => $definition_id];
+		}
+
+		$success = $this->db->delete('attribute_links', $delete_data);
+
+		return $success;
 	}
 
 	public function get_link_value($item_id, $definition_id)
 	{
 		$this->db->where('item_id', $item_id);
-		$this->db->where('definition_id', $definition_id);
 		$this->db->where('sale_id');
 		$this->db->where('receiving_id');
+		$this->db->where('definition_id', $definition_id);
 
 		return $this->db->get('attribute_links')->row_object();
 	}
@@ -516,11 +537,11 @@ class Attribute extends CI_Model
 		$format = $this->db->escape(dateformat_mysql());
 		$this->db->select("GROUP_CONCAT(attribute_value SEPARATOR ', ') AS attribute_values");
 		$this->db->select("GROUP_CONCAT(DATE_FORMAT(attribute_date, $format) SEPARATOR ', ') AS attribute_dtvalues");
-		$this->db->from('attribute_links');
 		$this->db->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id');
 		$this->db->join('attribute_definitions', 'attribute_definitions.definition_id = attribute_links.definition_id');
 		$this->db->where('definition_type <>', GROUP);
 		$this->db->where('deleted', 0);
+		$this->db->where('item_id', intval($item_id));
 
 		if(!empty($id))
 		{
@@ -532,37 +553,47 @@ class Attribute extends CI_Model
 			$this->db->where('receiving_id');
 		}
 
-		$this->db->where('item_id', (int) $item_id);
 		$this->db->where('definition_flags & ', $definition_flags);
 
-		return $this->db->get();
+		return $this->db->get('attribute_links');
 	}
 
 	public function get_attribute_value($item_id, $definition_id)
 	{
-		$this->db->from('attribute_values');
 		$this->db->join('attribute_links', 'attribute_links.attribute_id = attribute_values.attribute_id');
-		$this->db->where('definition_id', $definition_id);
+		$this->db->where('item_id', intval($item_id));
 		$this->db->where('sale_id');
 		$this->db->where('receiving_id');
-		$this->db->where('item_id', (int) $item_id);
+		$this->db->where('definition_id', $definition_id);
 
-		return $this->db->get()->row_object();
+		return $this->db->get('attribute_values')->row_object();
 	}
 
+	public function get_attribute_values($item_id)
+	{
+		$this->db->select('attribute_values.attribute_value, attribute_values.attribute_decimal, attribute_values.attribute_date, attribute_links.definition_id');
+		$this->db->join('attribute_values', 'attribute_links.attribute_id = attribute_values.attribute_id');
+		$this->db->where('item_id', intval($item_id));
+
+		$results = $this->db->get('attribute_links')->result_array();
+
+		return $this->to_array($results, 'definition_id');
+	}
+
+
 	public function copy_attribute_links($item_id, $sale_receiving_fk, $id)
 	{
 		$this->db->query(
-			'INSERT INTO ospos_attribute_links (item_id, definition_id, attribute_id, ' . $sale_receiving_fk . ')
-			  SELECT ' . $this->db->escape($item_id) . ', definition_id, attribute_id, ' . $this->db->escape($id) . '
-			  FROM ' . $this->db->dbprefix('attribute_links') . '
-			  WHERE item_id = ' . $this->db->escape($item_id) . ' AND sale_id IS NULL AND receiving_id IS NULL'
+			'INSERT INTO ' . $this->db->dbprefix('attribute_links') . ' (item_id, definition_id, attribute_id, ' . $sale_receiving_fk . ')
+			SELECT ' . $this->db->escape($item_id) . ', definition_id, attribute_id, ' . $this->db->escape($id) . '
+			FROM ' . $this->db->dbprefix('attribute_links') . '
+			WHERE item_id = ' . $this->db->escape($item_id) . ' AND sale_id IS NULL AND receiving_id IS NULL'
 			);
 	}
 
 	public function get_suggestions($definition_id, $term)
 	{
-		$suggestions = array();
+		$suggestions = [];
 		$this->db->distinct();
 		$this->db->select('attribute_value, attribute_values.attribute_id');
 		$this->db->from('attribute_definitions AS definition');
@@ -586,25 +617,32 @@ class Attribute extends CI_Model
 	{
 		$this->db->trans_start();
 
+		$locale_date_format = $this->Appconfig->get('dateformat');
+
 		//New Attribute
 		if(empty($attribute_id) || empty($item_id))
 		{
-			if(in_array($definition_type, [TEXT, DROPDOWN, CHECKBOX], TRUE))
-			{
-				$attribute_id = $this->value_exists($attribute_value);
+		//Update attribute_value
+			$attribute_id = $this->value_exists($attribute_value, $definition_type);
 
-				if(empty($attribute_id))
+			if($attribute_id === FALSE)
+			{
+				switch($definition_type)
 				{
-					$this->db->insert('attribute_values', array('attribute_value' => $attribute_value));
+					case DATE:
+						$data_type				= 'date';
+						$attribute_date_value	= DateTime::createFromFormat($locale_date_format, $attribute_value);
+						$attribute_value		= $attribute_date_value->format('Y-m-d');
+						break;
+					case DECIMAL:
+						$data_type	= 'decimal';
+						break;
+					default:
+						$data_type	= 'value';
+						break;
 				}
-			}
-			else if($definition_type == DECIMAL)
-			{
-				$this->db->insert('attribute_values', array('attribute_decimal' => $attribute_value));
-			}
-			else
-			{
-				$this->db->insert('attribute_values', array('attribute_date' => date('Y-m-d', strtotime($attribute_value))));
+
+				$this->db->insert('attribute_values', array("attribute_$data_type" => $attribute_value));
 			}
 
 			$attribute_id = $attribute_id ? $attribute_id : $this->db->insert_id();
@@ -614,24 +652,26 @@ class Attribute extends CI_Model
 				'item_id' => empty($item_id) ? NULL : $item_id,
 				'definition_id' => $definition_id));
 		}
-
 		//Existing Attribute
 		else
 		{
-			$this->db->where('attribute_id', $attribute_id);
+			switch($definition_type)
+			{
+				case DATE:
+					$data_type				= 'date';
+					$attribute_date_value	= DateTime::createFromFormat($locale_date_format, $attribute_value);
+					$attribute_value		= $attribute_date_value->format('Y-m-d');
+					break;
+				case DECIMAL:
+					$data_type	= 'decimal';
+					break;
+				default:
+					$data_type	= 'value';
+					break;
+			}
 
-			if(in_array($definition_type, [TEXT, DROPDOWN], TRUE))
-			{
-				$this->db->update('attribute_values', array('attribute_value' => $attribute_value));
-			}
-			else if($definition_type == DECIMAL)
-			{
-				$this->db->update('attribute_values', array('attribute_decimal' => $attribute_value));
-			}
-			else
-			{
-				$this->db->update('attribute_values', array('attribute_date' => date('Y-m-d', strtotime($attribute_value))));
-			}
+				$this->db->where('attribute_id', $attribute_id);
+				$this->db->update('attribute_values', array("attribute_$data_type" => $attribute_value));
 		}
 
 		$this->db->trans_complete();
@@ -641,14 +681,14 @@ class Attribute extends CI_Model
 
 	public function delete_value($attribute_value, $definition_id)
 	{
-		return $this->db->query("DELETE atrv, atrl FROM " . $this->db->dbprefix('attribute_values') . " atrv, " . $this->db->dbprefix('attribute_links') .  " atrl " .
-			"WHERE atrl.attribute_id = atrv.attribute_id AND atrv.attribute_value = " . $this->db->escape($attribute_value) . " AND atrl.definition_id = " . $this->db->escape($definition_id));
+		return $this->db->query('DELETE atrv, atrl FROM ' . $this->db->dbprefix('attribute_values') . ' atrv, ' . $this->db->dbprefix('attribute_links') .  ' atrl ' .
+			'WHERE atrl.attribute_id = atrv.attribute_id AND atrv.attribute_value = ' . $this->db->escape($attribute_value) . ' AND atrl.definition_id = ' . $this->db->escape($definition_id));
 	}
 
 	/**
 	 * Deletes an Attribute definition from the database and associated column in the items_import.csv
 	 *
-	 * @param	unknown	$definition_id	Attribute definition ID to remove.
+	 * @param	int		$definition_id	Attribute definition ID to remove.
 	 * @return 	boolean					TRUE if successful and FALSE if there is a failure
 	 */
 	public function delete_definition($definition_id)
@@ -666,6 +706,33 @@ class Attribute extends CI_Model
 	}
 
 	/**
+	 * Deletes any attribute_links for a specific definition that do not have an item_id associated with them and are not DROPDOWN types
+	 *
+	 * @param int $definition_id
+	 * @return boolean TRUE is returned if the delete was successful or FALSE if there were any failures
+	 */
+	public function delete_orphaned_links($definition_id)
+	{
+		$this->db->select('definition_type');
+		$this->db->where('definition_id', $definition_id);
+
+		$definition = $this->db->get('attribute_definitions')->row();
+
+		if($definition->definition_type != DROPDOWN)
+		{
+			$this->db->trans_start();
+
+			$this->db->where('item_id');
+			$this->db->where('definition_id', $definition_id);
+			$this->db->delete('attribute_links');
+
+			$this->db->trans_complete();
+
+			return $this->db->trans_status();
+		}
+	}
+
+	/*
 	 * Deletes any orphaned values that do not have associated links
 	 * @param int $definition_id
 	 * @return boolean TRUE is returned if the delete was successful or FALSE if there were any failures
@@ -693,6 +760,48 @@ class Attribute extends CI_Model
 	{
 		$this->db->where('definition_id', $definition_id);
 
-		return $this->db->update('attribute_definitions', array('deleted'=>0));
+		return $this->db->update('attribute_definitions', array('deleted' => 0));
+	}
+
+	/**
+	 *
+	 * @param array 	attributes 			attributes that need to be fixed
+	 * @param int 		$definition_id
+	 * @param string	$definition_type	This dictates what column should be populated in any new attribute_values that are created
+	 */
+	public function attribute_cleanup($attributes, $definition_id, $definition_type)
+	{
+		$this->db->trans_begin();
+
+		foreach($attributes as $attribute)
+		{
+			$new_attribute_id = $this->save_value($attribute['attribute_value'], $definition_id, FALSE, $attribute['attribute_id'], $definition_type);
+
+			if($this->save_link($attribute['item_id'], $definition_id, $new_attribute_id) == FALSE)
+			{
+				log_message('Error', 'Transaction failed');
+				$this->db->trans_rollback();
+				return FALSE;
+			}
+		}
+		$success = $this->delete_orphaned_links($definition_id);
+
+		$this->db->trans_commit();
+		return $success;
+	}
+
+	/**
+	 * Returns all attribute_ids and item_ids assigned to that definition_id
+	 *
+	 * @param int $definition_id
+	 * @return array All attribute_id and item_id pairs in the attribute_links table with that attribute definition_id
+	 */
+	public function get_attributes_by_definition($definition_id)
+	{
+		$this->db->select('attribute_links.attribute_id, item_id, attribute_value, attribute_decimal, attribute_date');
+		$this->db->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id');
+		$this->db->where('definition_id', $definition_id);
+
+		return $this->db->get('attribute_links')->result_array();
 	}
 }

application/models/Employee.php

@@ -18,6 +18,15 @@ class Employee extends Person
 		return ($this->db->get()->num_rows() == 1);
 	}
 
+	public function username_exists($employee_id, $username)
+	{
+		$this->db->from('employees');
+		$this->db->where('employees.username', $username);
+		$this->db->where('employees.person_id <>', $employee_id);
+
+		return ($this->db->get()->num_rows() == 1);
+	}
+
 	/*
 	Gets total of rows
 	*/

application/models/Item.php

@@ -12,16 +12,15 @@ class Item extends CI_Model
 	{
 		// check if $item_id is a number and not a string starting with 0
 		// because cases like 00012345 will be seen as a number where it is a barcode
-		if(ctype_digit($item_id) && substr($item_id, 0, 1) != '0')
+		if(ctype_digit($item_id) && substr($item_id, 0, 1) !== '0')
 		{
-			$this->db->from('items');
-			$this->db->where('item_id', (int) $item_id);
-			if($ignore_deleted == FALSE)
+			$this->db->where('item_id', intval($item_id));
+			if($ignore_deleted === FALSE)
 			{
 				$this->db->where('deleted', $deleted);
 			}
 
-			return ($this->db->get()->num_rows() == 1);
+			return ($this->db->get('items')->num_rows() === 1);
 		}
 
 		return FALSE;
@@ -37,16 +36,15 @@ class Item extends CI_Model
 			return FALSE;
 		}
 
-		$this->db->from('items');
 		$this->db->where('item_number', (string) $item_number);
 		// check if $item_id is a number and not a string starting with 0
 		// because cases like 00012345 will be seen as a number where it is a barcode
 		if(ctype_digit($item_id) && substr($item_id, 0, 1) != '0')
 		{
-			$this->db->where('item_id !=', (int) $item_id);
+			$this->db->where('item_id !=', intval($item_id));
 		}
 
-		return $this->db->get()->num_rows() >= 1;
+		return ($this->db->get('items')->num_rows() >= 1);
 	}
 
 	/*
@@ -82,7 +80,7 @@ class Item extends CI_Model
 	public function search($search, $filters, $rows = 0, $limit_from = 0, $sort = 'items.name', $order = 'asc', $count_only = FALSE)
 	{
 		// get_found_rows case
-		if($count_only == TRUE)
+		if($count_only === TRUE)
 		{
 			$this->db->select('COUNT(DISTINCT items.item_id) AS count');
 		}
@@ -208,7 +206,7 @@ class Item extends CI_Model
 		}
 
 		// get_found_rows case
-		if($count_only == TRUE)
+		if($count_only === TRUE)
 		{
 			return $this->db->get()->row()->count;
 		}
@@ -262,13 +260,12 @@ class Item extends CI_Model
 		$this->db->select('GROUP_CONCAT(attribute_value SEPARATOR \'|\') AS attribute_values');
 		$this->db->select('GROUP_CONCAT(attribute_decimal SEPARATOR \'|\') AS attribute_dvalues');
 		$this->db->select('GROUP_CONCAT(attribute_date SEPARATOR \'|\') AS attribute_dtvalues');
-		$this->db->from('items');
 		$this->db->join('attribute_links', 'attribute_links.item_id = items.item_id', 'left');
 		$this->db->join('attribute_values', 'attribute_links.attribute_id = attribute_values.attribute_id', 'left');
 		$this->db->where('items.item_id', $item_id);
 		$this->db->group_by('items.item_id');
 
-		$query = $this->db->get();
+		$query = $this->db->get('items');
 
 		if($query->num_rows() == 1)
 		{
@@ -294,17 +291,14 @@ class Item extends CI_Model
 	*/
 	public function get_info_by_id_or_number($item_id, $include_deleted = TRUE)
 	{
-		$this->db->from('items');
-
 		$this->db->group_start();
-
 		$this->db->where('items.item_number', $item_id);
 
 		// check if $item_id is a number and not a string starting with 0
 		// because cases like 00012345 will be seen as a number where it is a barcode
 		if(ctype_digit($item_id) && substr($item_id, 0, 1) != '0')
 		{
-			$this->db->or_where('items.item_id', (int) $item_id);
+			$this->db->or_where('items.item_id', intval($item_id));
 		}
 
 		$this->db->group_end();
@@ -318,7 +312,7 @@ class Item extends CI_Model
 		// due to barcode and item_id clash
 		$this->db->limit(1);
 
-		$query = $this->db->get();
+		$query = $this->db->get('items');
 
 		if($query->num_rows() == 1)
 		{
@@ -390,10 +384,16 @@ class Item extends CI_Model
 					$this->db->where('item_id', $item_data['item_id']);
 					$this->db->update('items', array('low_sell_item_id'=>$item_data['item_id']));
 				}
+
 				return TRUE;
 			}
+
 			return FALSE;
 		}
+		else
+		{
+			$item_data['item_id'] = $item_id;
+		}
 
 		$this->db->where('item_id', $item_id);
 
@@ -546,7 +546,7 @@ class Item extends CI_Model
 
 	public function get_search_suggestions($search, $filters = array('is_deleted' => FALSE, 'search_custom' => FALSE), $unique = FALSE, $limit = 25)
 	{
-		$suggestions = array();
+		$suggestions = [];
 		$non_kit = array(ITEM, ITEM_AMOUNT_ENTRY);
 
 		$this->db->select($this->get_search_suggestion_format('item_id, name, pack_name'));
@@ -614,16 +614,16 @@ class Item extends CI_Model
 			}
 
 			//Search by custom fields
-			if($filters['search_custom'] != FALSE)
+			if($filters['search_custom'] !== FALSE)
 			{
-				$this->db->from('attribute_links');
-				$this->db->join('attribute_values','attribute_links.attribute_id = attribute_values.attribute_id');
+				$this->db->join('attribute_values', 'attribute_links.attribute_id = attribute_values.attribute_id');
 				$this->db->join('attribute_definitions', 'attribute_definitions.definition_id = attribute_links.definition_id');
 				$this->db->like('attribute_value', $search);
 				$this->db->where('definition_type', TEXT);
 				$this->db->where('deleted', $filters['is_deleted']);
+				$this->db->where_in('item_type', $non_kit); // standard, exclude kit items since kits will be picked up later
 
-				foreach($this->db->get()->result() as $row)
+				foreach($this->db->get('attribute_links')->result() as $row)
 				{
 					$suggestions[] = array('value' => $row->item_id, 'label' => $this->get_search_suggestion_label($row));
 				}
@@ -642,7 +642,7 @@ class Item extends CI_Model
 
 	public function get_stock_search_suggestions($search, $filters = array('is_deleted' => FALSE, 'search_custom' => FALSE), $unique = FALSE, $limit = 25)
 	{
-		$suggestions = array();
+		$suggestions = [];
 		$non_kit = array(ITEM, ITEM_AMOUNT_ENTRY);
 
 		$this->db->select($this->get_search_suggestion_format('item_id, name, pack_name'));
@@ -716,16 +716,16 @@ class Item extends CI_Model
 			}
 
 			//Search by custom fields
-			if($filters['search_custom'] != FALSE)
+			if($filters['search_custom'] !== FALSE)
 			{
-				$this->db->from('attribute_links');
-				$this->db->join('attribute_links.attribute_id = attribute_values.attribute_id');
+				$this->db->join('attribute_values', 'attribute_links.attribute_id = attribute_values.attribute_id');
 				$this->db->join('attribute_definitions', 'attribute_definitions.definition_id = attribute_links.definition_id');
 				$this->db->like('attribute_value', $search);
 				$this->db->where('definition_type', TEXT);
 				$this->db->where('stock_type', '0'); // stocked items only
 				$this->db->where('deleted', $filters['is_deleted']);
-				foreach($this->db->get()->result() as $row)
+
+				foreach($this->db->get('attribute_links')->result() as $row)
 				{
 					$suggestions[] = array('value' => $row->item_id, 'label' => $this->get_search_suggestion_label($row));
 				}
@@ -743,16 +743,15 @@ class Item extends CI_Model
 
 	public function get_kit_search_suggestions($search, $filters = array('is_deleted' => FALSE, 'search_custom' => FALSE), $unique = FALSE, $limit = 25)
 	{
-		$suggestions = array();
+		$suggestions = [];
 		$non_kit = array(ITEM, ITEM_AMOUNT_ENTRY);
 
 		$this->db->select('item_id, name');
-		$this->db->from('items');
 		$this->db->where('deleted', $filters['is_deleted']);
 		$this->db->where('item_type', ITEM_KIT);
 		$this->db->like('name', $search);
 		$this->db->order_by('name', 'asc');
-		foreach($this->db->get()->result() as $row)
+		foreach($this->db->get('items')->result() as $row)
 		{
 			$suggestions[] = array('value' => $row->item_id, 'label' => $row->name);
 		}
@@ -778,6 +777,7 @@ class Item extends CI_Model
 			$this->db->distinct();
 			$this->db->like('category', $search);
 			$this->db->order_by('category', 'asc');
+
 			foreach($this->db->get()->result() as $row)
 			{
 				$suggestions[] = array('label' => $row->category);
@@ -787,10 +787,12 @@ class Item extends CI_Model
 			$this->db->select('company_name');
 			$this->db->from('suppliers');
 			$this->db->like('company_name', $search);
+
 			// restrict to non deleted companies only if is_deleted is FALSE
 			$this->db->where('deleted', $filters['is_deleted']);
 			$this->db->distinct();
 			$this->db->order_by('company_name', 'asc');
+
 			foreach($this->db->get()->result() as $row)
 			{
 				$suggestions[] = array('label' => $row->company_name);
@@ -813,31 +815,19 @@ class Item extends CI_Model
 			}
 
 			//Search by custom fields
-			if($filters['search_custom'] != FALSE)
+			if($filters['search_custom'] !== FALSE)
 			{
-				// This section is currently never used but custom fields are replaced with attributes
-				// therefore in case this feature is required a proper query needs to be written here
-				/*
-				$this->db->from('items');
-				$this->db->group_start();
-				$this->db->where('item_type', ITEM_KIT);
-				$this->db->like('custom1', $search);
-				$this->db->or_like('custom2', $search);
-				$this->db->or_like('custom3', $search);
-				$this->db->or_like('custom4', $search);
-				$this->db->or_like('custom5', $search);
-				$this->db->or_like('custom6', $search);
-				$this->db->or_like('custom7', $search);
-				$this->db->or_like('custom8', $search);
-				$this->db->or_like('custom9', $search);
-				$this->db->or_like('custom10', $search);
-				$this->db->group_end();
+				$this->db->join('attribute_values', 'attribute_links.attribute_id = attribute_values.attribute_id');
+				$this->db->join('attribute_definitions', 'attribute_definitions.definition_id = attribute_links.definition_id');
+				$this->db->like('attribute_value', $search);
+				$this->db->where('definition_type', TEXT);
+				$this->db->where('stock_type', '0'); // stocked items only
 				$this->db->where('deleted', $filters['is_deleted']);
-				foreach($this->db->get()->result() as $row)
+
+				foreach($this->db->get('attribute_links')->result() as $row)
 				{
-					$suggestions[] = array('value' => $row->item_id, 'label' => $row->name);
+					$suggestions[] = array('value' => $row->item_id, 'label' => $this->get_search_suggestion_label($row));
 				}
-				*/
 			}
 		}
 
@@ -852,7 +842,7 @@ class Item extends CI_Model
 
 	public function get_low_sell_suggestions($search)
 	{
-		$suggestions = array();
+		$suggestions = [];
 
 		$this->db->select($this->get_search_suggestion_format('item_id, pack_name'));
 		$this->db->from('items');
@@ -870,7 +860,7 @@ class Item extends CI_Model
 
 	public function get_category_suggestions($search)
 	{
-		$suggestions = array();
+		$suggestions = [];
 		$this->db->distinct();
 		$this->db->select('category');
 		$this->db->from('items');
@@ -887,7 +877,7 @@ class Item extends CI_Model
 
 	public function get_location_suggestions($search)
 	{
-		$suggestions = array();
+		$suggestions = [];
 		$this->db->distinct();
 		$this->db->select('location');
 		$this->db->from('items');

application/models/reports/Summary_items.php

@@ -8,6 +8,7 @@ class Summary_items extends Summary_report
 	{
 		return array(
 			array('item_name' => $this->lang->line('reports_item')),
+			array('category' => $this->lang->line('reports_category')),
 			array('unit_price' => $this->lang->line('reports_unit_price'), 'sorter' => 'number_sorter'),
 			array('quantity' => $this->lang->line('reports_quantity')),
 			array('subtotal' => $this->lang->line('reports_subtotal'), 'sorter' => 'number_sorter'),
@@ -23,6 +24,7 @@ class Summary_items extends Summary_report
 
 		$this->db->select('
 				MAX(items.name) AS name,
+				MAX(items.category) AS category,
 				MAX(items.unit_price) AS unit_price,
 				SUM(sales_items.quantity_purchased) AS quantity_purchased
 		');

application/views/attributes/form.php

@@ -147,7 +147,7 @@ $(document).ready(function()
 		}
 		else
 		{
-			$.post('<?php echo site_url($controller_name . "/delete_attribute_value/");?>' + escape(value), {definition_id: definition_id});
+			$.post('<?php echo site_url($controller_name . "/delete_attribute_value/");?>', {definition_id: definition_id, attribute_value: value});
 		}
 		$(this).parents("li").remove();
 	};
@@ -176,7 +176,7 @@ $(document).ready(function()
 			}
 			else
 			{
-				$.post('<?php echo site_url("attributes/save_attribute_value/");?>' + escape(value), {definition_id: definition_id});
+				$.post('<?php echo site_url("attributes/save_attribute_value/");?>', {definition_id: definition_id, attribute_value: value});
 			}
 		}
 

application/views/employees/form.php

@@ -209,8 +209,10 @@ $(document).ready(function()
 			last_name: 'required',
 			username:
 			{
+
 				required: true,
-				minlength: 5
+				minlength: 5,
+				remote: '<?php echo site_url("$controller_name/check_username/$employee_id")?>'
 			},
 			password:
 			{
@@ -238,8 +240,9 @@ $(document).ready(function()
 			username:
 			{
 				required: "<?php echo $this->lang->line('employees_username_required'); ?>",
-				minlength: "<?php echo $this->lang->line('employees_username_minlength'); ?>"
-			},
+				minlength: "<?php echo $this->lang->line('employees_username_minlength'); ?>",
+				remote: "<?php echo $this->lang->line('employees_username_duplicate'); ?>"
+            },
 			password:
 			{
 				<?php

application/views/items/form_csv_import.php

@@ -1,10 +1,10 @@
 <ul id="error_message_box" class="error_message_box"></ul>
 
-<?php echo form_open_multipart('items/do_csv_import/', array('id'=>'csv_form', 'class'=>'form-horizontal')); ?>
+<?php echo form_open_multipart('items/import_csv_file/', array('id'=>'csv_form', 'class'=>'form-horizontal')); ?>
 	<fieldset id="item_basic_info">
 		<div class="form-group form-group-sm">
 			<div class="col-xs-12">
-				<a href="<?php echo site_url('items/csv'); ?>"><?php echo $this->lang->line('common_download_import_template'); ?></a>
+				<a href="<?php echo site_url('items/generate_csv_file'); ?>"><?php echo $this->lang->line('common_download_import_template'); ?></a>
 			</div>
 		</div>
 
@@ -12,8 +12,8 @@
 			<div class='col-xs-12'>
 				<div class="fileinput fileinput-new input-group" data-provides="fileinput">
 					<div class="form-control" data-trigger="fileinput"><i class="glyphicon glyphicon-file fileinput-exists"></i><span class="fileinput-filename"></span></div>
-					<span class="input-group-addon input-sm btn btn-default btn-file"><span class="fileinput-new"><?php echo $this->lang->line("common_import_select_file"); ?></span><span class="fileinput-exists"><?php echo $this->lang->line("common_import_change_file"); ?></span><input type="file" id="file_path" name="file_path" accept=".csv"></span>
-					<a href="#" class="input-group-addon input-sm btn btn-default fileinput-exists" data-dismiss="fileinput"><?php echo $this->lang->line("common_import_remove_file"); ?></a>
+					<span class="input-group-addon input-sm btn btn-default btn-file"><span class="fileinput-new"><?php echo $this->lang->line('common_import_select_file'); ?></span><span class="fileinput-exists"><?php echo $this->lang->line('common_import_change_file'); ?></span><input type="file" id="file_path" name="file_path" accept=".csv"></span>
+					<a href="#" class="input-group-addon input-sm btn btn-default fileinput-exists" data-dismiss="fileinput"><?php echo $this->lang->line('common_import_remove_file'); ?></a>
 				</div>
 			</div>
 		</div>

application/views/items/manage.php

@@ -1,4 +1,4 @@
-<?php $this->load->view("partial/header"); ?>
+<?php $this->load->view('partial/header'); ?>
 
 <script type="text/javascript">
 $(document).ready(function()
@@ -17,7 +17,7 @@ $(document).ready(function()
         table_support.refresh();
     });
 
-	// load the preset datarange picker
+	// load the preset daterange picker
 	<?php $this->load->view('partial/daterangepicker'); ?>
     // set the beginning of time as starting date
     $('#daterangepicker').data('daterangepicker').setStartDate("<?php echo date($this->config->item('dateformat'), mktime(0,0,0,01,01,2010));?>");
@@ -58,28 +58,28 @@ $(document).ready(function()
 </script>
 
 <div id="title_bar" class="btn-toolbar print_hide">
-    <button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-submit='<?php echo $this->lang->line('common_submit') ?>' data-href='<?php echo site_url($controller_name."/csv_import"); ?>'
+    <button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-submit='<?php echo $this->lang->line('common_submit') ?>' data-href='<?php echo site_url("$controller_name/csv_import"); ?>'
             title='<?php echo $this->lang->line('items_import_items_csv'); ?>'>
-        <span class="glyphicon glyphicon-import">&nbsp</span><?php echo $this->lang->line('common_import_csv'); ?>
+        <span class="glyphicon glyphicon-import">&nbsp;</span><?php echo $this->lang->line('common_import_csv'); ?>
     </button>
 
-    <button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-new='<?php echo $this->lang->line('common_new') ?>' data-btn-submit='<?php echo $this->lang->line('common_submit') ?>' data-href='<?php echo site_url($controller_name."/view"); ?>'
+    <button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-new='<?php echo $this->lang->line('common_new') ?>' data-btn-submit='<?php echo $this->lang->line('common_submit') ?>' data-href='<?php echo site_url("$controller_name/view"); ?>'
             title='<?php echo $this->lang->line($controller_name . '_new'); ?>'>
-        <span class="glyphicon glyphicon-tag">&nbsp</span><?php echo $this->lang->line($controller_name. '_new'); ?>
+        <span class="glyphicon glyphicon-tag">&nbsp;</span><?php echo $this->lang->line($controller_name. '_new'); ?>
     </button>
 </div>
 
 <div id="toolbar">
     <div class="pull-left form-inline" role="toolbar">
         <button id="delete" class="btn btn-default btn-sm print_hide">
-            <span class="glyphicon glyphicon-trash">&nbsp</span><?php echo $this->lang->line("common_delete"); ?>
+            <span class="glyphicon glyphicon-trash">&nbsp;</span><?php echo $this->lang->line('common_delete'); ?>
         </button>
-        <button id="bulk_edit" class="btn btn-default btn-sm modal-dlg print_hide", data-btn-submit='<?php echo $this->lang->line('common_submit') ?>', data-href='<?php echo site_url($controller_name."/bulk_edit"); ?>'
+        <button id="bulk_edit" class="btn btn-default btn-sm modal-dlg print_hide", data-btn-submit='<?php echo $this->lang->line('common_submit') ?>', data-href='<?php echo site_url("$controller_name/bulk_edit"); ?>'
 				title='<?php echo $this->lang->line('items_edit_multiple_items'); ?>'>
-            <span class="glyphicon glyphicon-edit">&nbsp</span><?php echo $this->lang->line("items_bulk_edit"); ?>
+            <span class="glyphicon glyphicon-edit">&nbsp;</span><?php echo $this->lang->line("items_bulk_edit"); ?>
         </button>
-        <button id="generate_barcodes" class="btn btn-default btn-sm print_hide" data-href='<?php echo site_url($controller_name."/generate_barcodes"); ?>' title='<?php echo $this->lang->line('items_generate_barcodes');?>'>
-            <span class="glyphicon glyphicon-barcode">&nbsp</span><?php echo $this->lang->line("items_generate_barcodes"); ?>
+        <button id="generate_barcodes" class="btn btn-default btn-sm print_hide" data-href='<?php echo site_url("$controller_name/generate_barcodes"); ?>' title='<?php echo $this->lang->line('items_generate_barcodes');?>'>
+            <span class="glyphicon glyphicon-barcode">&nbsp;</span><?php echo $this->lang->line('items_generate_barcodes'); ?>
         </button>
         <?php echo form_input(array('name'=>'daterangepicker', 'class'=>'form-control input-sm', 'id'=>'daterangepicker')); ?>
         <?php echo form_multiselect('filters[]', $filters, '', array('id'=>'filters', 'class'=>'selectpicker show-menu-arrow', 'data-none-selected-text'=>$this->lang->line('common_none_selected_text'), 'data-selected-text-format'=>'count > 1', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
@@ -96,4 +96,4 @@ $(document).ready(function()
     <table id="table"></table>
 </div>
 
-<?php $this->load->view("partial/footer"); ?>
+<?php $this->load->view('partial/footer'); ?>

composer.json

@@ -17,8 +17,8 @@
 	],
 	"homepage": "https://github.com/opensourcepos/opensourcepos",
 	"require": {
-		"php": "^7.2",
-		"codeigniter/framework": "^3.1.11",
+		"php": "^7.3",
+		"codeigniter/framework": "^4.1.3",
 		"dompdf/dompdf": "^0.8.5",
 		"tamtamchik/namecase": "^1.0",
 		"paragonie/random_compat": "^2.0",