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

Standardize code.

Browse Source
This commit is contained in:
Laurent Destailleur 2018-12-17 03:25:45 +01:00
parent 72c5943c55
commit bf9ee18bed
4 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/cashcontrol/cashcontrol_card.php
View File

@ -135,7 +135,7 @@ if ($action=="close")
{ {
$cashcontrol= new CashControl($db); $cashcontrol= new CashControl($db);
$cashcontrol->id=$id; $cashcontrol->id=$id;
$cashcontrol->close($user); $cashcontrol->valid($user);
$action="view"; $action="view";
} }

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

@ -182,19 +182,43 @@ class CashControl extends CommonObject
} }
/** /**
* close * Validate cash fence
* *
* @param User $user User * @param User $user User
* @param number $notrigger No trigger * @param number $notrigger No trigger
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
public function close(User $user, $notrigger = 0) public function valid(User $user, $notrigger = 0)
{ {
global $conf,$langs;
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$error = 0; $error = 0;
// Protection
if ($this->status == self::STATUS_VALIDATED)
{
dol_syslog(get_class($this)."::valid action abandonned: already validated", LOG_WARNING);
return 0;
}
/*
$posmodule = $this->posmodule;
if (! empty($user->rights->$posmodule->use))
{
$this->error='NotEnoughPermissions';
dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
return -1;
}
*/
$now=dol_now();
// Update request // Update request
$sql = "UPDATE ".MAIN_DB_PREFIX."pos_cash_fence"; $sql = "UPDATE ".MAIN_DB_PREFIX."pos_cash_fence";
$sql.= " SET status = ".self::STATUS_VALIDATED; $sql.= " SET status = ".self::STATUS_VALIDATED.",";
$sql.= " date_valid='".$this->db->idate($now)."',";
$sql.= " fk_user_valid = ".$user->id;
$sql.= " WHERE rowid=".$this->id; $sql.= " WHERE rowid=".$this->id;
$this->db->begin(); $this->db->begin();
@ -212,10 +236,10 @@ class CashControl extends CommonObject
if (! $error && ! $notrigger) if (! $error && ! $notrigger)
{ {
$this->context=array('operation'=>'close'); $this->context=array('date_valid'=>$now);
// Call trigger // Call trigger
$result=$this->call_trigger('CASHCONTROL_MODIFY', $user); $result=$this->call_trigger('CASHCONTROL_VALIDATE', $user);
if ($result < 0) $error++; if ($result < 0) $error++;
// End call triggers // End call triggers
} }

1
htdocs/install/mysql/migration/8.0.0-9.0.0.sql
View File

@ -242,6 +242,7 @@ CREATE TABLE llx_pos_cash_fence(
cheque double(24,8) default 0, cheque double(24,8) default 0,
status INTEGER, status INTEGER,
date_creation DATETIME NOT NULL, date_creation DATETIME NOT NULL,
date_valid DATETIME,
day_close INTEGER, day_close INTEGER,
month_close INTEGER, month_close INTEGER,
year_close INTEGER, year_close INTEGER,

1
htdocs/install/mysql/tables/llx_pos_cash_fence.sql
View File

@ -25,6 +25,7 @@ CREATE TABLE llx_pos_cash_fence(
cheque double(24,8) default 0, cheque double(24,8) default 0,
status INTEGER, status INTEGER,
date_creation DATETIME NOT NULL, date_creation DATETIME NOT NULL,
date_valid DATETIME,
day_close INTEGER, day_close INTEGER,
month_close INTEGER, month_close INTEGER,
year_close INTEGER, year_close INTEGER,