lang->line('config_print_after_sale').':', 'print_after_sale',array('class'=>'wide')); ?>
diff --git a/database/2.3_to_2.3.1.sql b/database/2.3_to_2.3.1.sql
index d3a3a6e49..57c58d5a1 100644
--- a/database/2.3_to_2.3.1.sql
+++ b/database/2.3_to_2.3.1.sql
@@ -78,7 +78,8 @@ INSERT INTO `ospos_grants` (`permission_id`, `person_id`) VALUES
INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
('tax_included', '0'),
('recv_invoice_format', '$CO'),
-('sales_invoice_format', '$CO');
+('sales_invoice_format', '$CO'),
+('barcode_content', 'name');
-- add invoice_number column to receivings table
ALTER TABLE `ospos_receivings`
diff --git a/database/database.sql b/database/database.sql
index 0a01f0b0a..d5b40ef47 100644
--- a/database/database.sql
+++ b/database/database.sql
@@ -39,7 +39,8 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
('website', ''),
('recv_invoice_format', '$CO'),
('sales_invoice_format', '$CO'),
-('tax_included', '0');
+('tax_included', '0'),
+('barcode_content', 'name');
-- --------------------------------------------------------
diff --git a/translations/config_lang.csv b/translations/config_lang.csv
index a9c5a32ce..13db26b77 100644
--- a/translations/config_lang.csv
+++ b/translations/config_lang.csv
@@ -1,41 +1,44 @@
-"label","nl-BE","es","en","fr","zh","ru","th","tr","id"
-"config_address","Adres","Dirección del Comercio","Company Address","Addresse","公司地址","Адрес Компании","ที่อยู่","Şirket Adresi","Alamat Perusahaan"
-"config_address_required","Het adres van het bedrijf moet ingevuld worden","Dirección del Comercio es requerida","Company address is a required field","L\'adresse est requise","公司地址為必填","Адрес Компании обязательный пробел","ที่อยู่ต้องกรอก","Şirket Adresi zorunlu alandır","Alamat Perusahaan wajib diisi"
-"config_company","Bedrijfsnaam","Nombre del Comercio","Company Name","Nome de l\'Entreprise","公司名稱","Название Компании","ชื่อร้านค้า","Şirket Adı","Nama Perusahaan"
-"config_company_required","De bedrijfsnaam moet ingevuld worden","Nombre del Comercio es requerido","Company name is a required field","Le nom d\'entreprise est requis","公司名稱為必填","Имя Компании обязательный пробел","ชื่อร้านค้าต้องกรอก","Şirket Adı zorunlu alandır","Nama Perusahaan wajib diisi"
-"config_company_website_url","De website van het bedrijf is geen geldige URL (http://...)","Sitio Web no es una URL estándard (http://...)","Company website is not a valid URL (http://...)","Le site web de l\'entreprise n\'est pas une URL valide (http://...)","公司網址格式錯誤 (http://...)","Веб-сайт Компании не является допустимым URL (http://...)","เว็บไซต์ร้านค้าไม่ถูกต้อง","website adresi yanlış (http://...)","Situs Perusahaan bukan URL yang benar(http://...)"
-"config_currency_side","Rechterkant","Lado derecho","Right side","Symbole à droite","Right side","Правая сторона","ด้านขวา","Sağda","Sisi Kanan"
-"config_currency_symbol","Valuta","Símbolo de divisa","Currency Symbol","Symbole Monétaire","貨幣符號","Символ валюты","ลัญลักษณ์สกุลเงิน","Para Birimi","Simbol Mata Uang"
-"config_custom1","Custom Veld 1","Campo Libre 1","Custom Field 1","Champ Personnalisé 1","Custom Field 1","Изготовленный пробел 1","พื้นที่เพิ่มเติม 1","Özel Alan 1","Custom Field 1"
-"config_custom10","Custom Veld 10","Campo Libre 10","Custom Field 10","Champ Personnalisé 10","Custom Field 10","Изготовленный пробел 10","พื้นที่เพิ่มเติม 10","Özel Alan 10","Custom Field 10"
-"config_custom2","Custom Veld 2","Campo Libre 2","Custom Field 2","Champ Personnalisé 2","Custom Field 2","Изготовленный пробел 2","พื้นที่เพิ่มเติม 2","Özel Alan 2","Custom Field 2"
-"config_custom3","Custom Veld 3","Campo Libre 3","Custom Field 3","Champ Personnalisé 3","Custom Field 3","Изготовленный пробел 3","พื้นที่เพิ่มเติม 3","Özel Alan 3","Custom Field 3"
-"config_custom4","Custom Veld 4","Campo Libre 4","Custom Field 4","Champ Personnalisé 4","Custom Field 4","Изготовленный пробел 4","พื้นที่เพิ่มเติม 4","Özel Alan 4","Custom Field 4"
-"config_custom5","Custom Veld 5","Campo Libre 5","Custom Field 5","Champ Personnalisé 5","Custom Field 5","Изготовленный пробел 5","พื้นที่เพิ่มเติม 5","Özel Alan 5","Custom Field 5"
-"config_custom6","Custom Veld 6","Campo Libre 6","Custom Field 6","Champ Personnalisé 6","Custom Field 6","Изготовленный пробел 6","พื้นที่เพิ่มเติม 6","Özel Alan 6","Custom Field 6"
-"config_custom7","Custom Veld 7","Campo Libre 7","Custom Field 7","Champ Personnalisé 7","Custom Field 7","Изготовленный пробел 7","พื้นที่เพิ่มเติม 7","Özel Alan 7","Custom Field 7"
-"config_custom8","Custom Veld 8","Campo Libre 8","Custom Field 8","Champ Personnalisé 8","Custom Field 8","Изготовленный пробел 8","พื้นที่เพิ่มเติม 8","Özel Alan 8","Custom Field 8"
-"config_custom9","Custom Veld 9","Campo Libre 9","Custom Field 9","Champ Personnalisé 9","Custom Field 9","Изготовленный пробел 9","พื้นที่เพิ่มเติม 9","Özel Alan 9","Custom Field 9"
-"config_default_tax_rate","Standaard VAT %","% de Impuestos Predeterminada","Default Tax Rate %","Taux d\'Imposition par Défaut","預設稅率 %","Обычный ставка налога %","อัตราภาษีโดยปริยาย %","Varsayılan Vergi Oranı %","Tarif Pajak Biasa%"
-"config_default_tax_rate_1","VAT 1 %","Impuesto 1","Tax 1 Rate","Taux d\'Imposition 1","稅率 1","ставка налога 1","อัตราภาษี 1","Vergi Oranı 1","Tarif Pajak 1"
-"config_default_tax_rate_2","VAT 2 %","Impuesto 2","Tax 2 Rate","Taux d\'Imposition 2","稅率 2","ставка налога 2","อัตราภาษี 2","Vergi Oranı 2","Tarif Pajak 2"
-"config_default_tax_rate_number","Het percentage VAT moet een nummer zijn","El Impuesto Predeterminado debe ser un número","The default tax rate must be a number","Le taux d\'imposition doit etre un nombre","預設稅率必需為數字","Обычный ставка налога должен быть цифра","อัตราภาษีเริ่มต้นต้องเป็นตัวเลข","Varsayılan Vergi Oranı sayı olmalıdır","Tarif Pajak Biasa harus angka"
-"config_default_tax_rate_required","Het percentage VAT moet ingevuld worden","El Impuesto Predeterminado es requerido","The default tax rate is a required field","Le taux d\'imposition par défaut est requis","預設稅率為必填","Обычный ставка налога обязательный пробел","อัตราภาษีเริ่มต้นต้องกรอก","Varsayılan Vergi Oranı zorunlu alandır","Tarif Pajak Biasa wajib diisi"
-"config_fax","Fax","Fax","Fax","Fax","傳真","Факс","แฟ็กซ์","Faks","Fax"
-"config_info","Configuratie Informatie","Información del Comercio","Store Configuration Information","Çonfiguration de l\'Entreprise","儲存組態","информация о магазин конфигурация","ข้อมูลร้านค้า","Mağaza yapılandırma bilgisi","Informasi Konfigurasi Toko"
-"config_language","Taal","Idioma","Language","Langue","語言","Язик","ภาษา","Dil","Bahasa"
-"config_phone","Telefoon","Teléfono del Comercio","Company Phone","Téléphone","電話","Телефон Компании","เบอร์โทรศัพท์","Şirket Telefonu","Telepon Perusahaan"
-"config_phone_required","De telefoonnummer van het bedrijf moet ingevuld worden","Teléfono del Comercio es requerido","Company phone is a required field","Le numéro de téléphone est requis","公司電話為必填","Телефон Компании обязательный пробел","เบอร์โทรต้องกรอก","Şirket Telefonu zorunlu alandır","Telepon Perusahaan wajib diisi"
-"config_print_after_sale","Druk ticket na verkoop","Imprimir recibo después de una venta","Print receipt after sale","Imprimer un recu après vente","出貨時打印收據","Распечатать квитанцию после продажи","พิมพ์บิลหลังการขาย","Satıştan sonra yazdır","Cetak Faktur setelah penjualan"
-"config_recv_invoice_enable","","","Enable Orders Invoice#","","","","หมายเลขใบแจ้งหนี้","",""
-"config_recv_invoice_format","","","Receivings Invoice Format","","","","รหัสใบแจ้งหนี้","",""
-"config_return_policy_required","De retourvoorwaarden moeten ingevuld worden","Política de Devolución es requerida","Return policy is a required field","Le Message est un champ requis","退換貨政策為必填","Возвратний полис обязательный пробел","กฎการคืนของต้องกรอก","İade Politikası zorunlu alandır","Kebijakan retur wajib diisi"
-"config_sales_invoice_enable","","","Enable Sales Invoice#","","","","หมายเลขใบแจ้งหนี้","",""
-"config_sales_invoice_format","","","Sales Invoice Format","","","","รหัสใบเสร็จ","",""
-"config_saved_successfully","Configuratie werd bewaard","Configuración guardada satisfactoriamente","Configuration saved successfully","Configuration sauvegardée","組態設置儲存成功","Конфигурация успешно сохранена","องค์ประกอบร้านค้าบันทึกเรียบร้อย","Yapılandırma kaydedildi","Konfigurasi berhasil disimpan"
-"config_saved_unsuccessfully","Configuratie kon niet worden bewaard","Configuración no guardada","Configuration saved unsuccessfully","Échec de sauvegarde de configuration","組態設置儲存失敗","Конфигурация сохраненная безуспешно","องค์ประกอบร้านค้าบันทึกล้มเหลว","Yapılandırma kaydedilemedi","Konfigurasi tidak berhasil disimpan"
-"config_stock_location","","","Stock location","","","","สถานที่เก็บ","Mağaza Yeri",""
-"config_stock_location_required","","","Stock location number is a required field","","","","จำเป็นต้องระบุสถานที่เก็บ","Mağaza Yeri numarası zorunlu alandır",""
-"config_tax_included","VAT Ingebgrepen","Impuestos incluidos","Tax Included","","Tax Included","Tax Included","รวมภาษีแล้ว","","Dikenakan Pajak"
-"config_timezone","Tijdzone","Zona Horaria","Timezone","Fuseau Horaire","時區","Часовой пояс","โซนเวลา","Saat Dilimi","Zona Waktu"
-"config_website","Website","Sitio Web","Website","Site-web","網站","Веб-сайт","เว็บไซต์","Website","Situs Perusahaan"
+label,nl-BE,es,en,fr,zh,ru,th,tr,id
+config_address,Adres,Dirección del Comercio,Company Address,Addresse,公司地址,Адрес Компании,ที่อยู่,Şirket Adresi,Alamat Perusahaan
+config_address_required,Het adres van het bedrijf moet ingevuld worden,Dirección del Comercio es requerida,Company address is a required field,L\'adresse est requise,公司地址為必填,Адрес Компании обязательный пробел,ที่อยู่ต้องกรอก,Şirket Adresi zorunlu alandır,Alamat Perusahaan wajib diisi
+config_company,Bedrijfsnaam,Nombre del Comercio,Company Name,Nome de l\'Entreprise,公司名稱,Название Компании,ชื่อร้านค้า,Şirket Adı,Nama Perusahaan
+config_company_required,De bedrijfsnaam moet ingevuld worden,Nombre del Comercio es requerido,Company name is a required field,Le nom d\'entreprise est requis,公司名稱為必填,Имя Компании обязательный пробел,ชื่อร้านค้าต้องกรอก,Şirket Adı zorunlu alandır,Nama Perusahaan wajib diisi
+config_company_website_url,De website van het bedrijf is geen geldige URL (http://...),Sitio Web no es una URL estándard (http://...),Company website is not a valid URL (http://...),Le site web de l\'entreprise n\'est pas une URL valide (http://...),公司網址格式錯誤 (http://...),Веб-сайт Компании не является допустимым URL (http://...),เว็บไซต์ร้านค้าไม่ถูกต้อง,website adresi yanlış (http://...),Situs Perusahaan bukan URL yang benar(http://...)
+config_currency_side,Rechterkant,Lado derecho,Right side,Symbole à droite,Right side,Правая сторона,ด้านขวา,Sağda,Sisi Kanan
+config_currency_symbol,Valuta,Símbolo de divisa,Currency Symbol,Symbole Monétaire,貨幣符號,Символ валюты,ลัญลักษณ์สกุลเงิน,Para Birimi,Simbol Mata Uang
+config_custom1,Custom Veld 1,Campo Libre 1,Custom Field 1,Champ Personnalisé 1,Custom Field 1,Изготовленный пробел 1,พื้นที่เพิ่มเติม 1,Özel Alan 1,Custom Field 1
+config_custom10,Custom Veld 10,Campo Libre 10,Custom Field 10,Champ Personnalisé 10,Custom Field 10,Изготовленный пробел 10,พื้นที่เพิ่มเติม 10,Özel Alan 10,Custom Field 10
+config_custom2,Custom Veld 2,Campo Libre 2,Custom Field 2,Champ Personnalisé 2,Custom Field 2,Изготовленный пробел 2,พื้นที่เพิ่มเติม 2,Özel Alan 2,Custom Field 2
+config_custom3,Custom Veld 3,Campo Libre 3,Custom Field 3,Champ Personnalisé 3,Custom Field 3,Изготовленный пробел 3,พื้นที่เพิ่มเติม 3,Özel Alan 3,Custom Field 3
+config_custom4,Custom Veld 4,Campo Libre 4,Custom Field 4,Champ Personnalisé 4,Custom Field 4,Изготовленный пробел 4,พื้นที่เพิ่มเติม 4,Özel Alan 4,Custom Field 4
+config_custom5,Custom Veld 5,Campo Libre 5,Custom Field 5,Champ Personnalisé 5,Custom Field 5,Изготовленный пробел 5,พื้นที่เพิ่มเติม 5,Özel Alan 5,Custom Field 5
+config_custom6,Custom Veld 6,Campo Libre 6,Custom Field 6,Champ Personnalisé 6,Custom Field 6,Изготовленный пробел 6,พื้นที่เพิ่มเติม 6,Özel Alan 6,Custom Field 6
+config_custom7,Custom Veld 7,Campo Libre 7,Custom Field 7,Champ Personnalisé 7,Custom Field 7,Изготовленный пробел 7,พื้นที่เพิ่มเติม 7,Özel Alan 7,Custom Field 7
+config_custom8,Custom Veld 8,Campo Libre 8,Custom Field 8,Champ Personnalisé 8,Custom Field 8,Изготовленный пробел 8,พื้นที่เพิ่มเติม 8,Özel Alan 8,Custom Field 8
+config_custom9,Custom Veld 9,Campo Libre 9,Custom Field 9,Champ Personnalisé 9,Custom Field 9,Изготовленный пробел 9,พื้นที่เพิ่มเติม 9,Özel Alan 9,Custom Field 9
+config_default_tax_rate,Standaard VAT %,% de Impuestos Predeterminada,Default Tax Rate %,Taux d\'Imposition par Défaut,預設稅率 %,Обычный ставка налога %,อัตราภาษีโดยปริยาย %,Varsayılan Vergi Oranı %,Tarif Pajak Biasa%
+config_default_tax_rate_1,VAT 1 %,Impuesto 1,Tax 1 Rate,Taux d\'Imposition 1,稅率 1,ставка налога 1,อัตราภาษี 1,Vergi Oranı 1,Tarif Pajak 1
+config_default_tax_rate_2,VAT 2 %,Impuesto 2,Tax 2 Rate,Taux d\'Imposition 2,稅率 2,ставка налога 2,อัตราภาษี 2,Vergi Oranı 2,Tarif Pajak 2
+config_default_tax_rate_number,Het percentage VAT moet een nummer zijn,El Impuesto Predeterminado debe ser un número,The default tax rate must be a number,Le taux d\'imposition doit etre un nombre,預設稅率必需為數字,Обычный ставка налога должен быть цифра,อัตราภาษีเริ่มต้นต้องเป็นตัวเลข,Varsayılan Vergi Oranı sayı olmalıdır,Tarif Pajak Biasa harus angka
+config_default_tax_rate_required,Het percentage VAT moet ingevuld worden,El Impuesto Predeterminado es requerido,The default tax rate is a required field,Le taux d\'imposition par défaut est requis,預設稅率為必填,Обычный ставка налога обязательный пробел,อัตราภาษีเริ่มต้นต้องกรอก,Varsayılan Vergi Oranı zorunlu alandır,Tarif Pajak Biasa wajib diisi
+config_fax,Fax,Fax,Fax,Fax,傳真,Факс,แฟ็กซ์,Faks,Fax
+config_info,Configuratie Informatie,Información del Comercio,Store Configuration Information,Çonfiguration de l\'Entreprise,儲存組態,информация о магазин конфигурация,ข้อมูลร้านค้า,Mağaza yapılandırma bilgisi,Informasi Konfigurasi Toko
+config_language,Taal,Idioma,Language,Langue,語言,Язик,ภาษา,Dil,Bahasa
+config_phone,Telefoon,Teléfono del Comercio,Company Phone,Téléphone,電話,Телефон Компании,เบอร์โทรศัพท์,Şirket Telefonu,Telepon Perusahaan
+config_phone_required,De telefoonnummer van het bedrijf moet ingevuld worden,Teléfono del Comercio es requerido,Company phone is a required field,Le numéro de téléphone est requis,公司電話為必填,Телефон Компании обязательный пробел,เบอร์โทรต้องกรอก,Şirket Telefonu zorunlu alandır,Telepon Perusahaan wajib diisi
+config_print_after_sale,Druk ticket na verkoop,Imprimir recibo después de una venta,Print receipt after sale,Imprimer un recu après vente,出貨時打印收據,Распечатать квитанцию после продажи,พิมพ์บิลหลังการขาย,Satıştan sonra yazdır,Cetak Faktur setelah penjualan
+config_recv_invoice_enable,,,Enable Orders Invoice#,,,,หมายเลขใบแจ้งหนี้,,
+config_recv_invoice_format,,,Receivings Invoice Format,,,,รหัสใบแจ้งหนี้,,
+config_return_policy_required,De retourvoorwaarden moeten ingevuld worden,Política de Devolución es requerida,Return policy is a required field,Le Message est un champ requis,退換貨政策為必填,Возвратний полис обязательный пробел,กฎการคืนของต้องกรอก,İade Politikası zorunlu alandır,Kebijakan retur wajib diisi
+config_sales_invoice_enable,,,Enable Sales Invoice#,,,,หมายเลขใบแจ้งหนี้,,
+config_sales_invoice_format,,,Sales Invoice Format,,,,รหัสใบเสร็จ,,
+config_saved_successfully,Configuratie werd bewaard,Configuración guardada satisfactoriamente,Configuration saved successfully,Configuration sauvegardée,組態設置儲存成功,Конфигурация успешно сохранена,องค์ประกอบร้านค้าบันทึกเรียบร้อย,Yapılandırma kaydedildi,Konfigurasi berhasil disimpan
+config_saved_unsuccessfully,Configuratie kon niet worden bewaard,Configuración no guardada,Configuration saved unsuccessfully,Échec de sauvegarde de configuration,組態設置儲存失敗,Конфигурация сохраненная безуспешно,องค์ประกอบร้านค้าบันทึกล้มเหลว,Yapılandırma kaydedilemedi,Konfigurasi tidak berhasil disimpan
+config_stock_location,,,Stock location,,,,สถานที่เก็บ,Mağaza Yeri,
+config_stock_location_required,,,Stock location number is a required field,,,,จำเป็นต้องระบุสถานที่เก็บ,Mağaza Yeri numarası zorunlu alandır,
+config_tax_included,VAT Ingebgrepen,Impuestos incluidos,Tax Included,,Tax Included,Tax Included,รวมภาษีแล้ว,,Dikenakan Pajak
+config_timezone,Tijdzone,Zona Horaria,Timezone,Fuseau Horaire,時區,Часовой пояс,โซนเวลา,Saat Dilimi,Zona Waktu
+config_website,Website,Sitio Web,Website,Site-web,網站,Веб-сайт,เว็บไซต์,Website,Situs Perusahaan
+config_barcode_number,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN
+config_barcode_name,Productnaam,,Item Name,,,,,,
+config_barcode_text,Inhoud Barcode,,Barcode Content,,,,,,