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

Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	htdocs/takepos/index.php
This commit is contained in:
Laurent Destailleur 2021-11-11 16:19:01 +01:00
commit fd74e33ef1
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/datapolicy/class/datapolicy.class.php
View File

@ -311,7 +311,6 @@ class DataPolicy
$sendto = $adherent->email; $sendto = $adherent->email;
$code = md5($adherent->email); $code = md5($adherent->email);
if (!empty($adherent->default_lang)) { if (!empty($adherent->default_lang)) {
$l = $adherent->default_lang; $l = $adherent->default_lang;

2
htdocs/projet/tasks.php
View File

@ -171,6 +171,7 @@ if ($object->usage_bill_time) {
} }
// Extra fields // Extra fields
$extrafieldsobjectkey = $taskstatic->table_element;
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php'; include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
$arrayfields = dol_sort_array($arrayfields, 'position'); $arrayfields = dol_sort_array($arrayfields, 'position');
@ -969,7 +970,6 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
print '</td>'; print '</td>';
} }
$extrafieldsobjectkey = $taskstatic->table_element;
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php'; include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
// Action column // Action column

9
htdocs/takepos/index.php
View File

@ -820,10 +820,11 @@ $( document ).ready(function() {
if ($_SESSION["takeposterminal"] == "") { if ($_SESSION["takeposterminal"] == "") {
print "ModalBox('ModalTerminal');"; print "ModalBox('ModalTerminal');";
} }
if (getDolGlobalString('TAKEPOS_CONTROL_CASH_OPENING')) { if (getDolGlobalString('TAKEPOS_CONTROL_CASH_OPENING')) {
$sql = "SELECT rowid, status FROM ".MAIN_DB_PREFIX."pos_cash_fence WHERE"; $sql = "SELECT rowid, status FROM ".MAIN_DB_PREFIX."pos_cash_fence WHERE";
$sql .= " entity = ".$conf->entity." AND "; $sql .= " entity = ".((int) $conf->entity)." AND ";
$sql .= " posnumber = ".$_SESSION["takeposterminal"]." AND "; $sql .= " posnumber = ".((int) $_SESSION["takeposterminal"])." AND ";
$sql .= " date_creation > '".$db->idate(dol_get_first_hour(dol_now()))."'"; $sql .= " date_creation > '".$db->idate(dol_get_first_hour(dol_now()))."'";
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) { if ($resql) {
@ -1105,8 +1106,8 @@ if (getDolGlobalString('TAKEPOS_PRINT_METHOD') == "receiptprinter") {
} }
$sql = "SELECT rowid, status, entity FROM ".MAIN_DB_PREFIX."pos_cash_fence WHERE"; $sql = "SELECT rowid, status, entity FROM ".MAIN_DB_PREFIX."pos_cash_fence WHERE";
$sql .= " entity = ".$conf->entity." AND "; $sql .= " entity = ".((int) $conf->entity)." AND ";
$sql .= " posnumber = ".$_SESSION["takeposterminal"]." AND "; $sql .= " posnumber = ".((int) $_SESSION["takeposterminal"])." AND ";
$sql .= " date_creation > '".$db->idate(dol_get_first_hour(dol_now()))."'"; $sql .= " date_creation > '".$db->idate(dol_get_first_hour(dol_now()))."'";
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) { if ($resql) {