diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index d5a24a0e2e5..f7a5d336bd8 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -86,6 +86,7 @@ $search_debit = GETPOST('search_debit', 'alpha');
$search_credit = GETPOST('search_credit', 'alpha');
$search_ledger_code = GETPOST('search_ledger_code', 'alpha');
$search_lettering_code = GETPOST('search_lettering_code', 'alpha');
+$search_not_lettering = GETPOST('search_lettering_option', 'alpha');
// Load variable for pagination
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
@@ -202,6 +203,7 @@ if (empty($reshook))
$search_debit = '';
$search_credit = '';
$search_lettering_code = '';
+ $search_not_lettering='';
}
// Must be after the remove filter action, before the export.
@@ -312,6 +314,10 @@ if (empty($reshook))
$filter['t.lettering_code'] = $search_lettering_code;
$param .= '&search_lettering_code='.urlencode($search_lettering_code);
}
+ if (! empty($search_not_lettering)) {
+ $filter['t.lettering_option'] = $search_not_lettering;
+ $param .= '&search_not_lettering=' . urlencode($search_not_lettering);
+ }
}
if ($action == 'delbookkeeping' && $user->rights->accounting->mouvements->supprimer) {
@@ -444,6 +450,8 @@ if (count($filter) > 0) {
$sqlwhere[] = $key.'\''.$db->idate($value).'\'';
} elseif ($key == 't.credit' || $key == 't.debit') {
$sqlwhere[] = natural_search($key, $value, 1, 1);
+ } elseif ($key == 't.lettering_option') {
+ $sqlwhere[] = 't.lettering_code IS NULL';
} else {
$sqlwhere[] = natural_search($key, $value, 0, 1);
}
@@ -758,6 +766,7 @@ if (!empty($arrayfields['t.lettering_code']['checked']))
{
print '
';
print '';
+ print ' '.$langs->trans("NotLettering").'';
print ' | ';
}
// Code journal
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
index 9cb863aec7d..91ce9f5e31a 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
@@ -260,9 +260,9 @@ if ($resql) {
print '' . dol_print_date($db->jdate($obj->doc_date), 'day') . ' | ';
print '' . $obj->doc_ref . ' | ';
print '' . $obj->label_compte . ' | ';
- print '' . price($obj->debit) . ' | ';
- print '' . price($obj->credit) . ' | ';
- print '' . price(round($solde, 2)) . ' | ';
+ print '' . price($obj->debit) . ' | ';
+ print '' . price($obj->credit) . ' | ';
+ print '' . price(round($solde, 2)) . ' | ';
// Journal
$accountingjournal = new AccountingJournal($db);
@@ -285,15 +285,15 @@ if ($resql) {
print '';
print '| '.$langs->trans("Total").': | ' . "\n";
- print '' . price($debit) . ' | ';
- print '' . price($credit) . ' | ';
+ print '' . price($debit) . ' | ';
+ print '' . price($credit) . ' | ';
print ' | ';
print "
\n";
print '';
print '| '.$langs->trans("Balancing").': | ' . "\n";
print ' | ';
- print '' . price($credit - $debit) . ' | ';
+ print '' . price($credit - $debit) . ' | ';
print ' | ';
print "
\n";
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
index 61e5e34da99..7eca182d630 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
@@ -257,9 +257,9 @@ if ($resql) {
print '' . dol_print_date($db->jdate($obj->doc_date), 'day') . ' | ';
print '' . $obj->doc_ref . ' | ';
print '' . $obj->label_compte . ' | ';
- print '' . price($obj->debit) . ' | ';
- print '' . price($obj->credit) . ' | ';
- print '' . price(round($solde, 2)) . ' | ';
+ print '' . price($obj->debit) . ' | ';
+ print '' . price($obj->credit) . ' | ';
+ print '' . price(round($solde, 2)) . ' | ';
// Journal
$accountingjournal = new AccountingJournal($db);
@@ -282,15 +282,15 @@ if ($resql) {
print '';
print '| '.$langs->trans("Total").': | ' . "\n";
- print '' . price($debit) . ' | ';
- print '' . price($credit) . ' | ';
+ print '' . price($debit) . ' | ';
+ print '' . price($credit) . ' | ';
print ' | ';
print "
\n";
print '';
print '| '.$langs->trans("Balancing").': | ' . "\n";
print ' | ';
- print '' . price($credit - $debit) . ' | ';
+ print '' . price($credit - $debit) . ' | ';
print ' | ';
print "
\n";