lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix disable direct debit request for replaced invoices

Browse Source
This commit is contained in:
Laurent Destailleur 2018-01-04 14:35:02 +01:00
parent c4eba665d0
commit 300d4e1603
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/compta/facture/card.php
View File

@ -64,7 +64,7 @@ if (! empty($conf->accounting->enabled)) {
require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php'; require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
} }
$langs->loadLangs(array('bills','companies','compta','products','banks','main')); $langs->loadLangs(array('bills','companies','compta','products','banks','main','withdrawals'));
if (! empty($conf->incoterm->enabled)) $langs->load('incoterm'); if (! empty($conf->incoterm->enabled)) $langs->load('incoterm');
if (! empty($conf->margin->enabled)) $langs->load('margins'); if (! empty($conf->margin->enabled)) $langs->load('margins');
@ -4293,8 +4293,12 @@ else if ($id > 0 || ! empty($ref))
{ {
if ($user->rights->prelevement->bons->creer) if ($user->rights->prelevement->bons->creer)
{ {
$langs->load("withdrawals"); if (! $objectidnext && $object->close_code != 'replaced') // Not replaced by another invoice
print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("MakeWithdrawRequest")).'">'.$langs->trans("MakeWithdrawRequest").'</a>'; {
print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("MakeWithdrawRequest")).'">'.$langs->trans("MakeWithdrawRequest").'</a>';
} else {
print '<div class="inline-block divButAction"><span class="butActionRefused" title="' . $langs->trans("DisabledBecauseReplacedInvoice") . '">' . $langs->trans('MakeWithdrawRequest') . '</span></div>';
}
} }
else else
{ {

2
htdocs/projet/ganttchart.inc.php
View File

@ -111,7 +111,7 @@ if (g.getDivId() != null)
<?php <?php
echo "\n"; echo "\n";
echo "/* g.AddTaskItem(new JSGantt.TaskItem(task_id, 'label', 'start_date', 'end_date', 'css', 'link', milestone, 'Resources', Compl%, Group, Parent, 1, 'Dependency', 'label','note', g)); */\n"; echo "/* g.AddTaskItem(new JSGantt.TaskItem(task_id, 'label', 'start_date', 'end_date', 'css', 'link', milestone, 'Resources', Compl%, Group, Parent, Open, 'Dependency', 'label','note', g)); */\n";
$level=0; $level=0;
$tnums = count($tasks); $tnums = count($tasks);

2
htdocs/theme/eldy/style.css.php
View File

@ -4954,6 +4954,7 @@ div.tabsElem a.tab {
.mainmenuaspan { .mainmenuaspan {
/*display: none;*/ /*display: none;*/
font-size: 10px; font-size: 10px;
padding-right: 0;
} }
.topmenuimage { .topmenuimage {
background-size: 22px auto; background-size: 22px auto;
@ -4990,6 +4991,7 @@ div.tabsElem a.tab {
.mainmenuaspan { .mainmenuaspan {
/*display: none;*/ /*display: none;*/
font-size: 10px; font-size: 10px;
padding-right: 0;
} }
.topmenuimage { .topmenuimage {
background-size: 20px auto; background-size: 20px auto;