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

Merge pull request #15282 from frederic34/patch-10

Browse Source 
doxygen
This commit is contained in:
Laurent Destailleur 2020-11-04 18:36:03 +01:00 committed by GitHub
commit 6392a36489
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/compta/cashcontrol/class/cashcontrol.class.php
View File

@ -19,7 +19,7 @@
*/ */
/** /**
* \file cashcontrol/class/cashcontrol.class.php * \file htdocs/compta/cashcontrol/class/cashcontrol.class.php
* \ingroup cashdesk|takepos * \ingroup cashdesk|takepos
* \brief This file is CRUD class file (Create/Read/Update/Delete) for cash fence table * \brief This file is CRUD class file (Create/Read/Update/Delete) for cash fence table
*/ */
@ -76,6 +76,9 @@ class CashControl extends CommonObject
'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'position'=>1000, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Brouillon', '1'=>'Validated')), 'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'position'=>1000, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Brouillon', '1'=>'Validated')),
); );
/**
* @var int Object Id
*/
public $id; public $id;
public $opening; public $opening;
public $status; public $status;
@ -286,7 +289,7 @@ class CashControl extends CommonObject
public function fetch($id, $ref = null) public function fetch($id, $ref = null)
{ {
$result = $this->fetchCommon($id, $ref); $result = $this->fetchCommon($id, $ref);
if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines(); //if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
return $result; return $result;
} }
@ -420,8 +423,10 @@ class CashControl extends CommonObject
$hookmanager->initHooks(array('cashfencedao')); $hookmanager->initHooks(array('cashfencedao'));
$parameters = array('id'=>$this->id, 'getnomurl'=>$result); $parameters = array('id'=>$this->id, 'getnomurl'=>$result);
$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) { $result = $hookmanager->resPrint; if ($reshook > 0) {
} else { $result .= $hookmanager->resPrint; $result = $hookmanager->resPrint;
} else {
$result .= $hookmanager->resPrint;
} }
return $result; return $result;