diff --git a/application/language/ar-EG/config_lang.php b/application/language/ar-EG/config_lang.php
index 2160c209f..cd1aa0e3a 100644
--- a/application/language/ar-EG/config_lang.php
+++ b/application/language/ar-EG/config_lang.php
@@ -28,6 +28,9 @@ $lang["config_barcode_third_row"] = "الصف 3";
 $lang["config_barcode_type"] = "نوعية الباركود";
 $lang["config_barcode_width"] = "العرض (px)";
 $lang["config_bottom"] = "الأسفل";
+$lang["config_cash_decimals"] = "";
+$lang["config_cash_decimals_tooltip"] = "";
+$lang["config_cash_rounding"] = "";
 $lang["config_center"] = "الوسط";
 $lang["config_comma"] = "فاصلة";
 $lang["config_company"] = "اسم الشركة";
@@ -56,6 +59,7 @@ $lang["config_customer_reward_duplicate"] = "";
 $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_datetimeformat"] = "شكل الوقت و التاريخ";
 $lang["config_decimal_point"] = "العلامة العشرية";
@@ -73,6 +77,7 @@ $lang["config_default_barcode_quality_number"] = "الجودة الافتراض
 $lang["config_default_barcode_quality_required"] = "الجودة الافتراضية للباركود مطلوبة";
 $lang["config_default_barcode_width_number"] = "العرض الافتراضي للباركود لابد ان يكون رقم";
 $lang["config_default_barcode_width_required"] = "العرض الافتراضي للباركود مطلوب";
+$lang["config_default_origin_tax_code"] = "";
 $lang["config_default_sales_discount"] = "نسبة الخصم الافتراضية %";
 $lang["config_default_sales_discount_number"] = "نسبة الخصم الافتراضية لابد ان تكون رقم";
 $lang["config_default_sales_discount_required"] = "نسبة الخصم الافتراضية مطلوبة";
@@ -99,6 +104,19 @@ $lang["config_email_smtp_port"] = "رقم منفذ SMTP";
 $lang["config_email_smtp_timeout"] = "وقت فشل المحاولة (ثوانى) لـ SMTP";
 $lang["config_email_smtp_user"] = "اسم مستخدم SMTP";
 $lang["config_fax"] = "الفاكس";
+$lang["config_financial_year"] = "";
+$lang["config_financial_year_apr"] = "";
+$lang["config_financial_year_aug"] = "";
+$lang["config_financial_year_dec"] = "";
+$lang["config_financial_year_feb"] = "";
+$lang["config_financial_year_jan"] = "";
+$lang["config_financial_year_jul"] = "";
+$lang["config_financial_year_jun"] = "";
+$lang["config_financial_year_mar"] = "";
+$lang["config_financial_year_may"] = "";
+$lang["config_financial_year_nov"] = "";
+$lang["config_financial_year_oct"] = "";
+$lang["config_financial_year_sep"] = "";
 $lang["config_general"] = "عام";
 $lang["config_general_configuration"] = "إعدادات عامة";
 $lang["config_info"] = "معلومات";
diff --git a/application/language/ar-EG/customers_lang.php b/application/language/ar-EG/customers_lang.php
index 94b16b835..26ef38e6b 100644
--- a/application/language/ar-EG/customers_lang.php
+++ b/application/language/ar-EG/customers_lang.php
@@ -20,6 +20,7 @@ $lang["customers_one_or_multiple"] = "عميل/عملاء";
 $lang["customers_successful_adding"] = "لقد أضفت عميل بنجاح";
 $lang["customers_successful_deleted"] = "لقد قمت بالحذف بنجاح";
 $lang["customers_successful_updating"] = "لقد قمت بتحديث بيانات العميل بنجاح";
+$lang["customers_tax_code"] = "";
 $lang["customers_taxable"] = "خاضع للضريبة";
 $lang["customers_total"] = "المجموع";
 $lang["customers_update"] = "تحديث بيانات عميل";
diff --git a/application/language/ar-EG/datepicker_lang.php b/application/language/ar-EG/datepicker_lang.php
index aa47311f0..ce6c6b633 100644
--- a/application/language/ar-EG/datepicker_lang.php
+++ b/application/language/ar-EG/datepicker_lang.php
@@ -7,11 +7,13 @@ $lang["datepicker_custom"] = "مخصص";
 $lang["datepicker_from"] = "من";
 $lang["datepicker_last_30"] = "أخر 30 يوم";
 $lang["datepicker_last_7"] = "أخر سبعة أيام";
+$lang["datepicker_last_financial_year"] = "";
 $lang["datepicker_last_month"] = "أخر شهر";
 $lang["datepicker_last_year"] = "السنة الماضية";
-$lang["datepicker_same_month_to_same_day_last_year"] = "نفس الشهر حتى اليوم من السنة الماضية";
-$lang["datepicker_this_month"] = "هذا الشهر";
 $lang["datepicker_same_month_last_year"] = "نفس الشهر من العام الماضي";
+$lang["datepicker_same_month_to_same_day_last_year"] = "نفس الشهر حتى اليوم من السنة الماضية";
+$lang["datepicker_this_financial_year"] = "";
+$lang["datepicker_this_month"] = "هذا الشهر";
 $lang["datepicker_this_year"] = "السنة الحالية";
 $lang["datepicker_to"] = "إلى";
 $lang["datepicker_today"] = "اليوم";
diff --git a/application/language/ar-EG/enum_lang.php b/application/language/ar-EG/enum_lang.php
new file mode 100644
index 000000000..dde09937b
--- /dev/null
+++ b/application/language/ar-EG/enum_lang.php
@@ -0,0 +1,9 @@
+<?php 
+
+$lang["enum_half_down"] = "";
+$lang["enum_half_even"] = "";
+$lang["enum_half_five"] = "";
+$lang["enum_half_odd"] = "";
+$lang["enum_half_up"] = "";
+$lang["enum_round_down"] = "";
+$lang["enum_round_up"] = "";
diff --git a/application/language/ar-EG/items_lang.php b/application/language/ar-EG/items_lang.php
index d80619034..0744737a6 100644
--- a/application/language/ar-EG/items_lang.php
+++ b/application/language/ar-EG/items_lang.php
@@ -73,7 +73,7 @@ $lang["items_retrive_item_info"] = "استرجاع بيانات الصنف";
 $lang["items_sales_tax_1"] = "ضريبة المبيعات";
 $lang["items_sales_tax_2"] = "ضريبة المبيعات 2";
 $lang["items_search_attributes"] = "بحث الحقول المخصصة";
-$lang["items_search_custom_items"] = "بحث الحقول المخصصة";
+$lang["items_search_custom_items"] = "";
 $lang["items_select_image"] = "اختار صورة";
 $lang["items_serialized_items"] = "أصناف مسلسلة";
 $lang["items_standard"] = "";
diff --git a/application/language/ar-EG/module_lang.php b/application/language/ar-EG/module_lang.php
index e377b2f41..c9de5cf3a 100644
--- a/application/language/ar-EG/module_lang.php
+++ b/application/language/ar-EG/module_lang.php
@@ -23,3 +23,5 @@ $lang["module_sales"] = "المبيعات";
 $lang["module_sales_desc"] = "معالجة المبيعات و المرتجعات";
 $lang["module_suppliers"] = "الموردين";
 $lang["module_suppliers_desc"] = "إضافة، تحديث ، بحث و حذف مجموعات الموردين";
+$lang["module_taxes"] = "";
+$lang["module_taxes_desc"] = "";
diff --git a/application/language/ar-EG/sales_lang.php b/application/language/ar-EG/sales_lang.php
index 2d381186d..897cea8be 100644
--- a/application/language/ar-EG/sales_lang.php
+++ b/application/language/ar-EG/sales_lang.php
@@ -12,6 +12,7 @@ $lang["sales_cash_filter"] = "نقدى";
 $lang["sales_change_due"] = "الباقى";
 $lang["sales_check"] = "شيك";
 $lang["sales_check_balance"] = "تذكير بموعد الشيك";
+$lang["sales_check_filter"] = "";
 $lang["sales_comment"] = "تعليق";
 $lang["sales_comments"] = "تعليقات";
 $lang["sales_complete_sale"] = "إتمام البيع";
@@ -105,6 +106,7 @@ $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"] = "";
diff --git a/application/language/ar-EG/taxes_lang.php b/application/language/ar-EG/taxes_lang.php
new file mode 100644
index 000000000..feb59c695
--- /dev/null
+++ b/application/language/ar-EG/taxes_lang.php
@@ -0,0 +1,31 @@
+<?php 
+
+$lang["taxes_add_exception"] = "";
+$lang["taxes_confirm_delete"] = "";
+$lang["taxes_default_tax_category"] = "";
+$lang["taxes_error_adding_updating"] = "";
+$lang["taxes_new"] = "";
+$lang["taxes_no_taxes_to_display"] = "";
+$lang["taxes_round_half_down"] = "";
+$lang["taxes_round_half_even"] = "";
+$lang["taxes_round_half_odd"] = "";
+$lang["taxes_round_half_up"] = "";
+$lang["taxes_rounding_code"] = "";
+$lang["taxes_sales_tax"] = "";
+$lang["taxes_sales_tax_by_invoice"] = "";
+$lang["taxes_successful_deleted"] = "";
+$lang["taxes_tax_category"] = "";
+$lang["taxes_tax_code"] = "";
+$lang["taxes_tax_code_cannot_be_deleted"] = "";
+$lang["taxes_tax_code_name"] = "";
+$lang["taxes_tax_code_required"] = "";
+$lang["taxes_tax_code_successful_deleted"] = "";
+$lang["taxes_tax_code_successful_updated"] = "";
+$lang["taxes_tax_code_successful_updating"] = "";
+$lang["taxes_tax_code_successfully_added"] = "";
+$lang["taxes_tax_code_type"] = "";
+$lang["taxes_tax_rate"] = "";
+$lang["taxes_tax_rate_numeric"] = "";
+$lang["taxes_tax_rate_required"] = "";
+$lang["taxes_update"] = "";
+$lang["taxes_vat_tax"] = "";
diff --git a/application/language/de-CH/config_lang.php b/application/language/de-CH/config_lang.php
index 530246818..10ea8b090 100644
--- a/application/language/de-CH/config_lang.php
+++ b/application/language/de-CH/config_lang.php
@@ -28,6 +28,9 @@ $lang["config_barcode_third_row"] = "Zeile 3";
 $lang["config_barcode_type"] = "Barcode Typ";
 $lang["config_barcode_width"] = "Breite (px)";
 $lang["config_bottom"] = "Bottom";
+$lang["config_cash_decimals"] = "";
+$lang["config_cash_decimals_tooltip"] = "";
+$lang["config_cash_rounding"] = "";
 $lang["config_center"] = "Center";
 $lang["config_comma"] = "comma";
 $lang["config_company"] = "Firmenname";
@@ -56,6 +59,7 @@ $lang["config_customer_reward_duplicate"] = "";
 $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_datetimeformat"] = "Datum und Zeit";
 $lang["config_decimal_point"] = "Dezimaltrennzeichen";
@@ -73,6 +77,7 @@ $lang["config_default_barcode_quality_number"] = "Die Barcode Qualität muss ein
 $lang["config_default_barcode_quality_required"] = "Die Barcode Qualität ist erforderlich";
 $lang["config_default_barcode_width_number"] = "Die Barcode Breite muss eine Zahl sein";
 $lang["config_default_barcode_width_required"] = "Die Barcode Breite ist erforderlich";
+$lang["config_default_origin_tax_code"] = "";
 $lang["config_default_sales_discount"] = "Standard Verkaufsrabatt";
 $lang["config_default_sales_discount_number"] = "Der Standard Verkaufsrabatt muss eine Zahl sein";
 $lang["config_default_sales_discount_required"] = "Der Standard Verkaufsrabatt ist erforderlich";
@@ -99,6 +104,19 @@ $lang["config_email_smtp_port"] = "SMTP Port";
 $lang["config_email_smtp_timeout"] = "SMTP Timeout (s)";
 $lang["config_email_smtp_user"] = "SMTP Username";
 $lang["config_fax"] = "Fax";
+$lang["config_financial_year"] = "";
+$lang["config_financial_year_apr"] = "";
+$lang["config_financial_year_aug"] = "";
+$lang["config_financial_year_dec"] = "";
+$lang["config_financial_year_feb"] = "";
+$lang["config_financial_year_jan"] = "";
+$lang["config_financial_year_jul"] = "";
+$lang["config_financial_year_jun"] = "";
+$lang["config_financial_year_mar"] = "";
+$lang["config_financial_year_may"] = "";
+$lang["config_financial_year_nov"] = "";
+$lang["config_financial_year_oct"] = "";
+$lang["config_financial_year_sep"] = "";
 $lang["config_general"] = "Einstellungen";
 $lang["config_general_configuration"] = "Einstellungen";
 $lang["config_info"] = "Instellungen";
diff --git a/application/language/de-CH/customers_lang.php b/application/language/de-CH/customers_lang.php
index 2898994da..86422e09d 100644
--- a/application/language/de-CH/customers_lang.php
+++ b/application/language/de-CH/customers_lang.php
@@ -20,6 +20,7 @@ $lang["customers_one_or_multiple"] = "Kunde(n)";
 $lang["customers_successful_adding"] = "Kunde erfolgreich hinzugefügt";
 $lang["customers_successful_deleted"] = "Löschung erfolgreich";
 $lang["customers_successful_updating"] = "Änderung erfolgreich";
+$lang["customers_tax_code"] = "";
 $lang["customers_taxable"] = "Steuerpflichtig";
 $lang["customers_total"] = "Total";
 $lang["customers_update"] = "Kunde ändern";
diff --git a/application/language/de-CH/datepicker_lang.php b/application/language/de-CH/datepicker_lang.php
index a70711d18..2978f969c 100644
--- a/application/language/de-CH/datepicker_lang.php
+++ b/application/language/de-CH/datepicker_lang.php
@@ -7,11 +7,13 @@ $lang["datepicker_custom"] = "Custom";
 $lang["datepicker_from"] = "From";
 $lang["datepicker_last_30"] = "Letzte 30 Tage";
 $lang["datepicker_last_7"] = "Letzte 7 Tage";
+$lang["datepicker_last_financial_year"] = "";
 $lang["datepicker_last_month"] = "Letzter Monat";
 $lang["datepicker_last_year"] = "Letztes Jahr";
-$lang["datepicker_same_month_to_same_day_last_year"] = "Dieser Monat bis Heute letzten Jahres";
-$lang["datepicker_this_month"] = "Dieser Monat";
 $lang["datepicker_same_month_last_year"] = "Dieser Monat letzten Jahres";
+$lang["datepicker_same_month_to_same_day_last_year"] = "Dieser Monat bis Heute letzten Jahres";
+$lang["datepicker_this_financial_year"] = "";
+$lang["datepicker_this_month"] = "Dieser Monat";
 $lang["datepicker_this_year"] = "Dieses Jahr";
 $lang["datepicker_to"] = "To";
 $lang["datepicker_today"] = "Heute";
diff --git a/application/language/de-CH/enum_lang.php b/application/language/de-CH/enum_lang.php
new file mode 100644
index 000000000..dde09937b
--- /dev/null
+++ b/application/language/de-CH/enum_lang.php
@@ -0,0 +1,9 @@
+<?php 
+
+$lang["enum_half_down"] = "";
+$lang["enum_half_even"] = "";
+$lang["enum_half_five"] = "";
+$lang["enum_half_odd"] = "";
+$lang["enum_half_up"] = "";
+$lang["enum_round_down"] = "";
+$lang["enum_round_up"] = "";
diff --git a/application/language/de-CH/items_lang.php b/application/language/de-CH/items_lang.php
index b76570e11..38f497321 100644
--- a/application/language/de-CH/items_lang.php
+++ b/application/language/de-CH/items_lang.php
@@ -72,8 +72,8 @@ $lang["items_reorder_level_required"] = "Mindestbestand ist erforderlich";
 $lang["items_retrive_item_info"] = "Artikelinformation";
 $lang["items_sales_tax_1"] = "Umsatzsteuer 1";
 $lang["items_sales_tax_2"] = "Umsatzsteuer 2";
-$lang["items_search_attributes"] = "";
-$lang["items_search_custom_items"] = "Suche in Zusatzfeldern";
+$lang["items_search_attributes"] = "Suche in Zusatzfeldern";
+$lang["items_search_custom_items"] = "";
 $lang["items_select_image"] = "Select Image";
 $lang["items_serialized_items"] = "Serialisierte Artikel";
 $lang["items_standard"] = "";
diff --git a/application/language/de-CH/module_lang.php b/application/language/de-CH/module_lang.php
index 41f6d9704..77e2da6a5 100644
--- a/application/language/de-CH/module_lang.php
+++ b/application/language/de-CH/module_lang.php
@@ -23,3 +23,5 @@ $lang["module_sales"] = "Verkauf";
 $lang["module_sales_desc"] = "Hinzufügen, Ändern, Löschen und Suchen";
 $lang["module_suppliers"] = "Lieferanten";
 $lang["module_suppliers_desc"] = "Hinzufügen, Ändern, Löschen und Suchen";
+$lang["module_taxes"] = "";
+$lang["module_taxes_desc"] = "";
diff --git a/application/language/de-CH/sales_lang.php b/application/language/de-CH/sales_lang.php
index cb287ead1..f117a9520 100644
--- a/application/language/de-CH/sales_lang.php
+++ b/application/language/de-CH/sales_lang.php
@@ -12,6 +12,7 @@ $lang["sales_cash_filter"] = "Bar";
 $lang["sales_change_due"] = "Wechselgeld";
 $lang["sales_check"] = "Scheck";
 $lang["sales_check_balance"] = "Scheck-Differenz";
+$lang["sales_check_filter"] = "";
 $lang["sales_comment"] = "Bemerkung";
 $lang["sales_comments"] = "Bemerkungen";
 $lang["sales_complete_sale"] = "Abschliessen";
@@ -105,6 +106,7 @@ $lang["sales_sale"] = "Verkauf";
 $lang["sales_sale_by_invoice"] = "";
 $lang["sales_sale_for_customer"] = "Kunde:";
 $lang["sales_sale_time"] = "Zeit";
+$lang["sales_sales_tax"] = "";
 $lang["sales_select_customer"] = "Wähle Kunde (optional)";
 $lang["sales_send_invoice"] = "Sende Rechnung";
 $lang["sales_send_quote"] = "";
diff --git a/application/language/de-CH/taxes_lang.php b/application/language/de-CH/taxes_lang.php
new file mode 100644
index 000000000..feb59c695
--- /dev/null
+++ b/application/language/de-CH/taxes_lang.php
@@ -0,0 +1,31 @@
+<?php 
+
+$lang["taxes_add_exception"] = "";
+$lang["taxes_confirm_delete"] = "";
+$lang["taxes_default_tax_category"] = "";
+$lang["taxes_error_adding_updating"] = "";
+$lang["taxes_new"] = "";
+$lang["taxes_no_taxes_to_display"] = "";
+$lang["taxes_round_half_down"] = "";
+$lang["taxes_round_half_even"] = "";
+$lang["taxes_round_half_odd"] = "";
+$lang["taxes_round_half_up"] = "";
+$lang["taxes_rounding_code"] = "";
+$lang["taxes_sales_tax"] = "";
+$lang["taxes_sales_tax_by_invoice"] = "";
+$lang["taxes_successful_deleted"] = "";
+$lang["taxes_tax_category"] = "";
+$lang["taxes_tax_code"] = "";
+$lang["taxes_tax_code_cannot_be_deleted"] = "";
+$lang["taxes_tax_code_name"] = "";
+$lang["taxes_tax_code_required"] = "";
+$lang["taxes_tax_code_successful_deleted"] = "";
+$lang["taxes_tax_code_successful_updated"] = "";
+$lang["taxes_tax_code_successful_updating"] = "";
+$lang["taxes_tax_code_successfully_added"] = "";
+$lang["taxes_tax_code_type"] = "";
+$lang["taxes_tax_rate"] = "";
+$lang["taxes_tax_rate_numeric"] = "";
+$lang["taxes_tax_rate_required"] = "";
+$lang["taxes_update"] = "";
+$lang["taxes_vat_tax"] = "";
diff --git a/application/language/de/config_lang.php b/application/language/de/config_lang.php
index b824de14d..70fa91ac5 100644
--- a/application/language/de/config_lang.php
+++ b/application/language/de/config_lang.php
@@ -28,6 +28,9 @@ $lang["config_barcode_third_row"] = "Zeile 3";
 $lang["config_barcode_type"] = "Barcode Typ";
 $lang["config_barcode_width"] = "Breite (px)";
 $lang["config_bottom"] = "Bottom";
+$lang["config_cash_decimals"] = "";
+$lang["config_cash_decimals_tooltip"] = "";
+$lang["config_cash_rounding"] = "";
 $lang["config_center"] = "Center";
 $lang["config_comma"] = "Komma";
 $lang["config_company"] = "Firmenname";
@@ -56,6 +59,7 @@ $lang["config_customer_reward_duplicate"] = "";
 $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_datetimeformat"] = "Datum und Zeit";
 $lang["config_decimal_point"] = "Dezimaltrennzeichen";
@@ -73,6 +77,7 @@ $lang["config_default_barcode_quality_number"] = "Die Barcode Qualität muss ein
 $lang["config_default_barcode_quality_required"] = "Die Barcode Qualität ist erforderlich";
 $lang["config_default_barcode_width_number"] = "Die Barcode Breite muss eine Zahl sein";
 $lang["config_default_barcode_width_required"] = "Die Barcode Breite ist erforderlich";
+$lang["config_default_origin_tax_code"] = "";
 $lang["config_default_sales_discount"] = "Standard Verkaufsrabatt";
 $lang["config_default_sales_discount_number"] = "Der Standard Verkaufsrabatt muss eine Zahl sein";
 $lang["config_default_sales_discount_required"] = "Der Standard Verkaufsrabatt ist erforderlich";
@@ -99,6 +104,19 @@ $lang["config_email_smtp_port"] = "SMTP Port";
 $lang["config_email_smtp_timeout"] = "SMTP Timeout (s)";
 $lang["config_email_smtp_user"] = "SMTP Benutzername";
 $lang["config_fax"] = "Fax";
+$lang["config_financial_year"] = "";
+$lang["config_financial_year_apr"] = "";
+$lang["config_financial_year_aug"] = "";
+$lang["config_financial_year_dec"] = "";
+$lang["config_financial_year_feb"] = "";
+$lang["config_financial_year_jan"] = "";
+$lang["config_financial_year_jul"] = "";
+$lang["config_financial_year_jun"] = "";
+$lang["config_financial_year_mar"] = "";
+$lang["config_financial_year_may"] = "";
+$lang["config_financial_year_nov"] = "";
+$lang["config_financial_year_oct"] = "";
+$lang["config_financial_year_sep"] = "";
 $lang["config_general"] = "Einstellungen";
 $lang["config_general_configuration"] = "Einstellungen";
 $lang["config_info"] = "Generelle Einstellungen";
diff --git a/application/language/de/customers_lang.php b/application/language/de/customers_lang.php
index 72253489b..edaf5c6e6 100644
--- a/application/language/de/customers_lang.php
+++ b/application/language/de/customers_lang.php
@@ -20,6 +20,7 @@ $lang["customers_one_or_multiple"] = "Kunde(n)";
 $lang["customers_successful_adding"] = "Kunde erfolgreich hinzugefügt";
 $lang["customers_successful_deleted"] = "Löschung erfolgreich";
 $lang["customers_successful_updating"] = "Änderung erfolgreich";
+$lang["customers_tax_code"] = "";
 $lang["customers_taxable"] = "Steuerpflichtig";
 $lang["customers_total"] = "Total";
 $lang["customers_update"] = "Kunde ändern";
diff --git a/application/language/de/datepicker_lang.php b/application/language/de/datepicker_lang.php
index 259fb480d..8a309c8fd 100644
--- a/application/language/de/datepicker_lang.php
+++ b/application/language/de/datepicker_lang.php
@@ -7,11 +7,13 @@ $lang["datepicker_custom"] = "Benutzerdefiniert";
 $lang["datepicker_from"] = "Von";
 $lang["datepicker_last_30"] = "Letzte 30 Tage";
 $lang["datepicker_last_7"] = "Letzte 7 Tage";
+$lang["datepicker_last_financial_year"] = "";
 $lang["datepicker_last_month"] = "Letzter Monat";
 $lang["datepicker_last_year"] = "Letztes Jahr";
-$lang["datepicker_same_month_to_same_day_last_year"] = "Dieser Monat bis Heute letzten Jahres";
-$lang["datepicker_this_month"] = "Dieser Monat";
 $lang["datepicker_same_month_last_year"] = "Dieser Monat letzten Jahres";
+$lang["datepicker_same_month_to_same_day_last_year"] = "Dieser Monat bis Heute letzten Jahres";
+$lang["datepicker_this_financial_year"] = "";
+$lang["datepicker_this_month"] = "Dieser Monat";
 $lang["datepicker_this_year"] = "Dieses Jahr";
 $lang["datepicker_to"] = "Bis";
 $lang["datepicker_today"] = "Heute";
diff --git a/application/language/de/enum_lang.php b/application/language/de/enum_lang.php
new file mode 100644
index 000000000..dde09937b
--- /dev/null
+++ b/application/language/de/enum_lang.php
@@ -0,0 +1,9 @@
+<?php 
+
+$lang["enum_half_down"] = "";
+$lang["enum_half_even"] = "";
+$lang["enum_half_five"] = "";
+$lang["enum_half_odd"] = "";
+$lang["enum_half_up"] = "";
+$lang["enum_round_down"] = "";
+$lang["enum_round_up"] = "";
diff --git a/application/language/de/items_lang.php b/application/language/de/items_lang.php
index af694f588..dbe8476b7 100644
--- a/application/language/de/items_lang.php
+++ b/application/language/de/items_lang.php
@@ -72,8 +72,8 @@ $lang["items_reorder_level_required"] = "Mindestbestand ist erforderlich";
 $lang["items_retrive_item_info"] = "Artikelinformation";
 $lang["items_sales_tax_1"] = "Umsatzsteuer 1";
 $lang["items_sales_tax_2"] = "Umsatzsteuer 2";
-$lang["items_search_attributes"] = "";
-$lang["items_search_custom_items"] = "Suche in Zusatzfeldern";
+$lang["items_search_attributes"] = "Suche in Zusatzfeldern";
+$lang["items_search_custom_items"] = "";
 $lang["items_select_image"] = "Bild auswählen";
 $lang["items_serialized_items"] = "Serialisierte Artikel";
 $lang["items_standard"] = "";
diff --git a/application/language/de/module_lang.php b/application/language/de/module_lang.php
index c84666b27..181baa708 100644
--- a/application/language/de/module_lang.php
+++ b/application/language/de/module_lang.php
@@ -23,3 +23,5 @@ $lang["module_sales"] = "Verkauf";
 $lang["module_sales_desc"] = "Hinzufügen, Ändern, Löschen und Suchen";
 $lang["module_suppliers"] = "Lieferanten";
 $lang["module_suppliers_desc"] = "Hinzufügen, Ändern, Löschen und Suchen";
+$lang["module_taxes"] = "";
+$lang["module_taxes_desc"] = "";
diff --git a/application/language/de/sales_lang.php b/application/language/de/sales_lang.php
index a8033e8e9..3b0ae1f2f 100644
--- a/application/language/de/sales_lang.php
+++ b/application/language/de/sales_lang.php
@@ -12,6 +12,7 @@ $lang["sales_cash_filter"] = "Bar";
 $lang["sales_change_due"] = "Wechselgeld";
 $lang["sales_check"] = "Scheck";
 $lang["sales_check_balance"] = "Scheck-Differenz";
+$lang["sales_check_filter"] = "";
 $lang["sales_comment"] = "Bemerkung";
 $lang["sales_comments"] = "Bemerkungen";
 $lang["sales_complete_sale"] = "Abschliessen";
@@ -105,6 +106,7 @@ $lang["sales_sale"] = "Verkauf";
 $lang["sales_sale_by_invoice"] = "";
 $lang["sales_sale_for_customer"] = "Kunde:";
 $lang["sales_sale_time"] = "Zeit";
+$lang["sales_sales_tax"] = "";
 $lang["sales_select_customer"] = "Wähle Kunde (optional)";
 $lang["sales_send_invoice"] = "Sende Rechnung";
 $lang["sales_send_quote"] = "";
diff --git a/application/language/de/taxes_lang.php b/application/language/de/taxes_lang.php
new file mode 100644
index 000000000..feb59c695
--- /dev/null
+++ b/application/language/de/taxes_lang.php
@@ -0,0 +1,31 @@
+<?php 
+
+$lang["taxes_add_exception"] = "";
+$lang["taxes_confirm_delete"] = "";
+$lang["taxes_default_tax_category"] = "";
+$lang["taxes_error_adding_updating"] = "";
+$lang["taxes_new"] = "";
+$lang["taxes_no_taxes_to_display"] = "";
+$lang["taxes_round_half_down"] = "";
+$lang["taxes_round_half_even"] = "";
+$lang["taxes_round_half_odd"] = "";
+$lang["taxes_round_half_up"] = "";
+$lang["taxes_rounding_code"] = "";
+$lang["taxes_sales_tax"] = "";
+$lang["taxes_sales_tax_by_invoice"] = "";
+$lang["taxes_successful_deleted"] = "";
+$lang["taxes_tax_category"] = "";
+$lang["taxes_tax_code"] = "";
+$lang["taxes_tax_code_cannot_be_deleted"] = "";
+$lang["taxes_tax_code_name"] = "";
+$lang["taxes_tax_code_required"] = "";
+$lang["taxes_tax_code_successful_deleted"] = "";
+$lang["taxes_tax_code_successful_updated"] = "";
+$lang["taxes_tax_code_successful_updating"] = "";
+$lang["taxes_tax_code_successfully_added"] = "";
+$lang["taxes_tax_code_type"] = "";
+$lang["taxes_tax_rate"] = "";
+$lang["taxes_tax_rate_numeric"] = "";
+$lang["taxes_tax_rate_required"] = "";
+$lang["taxes_update"] = "";
+$lang["taxes_vat_tax"] = "";
diff --git a/application/language/en/config_lang.php b/application/language/en/config_lang.php
index 9818b6674..35537e98b 100644
--- a/application/language/en/config_lang.php
+++ b/application/language/en/config_lang.php
@@ -28,10 +28,10 @@ $lang["config_barcode_third_row"] = "Row 3";
 $lang["config_barcode_type"] = "Barcode Type";
 $lang["config_barcode_width"] = "Width (px)";
 $lang["config_bottom"] = "Bottom";
-$lang["config_center"] = "Center";
 $lang["config_cash_decimals"] = "Cash Decimals";
 $lang["config_cash_decimals_tooltip"] = "If cash decimals and currency decimals are the same then no cash rounding will take place.";
 $lang["config_cash_rounding"] = "Cash Rounding";
+$lang["config_center"] = "Center";
 $lang["config_comma"] = "comma";
 $lang["config_company"] = "Company Name";
 $lang["config_company_change_image"] = "Change Image";
@@ -59,7 +59,7 @@ $lang["config_customer_reward_duplicate"] = "Please use an unique reward name";
 $lang["config_customer_reward_enable"] = "Enable Customer Rewards";
 $lang["config_customer_reward_invalid_chars"] = "The reward name can not contain '_'";
 $lang["config_customer_reward_required"] = "Reward is a required field";
-$lang["config_customer_sales_tax_support"] =  "Customer Sales Tax Support";
+$lang["config_customer_sales_tax_support"] = "Customer Sales Tax Support";
 $lang["config_date_or_time_format"] = "Date and Time Filter";
 $lang["config_datetimeformat"] = "Date and Time Format";
 $lang["config_decimal_point"] = "Decimal Point";
@@ -105,18 +105,18 @@ $lang["config_email_smtp_timeout"] = "SMTP Timeout (s)";
 $lang["config_email_smtp_user"] = "SMTP Username";
 $lang["config_fax"] = "Fax";
 $lang["config_financial_year"] = "Financial Year Start";
-$lang["config_financial_year_jan"] = "1st of January";
-$lang["config_financial_year_feb"] = "1st of February";
-$lang["config_financial_year_mar"] = "1st of March";
 $lang["config_financial_year_apr"] = "1st of April";
-$lang["config_financial_year_may"] = "1st of May";
-$lang["config_financial_year_jun"] = "1st of June";
-$lang["config_financial_year_jul"] = "1st of July";
 $lang["config_financial_year_aug"] = "1st of August";
-$lang["config_financial_year_sep"] = "1st of September";
-$lang["config_financial_year_oct"] = "1st of October";
-$lang["config_financial_year_nov"] = "1st of November";
 $lang["config_financial_year_dec"] = "1st of December";
+$lang["config_financial_year_feb"] = "1st of February";
+$lang["config_financial_year_jan"] = "1st of January";
+$lang["config_financial_year_jul"] = "1st of July";
+$lang["config_financial_year_jun"] = "1st of June";
+$lang["config_financial_year_mar"] = "1st of March";
+$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_general"] = "General";
 $lang["config_general_configuration"] = "General Configuration";
 $lang["config_info"] = "Information";
diff --git a/application/language/en/enum_lang.php b/application/language/en/enum_lang.php
index 21eb2755b..15b78890a 100644
--- a/application/language/en/enum_lang.php
+++ b/application/language/en/enum_lang.php
@@ -1,9 +1,9 @@
-<?php
+<?php 
 
 $lang["enum_half_down"] = "Half Down";
-$lang["enum_half_five"] = "Half Five";
 $lang["enum_half_even"] = "Half Even";
+$lang["enum_half_five"] = "Half Five";
 $lang["enum_half_odd"] = "Half Odd";
 $lang["enum_half_up"] = "Half Up";
-$lang["enum_round_up"] = "Round Up";
 $lang["enum_round_down"] = "Round Down";
+$lang["enum_round_up"] = "Round Up";
diff --git a/application/language/en/items_lang.php b/application/language/en/items_lang.php
index 259bbe4d0..f28af1299 100644
--- a/application/language/en/items_lang.php
+++ b/application/language/en/items_lang.php
@@ -72,8 +72,8 @@ $lang["items_reorder_level_required"] = "Reorder level is a required field";
 $lang["items_retrive_item_info"] = "Retrive Item Info";
 $lang["items_sales_tax_1"] = "Sales Tax";
 $lang["items_sales_tax_2"] = "Sales Tax 2";
-$lang["items_search_attributes"] = "";
-$lang["items_search_custom_items"] = "Search Custom Fields";
+$lang["items_search_attributes"] = "Search Attributes";
+$lang["items_search_custom_items"] = "";
 $lang["items_select_image"] = "Select Image";
 $lang["items_serialized_items"] = "Serialized Items";
 $lang["items_standard"] = "Standard";
diff --git a/application/language/en/module_lang.php b/application/language/en/module_lang.php
index 43541af8c..82ca2536e 100644
--- a/application/language/en/module_lang.php
+++ b/application/language/en/module_lang.php
@@ -25,5 +25,3 @@ $lang["module_suppliers"] = "Suppliers";
 $lang["module_suppliers_desc"] = "Add, Update, Delete, and Search suppliers";
 $lang["module_taxes"] = "Taxes";
 $lang["module_taxes_desc"] = "Configure sales taxes";
-$lang["module_messages"] = "Messages";
-$lang["module_messages_desc"] = "Send Messages to Customers, Suppliers, Employees et al.";
diff --git a/application/language/en/taxes_lang.php b/application/language/en/taxes_lang.php
index 24ba0e8be..f0cd6ddd7 100644
--- a/application/language/en/taxes_lang.php
+++ b/application/language/en/taxes_lang.php
@@ -1,35 +1,31 @@
-<?php
+<?php 
 
+$lang["taxes_add_exception"] = "Add Exception";
+$lang["taxes_confirm_delete"] = "Confirm deletion of tax code";
 $lang["taxes_default_tax_category"] = "Default Tax Category";
 $lang["taxes_error_adding_updating"] = "Error adding/updating tax code";
 $lang["taxes_new"] = "New Tax Code";
 $lang["taxes_no_taxes_to_display"] = "No taxes code available to display";
-$lang["taxes_rounding_code"] = "Rounding Code";
-$lang["taxes_round_half_up"] = "Half Up";
 $lang["taxes_round_half_down"] = "Half Down";
 $lang["taxes_round_half_even"] = "Half Even";
 $lang["taxes_round_half_odd"] = "Half Odd";
+$lang["taxes_round_half_up"] = "Half Up";
+$lang["taxes_rounding_code"] = "Rounding Code";
 $lang["taxes_sales_tax"] = "Sales Tax";
 $lang["taxes_sales_tax_by_invoice"] = "Sales Tax by Invoice";
 $lang["taxes_successful_deleted"] = "You have successfully deleted";
+$lang["taxes_tax_category"] = "Tax Category";
 $lang["taxes_tax_code"] = "Tax Code";
+$lang["taxes_tax_code_cannot_be_deleted"] = "Could not delete selected tax code";
 $lang["taxes_tax_code_name"] = "Tax Code Name";
+$lang["taxes_tax_code_required"] = "Tax code is a required field";
 $lang["taxes_tax_code_successful_deleted"] = "You have successfully deleted tax code";
+$lang["taxes_tax_code_successful_updated"] = "You have successfully updated";
 $lang["taxes_tax_code_successful_updating"] = "You have successfully updated tax code";
+$lang["taxes_tax_code_successfully_added"] = "You have successfully added";
 $lang["taxes_tax_code_type"] = "Tax Code Type";
 $lang["taxes_tax_rate"] = "Tax Rate";
 $lang["taxes_tax_rate_numeric"] = "Tax rate must be a number";
-$lang["taxes_tax_code_required"] = "Tax code is a required field";
 $lang["taxes_tax_rate_required"] = "Tax rate is a required field";
-$lang["taxes_vat_tax"] = "VAT Tax";
-$lang["taxes_tax_category"] = "Tax Category";
-$lang["taxes_tax_code_successfully_added"] = "You have successfully added";
-$lang["taxes_tax_code_successful_deleted"] = "You have successfully deleted";
-$lang["taxes_tax_code_cannot_be_deleted"] = "Could not delete selected tax code";
-$lang["taxes_tax_code_successful_updated"] = "You have successfully updated";
-$lang["taxes_confirm_delete"] = "Confirm deletion of tax code";
 $lang["taxes_update"] = "Update Sales Category Tax";
-$lang["taxes_add_exception"] = "Add Exception";
-
-
-
+$lang["taxes_vat_tax"] = "VAT Tax";
diff --git a/application/language/es/config_lang.php b/application/language/es/config_lang.php
index 091e3bd78..d38e7644d 100644
--- a/application/language/es/config_lang.php
+++ b/application/language/es/config_lang.php
@@ -28,6 +28,9 @@ $lang["config_barcode_third_row"] = "Fila 2";
 $lang["config_barcode_type"] = "Tipo de Código de Barra";
 $lang["config_barcode_width"] = "Ancho (px)";
 $lang["config_bottom"] = "Abajo";
+$lang["config_cash_decimals"] = "";
+$lang["config_cash_decimals_tooltip"] = "";
+$lang["config_cash_rounding"] = "";
 $lang["config_center"] = "Centro";
 $lang["config_comma"] = "coma";
 $lang["config_company"] = "Nombre del Comercio";
@@ -56,6 +59,7 @@ $lang["config_customer_reward_duplicate"] = "";
 $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"] = "Filtro de fecha y hora";
 $lang["config_datetimeformat"] = "Formato de fecha y hora";
 $lang["config_decimal_point"] = "Punto Decimal";
@@ -73,6 +77,7 @@ $lang["config_default_barcode_quality_number"] = "Calidad del código de barras
 $lang["config_default_barcode_quality_required"] = "Calidad del código de barras es requerido";
 $lang["config_default_barcode_width_number"] = "Ancho del código de barras debe ser número";
 $lang["config_default_barcode_width_required"] = "Ancho del código de barras es requerido";
+$lang["config_default_origin_tax_code"] = "";
 $lang["config_default_sales_discount"] = "% de Descuento en Ventas predeterminado";
 $lang["config_default_sales_discount_number"] = "Descuento en ventas predeterminado debe ser un número";
 $lang["config_default_sales_discount_required"] = "Descuento en ventas predeterminado es requerido";
@@ -99,6 +104,19 @@ $lang["config_email_smtp_port"] = "Puerto SMTP";
 $lang["config_email_smtp_timeout"] = "T. Espera SMTP (s)";
 $lang["config_email_smtp_user"] = "Usuario SMTP";
 $lang["config_fax"] = "Fax";
+$lang["config_financial_year"] = "";
+$lang["config_financial_year_apr"] = "";
+$lang["config_financial_year_aug"] = "";
+$lang["config_financial_year_dec"] = "";
+$lang["config_financial_year_feb"] = "";
+$lang["config_financial_year_jan"] = "";
+$lang["config_financial_year_jul"] = "";
+$lang["config_financial_year_jun"] = "";
+$lang["config_financial_year_mar"] = "";
+$lang["config_financial_year_may"] = "";
+$lang["config_financial_year_nov"] = "";
+$lang["config_financial_year_oct"] = "";
+$lang["config_financial_year_sep"] = "";
 $lang["config_general"] = "General";
 $lang["config_general_configuration"] = "Configuración General";
 $lang["config_info"] = "Información";
diff --git a/application/language/es/customers_lang.php b/application/language/es/customers_lang.php
index aeaabc2d9..ab150f59e 100644
--- a/application/language/es/customers_lang.php
+++ b/application/language/es/customers_lang.php
@@ -20,6 +20,7 @@ $lang["customers_one_or_multiple"] = "cliente(s)";
 $lang["customers_successful_adding"] = "Has agregado satisfactoriamente el cliente";
 $lang["customers_successful_deleted"] = "Has borrado satisfactoriamente a";
 $lang["customers_successful_updating"] = "No se ha podido agregar el cliente";
+$lang["customers_tax_code"] = "";
 $lang["customers_taxable"] = "Gravable";
 $lang["customers_total"] = "Total";
 $lang["customers_update"] = "Actualizar Cliente";
diff --git a/application/language/es/datepicker_lang.php b/application/language/es/datepicker_lang.php
index e61cd5de2..6825bce0b 100644
--- a/application/language/es/datepicker_lang.php
+++ b/application/language/es/datepicker_lang.php
@@ -7,11 +7,13 @@ $lang["datepicker_custom"] = "Personalizar";
 $lang["datepicker_from"] = "Desde";
 $lang["datepicker_last_30"] = "Últimos 30 Días";
 $lang["datepicker_last_7"] = "Últimos 7 Días";
+$lang["datepicker_last_financial_year"] = "";
 $lang["datepicker_last_month"] = "Mes Anterior";
 $lang["datepicker_last_year"] = "Año Anterior";
-$lang["datepicker_same_month_to_same_day_last_year"] = "Este mes hasta hoy, del año pasado";
-$lang["datepicker_this_month"] = "Este Mes";
 $lang["datepicker_same_month_last_year"] = "Este Mes hace un año";
+$lang["datepicker_same_month_to_same_day_last_year"] = "Este mes hasta hoy, del año pasado";
+$lang["datepicker_this_financial_year"] = "";
+$lang["datepicker_this_month"] = "Este Mes";
 $lang["datepicker_this_year"] = "Este Año";
 $lang["datepicker_to"] = "Hasta";
 $lang["datepicker_today"] = "Hoy";
diff --git a/application/language/es/enum_lang.php b/application/language/es/enum_lang.php
new file mode 100644
index 000000000..dde09937b
--- /dev/null
+++ b/application/language/es/enum_lang.php
@@ -0,0 +1,9 @@
+<?php 
+
+$lang["enum_half_down"] = "";
+$lang["enum_half_even"] = "";
+$lang["enum_half_five"] = "";
+$lang["enum_half_odd"] = "";
+$lang["enum_half_up"] = "";
+$lang["enum_round_down"] = "";
+$lang["enum_round_up"] = "";
diff --git a/application/language/es/module_lang.php b/application/language/es/module_lang.php
index 1375a815d..671f27147 100644
--- a/application/language/es/module_lang.php
+++ b/application/language/es/module_lang.php
@@ -23,3 +23,5 @@ $lang["module_sales"] = "Ventas";
 $lang["module_sales_desc"] = "Procesar ventas y devoluciones";
 $lang["module_suppliers"] = "Proveedores";
 $lang["module_suppliers_desc"] = "Agregar, Actualizar, Borrar y Buscar proveedores";
+$lang["module_taxes"] = "";
+$lang["module_taxes_desc"] = "";
diff --git a/application/language/es/sales_lang.php b/application/language/es/sales_lang.php
index cfd1ab8ec..b4618ab10 100644
--- a/application/language/es/sales_lang.php
+++ b/application/language/es/sales_lang.php
@@ -12,6 +12,7 @@ $lang["sales_cash_filter"] = "Efectivo";
 $lang["sales_change_due"] = "Cambio";
 $lang["sales_check"] = "Cheque";
 $lang["sales_check_balance"] = "Balance de Cheque";
+$lang["sales_check_filter"] = "";
 $lang["sales_comment"] = "Comentario";
 $lang["sales_comments"] = "Comentarios";
 $lang["sales_complete_sale"] = "Completar Venta";
@@ -105,6 +106,7 @@ $lang["sales_sale"] = "Venta";
 $lang["sales_sale_by_invoice"] = "";
 $lang["sales_sale_for_customer"] = "Cliente:";
 $lang["sales_sale_time"] = "Hora";
+$lang["sales_sales_tax"] = "";
 $lang["sales_select_customer"] = "Seleccionar Cliente (Opcional)";
 $lang["sales_send_invoice"] = "Enviar Factura";
 $lang["sales_send_quote"] = "";
diff --git a/application/language/es/taxes_lang.php b/application/language/es/taxes_lang.php
new file mode 100644
index 000000000..feb59c695
--- /dev/null
+++ b/application/language/es/taxes_lang.php
@@ -0,0 +1,31 @@
+<?php 
+
+$lang["taxes_add_exception"] = "";
+$lang["taxes_confirm_delete"] = "";
+$lang["taxes_default_tax_category"] = "";
+$lang["taxes_error_adding_updating"] = "";
+$lang["taxes_new"] = "";
+$lang["taxes_no_taxes_to_display"] = "";
+$lang["taxes_round_half_down"] = "";
+$lang["taxes_round_half_even"] = "";
+$lang["taxes_round_half_odd"] = "";
+$lang["taxes_round_half_up"] = "";
+$lang["taxes_rounding_code"] = "";
+$lang["taxes_sales_tax"] = "";
+$lang["taxes_sales_tax_by_invoice"] = "";
+$lang["taxes_successful_deleted"] = "";
+$lang["taxes_tax_category"] = "";
+$lang["taxes_tax_code"] = "";
+$lang["taxes_tax_code_cannot_be_deleted"] = "";
+$lang["taxes_tax_code_name"] = "";
+$lang["taxes_tax_code_required"] = "";
+$lang["taxes_tax_code_successful_deleted"] = "";
+$lang["taxes_tax_code_successful_updated"] = "";
+$lang["taxes_tax_code_successful_updating"] = "";
+$lang["taxes_tax_code_successfully_added"] = "";
+$lang["taxes_tax_code_type"] = "";
+$lang["taxes_tax_rate"] = "";
+$lang["taxes_tax_rate_numeric"] = "";
+$lang["taxes_tax_rate_required"] = "";
+$lang["taxes_update"] = "";
+$lang["taxes_vat_tax"] = "";
diff --git a/application/language/fr/config_lang.php b/application/language/fr/config_lang.php
index ca6a3b503..f0dafb2c9 100644
--- a/application/language/fr/config_lang.php
+++ b/application/language/fr/config_lang.php
@@ -28,6 +28,9 @@ $lang["config_barcode_third_row"] = "Row 4";
 $lang["config_barcode_type"] = "Type de Code à barre";
 $lang["config_barcode_width"] = "Largeur (px)";
 $lang["config_bottom"] = "Pied de page";
+$lang["config_cash_decimals"] = "";
+$lang["config_cash_decimals_tooltip"] = "";
+$lang["config_cash_rounding"] = "";
 $lang["config_center"] = "Centre";
 $lang["config_comma"] = "virgule";
 $lang["config_company"] = "Nome de l'Entreprise";
@@ -38,7 +41,7 @@ $lang["config_company_required"] = "Le nom d'entreprise est requis";
 $lang["config_company_select_image"] = "Sélectionner l'image";
 $lang["config_company_website_url"] = "Le site web de l'entreprise n'est pas une URL valide (http://...)";
 $lang["config_country_codes"] = "Codes de pays";
-$lang["config_country_codes_tooltip"] = "Liste des codes de pays séparés par virgules pour la recherche d'adresse \\"nominatim\\".";
+$lang["config_country_codes_tooltip"] = "Liste des codes de pays séparés par virgules pour la recherche d'adresse \\\"nominatim\\\".";
 $lang["config_currency_decimals"] = "Décimales";
 $lang["config_currency_symbol"] = "Symbole Monétaire";
 $lang["config_custom1"] = "Champ Personnalisé 1";
@@ -56,6 +59,7 @@ $lang["config_customer_reward_duplicate"] = "";
 $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_datetimeformat"] = "Format de la date et de l'heure";
 $lang["config_decimal_point"] = " Decimal Point";
@@ -73,6 +77,7 @@ $lang["config_default_barcode_quality_number"] = "La quantité de code à barre
 $lang["config_default_barcode_quality_required"] = "La quantité du code à barre par défaut est obligatoire";
 $lang["config_default_barcode_width_number"] = "Le code-barres par défaut est obligatoire";
 $lang["config_default_barcode_width_required"] = "The default barcode width is a required field";
+$lang["config_default_origin_tax_code"] = "";
 $lang["config_default_sales_discount"] = "Default Sales Discount %";
 $lang["config_default_sales_discount_number"] = "The default sales discount must be a number";
 $lang["config_default_sales_discount_required"] = "The default sales discount is a required field";
@@ -99,6 +104,19 @@ $lang["config_email_smtp_port"] = "SMTP Port";
 $lang["config_email_smtp_timeout"] = "SMTP Timeout (s)";
 $lang["config_email_smtp_user"] = "SMTP Username";
 $lang["config_fax"] = "Fax";
+$lang["config_financial_year"] = "";
+$lang["config_financial_year_apr"] = "";
+$lang["config_financial_year_aug"] = "";
+$lang["config_financial_year_dec"] = "";
+$lang["config_financial_year_feb"] = "";
+$lang["config_financial_year_jan"] = "";
+$lang["config_financial_year_jul"] = "";
+$lang["config_financial_year_jun"] = "";
+$lang["config_financial_year_mar"] = "";
+$lang["config_financial_year_may"] = "";
+$lang["config_financial_year_nov"] = "";
+$lang["config_financial_year_oct"] = "";
+$lang["config_financial_year_sep"] = "";
 $lang["config_general"] = "General";
 $lang["config_general_configuration"] = "General Configuration";
 $lang["config_info"] = "Entreprise";
@@ -109,7 +127,7 @@ $lang["config_invoice_default_comments"] = "Default Invoice Comments";
 $lang["config_invoice_email_message"] = "Invoice Email Template";
 $lang["config_invoice_enable"] = "Enable Invoicing";
 $lang["config_invoice_printer"] = "Invoice Printer";
-$lang["config_jsprintsetup_required"] = "Attention! Cette fonctionnalité ne fonctionnera que si vous avez le plugin \\"FireFox jsPrintSetup\\" installé. Sauvegarder quand même?";
+$lang["config_jsprintsetup_required"] = "Attention! Cette fonctionnalité ne fonctionnera que si vous avez le plugin \\\"FireFox jsPrintSetup\\\" installé. Sauvegarder quand même?";
 $lang["config_language"] = "Langue";
 $lang["config_last_used_invoice_number"] = "";
 $lang["config_last_used_quote_number"] = "";
diff --git a/application/language/fr/customers_lang.php b/application/language/fr/customers_lang.php
index 3fa04ff0c..86b31f685 100644
--- a/application/language/fr/customers_lang.php
+++ b/application/language/fr/customers_lang.php
@@ -20,6 +20,7 @@ $lang["customers_one_or_multiple"] = "client(s)";
 $lang["customers_successful_adding"] = "Vous avez ajouté un nouveau client";
 $lang["customers_successful_deleted"] = "Suppréssion réussie";
 $lang["customers_successful_updating"] = "Édition client réussie";
+$lang["customers_tax_code"] = "";
 $lang["customers_taxable"] = "Imposable";
 $lang["customers_total"] = "Total";
 $lang["customers_update"] = "Éditer Client";
diff --git a/application/language/fr/datepicker_lang.php b/application/language/fr/datepicker_lang.php
index 6d27c6c24..f03b4f1ab 100644
--- a/application/language/fr/datepicker_lang.php
+++ b/application/language/fr/datepicker_lang.php
@@ -7,11 +7,13 @@ $lang["datepicker_custom"] = "Personnaliser";
 $lang["datepicker_from"] = "De";
 $lang["datepicker_last_30"] = "Ces 30 derniers jours";
 $lang["datepicker_last_7"] = "Ces 7 derniers jours";
+$lang["datepicker_last_financial_year"] = "";
 $lang["datepicker_last_month"] = "Le mois dernier";
 $lang["datepicker_last_year"] = "L'année passée";
-$lang["datepicker_same_month_to_same_day_last_year"] = "Même mois au même jour que l'an dernier";
-$lang["datepicker_this_month"] = "Ce mois";
 $lang["datepicker_same_month_last_year"] = "Même mois de l'Année Dernière";
+$lang["datepicker_same_month_to_same_day_last_year"] = "Même mois au même jour que l'an dernier";
+$lang["datepicker_this_financial_year"] = "";
+$lang["datepicker_this_month"] = "Ce mois";
 $lang["datepicker_this_year"] = "Cette Année";
 $lang["datepicker_to"] = "To";
 $lang["datepicker_today"] = "Aujourd'hui";
diff --git a/application/language/fr/enum_lang.php b/application/language/fr/enum_lang.php
new file mode 100644
index 000000000..dde09937b
--- /dev/null
+++ b/application/language/fr/enum_lang.php
@@ -0,0 +1,9 @@
+<?php 
+
+$lang["enum_half_down"] = "";
+$lang["enum_half_even"] = "";
+$lang["enum_half_five"] = "";
+$lang["enum_half_odd"] = "";
+$lang["enum_half_up"] = "";
+$lang["enum_round_down"] = "";
+$lang["enum_round_up"] = "";
diff --git a/application/language/fr/module_lang.php b/application/language/fr/module_lang.php
index 0d39363df..770944612 100644
--- a/application/language/fr/module_lang.php
+++ b/application/language/fr/module_lang.php
@@ -23,3 +23,5 @@ $lang["module_sales"] = "Ventes";
 $lang["module_sales_desc"] = "Ventes et chiffre d'affaire";
 $lang["module_suppliers"] = "Fournisseurs";
 $lang["module_suppliers_desc"] = "Ajouter, Éditer, Supprimer, et Chercher des fournisseurs";
+$lang["module_taxes"] = "";
+$lang["module_taxes_desc"] = "";
diff --git a/application/language/fr/sales_lang.php b/application/language/fr/sales_lang.php
index ed7fe8185..a42e30436 100644
--- a/application/language/fr/sales_lang.php
+++ b/application/language/fr/sales_lang.php
@@ -12,6 +12,7 @@ $lang["sales_cash_filter"] = "Cash";
 $lang["sales_change_due"] = "Reste";
 $lang["sales_check"] = "Cheque";
 $lang["sales_check_balance"] = "Vérifier Reste";
+$lang["sales_check_filter"] = "";
 $lang["sales_comment"] = "Commentaire";
 $lang["sales_comments"] = "Commentaires";
 $lang["sales_complete_sale"] = "Finaliser la Vente";
@@ -105,6 +106,7 @@ $lang["sales_sale"] = "Vente";
 $lang["sales_sale_by_invoice"] = "";
 $lang["sales_sale_for_customer"] = "Client:";
 $lang["sales_sale_time"] = "Heure";
+$lang["sales_sales_tax"] = "";
 $lang["sales_select_customer"] = "Choisir Client (Facultatif)";
 $lang["sales_send_invoice"] = "Envoyer la Facture";
 $lang["sales_send_quote"] = "";
diff --git a/application/language/fr/taxes_lang.php b/application/language/fr/taxes_lang.php
new file mode 100644
index 000000000..feb59c695
--- /dev/null
+++ b/application/language/fr/taxes_lang.php
@@ -0,0 +1,31 @@
+<?php 
+
+$lang["taxes_add_exception"] = "";
+$lang["taxes_confirm_delete"] = "";
+$lang["taxes_default_tax_category"] = "";
+$lang["taxes_error_adding_updating"] = "";
+$lang["taxes_new"] = "";
+$lang["taxes_no_taxes_to_display"] = "";
+$lang["taxes_round_half_down"] = "";
+$lang["taxes_round_half_even"] = "";
+$lang["taxes_round_half_odd"] = "";
+$lang["taxes_round_half_up"] = "";
+$lang["taxes_rounding_code"] = "";
+$lang["taxes_sales_tax"] = "";
+$lang["taxes_sales_tax_by_invoice"] = "";
+$lang["taxes_successful_deleted"] = "";
+$lang["taxes_tax_category"] = "";
+$lang["taxes_tax_code"] = "";
+$lang["taxes_tax_code_cannot_be_deleted"] = "";
+$lang["taxes_tax_code_name"] = "";
+$lang["taxes_tax_code_required"] = "";
+$lang["taxes_tax_code_successful_deleted"] = "";
+$lang["taxes_tax_code_successful_updated"] = "";
+$lang["taxes_tax_code_successful_updating"] = "";
+$lang["taxes_tax_code_successfully_added"] = "";
+$lang["taxes_tax_code_type"] = "";
+$lang["taxes_tax_rate"] = "";
+$lang["taxes_tax_rate_numeric"] = "";
+$lang["taxes_tax_rate_required"] = "";
+$lang["taxes_update"] = "";
+$lang["taxes_vat_tax"] = "";
diff --git a/application/language/hr-HR/config_lang.php b/application/language/hr-HR/config_lang.php
index 7d42a7961..afe64b4e6 100644
--- a/application/language/hr-HR/config_lang.php
+++ b/application/language/hr-HR/config_lang.php
@@ -28,6 +28,9 @@ $lang["config_barcode_third_row"] = "3.red";
 $lang["config_barcode_type"] = "Tip barkod-a";
 $lang["config_barcode_width"] = "Širina (px)";
 $lang["config_bottom"] = "Bottom";
+$lang["config_cash_decimals"] = "";
+$lang["config_cash_decimals_tooltip"] = "";
+$lang["config_cash_rounding"] = "";
 $lang["config_center"] = "Center";
 $lang["config_comma"] = "comma";
 $lang["config_company"] = "Naziv tvrtke";
@@ -56,6 +59,7 @@ $lang["config_customer_reward_duplicate"] = "";
 $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_datetimeformat"] = "Oblik datuma i vremena";
 $lang["config_decimal_point"] = "Decimalna točka";
@@ -73,6 +77,7 @@ $lang["config_default_barcode_quality_number"] = "Kvaliteta barkod-a mora biti b
 $lang["config_default_barcode_quality_required"] = "Kvaliteta barkod-a je potrebna";
 $lang["config_default_barcode_width_number"] = "Az alapértelmezett vonalkód szélességnek számnak kell lennie";
 $lang["config_default_barcode_width_required"] = "Širina barkod-a mora bit broj";
+$lang["config_default_origin_tax_code"] = "";
 $lang["config_default_sales_discount"] = "Zadani popust %";
 $lang["config_default_sales_discount_number"] = "Zadani popust mora biti broj";
 $lang["config_default_sales_discount_required"] = "Zadani popust je potreban";
@@ -99,6 +104,19 @@ $lang["config_email_smtp_port"] = "SMTP Port";
 $lang["config_email_smtp_timeout"] = "SMTP Timeout (s)";
 $lang["config_email_smtp_user"] = "SMTP Username";
 $lang["config_fax"] = "Fax";
+$lang["config_financial_year"] = "";
+$lang["config_financial_year_apr"] = "";
+$lang["config_financial_year_aug"] = "";
+$lang["config_financial_year_dec"] = "";
+$lang["config_financial_year_feb"] = "";
+$lang["config_financial_year_jan"] = "";
+$lang["config_financial_year_jul"] = "";
+$lang["config_financial_year_jun"] = "";
+$lang["config_financial_year_mar"] = "";
+$lang["config_financial_year_may"] = "";
+$lang["config_financial_year_nov"] = "";
+$lang["config_financial_year_oct"] = "";
+$lang["config_financial_year_sep"] = "";
 $lang["config_general"] = "Opća";
 $lang["config_general_configuration"] = "Opća konfiguracija";
 $lang["config_info"] = "Info";
diff --git a/application/language/hr-HR/customers_lang.php b/application/language/hr-HR/customers_lang.php
index 1e929a701..cdd0a29a2 100644
--- a/application/language/hr-HR/customers_lang.php
+++ b/application/language/hr-HR/customers_lang.php
@@ -20,6 +20,7 @@ $lang["customers_one_or_multiple"] = "Kupac(i)";
 $lang["customers_successful_adding"] = "Uspješno ste dodali kupca";
 $lang["customers_successful_deleted"] = "Kupac je uspješno obrisan";
 $lang["customers_successful_updating"] = "Podaci o kupcu su uspješno ažurirani";
+$lang["customers_tax_code"] = "";
 $lang["customers_taxable"] = "Oporezivo";
 $lang["customers_total"] = "Total";
 $lang["customers_update"] = "Ažuriraj kupca";
diff --git a/application/language/hr-HR/datepicker_lang.php b/application/language/hr-HR/datepicker_lang.php
index 97848068c..91d9f4ad8 100644
--- a/application/language/hr-HR/datepicker_lang.php
+++ b/application/language/hr-HR/datepicker_lang.php
@@ -7,11 +7,13 @@ $lang["datepicker_custom"] = "Slobodan izbor";
 $lang["datepicker_from"] = "Od";
 $lang["datepicker_last_30"] = "Zadnjih 30 dana";
 $lang["datepicker_last_7"] = "Zadnjih 7 dana";
+$lang["datepicker_last_financial_year"] = "";
 $lang["datepicker_last_month"] = "Zadnji mjesec";
 $lang["datepicker_last_year"] = "Zadnja godina";
-$lang["datepicker_same_month_to_same_day_last_year"] = "Ovaj mjesec do danas prošle godine";
-$lang["datepicker_this_month"] = "Ovaj mjesec";
 $lang["datepicker_same_month_last_year"] = "Ovaj mjesec prošle godine";
+$lang["datepicker_same_month_to_same_day_last_year"] = "Ovaj mjesec do danas prošle godine";
+$lang["datepicker_this_financial_year"] = "";
+$lang["datepicker_this_month"] = "Ovaj mjesec";
 $lang["datepicker_this_year"] = "Ova godina";
 $lang["datepicker_to"] = "Do";
 $lang["datepicker_today"] = "Danas";
diff --git a/application/language/hr-HR/enum_lang.php b/application/language/hr-HR/enum_lang.php
new file mode 100644
index 000000000..dde09937b
--- /dev/null
+++ b/application/language/hr-HR/enum_lang.php
@@ -0,0 +1,9 @@
+<?php 
+
+$lang["enum_half_down"] = "";
+$lang["enum_half_even"] = "";
+$lang["enum_half_five"] = "";
+$lang["enum_half_odd"] = "";
+$lang["enum_half_up"] = "";
+$lang["enum_round_down"] = "";
+$lang["enum_round_up"] = "";
diff --git a/application/language/hr-HR/module_lang.php b/application/language/hr-HR/module_lang.php
index 09e568f12..707784bdb 100644
--- a/application/language/hr-HR/module_lang.php
+++ b/application/language/hr-HR/module_lang.php
@@ -23,3 +23,5 @@ $lang["module_sales"] = "Prodaja";
 $lang["module_sales_desc"] = "Procesi prodaje i povrata";
 $lang["module_suppliers"] = "Dobavljači";
 $lang["module_suppliers_desc"] = "Dodaj, ažuriraj, obriši ili traži dobavljače";
+$lang["module_taxes"] = "";
+$lang["module_taxes_desc"] = "";
diff --git a/application/language/hr-HR/sales_lang.php b/application/language/hr-HR/sales_lang.php
index a9a8456df..d3e0a1310 100644
--- a/application/language/hr-HR/sales_lang.php
+++ b/application/language/hr-HR/sales_lang.php
@@ -12,6 +12,7 @@ $lang["sales_cash_filter"] = "Novčanice";
 $lang["sales_change_due"] = "Ostatak";
 $lang["sales_check"] = "Ček";
 $lang["sales_check_balance"] = "Ostatak čeka";
+$lang["sales_check_filter"] = "";
 $lang["sales_comment"] = "Komentar";
 $lang["sales_comments"] = "Komentari";
 $lang["sales_complete_sale"] = "Završeno";
@@ -105,6 +106,7 @@ $lang["sales_sale"] = "Prodaja";
 $lang["sales_sale_by_invoice"] = "";
 $lang["sales_sale_for_customer"] = "Kupac:";
 $lang["sales_sale_time"] = "Vrijeme";
+$lang["sales_sales_tax"] = "";
 $lang["sales_select_customer"] = "Odaberi kupca(neobaveno)";
 $lang["sales_send_invoice"] = "Pošalji fakturu";
 $lang["sales_send_quote"] = "";
diff --git a/application/language/hr-HR/taxes_lang.php b/application/language/hr-HR/taxes_lang.php
new file mode 100644
index 000000000..feb59c695
--- /dev/null
+++ b/application/language/hr-HR/taxes_lang.php
@@ -0,0 +1,31 @@
+<?php 
+
+$lang["taxes_add_exception"] = "";
+$lang["taxes_confirm_delete"] = "";
+$lang["taxes_default_tax_category"] = "";
+$lang["taxes_error_adding_updating"] = "";
+$lang["taxes_new"] = "";
+$lang["taxes_no_taxes_to_display"] = "";
+$lang["taxes_round_half_down"] = "";
+$lang["taxes_round_half_even"] = "";
+$lang["taxes_round_half_odd"] = "";
+$lang["taxes_round_half_up"] = "";
+$lang["taxes_rounding_code"] = "";
+$lang["taxes_sales_tax"] = "";
+$lang["taxes_sales_tax_by_invoice"] = "";
+$lang["taxes_successful_deleted"] = "";
+$lang["taxes_tax_category"] = "";
+$lang["taxes_tax_code"] = "";
+$lang["taxes_tax_code_cannot_be_deleted"] = "";
+$lang["taxes_tax_code_name"] = "";
+$lang["taxes_tax_code_required"] = "";
+$lang["taxes_tax_code_successful_deleted"] = "";
+$lang["taxes_tax_code_successful_updated"] = "";
+$lang["taxes_tax_code_successful_updating"] = "";
+$lang["taxes_tax_code_successfully_added"] = "";
+$lang["taxes_tax_code_type"] = "";
+$lang["taxes_tax_rate"] = "";
+$lang["taxes_tax_rate_numeric"] = "";
+$lang["taxes_tax_rate_required"] = "";
+$lang["taxes_update"] = "";
+$lang["taxes_vat_tax"] = "";
diff --git a/application/language/hu-HU/config_lang.php b/application/language/hu-HU/config_lang.php
index 9e28ed7d1..7265ae24f 100644
--- a/application/language/hu-HU/config_lang.php
+++ b/application/language/hu-HU/config_lang.php
@@ -28,6 +28,9 @@ $lang["config_barcode_third_row"] = "Sor 3";
 $lang["config_barcode_type"] = "Vonalkód tipus";
 $lang["config_barcode_width"] = "Szélesség (px)";
 $lang["config_bottom"] = "Alul";
+$lang["config_cash_decimals"] = "";
+$lang["config_cash_decimals_tooltip"] = "";
+$lang["config_cash_rounding"] = "";
 $lang["config_center"] = "Közép";
 $lang["config_comma"] = "vessző";
 $lang["config_company"] = "Cégnév";
@@ -56,6 +59,7 @@ $lang["config_customer_reward_duplicate"] = "";
 $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_datetimeformat"] = "Dátum és idő formátum";
 $lang["config_decimal_point"] = "Tizedes pont";
@@ -73,6 +77,7 @@ $lang["config_default_barcode_quality_number"] = "Az alapértelmezett vonalkód
 $lang["config_default_barcode_quality_required"] = "Az alapértelmezett vonalkód minőség kötelező mező";
 $lang["config_default_barcode_width_number"] = "Az alapértelmezett vonalkód szélességnek számnak kell lennie";
 $lang["config_default_barcode_width_required"] = "Az alapértelmezett vonalkód szélesség kötelező mező";
+$lang["config_default_origin_tax_code"] = "";
 $lang["config_default_sales_discount"] = "Alapértelmezett kedvezmény %";
 $lang["config_default_sales_discount_number"] = "Alapértelmezett kedvezménynek számnak kell lennie";
 $lang["config_default_sales_discount_required"] = "Alapértelmezett kedvezmény kötelező mező";
@@ -99,6 +104,19 @@ $lang["config_email_smtp_port"] = "SMTP Port";
 $lang["config_email_smtp_timeout"] = "SMTP időtúllépést (mp)";
 $lang["config_email_smtp_user"] = "SMTP Username";
 $lang["config_fax"] = "Fax";
+$lang["config_financial_year"] = "";
+$lang["config_financial_year_apr"] = "";
+$lang["config_financial_year_aug"] = "";
+$lang["config_financial_year_dec"] = "";
+$lang["config_financial_year_feb"] = "";
+$lang["config_financial_year_jan"] = "";
+$lang["config_financial_year_jul"] = "";
+$lang["config_financial_year_jun"] = "";
+$lang["config_financial_year_mar"] = "";
+$lang["config_financial_year_may"] = "";
+$lang["config_financial_year_nov"] = "";
+$lang["config_financial_year_oct"] = "";
+$lang["config_financial_year_sep"] = "";
 $lang["config_general"] = "Általános";
 $lang["config_general_configuration"] = "Általános beállitás";
 $lang["config_info"] = "Információk";
diff --git a/application/language/hu-HU/customers_lang.php b/application/language/hu-HU/customers_lang.php
index 960d77d62..4236172ae 100644
--- a/application/language/hu-HU/customers_lang.php
+++ b/application/language/hu-HU/customers_lang.php
@@ -20,6 +20,7 @@ $lang["customers_one_or_multiple"] = "vevő(k)";
 $lang["customers_successful_adding"] = "Sikeresen hozzáadott egy vevőt";
 $lang["customers_successful_deleted"] = "Sikeres törlés.";
 $lang["customers_successful_updating"] = "Sikeresen módosította a vevőt";
+$lang["customers_tax_code"] = "";
 $lang["customers_taxable"] = "Adóköteles";
 $lang["customers_total"] = "Összesen";
 $lang["customers_update"] = "Vevő módosítása";
diff --git a/application/language/hu-HU/datepicker_lang.php b/application/language/hu-HU/datepicker_lang.php
index 8a3e2e152..bd1067fd3 100644
--- a/application/language/hu-HU/datepicker_lang.php
+++ b/application/language/hu-HU/datepicker_lang.php
@@ -7,11 +7,13 @@ $lang["datepicker_custom"] = "Egyedi";
 $lang["datepicker_from"] = "Tól";
 $lang["datepicker_last_30"] = "Utolsó 30 nap";
 $lang["datepicker_last_7"] = "Utolsó 7 nap";
+$lang["datepicker_last_financial_year"] = "";
 $lang["datepicker_last_month"] = "Múlt hónap";
 $lang["datepicker_last_year"] = "Múlt év";
-$lang["datepicker_same_month_to_same_day_last_year"] = "Ez a hónap, mai nap, múlt évben";
-$lang["datepicker_this_month"] = "Ez a hónap";
 $lang["datepicker_same_month_last_year"] = "Ez a hónap, múlt évben";
+$lang["datepicker_same_month_to_same_day_last_year"] = "Ez a hónap, mai nap, múlt évben";
+$lang["datepicker_this_financial_year"] = "";
+$lang["datepicker_this_month"] = "Ez a hónap";
 $lang["datepicker_this_year"] = "Ezév";
 $lang["datepicker_to"] = "Ig";
 $lang["datepicker_today"] = "Ma";
diff --git a/application/language/hu-HU/enum_lang.php b/application/language/hu-HU/enum_lang.php
new file mode 100644
index 000000000..dde09937b
--- /dev/null
+++ b/application/language/hu-HU/enum_lang.php
@@ -0,0 +1,9 @@
+<?php 
+
+$lang["enum_half_down"] = "";
+$lang["enum_half_even"] = "";
+$lang["enum_half_five"] = "";
+$lang["enum_half_odd"] = "";
+$lang["enum_half_up"] = "";
+$lang["enum_round_down"] = "";
+$lang["enum_round_up"] = "";
diff --git a/application/language/hu-HU/module_lang.php b/application/language/hu-HU/module_lang.php
index cf2879a36..b8687f371 100644
--- a/application/language/hu-HU/module_lang.php
+++ b/application/language/hu-HU/module_lang.php
@@ -23,3 +23,5 @@ $lang["module_sales"] = "Értékesítés";
 $lang["module_sales_desc"] = "Termékek értékesítése és visszavétele";
 $lang["module_suppliers"] = "Beszállítók";
 $lang["module_suppliers_desc"] = "Beszállítók hozzáadása, módosítása, törlése és keresése";
+$lang["module_taxes"] = "";
+$lang["module_taxes_desc"] = "";
diff --git a/application/language/hu-HU/sales_lang.php b/application/language/hu-HU/sales_lang.php
index 46d05d8a0..dfe7371f2 100644
--- a/application/language/hu-HU/sales_lang.php
+++ b/application/language/hu-HU/sales_lang.php
@@ -12,6 +12,7 @@ $lang["sales_cash_filter"] = "Készpénz";
 $lang["sales_change_due"] = "Visszajáró";
 $lang["sales_check"] = "Csekk";
 $lang["sales_check_balance"] = "Csekk maradék";
+$lang["sales_check_filter"] = "";
 $lang["sales_comment"] = "Komment";
 $lang["sales_comments"] = "Kommentek";
 $lang["sales_complete_sale"] = "Eladás befej.";
@@ -105,6 +106,7 @@ $lang["sales_sale"] = "Eladás";
 $lang["sales_sale_by_invoice"] = "";
 $lang["sales_sale_for_customer"] = "Vevő:";
 $lang["sales_sale_time"] = "Idő";
+$lang["sales_sales_tax"] = "";
 $lang["sales_select_customer"] = "Vevő kiválasztása (opcionális)";
 $lang["sales_send_invoice"] = "Számla küldése";
 $lang["sales_send_quote"] = "";
diff --git a/application/language/hu-HU/taxes_lang.php b/application/language/hu-HU/taxes_lang.php
new file mode 100644
index 000000000..feb59c695
--- /dev/null
+++ b/application/language/hu-HU/taxes_lang.php
@@ -0,0 +1,31 @@
+<?php 
+
+$lang["taxes_add_exception"] = "";
+$lang["taxes_confirm_delete"] = "";
+$lang["taxes_default_tax_category"] = "";
+$lang["taxes_error_adding_updating"] = "";
+$lang["taxes_new"] = "";
+$lang["taxes_no_taxes_to_display"] = "";
+$lang["taxes_round_half_down"] = "";
+$lang["taxes_round_half_even"] = "";
+$lang["taxes_round_half_odd"] = "";
+$lang["taxes_round_half_up"] = "";
+$lang["taxes_rounding_code"] = "";
+$lang["taxes_sales_tax"] = "";
+$lang["taxes_sales_tax_by_invoice"] = "";
+$lang["taxes_successful_deleted"] = "";
+$lang["taxes_tax_category"] = "";
+$lang["taxes_tax_code"] = "";
+$lang["taxes_tax_code_cannot_be_deleted"] = "";
+$lang["taxes_tax_code_name"] = "";
+$lang["taxes_tax_code_required"] = "";
+$lang["taxes_tax_code_successful_deleted"] = "";
+$lang["taxes_tax_code_successful_updated"] = "";
+$lang["taxes_tax_code_successful_updating"] = "";
+$lang["taxes_tax_code_successfully_added"] = "";
+$lang["taxes_tax_code_type"] = "";
+$lang["taxes_tax_rate"] = "";
+$lang["taxes_tax_rate_numeric"] = "";
+$lang["taxes_tax_rate_required"] = "";
+$lang["taxes_update"] = "";
+$lang["taxes_vat_tax"] = "";
diff --git a/application/language/id/common_lang.php b/application/language/id/common_lang.php
index dd2e79c80..09d4438f8 100644
--- a/application/language/id/common_lang.php
+++ b/application/language/id/common_lang.php
@@ -3,12 +3,12 @@
 $lang["common_address_1"] = "Alamat 1";
 $lang["common_address_2"] = "Alamat 2";
 $lang["common_city"] = "Kota";
-$lang["common_close"] = "Tutup";
+$lang["common_close"] = "Close";
 $lang["common_comments"] = "Catatan";
 $lang["common_common"] = "Biasa";
 $lang["common_confirm_search"] = "Anda telah memilih satu atau lebih baris, ini tidak akan lagi dipilih setelah pencarian Anda. Apakah Anda yakin ingin mengirimkan pencarian ini?";
 $lang["common_country"] = "Negara";
-$lang["common_date"] = "Tanggal";
+$lang["common_date"] = "Date";
 $lang["common_delete"] = "Hapus";
 $lang["common_det"] = "Detail";
 $lang["common_download_import_template"] = "Download Import Excel Template (CSV)";
@@ -16,14 +16,14 @@ $lang["common_edit"] = "Ubah";
 $lang["common_email"] = "Email";
 $lang["common_email_invalid_format"] = "Format alamat email tidak benar";
 $lang["common_export_excel"] = "Excel Export";
-$lang["common_export_excel_no"] = "Tidak";
-$lang["common_export_excel_yes"] = "Ya";
+$lang["common_export_excel_no"] = "No";
+$lang["common_export_excel_yes"] = "Yes";
 $lang["common_fields_required_message"] = "Bagian yang ditandai warna merah wajib diisi";
 $lang["common_first_name"] = "Nama Depan";
 $lang["common_first_name_required"] = "Nama depan wajib diisi.";
-$lang["common_first_page"] = "Awal";
+$lang["common_first_page"] = "First";
 $lang["common_gender"] = "Jenis Kelamin";
-$lang["common_gender_female"] = "P";
+$lang["common_gender_female"] = "V";
 $lang["common_gender_male"] = "L";
 $lang["common_id"] = "Id";
 $lang["common_import"] = "Impor";
@@ -35,13 +35,13 @@ $lang["common_import_select_file"] = "Pilih file";
 $lang["common_inv"] = "Persediaan";
 $lang["common_last_name"] = "Nama Belakang";
 $lang["common_last_name_required"] = "Nama belakang wajib diisi.";
-$lang["common_last_page"] = "Terakhir";
+$lang["common_last_page"] = "Last";
 $lang["common_learn_about_project"] = "Untuk belajar informasi terbaru tentang proyek ini";
 $lang["common_list_of"] = "Daftar";
 $lang["common_logout"] = "Keluar";
-$lang["common_new"] = "Baru";
+$lang["common_new"] = "New";
 $lang["common_no_persons_to_display"] = "Tidak ada orang untuk ditampilkan";
-$lang["common_none_selected_text"] = "Tidak ada yg terpilih";
+$lang["common_none_selected_text"] = "Nothing selected";
 $lang["common_or"] = "ATAU";
 $lang["common_phone_number"] = "Telepon";
 $lang["common_phone_number_required"] = "Nomer Telepon Wajib Diisi";
@@ -50,16 +50,16 @@ $lang["common_powered_by"] = "Diberdayakan oleh";
 $lang["common_price"] = "Harga";
 $lang["common_print"] = "Cetak";
 $lang["common_remove"] = "Hapus";
-$lang["common_required"] = "Dibutuhkajn";
-$lang["common_return_policy"] = "Kebijakan Pengembalian";
+$lang["common_required"] = "Required";
+$lang["common_return_policy"] = "Kebijakan Retur";
 $lang["common_search"] = "Cari";
-$lang["common_search_options"] = "Pilihan pencarian";
+$lang["common_search_options"] = "Search options";
 $lang["common_searched_for"] = "Mencari untuk";
-$lang["common_state"] = "Propinsi";
+$lang["common_state"] = "Provinsi";
 $lang["common_submit"] = "Kirim";
 $lang["common_view_recent_sales"] = "Lihat Penjualan Terkini";
 $lang["common_website"] = "Situs";
 $lang["common_welcome"] = "Selamat Datang";
 $lang["common_welcome_message"] = "Selamat Datang, klik modul di bawah ini untuk memulai";
-$lang["common_you_are_using_ospos"] = "Anda menggunakan Open Source Point of Sale versi";
+$lang["common_you_are_using_ospos"] = "Anda menggunakan Open Source Point Of Sale Versi";
 $lang["common_zip"] = "Kode POS";
diff --git a/application/language/id/config_lang.php b/application/language/id/config_lang.php
index c83c41778..d277e34fb 100644
--- a/application/language/id/config_lang.php
+++ b/application/language/id/config_lang.php
@@ -28,6 +28,9 @@ $lang["config_barcode_third_row"] = "Baris 3";
 $lang["config_barcode_type"] = "Jenis kode batang";
 $lang["config_barcode_width"] = "Lebar (px)";
 $lang["config_bottom"] = "Bawah";
+$lang["config_cash_decimals"] = "";
+$lang["config_cash_decimals_tooltip"] = "";
+$lang["config_cash_rounding"] = "";
 $lang["config_center"] = "Tengah";
 $lang["config_comma"] = "koma";
 $lang["config_company"] = "Nama Perusahaan";
@@ -56,6 +59,7 @@ $lang["config_customer_reward_duplicate"] = "Masukkan nama unik untuk hadiah";
 $lang["config_customer_reward_enable"] = "Aktifkan Hadiah Konsumen";
 $lang["config_customer_reward_invalid_chars"] = "Nama hadiah tidak boleh berisi '_'";
 $lang["config_customer_reward_required"] = "Kolom hadiah tidak boleh kosong";
+$lang["config_customer_sales_tax_support"] = "";
 $lang["config_date_or_time_format"] = "Penyaring tanggal dan waktu";
 $lang["config_datetimeformat"] = "Format tanggal dan waktu";
 $lang["config_decimal_point"] = "Titik Desimal";
@@ -73,6 +77,7 @@ $lang["config_default_barcode_quality_number"] = "Kualitas kode batang harus ber
 $lang["config_default_barcode_quality_required"] = "Kualitas kode batang harus diisi";
 $lang["config_default_barcode_width_number"] = "Lebar kode batang harus berupa angka";
 $lang["config_default_barcode_width_required"] = "Lebar kode batang harus diisi";
+$lang["config_default_origin_tax_code"] = "";
 $lang["config_default_sales_discount"] = "Diskon Penjualan %";
 $lang["config_default_sales_discount_number"] = "Diskon penjualan harus berupa angka";
 $lang["config_default_sales_discount_required"] = "Diskon penjualan harus diisi";
@@ -99,6 +104,19 @@ $lang["config_email_smtp_port"] = "SMTP Port";
 $lang["config_email_smtp_timeout"] = "SMTP Timeout (s)";
 $lang["config_email_smtp_user"] = "SMTP Username";
 $lang["config_fax"] = "Fax";
+$lang["config_financial_year"] = "";
+$lang["config_financial_year_apr"] = "";
+$lang["config_financial_year_aug"] = "";
+$lang["config_financial_year_dec"] = "";
+$lang["config_financial_year_feb"] = "";
+$lang["config_financial_year_jan"] = "";
+$lang["config_financial_year_jul"] = "";
+$lang["config_financial_year_jun"] = "";
+$lang["config_financial_year_mar"] = "";
+$lang["config_financial_year_may"] = "";
+$lang["config_financial_year_nov"] = "";
+$lang["config_financial_year_oct"] = "";
+$lang["config_financial_year_sep"] = "";
 $lang["config_general"] = "Umum";
 $lang["config_general_configuration"] = "Pengaturan Umum";
 $lang["config_info"] = "Informasi";
diff --git a/application/language/id/customers_lang.php b/application/language/id/customers_lang.php
index bccf5167d..e4d7bd8d7 100644
--- a/application/language/id/customers_lang.php
+++ b/application/language/id/customers_lang.php
@@ -11,8 +11,7 @@ $lang["customers_discount"] = "Diskon";
 $lang["customers_error_adding_updating"] = "Menambah / Memperbarui Pelanggan Salah";
 $lang["customers_excel_import_failed"] = "Impor dari Excel tidak berhasil dilakukan";
 $lang["customers_excel_import_nodata_wrongformat"] = "Berkas yang Anda unggah tidak berisi data atau salah format";
-$lang["customers_excel_import_partially_failed"] = "Ada beberapa pelanggan yang gagal diimpor, berikut daftarnya
-Most Customers imported. But some were not, here is the list";
+$lang["customers_excel_import_partially_failed"] = "";
 $lang["customers_excel_import_success"] = "Impor pelanggan berhasil";
 $lang["customers_import_items_excel"] = "Impor pelanggan dari Excel";
 $lang["customers_new"] = "Pelanggan Baru";
@@ -21,6 +20,7 @@ $lang["customers_one_or_multiple"] = "pelanggan";
 $lang["customers_successful_adding"] = "Anda telah berhasil menambah pelanggan";
 $lang["customers_successful_deleted"] = "Anda telah berhasil menghapus pelanggan";
 $lang["customers_successful_updating"] = "Anda telah berhasil memperbarui pelanggan";
+$lang["customers_tax_code"] = "";
 $lang["customers_taxable"] = "Dapat dikenakan pajak";
 $lang["customers_total"] = "Total";
 $lang["customers_update"] = "Ubah Pelanggan";
diff --git a/application/language/id/datepicker_lang.php b/application/language/id/datepicker_lang.php
index 27cfa8cce..78fc9f2f3 100644
--- a/application/language/id/datepicker_lang.php
+++ b/application/language/id/datepicker_lang.php
@@ -7,11 +7,13 @@ $lang["datepicker_custom"] = "Kustom";
 $lang["datepicker_from"] = "Dari";
 $lang["datepicker_last_30"] = "30 Hari Terakhir";
 $lang["datepicker_last_7"] = "7 Hari Terakhir";
+$lang["datepicker_last_financial_year"] = "";
 $lang["datepicker_last_month"] = "Bulan lalu";
 $lang["datepicker_last_year"] = "Tahun lalu";
-$lang["datepicker_same_month_to_same_day_last_year"] = "Bulan yang sama untuk hari yang sama tahun yang lalu";
-$lang["datepicker_this_month"] = "Bulan ini";
 $lang["datepicker_same_month_last_year"] = "Bulan yang sama tahun kemarin";
+$lang["datepicker_same_month_to_same_day_last_year"] = "Bulan yang sama untuk hari yang sama tahun yang lalu";
+$lang["datepicker_this_financial_year"] = "";
+$lang["datepicker_this_month"] = "Bulan ini";
 $lang["datepicker_this_year"] = "Tahun ini";
 $lang["datepicker_to"] = "sampai";
 $lang["datepicker_today"] = "Hari ini";
diff --git a/application/language/id/enum_lang.php b/application/language/id/enum_lang.php
new file mode 100644
index 000000000..dde09937b
--- /dev/null
+++ b/application/language/id/enum_lang.php
@@ -0,0 +1,9 @@
+<?php 
+
+$lang["enum_half_down"] = "";
+$lang["enum_half_even"] = "";
+$lang["enum_half_five"] = "";
+$lang["enum_half_odd"] = "";
+$lang["enum_half_up"] = "";
+$lang["enum_round_down"] = "";
+$lang["enum_round_up"] = "";
diff --git a/application/language/id/items_lang.php b/application/language/id/items_lang.php
index 4828ff95d..4ec26090d 100644
--- a/application/language/id/items_lang.php
+++ b/application/language/id/items_lang.php
@@ -14,9 +14,9 @@ $lang["items_change_all_to_allow_alt_desc"] = " Diijinkan Deskripsi alternatif u
 $lang["items_change_all_to_not_allow_allow_desc"] = "Tidak Diijinkan Deskripsi alternatif untuk semua";
 $lang["items_change_all_to_serialized"] = "Ubah semua menggunakan nomor serial";
 $lang["items_change_all_to_unserialized"] = "Ubah semua tanpa nomor serial";
-$lang["items_change_image"] = "Ubah gambar";
+$lang["items_change_image"] = "Change Image";
 $lang["items_confirm_bulk_edit"] = "Apakah Anda yakin ingin merubah semua item yang dipilih?";
-$lang["items_confirm_bulk_edit_wipe_taxes"] = "Semua informasi pajak akan ditimpa!";
+$lang["items_confirm_bulk_edit_wipe_taxes"] = "All item tax information will be replaced!";
 $lang["items_confirm_delete"] = "Apakah Anda yakin ingin menghapus item yang dipilih?";
 $lang["items_cost_price"] = "Harga Pokok";
 $lang["items_cost_price_number"] = "Biaya Item harus angka";
@@ -32,20 +32,20 @@ $lang["items_empty_upc_items"] = "Empty UPC Items";
 $lang["items_error_adding_updating"] = "Kesalahan ketika menambahkan/memperbarui item";
 $lang["items_error_updating_multiple"] = "Kesalahan ketika memperbarui item";
 $lang["items_excel_import_failed"] = "Impor dari Excel tidak berhasil dilakukan";
-$lang["items_excel_import_nodata_wrongformat"] = "Berkas yang diunggal tidak berisi data atau salah format";
+$lang["items_excel_import_nodata_wrongformat"] = "Your uploaded file has no data or wrong format";
 $lang["items_excel_import_partially_failed"] = "Most Items imported. But some were not, here is the list";
-$lang["items_excel_import_success"] = "Impor barang berhasil";
+$lang["items_excel_import_success"] = "Import of Items successful";
 $lang["items_generate_barcodes"] = "Buat Barcode";
 $lang["items_image"] = "Avatar";
-$lang["items_import_items_excel"] = "Impor barang dari Excel";
+$lang["items_import_items_excel"] = "Import items from Excel sheet";
 $lang["items_info_provided_by"] = "Info disediakan oleh";
 $lang["items_inventory"] = "Inventori";
 $lang["items_inventory_comments"] = "Keterangan";
 $lang["items_is_deleted"] = "Item dihapus";
 $lang["items_is_serialized"] = "Item Memiliki Nomor Serial";
-$lang["items_item"] = "Barang";
+$lang["items_item"] = "Item";
 $lang["items_item_number"] = "Kode Barang";
-$lang["items_item_number_duplicate"] = "Nomor barang ini sudah ada pada basis data";
+$lang["items_item_number_duplicate"] = "The item number is already present in the database";
 $lang["items_kit"] = "";
 $lang["items_location"] = "Lokasi Barang";
 $lang["items_low_inventory_items"] = "Daftar Stock Rendah";
@@ -59,13 +59,13 @@ $lang["items_none"] = "Tidak Ada";
 $lang["items_none_selected"] = "Anda belum memilih item untuk diubah";
 $lang["items_nonstock"] = "";
 $lang["items_number_information"] = "Nomor Barang";
-$lang["items_number_required"] = "UPC/EAN/ISBN wajib diisi";
+$lang["items_number_required"] = "UPC/EAN/ISBN is a required field";
 $lang["items_one_or_multiple"] = "Item Barang";
 $lang["items_quantity"] = "Jumlah";
 $lang["items_quantity_number"] = "Jumlah harus angka";
 $lang["items_quantity_required"] = "Jumlah wajib diisi";
-$lang["items_receiving_quantity"] = "Jumlah Penerimaan";
-$lang["items_remove_image"] = "Hapus Gambar";
+$lang["items_receiving_quantity"] = "Receiving quantity";
+$lang["items_remove_image"] = "Remove Image";
 $lang["items_reorder_level"] = "Batas pesan ulang";
 $lang["items_reorder_level_number"] = "Batas pesan ulang harus angka";
 $lang["items_reorder_level_required"] = "Batas pesan ulang wajib diisi";
@@ -74,11 +74,11 @@ $lang["items_sales_tax_1"] = "Pajak Penjualan1";
 $lang["items_sales_tax_2"] = "Pajak Penjualan2";
 $lang["items_search_attributes"] = "";
 $lang["items_search_custom_items"] = "Cari secara manual";
-$lang["items_select_image"] = "Pilih gambar";
+$lang["items_select_image"] = "Select Image";
 $lang["items_serialized_items"] = "Serial Item";
 $lang["items_standard"] = "";
 $lang["items_stock"] = "";
-$lang["items_stock_location"] = "Lokasi Stock";
+$lang["items_stock_location"] = "Stock location";
 $lang["items_stock_type"] = "";
 $lang["items_successful_adding"] = "Item Barang telah berhasil ditambahkan";
 $lang["items_successful_bulk_edit"] = "Anda telah berhasil memperbarui item yang dipilih";
diff --git a/application/language/id/module_lang.php b/application/language/id/module_lang.php
index c571c23bf..fe5d8e9c5 100644
--- a/application/language/id/module_lang.php
+++ b/application/language/id/module_lang.php
@@ -23,3 +23,5 @@ $lang["module_sales"] = "Penjualan";
 $lang["module_sales_desc"] = "Proses Penjualan dan Retur";
 $lang["module_suppliers"] = "Pemasok";
 $lang["module_suppliers_desc"] = "Tambah, Rubah, Hapus, dan Cari Pemasok";
+$lang["module_taxes"] = "";
+$lang["module_taxes_desc"] = "";
diff --git a/application/language/id/sales_lang.php b/application/language/id/sales_lang.php
index 994e386ff..8364181d3 100644
--- a/application/language/id/sales_lang.php
+++ b/application/language/id/sales_lang.php
@@ -12,6 +12,7 @@ $lang["sales_cash_filter"] = "Kontan";
 $lang["sales_change_due"] = "Kembalian Uang";
 $lang["sales_check"] = "Cek";
 $lang["sales_check_balance"] = "Check remainder";
+$lang["sales_check_filter"] = "";
 $lang["sales_comment"] = "Catatan";
 $lang["sales_comments"] = "Keterangan";
 $lang["sales_complete_sale"] = "Entri penjualan";
@@ -105,6 +106,7 @@ $lang["sales_sale"] = "Penjualan";
 $lang["sales_sale_by_invoice"] = "";
 $lang["sales_sale_for_customer"] = "Pelanggan:";
 $lang["sales_sale_time"] = "Waktu";
+$lang["sales_sales_tax"] = "";
 $lang["sales_select_customer"] = "Pilih Pelanggan (Opsional)";
 $lang["sales_send_invoice"] = "Kirim Faktur";
 $lang["sales_send_quote"] = "";
diff --git a/application/language/id/taxes_lang.php b/application/language/id/taxes_lang.php
new file mode 100644
index 000000000..feb59c695
--- /dev/null
+++ b/application/language/id/taxes_lang.php
@@ -0,0 +1,31 @@
+<?php 
+
+$lang["taxes_add_exception"] = "";
+$lang["taxes_confirm_delete"] = "";
+$lang["taxes_default_tax_category"] = "";
+$lang["taxes_error_adding_updating"] = "";
+$lang["taxes_new"] = "";
+$lang["taxes_no_taxes_to_display"] = "";
+$lang["taxes_round_half_down"] = "";
+$lang["taxes_round_half_even"] = "";
+$lang["taxes_round_half_odd"] = "";
+$lang["taxes_round_half_up"] = "";
+$lang["taxes_rounding_code"] = "";
+$lang["taxes_sales_tax"] = "";
+$lang["taxes_sales_tax_by_invoice"] = "";
+$lang["taxes_successful_deleted"] = "";
+$lang["taxes_tax_category"] = "";
+$lang["taxes_tax_code"] = "";
+$lang["taxes_tax_code_cannot_be_deleted"] = "";
+$lang["taxes_tax_code_name"] = "";
+$lang["taxes_tax_code_required"] = "";
+$lang["taxes_tax_code_successful_deleted"] = "";
+$lang["taxes_tax_code_successful_updated"] = "";
+$lang["taxes_tax_code_successful_updating"] = "";
+$lang["taxes_tax_code_successfully_added"] = "";
+$lang["taxes_tax_code_type"] = "";
+$lang["taxes_tax_rate"] = "";
+$lang["taxes_tax_rate_numeric"] = "";
+$lang["taxes_tax_rate_required"] = "";
+$lang["taxes_update"] = "";
+$lang["taxes_vat_tax"] = "";
diff --git a/application/language/nl-BE/config_lang.php b/application/language/nl-BE/config_lang.php
index bdd1b24bc..02ec92d5d 100755
--- a/application/language/nl-BE/config_lang.php
+++ b/application/language/nl-BE/config_lang.php
@@ -28,6 +28,9 @@ $lang["config_barcode_third_row"] = "Rij 3";
 $lang["config_barcode_type"] = "Barcode Type";
 $lang["config_barcode_width"] = "Breedte (px)";
 $lang["config_bottom"] = "Bottom";
+$lang["config_cash_decimals"] = "";
+$lang["config_cash_decimals_tooltip"] = "";
+$lang["config_cash_rounding"] = "";
 $lang["config_center"] = "Midden";
 $lang["config_comma"] = "komma";
 $lang["config_company"] = "Bedrijfsnaam";
@@ -56,6 +59,7 @@ $lang["config_customer_reward_duplicate"] = "";
 $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_datetimeformat"] = "Datum en tijd formaat";
 $lang["config_decimal_point"] = "Decimale punt";
@@ -73,6 +77,7 @@ $lang["config_default_barcode_quality_number"] = "De standaard barcode kwaliteit
 $lang["config_default_barcode_quality_required"] = "De standaard barcode kwaliteit is een verplicht veld";
 $lang["config_default_barcode_width_number"] = "De standaard breedte van de barcode moet een getal zijn";
 $lang["config_default_barcode_width_required"] = "De standaard breedte van de barcode is een verplicht veld";
+$lang["config_default_origin_tax_code"] = "";
 $lang["config_default_sales_discount"] = "Standaard Korting %";
 $lang["config_default_sales_discount_number"] = "De standaard korting moet een getal zijn";
 $lang["config_default_sales_discount_required"] = "De standaard korting is een verplicht veld";
@@ -99,6 +104,19 @@ $lang["config_email_smtp_port"] = "SMTP Poort";
 $lang["config_email_smtp_timeout"] = "SMTP Time-out (s)";
 $lang["config_email_smtp_user"] = "SMTP Gebruikersnaam";
 $lang["config_fax"] = "Fax";
+$lang["config_financial_year"] = "";
+$lang["config_financial_year_apr"] = "";
+$lang["config_financial_year_aug"] = "";
+$lang["config_financial_year_dec"] = "";
+$lang["config_financial_year_feb"] = "";
+$lang["config_financial_year_jan"] = "";
+$lang["config_financial_year_jul"] = "";
+$lang["config_financial_year_jun"] = "";
+$lang["config_financial_year_mar"] = "";
+$lang["config_financial_year_may"] = "";
+$lang["config_financial_year_nov"] = "";
+$lang["config_financial_year_oct"] = "";
+$lang["config_financial_year_sep"] = "";
 $lang["config_general"] = "Algemene";
 $lang["config_general_configuration"] = "Algemene Instellingen";
 $lang["config_info"] = "Instellingen";
diff --git a/application/language/nl-BE/customers_lang.php b/application/language/nl-BE/customers_lang.php
index 025210d5b..88486c62f 100755
--- a/application/language/nl-BE/customers_lang.php
+++ b/application/language/nl-BE/customers_lang.php
@@ -20,6 +20,7 @@ $lang["customers_one_or_multiple"] = "klant(en) verwijderd";
 $lang["customers_successful_adding"] = "Klant succesvol aangemaakt";
 $lang["customers_successful_deleted"] = "Er werd(en)";
 $lang["customers_successful_updating"] = "Wijzigingen klantgegevens bewaard voor ";
+$lang["customers_tax_code"] = "";
 $lang["customers_taxable"] = "Belastbaar";
 $lang["customers_total"] = "Totaal";
 $lang["customers_update"] = "Bewerk Klant";
diff --git a/application/language/nl-BE/datepicker_lang.php b/application/language/nl-BE/datepicker_lang.php
index f901afd88..0022c2493 100644
--- a/application/language/nl-BE/datepicker_lang.php
+++ b/application/language/nl-BE/datepicker_lang.php
@@ -7,11 +7,13 @@ $lang["datepicker_custom"] = "Aangepaste";
 $lang["datepicker_from"] = "Van";
 $lang["datepicker_last_30"] = "Vorige 30 Dagen";
 $lang["datepicker_last_7"] = "Vorige 7 Dagen";
+$lang["datepicker_last_financial_year"] = "";
 $lang["datepicker_last_month"] = "Vorige Maand";
 $lang["datepicker_last_year"] = "Vorig Jaar";
-$lang["datepicker_same_month_to_same_day_last_year"] = "Dezelfde maand op dezelfde dag vorig jaar";
-$lang["datepicker_this_month"] = "Deze Maand";
 $lang["datepicker_same_month_last_year"] = "Dezelfde maand vorig jaar";
+$lang["datepicker_same_month_to_same_day_last_year"] = "Dezelfde maand op dezelfde dag vorig jaar";
+$lang["datepicker_this_financial_year"] = "";
+$lang["datepicker_this_month"] = "Deze Maand";
 $lang["datepicker_this_year"] = "Dit Jaar";
 $lang["datepicker_to"] = "To";
 $lang["datepicker_today"] = "Vandaag";
diff --git a/application/language/nl-BE/enum_lang.php b/application/language/nl-BE/enum_lang.php
new file mode 100644
index 000000000..dde09937b
--- /dev/null
+++ b/application/language/nl-BE/enum_lang.php
@@ -0,0 +1,9 @@
+<?php 
+
+$lang["enum_half_down"] = "";
+$lang["enum_half_even"] = "";
+$lang["enum_half_five"] = "";
+$lang["enum_half_odd"] = "";
+$lang["enum_half_up"] = "";
+$lang["enum_round_down"] = "";
+$lang["enum_round_up"] = "";
diff --git a/application/language/nl-BE/module_lang.php b/application/language/nl-BE/module_lang.php
index 049c28c92..75ea14b4d 100755
--- a/application/language/nl-BE/module_lang.php
+++ b/application/language/nl-BE/module_lang.php
@@ -23,3 +23,5 @@ $lang["module_sales"] = "Kassa";
 $lang["module_sales_desc"] = "Verwerk aankopen en retours";
 $lang["module_suppliers"] = "Leveranciers";
 $lang["module_suppliers_desc"] = "Zoek, bewerk, verwijder en voeg leveranciers toe";
+$lang["module_taxes"] = "";
+$lang["module_taxes_desc"] = "";
diff --git a/application/language/nl-BE/sales_lang.php b/application/language/nl-BE/sales_lang.php
index 4fb3a9ea9..ce8a57b14 100755
--- a/application/language/nl-BE/sales_lang.php
+++ b/application/language/nl-BE/sales_lang.php
@@ -12,6 +12,7 @@ $lang["sales_cash_filter"] = "Contant";
 $lang["sales_change_due"] = "Wisselgeld terug";
 $lang["sales_check"] = "Waardebon";
 $lang["sales_check_balance"] = "Waardebon terug";
+$lang["sales_check_filter"] = "";
 $lang["sales_comment"] = "Commentaar";
 $lang["sales_comments"] = "Commentaar";
 $lang["sales_complete_sale"] = "Bevestig";
@@ -105,6 +106,7 @@ $lang["sales_sale"] = "Verkoop";
 $lang["sales_sale_by_invoice"] = "";
 $lang["sales_sale_for_customer"] = "Klant:";
 $lang["sales_sale_time"] = "Datum";
+$lang["sales_sales_tax"] = "";
 $lang["sales_select_customer"] = "Selecteer Klant (Optioneel)";
 $lang["sales_send_invoice"] = "Vestuur Factuur";
 $lang["sales_send_quote"] = "";
diff --git a/application/language/nl-BE/taxes_lang.php b/application/language/nl-BE/taxes_lang.php
new file mode 100644
index 000000000..feb59c695
--- /dev/null
+++ b/application/language/nl-BE/taxes_lang.php
@@ -0,0 +1,31 @@
+<?php 
+
+$lang["taxes_add_exception"] = "";
+$lang["taxes_confirm_delete"] = "";
+$lang["taxes_default_tax_category"] = "";
+$lang["taxes_error_adding_updating"] = "";
+$lang["taxes_new"] = "";
+$lang["taxes_no_taxes_to_display"] = "";
+$lang["taxes_round_half_down"] = "";
+$lang["taxes_round_half_even"] = "";
+$lang["taxes_round_half_odd"] = "";
+$lang["taxes_round_half_up"] = "";
+$lang["taxes_rounding_code"] = "";
+$lang["taxes_sales_tax"] = "";
+$lang["taxes_sales_tax_by_invoice"] = "";
+$lang["taxes_successful_deleted"] = "";
+$lang["taxes_tax_category"] = "";
+$lang["taxes_tax_code"] = "";
+$lang["taxes_tax_code_cannot_be_deleted"] = "";
+$lang["taxes_tax_code_name"] = "";
+$lang["taxes_tax_code_required"] = "";
+$lang["taxes_tax_code_successful_deleted"] = "";
+$lang["taxes_tax_code_successful_updated"] = "";
+$lang["taxes_tax_code_successful_updating"] = "";
+$lang["taxes_tax_code_successfully_added"] = "";
+$lang["taxes_tax_code_type"] = "";
+$lang["taxes_tax_rate"] = "";
+$lang["taxes_tax_rate_numeric"] = "";
+$lang["taxes_tax_rate_required"] = "";
+$lang["taxes_update"] = "";
+$lang["taxes_vat_tax"] = "";
diff --git a/application/language/pt-BR/config_lang.php b/application/language/pt-BR/config_lang.php
index 906014bda..805e5ce25 100644
--- a/application/language/pt-BR/config_lang.php
+++ b/application/language/pt-BR/config_lang.php
@@ -28,6 +28,9 @@ $lang["config_barcode_third_row"] = "Linha 3";
 $lang["config_barcode_type"] = "Tipo de código de barras";
 $lang["config_barcode_width"] = "Largura (px)";
 $lang["config_bottom"] = "Inferior";
+$lang["config_cash_decimals"] = "";
+$lang["config_cash_decimals_tooltip"] = "";
+$lang["config_cash_rounding"] = "";
 $lang["config_center"] = "Centro";
 $lang["config_comma"] = "Vírgula";
 $lang["config_company"] = "Nome da empresa";
@@ -56,6 +59,7 @@ $lang["config_customer_reward_duplicate"] = "";
 $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_datetimeformat"] = "Formato da data e hora";
 $lang["config_decimal_point"] = "Ponto decimal";
@@ -73,6 +77,7 @@ $lang["config_default_barcode_quality_number"] = "A qualidade de código de barr
 $lang["config_default_barcode_quality_required"] = "A qualidade de código de barras padrão é um campo obrigatório";
 $lang["config_default_barcode_width_number"] = "A largura do código de barras padrão deve ser um número";
 $lang["config_default_barcode_width_required"] = "A largura do código de barras padrão é um campo obrigatório";
+$lang["config_default_origin_tax_code"] = "";
 $lang["config_default_sales_discount"] = "Desconto de vendas padrão %";
 $lang["config_default_sales_discount_number"] = "O desconto de vendas padrão deve ser um número";
 $lang["config_default_sales_discount_required"] = "O desconto de vendas padrão é um campo obrigatório";
@@ -99,6 +104,19 @@ $lang["config_email_smtp_port"] = "Porta SMTP";
 $lang["config_email_smtp_timeout"] = "SMTP Tempo esgotado";
 $lang["config_email_smtp_user"] = "Nome de usuário SMTP";
 $lang["config_fax"] = "Fax";
+$lang["config_financial_year"] = "";
+$lang["config_financial_year_apr"] = "";
+$lang["config_financial_year_aug"] = "";
+$lang["config_financial_year_dec"] = "";
+$lang["config_financial_year_feb"] = "";
+$lang["config_financial_year_jan"] = "";
+$lang["config_financial_year_jul"] = "";
+$lang["config_financial_year_jun"] = "";
+$lang["config_financial_year_mar"] = "";
+$lang["config_financial_year_may"] = "";
+$lang["config_financial_year_nov"] = "";
+$lang["config_financial_year_oct"] = "";
+$lang["config_financial_year_sep"] = "";
 $lang["config_general"] = "Gerais";
 $lang["config_general_configuration"] = "Configurações Gerais";
 $lang["config_info"] = "Informações";
diff --git a/application/language/pt-BR/customers_lang.php b/application/language/pt-BR/customers_lang.php
index 66f22ce32..71d55d497 100644
--- a/application/language/pt-BR/customers_lang.php
+++ b/application/language/pt-BR/customers_lang.php
@@ -20,6 +20,7 @@ $lang["customers_one_or_multiple"] = "Cliente(s)";
 $lang["customers_successful_adding"] = "Você adicionou o cliente com sucesso";
 $lang["customers_successful_deleted"] = "Você excluiu com sucesso";
 $lang["customers_successful_updating"] = "Você atualizou o cliente com secesso";
+$lang["customers_tax_code"] = "";
 $lang["customers_taxable"] = "Tributável";
 $lang["customers_total"] = "Total";
 $lang["customers_update"] = "Atualizar Cliente";
diff --git a/application/language/pt-BR/datepicker_lang.php b/application/language/pt-BR/datepicker_lang.php
index 7050bb9eb..e54a64f12 100644
--- a/application/language/pt-BR/datepicker_lang.php
+++ b/application/language/pt-BR/datepicker_lang.php
@@ -7,11 +7,13 @@ $lang["datepicker_custom"] = "Cliente";
 $lang["datepicker_from"] = "De";
 $lang["datepicker_last_30"] = "Últimos 30 Dias";
 $lang["datepicker_last_7"] = "Últimos 7 Dias";
+$lang["datepicker_last_financial_year"] = "";
 $lang["datepicker_last_month"] = "Último Mês";
 $lang["datepicker_last_year"] = "Último ano";
-$lang["datepicker_same_month_to_same_day_last_year"] = "Este mês Para Hoje Último Ano";
-$lang["datepicker_this_month"] = "Este Mês";
 $lang["datepicker_same_month_last_year"] = "Este mês último ano";
+$lang["datepicker_same_month_to_same_day_last_year"] = "Este mês Para Hoje Último Ano";
+$lang["datepicker_this_financial_year"] = "";
+$lang["datepicker_this_month"] = "Este Mês";
 $lang["datepicker_this_year"] = "Este Ano";
 $lang["datepicker_to"] = "Para";
 $lang["datepicker_today"] = "Hoje";
diff --git a/application/language/pt-BR/enum_lang.php b/application/language/pt-BR/enum_lang.php
new file mode 100644
index 000000000..dde09937b
--- /dev/null
+++ b/application/language/pt-BR/enum_lang.php
@@ -0,0 +1,9 @@
+<?php 
+
+$lang["enum_half_down"] = "";
+$lang["enum_half_even"] = "";
+$lang["enum_half_five"] = "";
+$lang["enum_half_odd"] = "";
+$lang["enum_half_up"] = "";
+$lang["enum_round_down"] = "";
+$lang["enum_round_up"] = "";
diff --git a/application/language/pt-BR/module_lang.php b/application/language/pt-BR/module_lang.php
index 8c12e9e76..98b8ea581 100644
--- a/application/language/pt-BR/module_lang.php
+++ b/application/language/pt-BR/module_lang.php
@@ -23,3 +23,5 @@ $lang["module_sales"] = "Vendas";
 $lang["module_sales_desc"] = "Processar vendas e devoluções";
 $lang["module_suppliers"] = "Fornecedores";
 $lang["module_suppliers_desc"] = "Adicionar,  atualizar,  excluir e Pesquisar fornecedores";
+$lang["module_taxes"] = "";
+$lang["module_taxes_desc"] = "";
diff --git a/application/language/pt-BR/sales_lang.php b/application/language/pt-BR/sales_lang.php
index dea3e3260..568b1992b 100644
--- a/application/language/pt-BR/sales_lang.php
+++ b/application/language/pt-BR/sales_lang.php
@@ -12,6 +12,7 @@ $lang["sales_cash_filter"] = "Dinheiro";
 $lang["sales_change_due"] = "Troco";
 $lang["sales_check"] = "Cheque";
 $lang["sales_check_balance"] = "Cheque restante";
+$lang["sales_check_filter"] = "";
 $lang["sales_comment"] = "Cementário";
 $lang["sales_comments"] = "Comentários";
 $lang["sales_complete_sale"] = "Finalizar";
@@ -105,6 +106,7 @@ $lang["sales_sale"] = "Venda";
 $lang["sales_sale_by_invoice"] = "";
 $lang["sales_sale_for_customer"] = "Cliente:";
 $lang["sales_sale_time"] = "Data";
+$lang["sales_sales_tax"] = "";
 $lang["sales_select_customer"] = "Selecionar Cliente (Opcional)";
 $lang["sales_send_invoice"] = "Enviar fatura";
 $lang["sales_send_quote"] = "";
diff --git a/application/language/pt-BR/taxes_lang.php b/application/language/pt-BR/taxes_lang.php
new file mode 100644
index 000000000..feb59c695
--- /dev/null
+++ b/application/language/pt-BR/taxes_lang.php
@@ -0,0 +1,31 @@
+<?php 
+
+$lang["taxes_add_exception"] = "";
+$lang["taxes_confirm_delete"] = "";
+$lang["taxes_default_tax_category"] = "";
+$lang["taxes_error_adding_updating"] = "";
+$lang["taxes_new"] = "";
+$lang["taxes_no_taxes_to_display"] = "";
+$lang["taxes_round_half_down"] = "";
+$lang["taxes_round_half_even"] = "";
+$lang["taxes_round_half_odd"] = "";
+$lang["taxes_round_half_up"] = "";
+$lang["taxes_rounding_code"] = "";
+$lang["taxes_sales_tax"] = "";
+$lang["taxes_sales_tax_by_invoice"] = "";
+$lang["taxes_successful_deleted"] = "";
+$lang["taxes_tax_category"] = "";
+$lang["taxes_tax_code"] = "";
+$lang["taxes_tax_code_cannot_be_deleted"] = "";
+$lang["taxes_tax_code_name"] = "";
+$lang["taxes_tax_code_required"] = "";
+$lang["taxes_tax_code_successful_deleted"] = "";
+$lang["taxes_tax_code_successful_updated"] = "";
+$lang["taxes_tax_code_successful_updating"] = "";
+$lang["taxes_tax_code_successfully_added"] = "";
+$lang["taxes_tax_code_type"] = "";
+$lang["taxes_tax_rate"] = "";
+$lang["taxes_tax_rate_numeric"] = "";
+$lang["taxes_tax_rate_required"] = "";
+$lang["taxes_update"] = "";
+$lang["taxes_vat_tax"] = "";
diff --git a/application/language/ru/config_lang.php b/application/language/ru/config_lang.php
index 818753da3..9f8bbb344 100644
--- a/application/language/ru/config_lang.php
+++ b/application/language/ru/config_lang.php
@@ -28,6 +28,9 @@ $lang["config_barcode_third_row"] = "Row 6";
 $lang["config_barcode_type"] = "Barcode Type";
 $lang["config_barcode_width"] = "Width (px)";
 $lang["config_bottom"] = "Bottom";
+$lang["config_cash_decimals"] = "";
+$lang["config_cash_decimals_tooltip"] = "";
+$lang["config_cash_rounding"] = "";
 $lang["config_center"] = "Center";
 $lang["config_comma"] = "comma";
 $lang["config_company"] = "Название Компании";
@@ -56,6 +59,7 @@ $lang["config_customer_reward_duplicate"] = "";
 $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_datetimeformat"] = "Date and Time format";
 $lang["config_decimal_point"] = " Decimal Point";
@@ -73,6 +77,7 @@ $lang["config_default_barcode_quality_number"] = "The default barcode quality mu
 $lang["config_default_barcode_quality_required"] = "The default barcode quality is a required field";
 $lang["config_default_barcode_width_number"] = "The default barcode width must be a number";
 $lang["config_default_barcode_width_required"] = "The default barcode width is a required field";
+$lang["config_default_origin_tax_code"] = "";
 $lang["config_default_sales_discount"] = "Default Sales Discount %";
 $lang["config_default_sales_discount_number"] = "The default sales discount must be a number";
 $lang["config_default_sales_discount_required"] = "The default sales discount is a required field";
@@ -99,6 +104,19 @@ $lang["config_email_smtp_port"] = "SMTP Port";
 $lang["config_email_smtp_timeout"] = "SMTP Timeout (s)";
 $lang["config_email_smtp_user"] = "SMTP Username";
 $lang["config_fax"] = "Факс";
+$lang["config_financial_year"] = "";
+$lang["config_financial_year_apr"] = "";
+$lang["config_financial_year_aug"] = "";
+$lang["config_financial_year_dec"] = "";
+$lang["config_financial_year_feb"] = "";
+$lang["config_financial_year_jan"] = "";
+$lang["config_financial_year_jul"] = "";
+$lang["config_financial_year_jun"] = "";
+$lang["config_financial_year_mar"] = "";
+$lang["config_financial_year_may"] = "";
+$lang["config_financial_year_nov"] = "";
+$lang["config_financial_year_oct"] = "";
+$lang["config_financial_year_sep"] = "";
 $lang["config_general"] = "General";
 $lang["config_general_configuration"] = "General Configuration";
 $lang["config_info"] = "информация о магазин конфигурация";
diff --git a/application/language/ru/customers_lang.php b/application/language/ru/customers_lang.php
index 8c0e0682c..2a8e1077c 100644
--- a/application/language/ru/customers_lang.php
+++ b/application/language/ru/customers_lang.php
@@ -20,6 +20,7 @@ $lang["customers_one_or_multiple"] = "клиент(ов)";
 $lang["customers_successful_adding"] = "Вы успешно добавили клиентов";
 $lang["customers_successful_deleted"] = "Вы успешно удалили";
 $lang["customers_successful_updating"] = "Вы успешно обновили клиент";
+$lang["customers_tax_code"] = "";
 $lang["customers_taxable"] = "облагаемый";
 $lang["customers_total"] = "Total";
 $lang["customers_update"] = "Обновлять Клиент";
diff --git a/application/language/ru/datepicker_lang.php b/application/language/ru/datepicker_lang.php
index b6f3f8330..465893fc6 100644
--- a/application/language/ru/datepicker_lang.php
+++ b/application/language/ru/datepicker_lang.php
@@ -7,11 +7,13 @@ $lang["datepicker_custom"] = "Custom";
 $lang["datepicker_from"] = "From";
 $lang["datepicker_last_30"] = "Последние 30 дней";
 $lang["datepicker_last_7"] = "Последние 7 дней";
+$lang["datepicker_last_financial_year"] = "";
 $lang["datepicker_last_month"] = "Последний месяц";
 $lang["datepicker_last_year"] = "в прошлом году";
-$lang["datepicker_same_month_to_same_day_last_year"] = "Same Month To Same Day Last Year";
-$lang["datepicker_this_month"] = "В этом месяце";
 $lang["datepicker_same_month_last_year"] = "Same Month Last Year";
+$lang["datepicker_same_month_to_same_day_last_year"] = "Same Month To Same Day Last Year";
+$lang["datepicker_this_financial_year"] = "";
+$lang["datepicker_this_month"] = "В этом месяце";
 $lang["datepicker_this_year"] = "В этом году";
 $lang["datepicker_to"] = "To";
 $lang["datepicker_today"] = "сегодня";
diff --git a/application/language/ru/enum_lang.php b/application/language/ru/enum_lang.php
new file mode 100644
index 000000000..dde09937b
--- /dev/null
+++ b/application/language/ru/enum_lang.php
@@ -0,0 +1,9 @@
+<?php 
+
+$lang["enum_half_down"] = "";
+$lang["enum_half_even"] = "";
+$lang["enum_half_five"] = "";
+$lang["enum_half_odd"] = "";
+$lang["enum_half_up"] = "";
+$lang["enum_round_down"] = "";
+$lang["enum_round_up"] = "";
diff --git a/application/language/ru/module_lang.php b/application/language/ru/module_lang.php
index 562d2e77d..12e7facc4 100644
--- a/application/language/ru/module_lang.php
+++ b/application/language/ru/module_lang.php
@@ -23,3 +23,5 @@ $lang["module_sales"] = "Продажа";
 $lang["module_sales_desc"] = "Процесс продажи и возвращается";
 $lang["module_suppliers"] = "Поставщики";
 $lang["module_suppliers_desc"] = "Добавление, обновление, удаление и поиск suppliers";
+$lang["module_taxes"] = "";
+$lang["module_taxes_desc"] = "";
diff --git a/application/language/ru/sales_lang.php b/application/language/ru/sales_lang.php
index 478bf004e..e5c6158ec 100644
--- a/application/language/ru/sales_lang.php
+++ b/application/language/ru/sales_lang.php
@@ -12,6 +12,7 @@ $lang["sales_cash_filter"] = "Cash";
 $lang["sales_change_due"] = "сдача должное";
 $lang["sales_check"] = "банковский чек";
 $lang["sales_check_balance"] = "Check remainder";
+$lang["sales_check_filter"] = "";
 $lang["sales_comment"] = "комментировать";
 $lang["sales_comments"] = "Комментарии";
 $lang["sales_complete_sale"] = "Завершить продажу";
@@ -105,6 +106,7 @@ $lang["sales_sale"] = "Продажа";
 $lang["sales_sale_by_invoice"] = "";
 $lang["sales_sale_for_customer"] = "Клиент:";
 $lang["sales_sale_time"] = "Time";
+$lang["sales_sales_tax"] = "";
 $lang["sales_select_customer"] = "Выберите клиента (необязательно)";
 $lang["sales_send_invoice"] = "Send Invoice";
 $lang["sales_send_quote"] = "";
diff --git a/application/language/ru/taxes_lang.php b/application/language/ru/taxes_lang.php
new file mode 100644
index 000000000..feb59c695
--- /dev/null
+++ b/application/language/ru/taxes_lang.php
@@ -0,0 +1,31 @@
+<?php 
+
+$lang["taxes_add_exception"] = "";
+$lang["taxes_confirm_delete"] = "";
+$lang["taxes_default_tax_category"] = "";
+$lang["taxes_error_adding_updating"] = "";
+$lang["taxes_new"] = "";
+$lang["taxes_no_taxes_to_display"] = "";
+$lang["taxes_round_half_down"] = "";
+$lang["taxes_round_half_even"] = "";
+$lang["taxes_round_half_odd"] = "";
+$lang["taxes_round_half_up"] = "";
+$lang["taxes_rounding_code"] = "";
+$lang["taxes_sales_tax"] = "";
+$lang["taxes_sales_tax_by_invoice"] = "";
+$lang["taxes_successful_deleted"] = "";
+$lang["taxes_tax_category"] = "";
+$lang["taxes_tax_code"] = "";
+$lang["taxes_tax_code_cannot_be_deleted"] = "";
+$lang["taxes_tax_code_name"] = "";
+$lang["taxes_tax_code_required"] = "";
+$lang["taxes_tax_code_successful_deleted"] = "";
+$lang["taxes_tax_code_successful_updated"] = "";
+$lang["taxes_tax_code_successful_updating"] = "";
+$lang["taxes_tax_code_successfully_added"] = "";
+$lang["taxes_tax_code_type"] = "";
+$lang["taxes_tax_rate"] = "";
+$lang["taxes_tax_rate_numeric"] = "";
+$lang["taxes_tax_rate_required"] = "";
+$lang["taxes_update"] = "";
+$lang["taxes_vat_tax"] = "";
diff --git a/application/language/sv/config_lang.php b/application/language/sv/config_lang.php
index 8f1b8daf6..009e34bbf 100644
--- a/application/language/sv/config_lang.php
+++ b/application/language/sv/config_lang.php
@@ -28,6 +28,9 @@ $lang["config_barcode_third_row"] = "";
 $lang["config_barcode_type"] = "";
 $lang["config_barcode_width"] = "";
 $lang["config_bottom"] = "";
+$lang["config_cash_decimals"] = "";
+$lang["config_cash_decimals_tooltip"] = "";
+$lang["config_cash_rounding"] = "";
 $lang["config_center"] = "";
 $lang["config_comma"] = "";
 $lang["config_company"] = "";
@@ -56,6 +59,7 @@ $lang["config_customer_reward_duplicate"] = "";
 $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_datetimeformat"] = "";
 $lang["config_decimal_point"] = "";
@@ -73,6 +77,7 @@ $lang["config_default_barcode_quality_number"] = "";
 $lang["config_default_barcode_quality_required"] = "";
 $lang["config_default_barcode_width_number"] = "";
 $lang["config_default_barcode_width_required"] = "";
+$lang["config_default_origin_tax_code"] = "";
 $lang["config_default_sales_discount"] = "";
 $lang["config_default_sales_discount_number"] = "";
 $lang["config_default_sales_discount_required"] = "";
@@ -99,6 +104,19 @@ $lang["config_email_smtp_port"] = "";
 $lang["config_email_smtp_timeout"] = "";
 $lang["config_email_smtp_user"] = "";
 $lang["config_fax"] = "";
+$lang["config_financial_year"] = "";
+$lang["config_financial_year_apr"] = "";
+$lang["config_financial_year_aug"] = "";
+$lang["config_financial_year_dec"] = "";
+$lang["config_financial_year_feb"] = "";
+$lang["config_financial_year_jan"] = "";
+$lang["config_financial_year_jul"] = "";
+$lang["config_financial_year_jun"] = "";
+$lang["config_financial_year_mar"] = "";
+$lang["config_financial_year_may"] = "";
+$lang["config_financial_year_nov"] = "";
+$lang["config_financial_year_oct"] = "";
+$lang["config_financial_year_sep"] = "";
 $lang["config_general"] = "";
 $lang["config_general_configuration"] = "";
 $lang["config_info"] = "";
diff --git a/application/language/sv/customers_lang.php b/application/language/sv/customers_lang.php
index badc00315..65b76d4ee 100644
--- a/application/language/sv/customers_lang.php
+++ b/application/language/sv/customers_lang.php
@@ -20,6 +20,7 @@ $lang["customers_one_or_multiple"] = "";
 $lang["customers_successful_adding"] = "";
 $lang["customers_successful_deleted"] = "";
 $lang["customers_successful_updating"] = "";
+$lang["customers_tax_code"] = "";
 $lang["customers_taxable"] = "";
 $lang["customers_total"] = "";
 $lang["customers_update"] = "";
diff --git a/application/language/sv/datepicker_lang.php b/application/language/sv/datepicker_lang.php
index d251948d4..f8d23888d 100644
--- a/application/language/sv/datepicker_lang.php
+++ b/application/language/sv/datepicker_lang.php
@@ -7,10 +7,12 @@ $lang["datepicker_custom"] = "";
 $lang["datepicker_from"] = "";
 $lang["datepicker_last_30"] = "";
 $lang["datepicker_last_7"] = "";
+$lang["datepicker_last_financial_year"] = "";
 $lang["datepicker_last_month"] = "";
 $lang["datepicker_last_year"] = "";
-$lang["datepicker_same_month_to_same_day_last_year"] = "";
 $lang["datepicker_same_month_last_year"] = "";
+$lang["datepicker_same_month_to_same_day_last_year"] = "";
+$lang["datepicker_this_financial_year"] = "";
 $lang["datepicker_this_month"] = "";
 $lang["datepicker_this_year"] = "";
 $lang["datepicker_to"] = "";
diff --git a/application/language/sv/enum_lang.php b/application/language/sv/enum_lang.php
new file mode 100644
index 000000000..dde09937b
--- /dev/null
+++ b/application/language/sv/enum_lang.php
@@ -0,0 +1,9 @@
+<?php 
+
+$lang["enum_half_down"] = "";
+$lang["enum_half_even"] = "";
+$lang["enum_half_five"] = "";
+$lang["enum_half_odd"] = "";
+$lang["enum_half_up"] = "";
+$lang["enum_round_down"] = "";
+$lang["enum_round_up"] = "";
diff --git a/application/language/sv/module_lang.php b/application/language/sv/module_lang.php
index 9f8f6c9e8..b324a058e 100644
--- a/application/language/sv/module_lang.php
+++ b/application/language/sv/module_lang.php
@@ -23,3 +23,5 @@ $lang["module_sales"] = "";
 $lang["module_sales_desc"] = "";
 $lang["module_suppliers"] = "";
 $lang["module_suppliers_desc"] = "";
+$lang["module_taxes"] = "";
+$lang["module_taxes_desc"] = "";
diff --git a/application/language/sv/sales_lang.php b/application/language/sv/sales_lang.php
index 9520d53d0..6edb486ec 100644
--- a/application/language/sv/sales_lang.php
+++ b/application/language/sv/sales_lang.php
@@ -12,6 +12,7 @@ $lang["sales_cash_filter"] = "";
 $lang["sales_change_due"] = "";
 $lang["sales_check"] = "";
 $lang["sales_check_balance"] = "";
+$lang["sales_check_filter"] = "";
 $lang["sales_comment"] = "";
 $lang["sales_comments"] = "";
 $lang["sales_complete_sale"] = "";
@@ -105,6 +106,7 @@ $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"] = "";
diff --git a/application/language/sv/taxes_lang.php b/application/language/sv/taxes_lang.php
new file mode 100644
index 000000000..feb59c695
--- /dev/null
+++ b/application/language/sv/taxes_lang.php
@@ -0,0 +1,31 @@
+<?php 
+
+$lang["taxes_add_exception"] = "";
+$lang["taxes_confirm_delete"] = "";
+$lang["taxes_default_tax_category"] = "";
+$lang["taxes_error_adding_updating"] = "";
+$lang["taxes_new"] = "";
+$lang["taxes_no_taxes_to_display"] = "";
+$lang["taxes_round_half_down"] = "";
+$lang["taxes_round_half_even"] = "";
+$lang["taxes_round_half_odd"] = "";
+$lang["taxes_round_half_up"] = "";
+$lang["taxes_rounding_code"] = "";
+$lang["taxes_sales_tax"] = "";
+$lang["taxes_sales_tax_by_invoice"] = "";
+$lang["taxes_successful_deleted"] = "";
+$lang["taxes_tax_category"] = "";
+$lang["taxes_tax_code"] = "";
+$lang["taxes_tax_code_cannot_be_deleted"] = "";
+$lang["taxes_tax_code_name"] = "";
+$lang["taxes_tax_code_required"] = "";
+$lang["taxes_tax_code_successful_deleted"] = "";
+$lang["taxes_tax_code_successful_updated"] = "";
+$lang["taxes_tax_code_successful_updating"] = "";
+$lang["taxes_tax_code_successfully_added"] = "";
+$lang["taxes_tax_code_type"] = "";
+$lang["taxes_tax_rate"] = "";
+$lang["taxes_tax_rate_numeric"] = "";
+$lang["taxes_tax_rate_required"] = "";
+$lang["taxes_update"] = "";
+$lang["taxes_vat_tax"] = "";
diff --git a/application/language/th/config_lang.php b/application/language/th/config_lang.php
index 8468d8591..d303fdb48 100644
--- a/application/language/th/config_lang.php
+++ b/application/language/th/config_lang.php
@@ -28,6 +28,9 @@ $lang["config_barcode_third_row"] = "แถว 3";
 $lang["config_barcode_type"] = "ประเภทบาร์โค้ด";
 $lang["config_barcode_width"] = "กว้าง (px)";
 $lang["config_bottom"] = "Bottom";
+$lang["config_cash_decimals"] = "";
+$lang["config_cash_decimals_tooltip"] = "";
+$lang["config_cash_rounding"] = "";
 $lang["config_center"] = "Center";
 $lang["config_comma"] = "comma";
 $lang["config_company"] = "ชื่อร้านค้า";
@@ -56,6 +59,7 @@ $lang["config_customer_reward_duplicate"] = "";
 $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_datetimeformat"] = "รูปแบบวันเวลา";
 $lang["config_decimal_point"] = "จุดทศนิยม";
@@ -73,6 +77,7 @@ $lang["config_default_barcode_quality_number"] = "The default barcode quality mu
 $lang["config_default_barcode_quality_required"] = "The default barcode quality is a required field";
 $lang["config_default_barcode_width_number"] = "The default barcode width must be a number";
 $lang["config_default_barcode_width_required"] = "The default barcode width is a required field";
+$lang["config_default_origin_tax_code"] = "";
 $lang["config_default_sales_discount"] = "Default Sales Discount %";
 $lang["config_default_sales_discount_number"] = "The default sales discount must be a number";
 $lang["config_default_sales_discount_required"] = "The default sales discount is a required field";
@@ -99,6 +104,19 @@ $lang["config_email_smtp_port"] = "SMTP Port";
 $lang["config_email_smtp_timeout"] = "SMTP Timeout (s)";
 $lang["config_email_smtp_user"] = "SMTP Username";
 $lang["config_fax"] = "แฟ็กซ์";
+$lang["config_financial_year"] = "";
+$lang["config_financial_year_apr"] = "";
+$lang["config_financial_year_aug"] = "";
+$lang["config_financial_year_dec"] = "";
+$lang["config_financial_year_feb"] = "";
+$lang["config_financial_year_jan"] = "";
+$lang["config_financial_year_jul"] = "";
+$lang["config_financial_year_jun"] = "";
+$lang["config_financial_year_mar"] = "";
+$lang["config_financial_year_may"] = "";
+$lang["config_financial_year_nov"] = "";
+$lang["config_financial_year_oct"] = "";
+$lang["config_financial_year_sep"] = "";
 $lang["config_general"] = "ตั้งค่าทั่วไป";
 $lang["config_general_configuration"] = "ตั้งค่าทั่วไป";
 $lang["config_info"] = "ข้อมูลร้านค้า";
diff --git a/application/language/th/customers_lang.php b/application/language/th/customers_lang.php
index 79b87cc5a..7b156846f 100644
--- a/application/language/th/customers_lang.php
+++ b/application/language/th/customers_lang.php
@@ -20,6 +20,7 @@ $lang["customers_one_or_multiple"] = "ลูกค้า";
 $lang["customers_successful_adding"] = "คุณได้ทำการเพิ่มลูกค้าเรียบร้อยแล้ว";
 $lang["customers_successful_deleted"] = "คุณได้ทำการลบข้อมูลเรียบร้อยแล้ว";
 $lang["customers_successful_updating"] = "คุณได้ทำการแก้ไขข้อมูลลูกค้าเรียบร้อยแล้ว";
+$lang["customers_tax_code"] = "";
 $lang["customers_taxable"] = "ต้องเสียภาษี";
 $lang["customers_total"] = "Total";
 $lang["customers_update"] = "แก้ไขข้อมูลลูกค้า";
diff --git a/application/language/th/datepicker_lang.php b/application/language/th/datepicker_lang.php
index 8f549471e..f3a86f98c 100644
--- a/application/language/th/datepicker_lang.php
+++ b/application/language/th/datepicker_lang.php
@@ -7,11 +7,13 @@ $lang["datepicker_custom"] = "Custom";
 $lang["datepicker_from"] = "From";
 $lang["datepicker_last_30"] = "30 วันสุดท้าย";
 $lang["datepicker_last_7"] = "7 วันสุดท้าย";
+$lang["datepicker_last_financial_year"] = "";
 $lang["datepicker_last_month"] = "เดือนที่แล้ว";
 $lang["datepicker_last_year"] = "ปีที่แล้ว";
-$lang["datepicker_same_month_to_same_day_last_year"] = "Same Month To Same Day Last Year";
-$lang["datepicker_this_month"] = "เดือนนี้";
 $lang["datepicker_same_month_last_year"] = "Same Month Last Year";
+$lang["datepicker_same_month_to_same_day_last_year"] = "Same Month To Same Day Last Year";
+$lang["datepicker_this_financial_year"] = "";
+$lang["datepicker_this_month"] = "เดือนนี้";
 $lang["datepicker_this_year"] = "ปีนี้";
 $lang["datepicker_to"] = "To";
 $lang["datepicker_today"] = "วันนี้";
diff --git a/application/language/th/enum_lang.php b/application/language/th/enum_lang.php
new file mode 100644
index 000000000..dde09937b
--- /dev/null
+++ b/application/language/th/enum_lang.php
@@ -0,0 +1,9 @@
+<?php 
+
+$lang["enum_half_down"] = "";
+$lang["enum_half_even"] = "";
+$lang["enum_half_five"] = "";
+$lang["enum_half_odd"] = "";
+$lang["enum_half_up"] = "";
+$lang["enum_round_down"] = "";
+$lang["enum_round_up"] = "";
diff --git a/application/language/th/module_lang.php b/application/language/th/module_lang.php
index 822d854e9..66f83b053 100644
--- a/application/language/th/module_lang.php
+++ b/application/language/th/module_lang.php
@@ -23,3 +23,5 @@ $lang["module_sales"] = "งานขาย";
 $lang["module_sales_desc"] = "งานขาย และ รับคืน";
 $lang["module_suppliers"] = "ผู้ผลิต";
 $lang["module_suppliers_desc"] = "เพิ่ม, อัพเดท, ลบ, และค้นหา ผู้ผลิต";
+$lang["module_taxes"] = "";
+$lang["module_taxes_desc"] = "";
diff --git a/application/language/th/sales_lang.php b/application/language/th/sales_lang.php
index 2885870c3..af6377895 100644
--- a/application/language/th/sales_lang.php
+++ b/application/language/th/sales_lang.php
@@ -12,6 +12,7 @@ $lang["sales_cash_filter"] = "เงินสด";
 $lang["sales_change_due"] = "เงินทอน";
 $lang["sales_check"] = "เช็ค";
 $lang["sales_check_balance"] = "เช็คยอดคงเหลือ";
+$lang["sales_check_filter"] = "";
 $lang["sales_comment"] = "หมายเหตุ";
 $lang["sales_comments"] = "หมายเหตุ";
 $lang["sales_complete_sale"] = "จบการขาย";
@@ -105,6 +106,7 @@ $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"] = "เลือกลูกค้า (Optional)";
 $lang["sales_send_invoice"] = "ส่งใบแจ้งหนี้";
 $lang["sales_send_quote"] = "";
diff --git a/application/language/th/taxes_lang.php b/application/language/th/taxes_lang.php
new file mode 100644
index 000000000..feb59c695
--- /dev/null
+++ b/application/language/th/taxes_lang.php
@@ -0,0 +1,31 @@
+<?php 
+
+$lang["taxes_add_exception"] = "";
+$lang["taxes_confirm_delete"] = "";
+$lang["taxes_default_tax_category"] = "";
+$lang["taxes_error_adding_updating"] = "";
+$lang["taxes_new"] = "";
+$lang["taxes_no_taxes_to_display"] = "";
+$lang["taxes_round_half_down"] = "";
+$lang["taxes_round_half_even"] = "";
+$lang["taxes_round_half_odd"] = "";
+$lang["taxes_round_half_up"] = "";
+$lang["taxes_rounding_code"] = "";
+$lang["taxes_sales_tax"] = "";
+$lang["taxes_sales_tax_by_invoice"] = "";
+$lang["taxes_successful_deleted"] = "";
+$lang["taxes_tax_category"] = "";
+$lang["taxes_tax_code"] = "";
+$lang["taxes_tax_code_cannot_be_deleted"] = "";
+$lang["taxes_tax_code_name"] = "";
+$lang["taxes_tax_code_required"] = "";
+$lang["taxes_tax_code_successful_deleted"] = "";
+$lang["taxes_tax_code_successful_updated"] = "";
+$lang["taxes_tax_code_successful_updating"] = "";
+$lang["taxes_tax_code_successfully_added"] = "";
+$lang["taxes_tax_code_type"] = "";
+$lang["taxes_tax_rate"] = "";
+$lang["taxes_tax_rate_numeric"] = "";
+$lang["taxes_tax_rate_required"] = "";
+$lang["taxes_update"] = "";
+$lang["taxes_vat_tax"] = "";
diff --git a/application/language/tr/config_lang.php b/application/language/tr/config_lang.php
index 6fd96c1ea..0ba3883af 100644
--- a/application/language/tr/config_lang.php
+++ b/application/language/tr/config_lang.php
@@ -28,6 +28,9 @@ $lang["config_barcode_third_row"] = "Row 8";
 $lang["config_barcode_type"] = "Barkod Türü";
 $lang["config_barcode_width"] = "Genişlik (pk)";
 $lang["config_bottom"] = "Dip";
+$lang["config_cash_decimals"] = "";
+$lang["config_cash_decimals_tooltip"] = "";
+$lang["config_cash_rounding"] = "";
 $lang["config_center"] = "Orta";
 $lang["config_comma"] = "virgül";
 $lang["config_company"] = "Şirket Adı";
@@ -56,6 +59,7 @@ $lang["config_customer_reward_duplicate"] = "";
 $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_datetimeformat"] = "Tarih ve Zaman biçimi";
 $lang["config_decimal_point"] = " Decimal Point";
@@ -73,6 +77,7 @@ $lang["config_default_barcode_quality_number"] = "Ön tanımlı barkod kalitesi
 $lang["config_default_barcode_quality_required"] = "Ön tanımlı barkod kalitesi zorunlu bir alandır";
 $lang["config_default_barcode_width_number"] = "Ön tanımlı barkod genişliği bir sayı olmalıdır";
 $lang["config_default_barcode_width_required"] = "Ön tanımlı barkod genişliği zorunlu bir alandır.";
+$lang["config_default_origin_tax_code"] = "";
 $lang["config_default_sales_discount"] = "Ön Tanımlı Satış İskontosu %";
 $lang["config_default_sales_discount_number"] = "Ön tanımlı satış iskontosu bir sayı olmalıdır";
 $lang["config_default_sales_discount_required"] = "Ön tanımlı satış iskontosu zorunlu bir alandır";
@@ -99,6 +104,19 @@ $lang["config_email_smtp_port"] = "SMTP Bağlantı Noktası";
 $lang["config_email_smtp_timeout"] = "SMTP Zaman Aşım(lar)ı";
 $lang["config_email_smtp_user"] = "SMTP Kullanıcı Adı";
 $lang["config_fax"] = "Faks";
+$lang["config_financial_year"] = "";
+$lang["config_financial_year_apr"] = "";
+$lang["config_financial_year_aug"] = "";
+$lang["config_financial_year_dec"] = "";
+$lang["config_financial_year_feb"] = "";
+$lang["config_financial_year_jan"] = "";
+$lang["config_financial_year_jul"] = "";
+$lang["config_financial_year_jun"] = "";
+$lang["config_financial_year_mar"] = "";
+$lang["config_financial_year_may"] = "";
+$lang["config_financial_year_nov"] = "";
+$lang["config_financial_year_oct"] = "";
+$lang["config_financial_year_sep"] = "";
 $lang["config_general"] = "General";
 $lang["config_general_configuration"] = "General Configuration";
 $lang["config_info"] = "Mağaza yapılandırma bilgisi";
diff --git a/application/language/tr/customers_lang.php b/application/language/tr/customers_lang.php
index 9f954af6c..44d707800 100644
--- a/application/language/tr/customers_lang.php
+++ b/application/language/tr/customers_lang.php
@@ -20,6 +20,7 @@ $lang["customers_one_or_multiple"] = "müşteri";
 $lang["customers_successful_adding"] = "Müşteri eklendi";
 $lang["customers_successful_deleted"] = "Silme başarılı";
 $lang["customers_successful_updating"] = "Müşteri güncellendi";
+$lang["customers_tax_code"] = "";
 $lang["customers_taxable"] = "Vergilendirilebilir";
 $lang["customers_total"] = "Toplam";
 $lang["customers_update"] = "Müşteri Güncelle";
diff --git a/application/language/tr/datepicker_lang.php b/application/language/tr/datepicker_lang.php
index 3736953b8..cb62f52bc 100644
--- a/application/language/tr/datepicker_lang.php
+++ b/application/language/tr/datepicker_lang.php
@@ -7,11 +7,13 @@ $lang["datepicker_custom"] = "Özel";
 $lang["datepicker_from"] = "From";
 $lang["datepicker_last_30"] = "Son 30 Gün";
 $lang["datepicker_last_7"] = "Son 7 Gün";
+$lang["datepicker_last_financial_year"] = "";
 $lang["datepicker_last_month"] = "Geçen Ay";
 $lang["datepicker_last_year"] = "Geçen Yıl";
-$lang["datepicker_same_month_to_same_day_last_year"] = "Geçen Sene Aynı Aydan Aynı Güne";
-$lang["datepicker_this_month"] = "Bu Ay";
 $lang["datepicker_same_month_last_year"] = "Geçen Sene Aynı Ay";
+$lang["datepicker_same_month_to_same_day_last_year"] = "Geçen Sene Aynı Aydan Aynı Güne";
+$lang["datepicker_this_financial_year"] = "";
+$lang["datepicker_this_month"] = "Bu Ay";
 $lang["datepicker_this_year"] = "Bu Yıl";
 $lang["datepicker_to"] = "To";
 $lang["datepicker_today"] = "Bugün";
diff --git a/application/language/tr/enum_lang.php b/application/language/tr/enum_lang.php
new file mode 100644
index 000000000..dde09937b
--- /dev/null
+++ b/application/language/tr/enum_lang.php
@@ -0,0 +1,9 @@
+<?php 
+
+$lang["enum_half_down"] = "";
+$lang["enum_half_even"] = "";
+$lang["enum_half_five"] = "";
+$lang["enum_half_odd"] = "";
+$lang["enum_half_up"] = "";
+$lang["enum_round_down"] = "";
+$lang["enum_round_up"] = "";
diff --git a/application/language/tr/module_lang.php b/application/language/tr/module_lang.php
index a480c5fd3..49f1d1129 100644
--- a/application/language/tr/module_lang.php
+++ b/application/language/tr/module_lang.php
@@ -23,3 +23,5 @@ $lang["module_sales"] = "Satış";
 $lang["module_sales_desc"] = "Satış ve iade";
 $lang["module_suppliers"] = "Sağlayıcılar";
 $lang["module_suppliers_desc"] = "Ekleme, değiştirme, silme ve arama";
+$lang["module_taxes"] = "";
+$lang["module_taxes_desc"] = "";
diff --git a/application/language/tr/sales_lang.php b/application/language/tr/sales_lang.php
index e915e5431..5c6ef8e3e 100644
--- a/application/language/tr/sales_lang.php
+++ b/application/language/tr/sales_lang.php
@@ -12,6 +12,7 @@ $lang["sales_cash_filter"] = "Nakit";
 $lang["sales_change_due"] = "Para Üstü";
 $lang["sales_check"] = "Çek";
 $lang["sales_check_balance"] = "Check remainder";
+$lang["sales_check_filter"] = "";
 $lang["sales_comment"] = "Yorum";
 $lang["sales_comments"] = "Yorumlar";
 $lang["sales_complete_sale"] = "Satışı Tamamla";
@@ -105,6 +106,7 @@ $lang["sales_sale"] = "Satış";
 $lang["sales_sale_by_invoice"] = "";
 $lang["sales_sale_for_customer"] = "Müşteri:";
 $lang["sales_sale_time"] = "Saat";
+$lang["sales_sales_tax"] = "";
 $lang["sales_select_customer"] = "Müşteri Seç (İsteğe Bağlı)";
 $lang["sales_send_invoice"] = "Fatura Gönder";
 $lang["sales_send_quote"] = "";
diff --git a/application/language/tr/taxes_lang.php b/application/language/tr/taxes_lang.php
new file mode 100644
index 000000000..feb59c695
--- /dev/null
+++ b/application/language/tr/taxes_lang.php
@@ -0,0 +1,31 @@
+<?php 
+
+$lang["taxes_add_exception"] = "";
+$lang["taxes_confirm_delete"] = "";
+$lang["taxes_default_tax_category"] = "";
+$lang["taxes_error_adding_updating"] = "";
+$lang["taxes_new"] = "";
+$lang["taxes_no_taxes_to_display"] = "";
+$lang["taxes_round_half_down"] = "";
+$lang["taxes_round_half_even"] = "";
+$lang["taxes_round_half_odd"] = "";
+$lang["taxes_round_half_up"] = "";
+$lang["taxes_rounding_code"] = "";
+$lang["taxes_sales_tax"] = "";
+$lang["taxes_sales_tax_by_invoice"] = "";
+$lang["taxes_successful_deleted"] = "";
+$lang["taxes_tax_category"] = "";
+$lang["taxes_tax_code"] = "";
+$lang["taxes_tax_code_cannot_be_deleted"] = "";
+$lang["taxes_tax_code_name"] = "";
+$lang["taxes_tax_code_required"] = "";
+$lang["taxes_tax_code_successful_deleted"] = "";
+$lang["taxes_tax_code_successful_updated"] = "";
+$lang["taxes_tax_code_successful_updating"] = "";
+$lang["taxes_tax_code_successfully_added"] = "";
+$lang["taxes_tax_code_type"] = "";
+$lang["taxes_tax_rate"] = "";
+$lang["taxes_tax_rate_numeric"] = "";
+$lang["taxes_tax_rate_required"] = "";
+$lang["taxes_update"] = "";
+$lang["taxes_vat_tax"] = "";
diff --git a/application/language/zh/config_lang.php b/application/language/zh/config_lang.php
index 90079830c..a8ebb1965 100755
--- a/application/language/zh/config_lang.php
+++ b/application/language/zh/config_lang.php
@@ -28,6 +28,9 @@ $lang["config_barcode_third_row"] = "Row 5";
 $lang["config_barcode_type"] = "Barcode Type";
 $lang["config_barcode_width"] = "Width (px)";
 $lang["config_bottom"] = "Bottom";
+$lang["config_cash_decimals"] = "";
+$lang["config_cash_decimals_tooltip"] = "";
+$lang["config_cash_rounding"] = "";
 $lang["config_center"] = "Center";
 $lang["config_comma"] = "comma";
 $lang["config_company"] = "公司名稱";
@@ -56,6 +59,7 @@ $lang["config_customer_reward_duplicate"] = "";
 $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_datetimeformat"] = "Date and Time format";
 $lang["config_decimal_point"] = "Decimal Point";
@@ -73,6 +77,7 @@ $lang["config_default_barcode_quality_number"] = "The default barcode quality mu
 $lang["config_default_barcode_quality_required"] = "The default barcode quality is a required field";
 $lang["config_default_barcode_width_number"] = "The default barcode width must be a number";
 $lang["config_default_barcode_width_required"] = "The default barcode width is a required field";
+$lang["config_default_origin_tax_code"] = "";
 $lang["config_default_sales_discount"] = "Default Sales Discount %";
 $lang["config_default_sales_discount_number"] = "The default sales discount must be a number";
 $lang["config_default_sales_discount_required"] = "The default sales discount is a required field";
@@ -99,6 +104,19 @@ $lang["config_email_smtp_port"] = "SMTP Port";
 $lang["config_email_smtp_timeout"] = "SMTP Timeout (s)";
 $lang["config_email_smtp_user"] = "SMTP Username";
 $lang["config_fax"] = "傳真";
+$lang["config_financial_year"] = "";
+$lang["config_financial_year_apr"] = "";
+$lang["config_financial_year_aug"] = "";
+$lang["config_financial_year_dec"] = "";
+$lang["config_financial_year_feb"] = "";
+$lang["config_financial_year_jan"] = "";
+$lang["config_financial_year_jul"] = "";
+$lang["config_financial_year_jun"] = "";
+$lang["config_financial_year_mar"] = "";
+$lang["config_financial_year_may"] = "";
+$lang["config_financial_year_nov"] = "";
+$lang["config_financial_year_oct"] = "";
+$lang["config_financial_year_sep"] = "";
 $lang["config_general"] = "General";
 $lang["config_general_configuration"] = "General Configuration";
 $lang["config_info"] = "儲存組態";
diff --git a/application/language/zh/customers_lang.php b/application/language/zh/customers_lang.php
index 9a2226140..af64f8e7e 100755
--- a/application/language/zh/customers_lang.php
+++ b/application/language/zh/customers_lang.php
@@ -20,6 +20,7 @@ $lang["customers_one_or_multiple"] = "客戶";
 $lang["customers_successful_adding"] = "成功新增顧客";
 $lang["customers_successful_deleted"] = "成功刪除";
 $lang["customers_successful_updating"] = "成功更新顧客";
+$lang["customers_tax_code"] = "";
 $lang["customers_taxable"] = "應課稅";
 $lang["customers_total"] = "Total";
 $lang["customers_update"] = "更新客戶";
diff --git a/application/language/zh/datepicker_lang.php b/application/language/zh/datepicker_lang.php
index f93d8582a..836d4f31b 100644
--- a/application/language/zh/datepicker_lang.php
+++ b/application/language/zh/datepicker_lang.php
@@ -7,11 +7,13 @@ $lang["datepicker_custom"] = "Custom";
 $lang["datepicker_from"] = "From";
 $lang["datepicker_last_30"] = "過去七天";
 $lang["datepicker_last_7"] = "過去七天";
+$lang["datepicker_last_financial_year"] = "";
 $lang["datepicker_last_month"] = "上個月";
 $lang["datepicker_last_year"] = "去年";
-$lang["datepicker_same_month_to_same_day_last_year"] = "Same Month To Same Day Last Year";
-$lang["datepicker_this_month"] = "這個月";
 $lang["datepicker_same_month_last_year"] = "Same Month Last Year";
+$lang["datepicker_same_month_to_same_day_last_year"] = "Same Month To Same Day Last Year";
+$lang["datepicker_this_financial_year"] = "";
+$lang["datepicker_this_month"] = "這個月";
 $lang["datepicker_this_year"] = "今年";
 $lang["datepicker_to"] = "To";
 $lang["datepicker_today"] = "今天";
diff --git a/application/language/zh/enum_lang.php b/application/language/zh/enum_lang.php
new file mode 100644
index 000000000..dde09937b
--- /dev/null
+++ b/application/language/zh/enum_lang.php
@@ -0,0 +1,9 @@
+<?php 
+
+$lang["enum_half_down"] = "";
+$lang["enum_half_even"] = "";
+$lang["enum_half_five"] = "";
+$lang["enum_half_odd"] = "";
+$lang["enum_half_up"] = "";
+$lang["enum_round_down"] = "";
+$lang["enum_round_up"] = "";
diff --git a/application/language/zh/module_lang.php b/application/language/zh/module_lang.php
index 88db08735..6fdd42eea 100755
--- a/application/language/zh/module_lang.php
+++ b/application/language/zh/module_lang.php
@@ -23,3 +23,5 @@ $lang["module_sales"] = "出貨";
 $lang["module_sales_desc"] = "出貨與退貨";
 $lang["module_suppliers"] = "供應商";
 $lang["module_suppliers_desc"] = "添加，更新，刪除，搜索供應商";
+$lang["module_taxes"] = "";
+$lang["module_taxes_desc"] = "";
diff --git a/application/language/zh/sales_lang.php b/application/language/zh/sales_lang.php
index e2abb0cbc..1b4d2a726 100755
--- a/application/language/zh/sales_lang.php
+++ b/application/language/zh/sales_lang.php
@@ -12,6 +12,7 @@ $lang["sales_cash_filter"] = "Cash";
 $lang["sales_change_due"] = "更改到期日";
 $lang["sales_check"] = "支票";
 $lang["sales_check_balance"] = "Check remainder";
+$lang["sales_check_filter"] = "";
 $lang["sales_comment"] = "評論";
 $lang["sales_comments"] = "評論";
 $lang["sales_complete_sale"] = "完成銷售";
@@ -105,6 +106,7 @@ $lang["sales_sale"] = "銷售";
 $lang["sales_sale_by_invoice"] = "";
 $lang["sales_sale_for_customer"] = "客戶:";
 $lang["sales_sale_time"] = "Time";
+$lang["sales_sales_tax"] = "";
 $lang["sales_select_customer"] = "選擇客戶 (Optional)";
 $lang["sales_send_invoice"] = "Send Invoice";
 $lang["sales_send_quote"] = "";
diff --git a/application/language/zh/taxes_lang.php b/application/language/zh/taxes_lang.php
new file mode 100644
index 000000000..feb59c695
--- /dev/null
+++ b/application/language/zh/taxes_lang.php
@@ -0,0 +1,31 @@
+<?php 
+
+$lang["taxes_add_exception"] = "";
+$lang["taxes_confirm_delete"] = "";
+$lang["taxes_default_tax_category"] = "";
+$lang["taxes_error_adding_updating"] = "";
+$lang["taxes_new"] = "";
+$lang["taxes_no_taxes_to_display"] = "";
+$lang["taxes_round_half_down"] = "";
+$lang["taxes_round_half_even"] = "";
+$lang["taxes_round_half_odd"] = "";
+$lang["taxes_round_half_up"] = "";
+$lang["taxes_rounding_code"] = "";
+$lang["taxes_sales_tax"] = "";
+$lang["taxes_sales_tax_by_invoice"] = "";
+$lang["taxes_successful_deleted"] = "";
+$lang["taxes_tax_category"] = "";
+$lang["taxes_tax_code"] = "";
+$lang["taxes_tax_code_cannot_be_deleted"] = "";
+$lang["taxes_tax_code_name"] = "";
+$lang["taxes_tax_code_required"] = "";
+$lang["taxes_tax_code_successful_deleted"] = "";
+$lang["taxes_tax_code_successful_updated"] = "";
+$lang["taxes_tax_code_successful_updating"] = "";
+$lang["taxes_tax_code_successfully_added"] = "";
+$lang["taxes_tax_code_type"] = "";
+$lang["taxes_tax_rate"] = "";
+$lang["taxes_tax_rate_numeric"] = "";
+$lang["taxes_tax_rate_required"] = "";
+$lang["taxes_update"] = "";
+$lang["taxes_vat_tax"] = "";