diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index dfdc9183886..2da33334a92 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -330,25 +330,27 @@ if ($id > 0)
print "";
print '';
- // Compte bancaire par défaut
- print '
| ';
- print '';
- print ' | ';
- if ($action == 'editbankaccount')
+ if (! empty($conf->banque->enabled))
{
- $form->formSelectAccount($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->fk_account,'fk_account',1);
+ // Compte bancaire par défaut
+ print ' |
| ';
+ print '';
+ print ' | ';
+ if ($action == 'editbankaccount')
+ {
+ $form->formSelectAccount($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->fk_account,'fk_account',1);
+ }
+ else
+ {
+ $form->formSelectAccount($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->fk_account,'none');
+ }
+ print " | ";
+ print '
';
}
- else
- {
- $form->formSelectAccount($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->fk_account,'none');
- }
- print "";
- print '';
-
// Relative discounts (Discounts-Drawbacks-Rebates)
print '| ';
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index e37c525b513..d222d1ab268 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -5026,7 +5026,7 @@ abstract class CommonObject
if (!$notrigger) {
// Call triggers
- $result=$this->call_trigger(strtoupper(get_class(self)).'_CREATE',$user);
+ $result=$this->call_trigger(strtoupper(get_class($this)).'_CREATE',$user);
if ($result < 0) { $error++; }
// End call triggers
}
@@ -5188,7 +5188,7 @@ abstract class CommonObject
if (! $error && ! $notrigger) {
// Call triggers
- $result=$this->call_trigger(strtoupper(get_class(self)).'_MODIFY',$user);
+ $result=$this->call_trigger(strtoupper(get_class($this)).'_MODIFY',$user);
if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail
// End call triggers
}
@@ -5219,7 +5219,7 @@ abstract class CommonObject
if (! $error) {
if (! $notrigger) {
// Call triggers
- $result=$this->call_trigger(strtoupper(get_class(self)).'_DELETE', $user);
+ $result=$this->call_trigger(strtoupper(get_class($this)).'_DELETE', $user);
if ($result < 0) { $error++; } // Do also here what you must do to rollback action if trigger fail
// End call triggers
}
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 2c2fe276146..f932ec05959 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1,6 +1,7 @@
# Dolibarr language file - Source file is en_US - admin
Foundation=Foundation
Version=Version
+Publisher=Publisher
VersionProgram=Version program
VersionLastInstall=Initial install version
VersionLastUpgrade=Latest version upgrade
|