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

Fixed some errors of Bookkeeping class

Browse Source
This commit is contained in:
Marcos García de La Fuente 2015-01-18 03:23:00 +01:00
parent 06eda34b56
commit be3527abd1
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
htdocs/accountancy/class/bookkeeping.class.php
View File

@ -221,7 +221,7 @@ class BookKeeping
* Insert line into bookkeeping * Insert line into bookkeeping
* *
* @param User $user User who inserted operation * @param User $user User who inserted operation
* @return $result Result * @return int <0 KO >0 OK
*/ */
function create($user='') function create($user='')
{ {
@ -276,8 +276,9 @@ class BookKeeping
} }
$now = dol_now(); $now = dol_now();
if (empty($this->date_create)) if (empty($this->date_create)) {
$this->date_create = $now(); $this->date_create = $now;
}
$sql = "INSERT INTO " . MAIN_DB_PREFIX . "accounting_bookkeeping (doc_date, "; $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,"; $sql .= "doc_type, doc_ref,fk_doc,fk_docdet,code_tiers,numero_compte,label_compte,";
@ -330,23 +331,19 @@ class BookKeeping
$sql .= " WHERE import_key = '" . $importkey . "'"; $sql .= " WHERE import_key = '" . $importkey . "'";
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if (! $resql) {
$error ++;
$this->errors[] = "Error " . $this->db->lasterror();
}
// Commit or rollback if (! $resql) {
if ($error) { $this->errors[] = "Error " . $this->db->lasterror();
foreach ( $this->errors as $errmsg ) { foreach ( $this->errors as $errmsg ) {
dol_syslog(get_class($this) . "::delete " . $errmsg, LOG_ERR); dol_syslog(get_class($this) . "::delete " . $errmsg, LOG_ERR);
$this->error .= ($this->error ? ', ' . $errmsg : $errmsg); $this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
} }
$this->db->rollback(); $this->db->rollback();
return - 1 * $error; return - 1;
} else {
$this->db->commit();
return 1;
} }
$this->db->commit();
return 1;
} }
/** /**
@ -595,16 +592,13 @@ class BookKeeping
$this->db->begin(); $this->db->begin();
if (! $error) // if (! $notrigger)
{ // {
if (! $notrigger) // // Call trigger
{ // $result=$this->call_trigger('ACCOUNTING_NUMPIECE_DELETE',$user);
// Call trigger // if ($result < 0) $error++;
$result=$this->call_trigger('ACCOUNTING_NUMPIECE_DELETE',$user); // // End call triggers
if ($result < 0) $error++; // }
// End call triggers
}
}
if (! $error) { if (! $error) {
$sql = "DELETE FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping"; $sql = "DELETE FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping";