diff --git a/htdocs/adherents/cotisation.class.php b/htdocs/adherents/cotisation.class.php index b7cc1b1edee..d32ddba8e66 100644 --- a/htdocs/adherents/cotisation.class.php +++ b/htdocs/adherents/cotisation.class.php @@ -190,11 +190,6 @@ class Cotisation extends CommonObject require_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); $accountline=new AccountLine($this->db); $result=$accountline->fetch($this->fk_bank); - if ($accountline->rappro) - { - $this->error="ErrorBankRecordConcialiated"; - return -1; - } } $this->db->begin(); @@ -209,7 +204,7 @@ class Cotisation extends CommonObject { if ($this->fk_bank) { - $result=$accountline->delete(); + $result=$accountline->delete(); // Renvoi faux si ligne rapprocher if ($result > 0) { $this->db->commit(); @@ -217,6 +212,7 @@ class Cotisation extends CommonObject } else { + $this->error=$accountline->error; $this->db->rollback(); return -1; } diff --git a/htdocs/adherents/fiche_subscription.php b/htdocs/adherents/fiche_subscription.php index 96a8719b72e..a72f07c6f82 100644 --- a/htdocs/adherents/fiche_subscription.php +++ b/htdocs/adherents/fiche_subscription.php @@ -130,7 +130,7 @@ if ($user->rights->adherent->cotisation->creer && $_REQUEST["action"] == 'update if ($user->rights->adherent->cotisation->creer && $_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes') { $result=$subscription->fetch($rowid); - $result=$subscription->delete($rowid); + $result=$subscription->delete(); if ($result > 0) { Header("Location: card_subscriptions.php?rowid=".$subscription->fk_adherent); diff --git a/htdocs/lib/databases/mssql.lib.php b/htdocs/lib/databases/mssql.lib.php index 1285aef1c3e..aeea4766cb7 100644 --- a/htdocs/lib/databases/mssql.lib.php +++ b/htdocs/lib/databases/mssql.lib.php @@ -244,43 +244,51 @@ class DoliDb } - /** - \brief Debut d'une transaction. - \return int 1 si ouverture transaction ok ou deja ouverte, 0 en cas d'erreur - */ - function begin() - { - if (! $this->transaction_opened) - { - $ret=$this->query("BEGIN TRANSACTION"); - if ($ret) $this->transaction_opened++; - return $ret; - } - else - { - $this->transaction_opened++; - return 1; - } - } + /** + \brief Debut d'une transaction. + \return int 1 si ouverture transaction ok ou deja ouverte, 0 en cas d'erreur + */ + function begin() + { + if (! $this->transaction_opened) + { + $ret=$this->query("BEGIN TRANSACTION"); + if ($ret) + { + $this->transaction_opened++; + dolibarr_syslog("BEGIN Transaction",LOG_DEBUG); + } + return $ret; + } + else + { + $this->transaction_opened++; + return 1; + } + } - /** - \brief Validation d'une transaction - \return int 1 si validation ok ou niveau de transaction non ouverte, 0 en cas d'erreur - */ - function commit() - { - if ($this->transaction_opened<=1) - { - $ret=$this->query("COMMIT TRANSACTION"); - if ($ret) $this->transaction_opened=0; - return $ret; - } - else - { - $this->transaction_opened--; - return 1; - } - } + /** + \brief Validation d'une transaction + \return int 1 si validation ok ou niveau de transaction non ouverte, 0 en cas d'erreur + */ + function commit() + { + if ($this->transaction_opened <= 1) + { + $ret=$this->query("COMMIT TRANSACTION"); + if ($ret) + { + $this->transaction_opened=0; + dolibarr_syslog("COMMIT Transaction",LOG_DEBUG); + } + return $ret; + } + else + { + $this->transaction_opened--; + return 1; + } + } /** \brief Annulation d'une transaction et retour aux anciennes valeurs @@ -288,13 +296,11 @@ class DoliDb */ function rollback() { - dolibarr_syslog("ROLLBACK ".$this->transaction_opened, LOG_ERR); - if ($this->transaction_opened<=1) { $ret=$this->query("ROLLBACK TRANSACTION"); $this->transaction_opened=0; - + dolibarr_syslog("ROLLBACK Transaction",LOG_DEBUG); return $ret; } else diff --git a/htdocs/lib/databases/mysql.lib.php b/htdocs/lib/databases/mysql.lib.php index 171c93245a6..da3f75b7f1a 100644 --- a/htdocs/lib/databases/mysql.lib.php +++ b/htdocs/lib/databases/mysql.lib.php @@ -299,20 +299,24 @@ class DoliDb \brief Debut d'une transaction. \return int 1 si ouverture transaction ok ou deja ouverte, 0 en cas d'erreur */ - function begin() - { - if (! $this->transaction_opened) - { - $ret=$this->query("BEGIN"); - if ($ret) $this->transaction_opened++; - return $ret; - } - else - { - $this->transaction_opened++; - return 1; - } - } + function begin() + { + if (! $this->transaction_opened) + { + $ret=$this->query("BEGIN"); + if ($ret) + { + $this->transaction_opened++; + dolibarr_syslog("BEGIN Transaction",LOG_DEBUG); + } + return $ret; + } + else + { + $this->transaction_opened++; + return 1; + } + } /** \brief Validation d'une transaction @@ -323,7 +327,11 @@ class DoliDb if ($this->transaction_opened<=1) { $ret=$this->query("COMMIT"); - if ($ret) $this->transaction_opened=0; + if ($ret) + { + $this->transaction_opened=0; + dolibarr_syslog("COMMIT Transaction",LOG_DEBUG); + } return $ret; } else @@ -339,13 +347,11 @@ class DoliDb */ function rollback() { - dolibarr_syslog("ROLLBACK ".$this->transaction_opened, LOG_ERR); - if ($this->transaction_opened<=1) { $ret=$this->query("ROLLBACK"); $this->transaction_opened=0; - + dolibarr_syslog("ROLLBACK Transaction",LOG_DEBUG); return $ret; } else diff --git a/htdocs/lib/databases/mysqli.lib.php b/htdocs/lib/databases/mysqli.lib.php index a06d4422b6f..f3f4553780d 100644 --- a/htdocs/lib/databases/mysqli.lib.php +++ b/htdocs/lib/databases/mysqli.lib.php @@ -309,7 +309,11 @@ class DoliDb if (! $this->transaction_opened) { $ret=$this->query("BEGIN"); - if ($ret) $this->transaction_opened++; + if ($ret) + { + $this->transaction_opened++; + dolibarr_syslog("BEGIN Transaction",LOG_DEBUG); + } return $ret; } else @@ -328,7 +332,11 @@ class DoliDb if ($this->transaction_opened<=1) { $ret=$this->query("COMMIT"); - if ($ret) $this->transaction_opened=0; + if ($ret) + { + $this->transaction_opened=0; + dolibarr_syslog("COMMIT Transaction",LOG_DEBUG); + } return $ret; } else @@ -348,6 +356,7 @@ class DoliDb { $ret=$this->query("ROLLBACK"); $this->transaction_opened=0; + dolibarr_syslog("ROLLBACK Transaction",LOG_DEBUG); return $ret; } else diff --git a/htdocs/lib/databases/pgsql.lib.php b/htdocs/lib/databases/pgsql.lib.php index da2656610c6..49391e7cb79 100644 --- a/htdocs/lib/databases/pgsql.lib.php +++ b/htdocs/lib/databases/pgsql.lib.php @@ -252,7 +252,11 @@ class DoliDb if (! $this->transaction_opened) { $ret=$this->query("BEGIN;"); - if ($ret) $this->transaction_opened++; + if ($ret) + { + $this->transaction_opened++; + dolibarr_syslog("BEGIN Transaction",LOG_DEBUG); + } return $ret; } else @@ -271,7 +275,11 @@ class DoliDb if ($this->transaction_opened<=1) { $ret=$this->query("COMMIT;"); - if ($ret) $this->transaction_opened=0; + if ($ret) + { + $this->transaction_opened=0; + dolibarr_syslog("COMMIT Transaction",LOG_DEBUG); + } return $ret; } else @@ -290,7 +298,8 @@ class DoliDb if ($this->transaction_opened<=1) { $ret=$this->query("ROLLBACK;"); - $this->transaction_opened=0; + $this->transaction_opened=0; + dolibarr_syslog("ROLLBACK Transaction",LOG_DEBUG); return $ret; } else