Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop

This commit is contained in:
Regis Houssin 2012-09-15 11:22:30 +02:00
commit 89e70cd61a

View File

@ -66,7 +66,7 @@ if ($user->rights->adherent->cotisation->creer && $_REQUEST["action"] == 'update
// If transaction consolidated
if ($accountline->rappro)
{
$errmsg=$langs->trans("SubscriptionLinkedToConciliatedTrnasaction");
$errmsg=$langs->trans("SubscriptionLinkedToConciliatedTransaction");
}
else
{