diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 74479a9d39f..e6bae2f73d8 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -142,18 +142,17 @@ if ($action == 'setmanagezero') {
}
if ($action == 'setdisabledirectinput') {
- $setdisabledirectinput = GETPOST('value', 'int');
- $res = dolibarr_set_const($db, "BANK_DISABLE_DIRECT_INPUT", $setdisabledirectinput, 'yesno', 0, '', $conf->entity);
- if (! $res > 0)
- $error ++;
- if (! $error) {
- setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
- } else {
- setEventMessages($langs->trans("Error"), null, 'mesgs');
- }
+ $setdisabledirectinput = GETPOST('value', 'int');
+ $res = dolibarr_set_const($db, "BANK_DISABLE_DIRECT_INPUT", $setdisabledirectinput, 'yesno', 0, '', $conf->entity);
+ if (! $res > 0)
+ $error ++;
+ if (! $error) {
+ setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+ } else {
+ setEventMessages($langs->trans("Error"), null, 'mesgs');
+ }
}
-
/*
* View
*/
@@ -243,20 +242,20 @@ if (! empty($user->admin))
}
print '';
- $var = ! $var;
- print "
";
- print '' . $langs->trans("BANK_DISABLE_DIRECT_INPUT") . ' ';
- if (! empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) {
- print '';
- print img_picto($langs->trans("Activated"), 'switch_on');
- print ' ';
- } else {
- print '';
- print img_picto($langs->trans("Disabled"), 'switch_off');
- print ' ';
- }
- print ' ';
-
+ $var = ! $var;
+ print "";
+ print '' . $langs->trans("BANK_DISABLE_DIRECT_INPUT") . ' ';
+ if (! empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) {
+ print '';
+ print img_picto($langs->trans("Activated"), 'switch_on');
+ print ' ';
+ } else {
+ print '';
+ print img_picto($langs->trans("Disabled"), 'switch_off');
+ print ' ';
+ }
+ print ' ';
+
$var = ! $var;
print "";
print '' . $langs->trans("ACCOUNTING_MANAGE_ZERO") . ' ';
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index aee7d7172c6..4174ee7809f 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -369,22 +369,23 @@ class AccountingAccount extends CommonObject
*/
function getNomUrl($withpicto = 0) {
global $langs;
-
+
$result = '';
-
+
$link = '';
$linkend = ' ';
-
+
$picto = 'billr';
-
+
$label = $langs->trans("Show") . ': ' . $this->account_number . ' - ' . $this->label;
-
+
if ($withpicto)
$result .= ($link . img_object($label, $picto) . $linkend);
if ($withpicto && $withpicto != 2)
$result .= ' ';
if ($withpicto != 2)
- $result .= $link . $this->account_number . $linkend;
+ require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+ $result .= $link . length_accountg($this->account_number) . ' - ' . $this->label . $linkend;
return $result;
}
diff --git a/htdocs/compta/bank/bankentries.php b/htdocs/compta/bank/bankentries.php
index de0e6d70b4c..9af9b6f4707 100644
--- a/htdocs/compta/bank/bankentries.php
+++ b/htdocs/compta/bank/bankentries.php
@@ -4,8 +4,9 @@
* Copyright (C) 2005-2010 Regis Houssin
* Copyright (C) 2012 Vinícius Nogueira
* Copyright (C) 2014 Florian Henry
- * Copyright (C) 2015 Jean-François Ferry
+ * Copyright (C) 2015 Jean-François Ferry
* Copyright (C) 2016 Juanjo Menent
+ * Copyright (C) 2017 Alexandre Spangaro
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -396,40 +397,37 @@ if ($id > 0 || ! empty($ref))
foreach ($bankcateg->fetchAll() as $bankcategory) {
$options[$bankcategory->id] = $bankcategory->label;
}
-
+
// Bank card
-
$head=bank_prepare_head($object);
dol_fiche_head($head,'journal',$langs->trans("FinancialAccount"),0,'account');
-
+
$linkback = ''.$langs->trans("BackToList").' ';
-
+
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
-
+
dol_fiche_end();
-
-
/*
* Buttons actions
*/
- if ($action != 'addline' && $action != 'reconcile')
+ if ($action != 'reconcile')
{
print ' ';
}
- // Form to add a transaction with no invoice
- if ($user->rights->banque->modifier && $action == 'addline')
- {
- print load_fiche_titre($langs->trans("AddBankRecordLong"),'','');
-
- print '';
- print '';
- print ''.$langs->trans("Date").' ';
- print ' ';
- print ''.$langs->trans("Type").' ';
- print ''.$langs->trans("Numero").' ';
- print ''.$langs->trans("Description").' ';
- print ''.$langs->trans("Debit").' ';
- print ''.$langs->trans("Credit").' ';
- print ' ';
- print ' ';
-
- print '';
- print '';
- $form->select_date(empty($dateop)?-1:$dateop,'op',0,0,0,'transaction');
- print ' ';
- print '';
- $form->select_types_paiements((GETPOST('operation')?GETPOST('operation'):($object->courant == Account::TYPE_CASH ? 'LIQ' : '')),'operation','1,2',2,1);
- print ' ';
- print ' ';
- print '';
- print ' ';
- if ($options) {
- print ' '.$langs->trans("Rubrique").': ';
- print Form::selectarray('cat1', $options, GETPOST('cat1'), 1);
- }
- print ' ';
- print ' ';
- print ' ';
- print '';
- print ' ';
- print ' ';
- print ' ';
- print '
';
- print ' ';
- }
-
-
/// ajax to adjust value date with plus and less picto
print '