Skip to content
Snippets Groups Projects
Commit be3527ab authored by Marcos García de La Fuente's avatar Marcos García de La Fuente
Browse files

Fixed some errors of Bookkeeping class

parent 06eda34b
No related branches found
No related tags found
No related merge requests found
......@@ -221,7 +221,7 @@ class BookKeeping
* Insert line into bookkeeping
*
* @param User $user User who inserted operation
* @return $result Result
* @return int <0 KO >0 OK
*/
function create($user='')
{
......@@ -276,8 +276,9 @@ class BookKeeping
}
$now = dol_now();
if (empty($this->date_create))
$this->date_create = $now();
if (empty($this->date_create)) {
$this->date_create = $now;
}
$sql = "INSERT INTO " . MAIN_DB_PREFIX . "accounting_bookkeeping (doc_date, ";
$sql .= "doc_type, doc_ref,fk_doc,fk_docdet,code_tiers,numero_compte,label_compte,";
......@@ -330,24 +331,20 @@ class BookKeeping
$sql .= " WHERE import_key = '" . $importkey . "'";
$resql = $this->db->query($sql);
if (! $resql) {
$error ++;
$this->errors[] = "Error " . $this->db->lasterror();
}
// Commit or rollback
if ($error) {
foreach ( $this->errors as $errmsg ) {
dol_syslog(get_class($this) . "::delete " . $errmsg, LOG_ERR);
$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
}
$this->db->rollback();
return - 1 * $error;
} else {
return - 1;
}
$this->db->commit();
return 1;
}
}
/**
* Create object into database
......@@ -595,16 +592,13 @@ class BookKeeping
$this->db->begin();
if (! $error)
{
if (! $notrigger)
{
// Call trigger
$result=$this->call_trigger('ACCOUNTING_NUMPIECE_DELETE',$user);
if ($result < 0) $error++;
// End call triggers
}
}
// if (! $notrigger)
// {
// // Call trigger
// $result=$this->call_trigger('ACCOUNTING_NUMPIECE_DELETE',$user);
// if ($result < 0) $error++;
// // End call triggers
// }
if (! $error) {
$sql = "DELETE FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment