diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index ec01d9c697c..52ac288856b 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -333,10 +333,6 @@ if (empty($reshook)) {
$filter['t.numero_compte<='] = $search_accountancy_code_end;
$param .= '&search_accountancy_code_end='.urlencode($search_accountancy_code_end);
}
- if (!empty($search_accountancy_aux_code)) {
- $filter['t.subledger_account'] = $search_accountancy_aux_code;
- $param .= '&search_accountancy_aux_code='.urlencode($search_accountancy_aux_code);
- }
if (!empty($search_accountancy_aux_code_start)) {
$filter['t.subledger_account>='] = $search_accountancy_aux_code_start;
$param .= '&search_accountancy_aux_code_start='.urlencode($search_accountancy_aux_code_start);
@@ -533,14 +529,12 @@ if (count($filter) > 0) {
$sqlwhere[] = $key.'=\''.$db->idate($value).'\'';
} elseif ($key == 't.doc_date>=' || $key == 't.doc_date<=') {
$sqlwhere[] = $key.'\''.$db->idate($value).'\'';
- } elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=') {
+ } elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.subledger_account>=' || $key == 't.subledger_account<=') {
$sqlwhere[] = $key.'\''.$db->escape($value).'\'';
} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
$sqlwhere[] = $key.'='.$value;
- } elseif ($key == 't.numero_compte') {
+ } elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
$sqlwhere[] = $key.' LIKE \''.$db->escape($value).'%\'';
- } elseif ($key == 't.subledger_account') {
- $sqlwhere[] = natural_search($key, $value, 0, 1);
} elseif ($key == 't.date_creation>=' || $key == 't.date_creation<=') {
$sqlwhere[] = $key.'\''.$db->idate($value).'\'';
} elseif ($key == 't.tms>=' || $key == 't.tms<=') {
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index 1afc7f49fb7..21f5b0b1230 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -8,12 +8,12 @@ FONTFORPDF=helvetica
FONTSIZEFORPDF=10
SeparatorDecimal=,
SeparatorThousand=Space
-FormatDateShort=%m/%d/%Y
-FormatDateShortInput=%m/%d/%Y
-FormatDateShortJava=MM/dd/yyyy
-FormatDateShortJavaInput=MM/dd/yyyy
-FormatDateShortJQuery=mm/dd/yy
-FormatDateShortJQueryInput=mm/dd/yy
+FormatDateShort=%d-%m-%Y
+FormatDateShortInput=%d-%m-%Y
+FormatDateShortJava=dd-MM-yyyy
+FormatDateShortJavaInput=dd-MM-yyyy
+FormatDateShortJQuery=dd-mm-yy
+FormatDateShortJQueryInput=dd-mm-yy
FormatHourShortJQuery=HH:MI
FormatHourShort=%I:%M %p
FormatHourShortDuration=%H:%M
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index 2bd92f40e78..cff6ee0dd09 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -233,7 +233,7 @@ if (empty($reshook)) {
if ($user->rights->produit->creer || $user->rights->service->creer) {
print '' . $langs->trans("Add") . '';
if ($cnt_trans > 0) {
- print '' . $langs->trans("Update") . '';
+ print '' . $langs->trans("Modify") . '';
}
}
}
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index dc6a0cd82e9..1956166cf60 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -768,7 +768,7 @@ function ModalBox(ModalID)
function DirectPayment(){
console.log("DirectPayment");
- $("#poslines").load("invoice.php?place="+place+"&action=valid&pay=trans("cash"); ?>", function() {
+ $("#poslines").load("invoice.php?place="+place+"&action=valid&pay=LIQ", function() {
});
}
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 16fdaf315f1..ab2c2794e38 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -568,7 +568,7 @@ if (empty($reshook)) {
if ($ret > 0) {
$log_action = $langs->trans('TicketInitialMessageModified')." \n";
// include the Diff class
- dol_include_once('/ticket/class/utils_diff.class.php');
+ dol_include_once('/core/class/utils_diff.class.php');
// output the result of comparing two files as plain text
$log_action .= Diff::toString(Diff::compare(strip_tags($oldvalue_message), strip_tags($object->message)));