FIX Manual deletion of a bookkeeping line
Conflicts: htdocs/accountancy/class/bookkeeping.class.php
This commit is contained in:
parent
aadd5376aa
commit
ae3847dc38
1 changed files with 15 additions and 14 deletions
|
|
@ -758,11 +758,10 @@ class BookKeeping extends CommonObject
|
|||
/**
|
||||
* Load object in memory from the database
|
||||
*
|
||||
* @param int $id Id object
|
||||
* @param string $ref Ref
|
||||
* @param string $mode Mode
|
||||
*
|
||||
* @return int Return integer <0 if KO, 0 if not found, >0 if OK
|
||||
* @param int $id Id object
|
||||
* @param string $ref Ref
|
||||
* @param string $mode Mode ('' or 'tmp_')
|
||||
* @return int Return integer <0 if KO, 0 if not found, >0 if OK
|
||||
*/
|
||||
public function fetch($id, $ref = null, $mode = '')
|
||||
{
|
||||
|
|
@ -1491,17 +1490,18 @@ class BookKeeping extends CommonObject
|
|||
/**
|
||||
* Delete object in database
|
||||
*
|
||||
* @param User $user User that deletes
|
||||
* @param bool $notrigger false=launch triggers after, true=disable triggers
|
||||
* @param string $mode Mode
|
||||
* @return int Return integer <0 if KO, >0 if OK
|
||||
* @param User $user User that deletes
|
||||
* @param int $notrigger 0=launch triggers after, 1=disable triggers
|
||||
* @param string $mode Mode ('' or 'tmp_')
|
||||
* @return int Return integer <0 if KO, >0 if OK
|
||||
*/
|
||||
public function delete(User $user, $notrigger = false, $mode = '')
|
||||
public function delete(User $user, $notrigger = 0, $mode = '')
|
||||
{
|
||||
global $langs;
|
||||
|
||||
dol_syslog(__METHOD__, LOG_DEBUG);
|
||||
|
||||
$result = $this->canModifyBookkeeping($this->id);
|
||||
$result = $this->canModifyBookkeeping($this->id, $mode);
|
||||
if ($result < 0) {
|
||||
return -1;
|
||||
} elseif ($result == 0) {
|
||||
|
|
@ -2303,9 +2303,10 @@ class BookKeeping extends CommonObject
|
|||
* Is the bookkeeping can be modified or deleted ?
|
||||
*
|
||||
* @param int $id Bookkeeping ID
|
||||
* @param string $mode Mode ('' or 'tmp_')
|
||||
* @return int Return integer <0 if KO, == 0 if No, == 1 if Yes
|
||||
*/
|
||||
public function canModifyBookkeeping($id)
|
||||
public function canModifyBookkeeping($id, $mode = '')
|
||||
{
|
||||
global $conf;
|
||||
|
||||
|
|
@ -2317,7 +2318,7 @@ class BookKeeping extends CommonObject
|
|||
}
|
||||
|
||||
$bookkeeping = new BookKeeping($this->db);
|
||||
$result = $bookkeeping->fetch($id);
|
||||
$result = $bookkeeping->fetch($id, null, $mode);
|
||||
if ($result <= 0) {
|
||||
return $result;
|
||||
}
|
||||
|
|
@ -2338,7 +2339,7 @@ class BookKeeping extends CommonObject
|
|||
}
|
||||
|
||||
$bookkeeping = new BookKeeping($this->db);
|
||||
$result = $bookkeeping->fetch($id);
|
||||
$result = $bookkeeping->fetch($id, null, $mode);
|
||||
if ($result <= 0) {
|
||||
return $result;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue