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

Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0

Browse Source 
Conflicts:
	htdocs/core/class/html.formmail.class.php
This commit is contained in:
Laurent Destailleur 2021-02-03 20:46:22 +01:00
commit 787e03a10d
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/class/html.formmail.class.php
View File

@ -455,10 +455,13 @@ class FormMail extends Form
// Zone to select email template // Zone to select email template
if (count($modelmail_array) > 0) if (count($modelmail_array) > 0)
{ {
$model_mail_selected_id = GETPOSTISSET('modelmailselected') ? GETPOST('modelmailselected', 'int') : $arraydefaultmessage->id;
// If list of template is filled // If list of template is filled
$out .= '<div class="center" style="padding: 0px 0 12px 0">'."\n"; $out .= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
$out .= '<span class="opacitymedium">'.$langs->trans('SelectMailModel').':</span> '; $out .= '<span class="opacitymedium">'.$langs->trans('SelectMailModel').':</span> ';
$out .= $this->selectarray('modelmailselected', $modelmail_array, 0, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100', 1, '', 0, 1); $out .= $this->selectarray('modelmailselected', $modelmail_array, $model_mail_selected_id, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100', 1, '', 0, 1);
if ($user->admin) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')), 1); if ($user->admin) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')), 1);
$out .= ' &nbsp; '; $out .= ' &nbsp; ';
$out .= '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">'; $out .= '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">';

8
htdocs/takepos/index.php
View File

@ -777,10 +777,9 @@ $( document ).ready(function() {
print "ModalBox('ModalTerminal');"; print "ModalBox('ModalTerminal');";
} }
if ($conf->global->TAKEPOS_CONTROL_CASH_OPENING) if ($conf->global->TAKEPOS_CONTROL_CASH_OPENING)
{ $sql = "SELECT rowid, status FROM ".MAIN_DB_PREFIX."pos_cash_fence WHERE";
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."pos_cash_fence WHERE "; $sql .= " entity = ".$conf->entity." AND ";
$sql .= " date(date_creation) = CURDATE()"; $sql .= " date(date_creation) = CURDATE()";
$sql .= "";
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) { if ($resql) {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
@ -1026,7 +1025,8 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
); );
} }
$sql = "SELECT rowid, status 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 .= " date(date_creation) = CURDATE()"; $sql .= " date(date_creation) = CURDATE()";
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)