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

Merge pull request #3139 from aspangaro/develop-patch50

Browse Source 
Disable button add a line in bank module when accountancy module is activated
This commit is contained in:
Laurent Destailleur 2015-07-04 04:42:37 +02:00
commit b7715635a0
1 changed files with 28 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
htdocs/compta/bank/account.php
View File

@ -374,43 +374,34 @@ if ($id > 0 || ! empty($ref))
* Boutons actions * Boutons actions
*/ */
if ($action != 'delete') if ($action != 'delete') {
{
print '<div class="tabsAction">'; print '<div class="tabsAction">';
if ($object->type != 2 && $object->rappro) // If not cash account and can be reconciliate if ($object->type != 2 && $object->rappro) { // If not cash account and can be reconciliate
{ if ($user->rights->banque->consolidate) {
if ($user->rights->banque->consolidate)
{
print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/bank/rappro.php?account='.$object->id.($vline?'&amp;vline='.$vline:'').'">'.$langs->trans("Conciliate").'</a>'; print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/bank/rappro.php?account='.$object->id.($vline?'&amp;vline='.$vline:'').'">'.$langs->trans("Conciliate").'</a>';
} } else {
else
{
print '<a class="butActionRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Conciliate").'</a>'; print '<a class="butActionRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Conciliate").'</a>';
} }
} }
if ($action != 'addline') if ($action != 'addline') {
{ if (empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) {
if (empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) if (empty($conf->accounting->enabled)) {
{ if ($user->rights->banque->modifier) {
if ($user->rights->banque->modifier) print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=addline&amp;id='.$object->id.'&amp;page='.$page.($vline?'&amp;vline='.$vline:'').'">'.$langs->trans("AddBankRecord").'</a>';
{ } else {
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=addline&amp;id='.$object->id.'&amp;page='.$page.($vline?'&amp;vline='.$vline:'').'">'.$langs->trans("AddBankRecord").'</a>'; print '<a class="butActionRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("AddBankRecord").'</a>';
} }
else } else {
{ print '<a class="butActionRefused" title="'.$langs->trans("FeatureDisabled").'" href="#">'.$langs->trans("AddBankRecord").'</a>';
print '<a class="butActionRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("AddBankRecord").'</a>'; }
} } else {
} print '<a class="butActionRefused" title="'.$langs->trans("FeatureDisabled").'" href="#">'.$langs->trans("AddBankRecord").'</a>';
else }
{ }
print '<a class="butActionRefused" title="'.$langs->trans("FeatureDisabled").'" href="#">'.$langs->trans("AddBankRecord").'</a>'; print '</div>';
} }
}
print '</div>';
}
print '<br>'; print '<br>';
@ -466,15 +457,12 @@ if ($id > 0 || ! empty($ref))
print '<div class="floatright">'.$navig.'</div>'; print '<div class="floatright">'.$navig.'</div>';
} }
print '<table class="noborder" width="100%">';
// Form to add a transaction with no invoice // Form to add a transaction with no invoice
if ($user->rights->banque->modifier && $action == 'addline') if ($user->rights->banque->modifier && $action == 'addline')
{ {
print '<tr>'; print_fiche_titre($langs->trans("AddBankRecordLong"),'','');
print '<td align="left" colspan="10"><b>'.$langs->trans("AddBankRecordLong").'</b></td>';
print '</tr>';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Date").'</td>'; print '<td>'.$langs->trans("Date").'</td>';
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
@ -507,11 +495,13 @@ if ($id > 0 || ! empty($ref))
print '<input type="submit" name="save" class="button" value="'.$langs->trans("Add").'"><br>'; print '<input type="submit" name="save" class="button" value="'.$langs->trans("Add").'"><br>';
print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">'; print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
print '</td></tr>'; print '</td></tr>';
print "</form>"; print '</table>';
print '</form>';
print '<tr class="noborder"><td colspan="10">&nbsp;</td></tr>'."\n"; print '<br>';
} }
print '<table class="noborder" width="100%">';
/* /*
* Affiche tableau des transactions bancaires * Affiche tableau des transactions bancaires
*/ */