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

Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0

Browse Source
This commit is contained in:
Laurent Destailleur 2016-08-29 18:18:35 +02:00
commit ff0b424f74
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/salaries/card.php
View File

@ -415,7 +415,7 @@ if ($id)
} }
else else
{ {
print '<a class="butActionRefused" href="#" title="'.$langs->trans("LinkedToAConcialitedTransaction").'">'.$langs->trans("Delete").'</a>'; print '<a class="butActionRefused" href="#" title="'.$langs->trans("LinkedToAConciliatedTransaction").'">'.$langs->trans("Delete").'</a>';
} }
print "</div>"; print "</div>";
} }

6
htdocs/compta/tva/card.php
View File

@ -365,8 +365,8 @@ if ($id)
/* /*
* Boutons d'actions * Action buttons
*/ */
print "<div class=\"tabsAction\">\n"; print "<div class=\"tabsAction\">\n";
if ($object->rappro == 0) if ($object->rappro == 0)
{ {
@ -381,7 +381,7 @@ if ($id)
} }
else else
{ {
print '<a class="butActionRefused" href="#" title="'.$langs->trans("LinkedToAConcialitedTransaction").'">'.$langs->trans("Delete").'</a>'; print '<a class="butActionRefused" href="#" title="'.$langs->trans("LinkedToAConciliatedTransaction").'">'.$langs->trans("Delete").'</a>';
} }
print "</div>"; print "</div>";
} }

1
htdocs/langs/en_US/banks.lang
View File

@ -78,6 +78,7 @@ AccountToCredit=Account to credit
AccountToDebit=Account to debit AccountToDebit=Account to debit
DisableConciliation=Disable reconciliation feature for this account DisableConciliation=Disable reconciliation feature for this account
ConciliationDisabled=Reconciliation feature disabled ConciliationDisabled=Reconciliation feature disabled
LinkedToAConciliatedTransaction=Linked to a conciliated transaction
StatusAccountOpened=Open StatusAccountOpened=Open
StatusAccountClosed=Closed StatusAccountClosed=Closed
AccountIdShort=Number AccountIdShort=Number