| '; - print $langs->trans("DateCreationShort"); - print ' | '; - print dol_print_date($object->date_creation, 'dayhour'); - print ' | ||||
| '.$langs->trans("InitialBankBalance").' - '.$langs->trans("Cash").' | '; - print ''.price($object->opening, 0, $langs, 1, -1, -1, $conf->currency).''; - print " |
| '.$langs->trans("Summary").' | '; + print ''.$langs->trans("InitialBankBalance").' | '; + print ''.$langs->trans("Sales").' | '; + print ''.$langs->trans("EndBankBalance").' | '; + print "||
| '.$langs->trans($val).' | '; - if ($realamountforpaymentmode) { - print ''.price($realamountforpaymentmode, 0, $langs, 1, -1, -1, $conf->currency).''; + $newkey = $key.'_declared'; + if (!property_exists($object, $key)) { + continue; } - print " | ||||
| '.$langs->trans($val).' | '; + print ''; + if ($key == 'cash') { + print ''.price($object->opening, 0, $langs, 1, -1, -1, $conf->currency).''; + } + print ' | '; + print ''; + if ($realamountforpaymentmode) { + print ''.($realamountforpaymentmode >= 0 ? '+' : '').price($realamountforpaymentmode, 0, $langs, 1, -1, -1, $conf->currency).''; + } + print ' | '; + print ''; + print ''; + print price($declaredamountforpaymentmode, 0, $langs, 1, -1, -1, $conf->currency).''; + print ' | '; + print '
| '.$langs->trans("NbOfInvoices").' | '; + print ''.$langs->trans("NbOfPayments").' | '; print ''; print ' | '; // Amount per payment type @@ -896,25 +1053,30 @@ if (empty($action) || $action == "view" || $action == "close") { print '';
print price($initialbalanceforterminal[$terminalid]['cash']).' '; print ' | ';
- // Amount per payment type
+
+ // Amount calculated per payment type
$i = 0;
foreach ($arrayofpaymentmode as $key => $val) {
- print ''; + print ' | '; $i++; } + // Save print ''; print ' |
| '.$langs->trans("RealAmount").' | '; + // Initial amount print ''; print ''; print ' | '; + // Amount per payment type $i = 0; foreach ($arrayofpaymentmode as $key => $val) { - print ''; + print ' | ';
print '';
diff --git a/htdocs/compta/cashcontrol/class/cashcontrol.class.php b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
index 7a54274527e..62062d82aac 100644
--- a/htdocs/compta/cashcontrol/class/cashcontrol.class.php
+++ b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
@@ -82,6 +82,13 @@ class CashControl extends CommonObject
'cash' => array('type' => 'price', 'label' => 'Cash', 'enabled' => 1, 'visible' => 1, 'position' => 30, 'csslist' => 'amount'),
'cheque' => array('type' => 'price', 'label' => 'Cheque', 'enabled' => 1, 'visible' => 1, 'position' => 33, 'csslist' => 'amount'),
'card' => array('type' => 'price', 'label' => 'CreditCard', 'enabled' => 1, 'visible' => 1, 'position' => 36, 'csslist' => 'amount'),
+ 'cash_declared' => array('type' => 'price', 'label' => 'CashDeclared', 'enabled' => 1, 'visible' => 1, 'position' => 40, 'csslist' => 'amount'),
+ 'cheque_declared' => array('type' => 'price', 'label' => 'ChequeDeclared', 'enabled' => 1, 'visible' => 1, 'position' => 41, 'csslist' => 'amount'),
+ 'card_declared' => array('type' => 'price', 'label' => 'CreditCardDeclared', 'enabled' => 1, 'visible' => 1, 'position' => 42, 'csslist' => 'amount'),
+ 'cash_lifetime' => array('type' => 'price', 'label' => 'CashLifetime', 'enabled' => 1, 'visible' => 0, 'position' => 45, 'csslist' => 'amount'),
+ 'cheque_lifetime' => array('type' => 'price', 'label' => 'ChequeLifetime', 'enabled' => 1, 'visible' => 0, 'position' => 46, 'csslist' => 'amount'),
+ 'card_lifetime' => array('type' => 'price', 'label' => 'CreditCardLifetime', 'enabled' => 1, 'visible' => 0, 'position' => 47, 'csslist' => 'amount'),
+ 'lifetime_start' => array('type' => 'datetime', 'label' => 'LifetimeStartDate', 'enabled' => 1, 'visible' => 0, 'position' => 48, 'csslist' => 'center'),
'year_close' => array('type' => 'integer', 'label' => 'Year', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 50, 'css' => 'center'),
'month_close' => array('type' => 'integer', 'label' => 'Month', 'enabled' => 1, 'visible' => 1, 'position' => 55, 'css' => 'center'),
'day_close' => array('type' => 'integer', 'label' => 'Day', 'enabled' => 1, 'visible' => 1, 'position' => 60, 'css' => 'center'),
@@ -158,20 +165,55 @@ class CashControl extends CommonObject
public $posnumber;
/**
- * @var float Cash amount
+ * @var float Cash amount earned during period (calculated)
*/
public $cash;
/**
- * @var float cheque amount
+ * @var float Cheque amount earned during period (calculated)
*/
public $cheque;
/**
- * @var float Card amountS
+ * @var float Card amount earned during period (calculated)
*/
public $card;
+ /**
+ * @var ?float Cash found/declared in account (is the
+ */
+ public $cash_declared;
+
+ /**
+ * @var ?float Cheque found/declared in account
+ */
+ public $cheque_declared;
+
+ /**
+ * @var ?float Card found/declared in account
+ */
+ public $card_declared;
+
+ /**
+ * @var ?float Lifetime cash earned
+ */
+ public $cash_lifetime;
+
+ /**
+ * @var ?float Lifetime cheque amount
+ */
+ public $cheque_lifetime;
+
+ /**
+ * @var ?float Lifetime card amountS
+ */
+ public $card_lifetime;
+
+ /**
+ * @var ?int Date when lifetime value start
+ */
+ public $lifetime_start;
+
/**
* @var int User ID create
*/
@@ -301,7 +343,7 @@ class CashControl extends CommonObject
}
/**
- * Validate cash fence
+ * Validate a cash register control
*
* @param User $user User
* @param int $notrigger No trigger
@@ -309,7 +351,6 @@ class CashControl extends CommonObject
*/
public function valid(User $user, $notrigger = 0)
{
- global $conf, $langs;
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$error = 0;
@@ -324,7 +365,7 @@ class CashControl extends CommonObject
// Update request
$sql = "UPDATE ".MAIN_DB_PREFIX."pos_cash_fence";
- $sql .= " SET status = ".self::STATUS_VALIDATED.",";
+ $sql .= " SET status = ".((int) self::STATUS_VALIDATED).",";
$sql .= " date_valid='".$this->db->idate($now)."',";
$sql .= " fk_user_valid = ".((int) $user->id);
$sql .= " WHERE rowid=".((int) $this->id);
@@ -368,6 +409,73 @@ class CashControl extends CommonObject
}
+ /**
+ * Close a cash register control
+ *
+ * @param User $user User
+ * @param int $notrigger No trigger
+ * @return int Return integer <0 if KO, >0 if OK
+ */
+ public function close(User $user, $notrigger = 0)
+ {
+ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+ $error = 0;
+
+ // Protection
+ if ($this->status == self::STATUS_CLOSED) {
+ $this->error = get_class($this)."::valid action abandoned: already validated";
+ dol_syslog($this->error, LOG_WARNING);
+ return 0;
+ }
+
+ $now = dol_now();
+
+ // Update request
+ $sql = "UPDATE ".MAIN_DB_PREFIX."pos_cash_fence";
+ $sql .= " SET status = ".((int) self::STATUS_CLOSED).",";
+ $sql .= " date_valid = '".$this->db->idate($now)."',";
+ $sql .= " fk_user_valid = ".((int) $user->id);
+ $sql .= " WHERE rowid=".((int) $this->id);
+
+ $this->db->begin();
+
+ dol_syslog(get_class($this)."::close", LOG_DEBUG);
+ $resql = $this->db->query($sql);
+ if (!$resql) {
+ $error++;
+ $this->errors[] = "Error ".$this->db->lasterror();
+ }
+
+ if (!$error) {
+ $this->status = self::STATUS_CLOSED;
+ $this->date_valid = $now;
+ $this->fk_user_valid = $user->id;
+ }
+
+ if (!$error && !$notrigger) {
+ // Call trigger
+ $result = $this->call_trigger('CASHCONTROL_CLOSE', $user);
+ if ($result < 0) {
+ $error++;
+ }
+ // End call triggers
+ }
+
+ // Commit or rollback
+ if ($error) {
+ foreach ($this->errors as $errmsg) {
+ dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+ $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+ }
+ $this->db->rollback();
+ return -1 * $error;
+ } else {
+ $this->db->commit();
+ return $this->id;
+ }
+ }
+
/**
* Load object in memory from the database
*
diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php
index b2c0cbf5a27..f6bd1240e9a 100644
--- a/htdocs/compta/cashcontrol/report.php
+++ b/htdocs/compta/cashcontrol/report.php
@@ -392,8 +392,8 @@ if ($resql) {
print '';
print ' '.price($cash).' ';
}
- if (!$summaryonly && $object->status == $object::STATUS_VALIDATED && price2num($newcash) != price2num($object->cash)) {
- print ' <> '.$langs->trans("Declared").': '.price($object->cash).' ';
+ if (!$summaryonly && $object->status == $object::STATUS_CLOSED && price2num($newcash) != price2num((float) $object->cash_declared)) {
+ print ' <> '.$langs->trans("Declared").': '.price($object->cash_declared).' ';
}
print ""; @@ -401,8 +401,8 @@ if ($resql) { print $langs->trans("PaymentTypeCHQ").(!empty($transactionspertype['CHQ']) ? ' ('.$transactionspertype['CHQ'].' '.$langs->trans("Articles").')' : '').' : '; print ''; print ' '.price($cheque).' ';
- if (!$summaryonly && $object->status == $object::STATUS_VALIDATED && price2num($cheque) != price2num($object->cheque)) {
- print ' <> '.$langs->trans("Declared").' : '.price($object->cheque).' ';
+ if (!$summaryonly && $object->status == $object::STATUS_CLOSED && price2num($cheque) != price2num((float) $object->cheque_declared)) {
+ print ' <> '.$langs->trans("Declared").' : '.price($object->cheque_declared).' ';
}
print ""; @@ -410,8 +410,8 @@ if ($resql) { print $langs->trans("PaymentTypeCB").(!empty($transactionspertype['CB']) ? ' ('.$transactionspertype['CB'].' '.$langs->trans("Articles").')' : '').' : '; print ''; print ' '.price($bank).' ';
- if (!$summaryonly && $object->status == $object::STATUS_VALIDATED && price2num($bank) != price2num($object->card)) {
- print ' <> '.$langs->trans("Declared").': '.price($object->card).' ';
+ if (!$summaryonly && $object->status == $object::STATUS_CLOSED && price2num($bank) != price2num((float) $object->card_declared)) {
+ print ' <> '.$langs->trans("Declared").': '.price($object->card_declared).' ';
}
print ""; diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php index 621ae8d5bb7..df703ce0bc4 100644 --- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php +++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php @@ -107,7 +107,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers || $action === 'BILL_SUPPLIER_VALIDATE' || (($action === 'BILL_SUPPLIER_DELETE' || $action === 'BILL_SUPPLIER_SENTBYMAIL') && ($object->statut != 0 || $object->status != 0)) || $action === 'MEMBER_SUBSCRIPTION_CREATE' || $action === 'MEMBER_SUBSCRIPTION_MODIFY' || $action === 'MEMBER_SUBSCRIPTION_DELETE' || $action === 'DON_VALIDATE' || (($action === 'DON_MODIFY' || $action === 'DON_DELETE') && ($object->statut != 0 || $object->status != 0)) - || $action === 'CASHCONTROL_VALIDATE' + || $action === 'CASHCONTROL_CLOSE' || (in_array($object->element, array('facture', 'supplier_invoice')) && $action === 'DOC_DOWNLOAD' && ($object->statut != 0 || $object->status != 0)) || (in_array($object->element, array('facture', 'supplier_invoice')) && $action === 'DOC_PREVIEW' && ($object->statut != 0 || $object->status != 0)) || (getDolGlobalString('BLOCKEDLOG_ADD_ACTIONS_SUPPORTED') && in_array($action, explode(',', getDolGlobalString('BLOCKEDLOG_ADD_ACTIONS_SUPPORTED')))) @@ -119,7 +119,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers 'DON_VALIDATE', 'DON_MODIFY', 'DON_DELETE'))) { /** @var Don|Subscription $object */ $amounts = (float) $object->amount; - } elseif ($action == 'CASHCONTROL_VALIDATE') { + } elseif ($action == 'CASHCONTROL_CLOSE') { /** @var CashControl $object */ $amounts = (float) $object->cash + (float) $object->cheque + (float) $object->card; } else { diff --git a/htdocs/install/mysql/migration/22.0.0-23.0.0.sql b/htdocs/install/mysql/migration/22.0.0-23.0.0.sql index 74f44d2bc1e..64842a39f6d 100644 --- a/htdocs/install/mysql/migration/22.0.0-23.0.0.sql +++ b/htdocs/install/mysql/migration/22.0.0-23.0.0.sql @@ -404,12 +404,14 @@ ALTER TABLE llx_pos_cash_fence ADD COLUMN hour_close INTEGER DEFAULT null after ALTER TABLE llx_pos_cash_fence ADD COLUMN min_close INTEGER DEFAULT null after hour_close; ALTER TABLE llx_pos_cash_fence ADD COLUMN sec_close INTEGER DEFAULT null after min_close; -ALTER TABLE llx_pos_cash_fence ADD COLUMN cash_calculated double(24,8) DEFAULT null; -ALTER TABLE llx_pos_cash_fence ADD COLUMN card_calculated double(24,8) DEFAULT null; -ALTER TABLE llx_pos_cash_fence ADD COLUMN cheque_calculated double(24,8) DEFAULT null; +ALTER TABLE llx_pos_cash_fence ADD COLUMN cash_declared double(24,8) DEFAULT null; +ALTER TABLE llx_pos_cash_fence ADD COLUMN card_declared double(24,8) DEFAULT null; +ALTER TABLE llx_pos_cash_fence ADD COLUMN cheque_declared double(24,8) DEFAULT null; ALTER TABLE llx_pos_cash_fence ADD COLUMN cash_lifetime double(24,8) DEFAULT null; ALTER TABLE llx_pos_cash_fence ADD COLUMN card_lifetime double(24,8) DEFAULT null; ALTER TABLE llx_pos_cash_fence ADD COLUMN cheque_lifetime double(24,8) DEFAULT null; +ALTER TABLE llx_pos_cash_fence ADD COLUMN lifetime_start datetime DEFAULT NULL; + -- end of migration diff --git a/htdocs/install/mysql/tables/llx_pos_cash_fence.sql b/htdocs/install/mysql/tables/llx_pos_cash_fence.sql index e3bb0625994..66796d11fbf 100644 --- a/htdocs/install/mysql/tables/llx_pos_cash_fence.sql +++ b/htdocs/install/mysql/tables/llx_pos_cash_fence.sql @@ -20,18 +20,19 @@ CREATE TABLE llx_pos_cash_fence( ref VARCHAR(64), label VARCHAR(255), opening double(24,8) default 0, - -- amount calculated - cash_calculated double(24,8) default NULL, - card_calculated double(24,8) default NULL, - cheque_calculated double(24,8) default NULL, - -- amount declared + -- amount cash double(24,8) default 0, card double(24,8) default 0, cheque double(24,8) default 0, + -- amount declared + cash_declared double(24,8) default NULL, + card_declared double(24,8) default NULL, + cheque_declared double(24,8) default NULL, -- lifetime amount (not used) cash_lifetime double(24,8) default NULL, card_lifetime double(24,8) default NULL, cheque_lifetime double(24,8) default NULL, + lifetime_start datetime default NULL, status INTEGER, date_creation DATETIME NOT NULL, date_valid DATETIME, diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index b98f2532cb3..57681119360 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -706,3 +706,4 @@ TypeAmountOfEachNewDiscountSplit=Input amount for each part SplitDiscountTitle=Split discount into several parts DisputeStatus=Dispute status DisputeOpen=Dispute open +Sales=Sales diff --git a/htdocs/langs/en_US/blockedlog.lang b/htdocs/langs/en_US/blockedlog.lang index 5a28f7faabd..0ac71fd6bb8 100644 --- a/htdocs/langs/en_US/blockedlog.lang +++ b/htdocs/langs/en_US/blockedlog.lang @@ -63,7 +63,8 @@ logBILL_PAYED=Customer invoice paid logBILL_SENTBYMAIL=Customer invoice send by mail logBILL_UNPAYED=Customer invoice set unpaid logBILL_VALIDATE=Customer invoice validated -logCASHCONTROL_VALIDATE=Cash register closing +logCASHCONTROL_VALIDATE=Cash register validation +logCASHCONTROL_CLOSE=Cash register closing logDOC_DOWNLOAD=Download of a validated document in order to print or send logDOC_PREVIEW=Preview of a validated document in order to print or download logDONATION_PAYMENT_CREATE=Donation payment created diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang index 831b8463a39..4a996848dee 100644 --- a/htdocs/langs/en_US/cashdesk.lang +++ b/htdocs/langs/en_US/cashdesk.lang @@ -180,3 +180,5 @@ CashControlEndDateMustBeBeforeNow=It is not possible to make a monthly or yearly CashControlEndDayMustNotBeInPast=It is not possible to make a daily cash control on a day in the future. TheoricalView=Theorical view SentOrderToKitchen=Send order to kitchen +LifetimeAmount=Lifetime amount +AllTerminals=All terminals diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 3b4222173e8..75cb6ec1c63 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -1408,3 +1408,4 @@ KO=KO AddThisPageToBookmarks = Add current page to bookmarks EditBookmarks = List/edit bookmarks Why=Why +since=since |