vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Laurent Destailleur 2024-01-13 11:18:04 +01:00
commit e948916e6f
6 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
htdocs/install/doctemplates/websites/website_template-restaurant/containers/page249.tpl.php
View file

@ -33,7 +33,7 @@ ob_start();
<!-- File generated by Dolibarr website module editor -->
<body id="bodywebsite" class="bodywebsite bodywebpage-contact">
<!-- Enter here your HTML content. Add a section with an id tag and tag contenteditable="true" if you want to use the inline editor for the content -->
<?php
<?php
if (GETPOST('action') == 'sendmail') {
include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
$from = GETPOST('email', 'alpha');
@ -74,7 +74,7 @@ if (GETPOST('action') == 'sendmail') {
</header>
<a id="reservation"></a><br>
<section class="contact section-padding">
<div class="container">
<div class="row">
@ -90,8 +90,8 @@ if (GETPOST('action') == 'sendmail') {
role="form"
>
<input type="hidden" name="action" value="sendmail">
<input type="hidden" name="toekn" value="<?php echo newToken(); ?>">
<input type="hidden" name="token" value="<?php echo newToken(); ?>">
<div class="col-lg-6 col-6">
<label for="contact-name" class="form-label"
>Full Name</label
@ -168,7 +168,7 @@ if (GETPOST('action') == 'sendmail') {
<div class=" mb-lg-3">
<?php $days = ["MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY"];
foreach ($days as $day){
echo "<p> $day : " .getDolGlobalString("MAIN_INFO_OPENINGHOURS_$day") ."</p>";
echo "<p> $day : " .getDolGlobalString("MAIN_INFO_OPENINGHOURS_$day") ."</p>";
}
?>
</div>
@ -184,7 +184,7 @@ if (GETPOST('action') == 'sendmail') {
<div class="col-12" id="divaddress">
<br><br>
<h4 class="mt-5 mb-4 center">
<?php echo $mysoc->getFullAddress() ?>
</h4>
@ -201,7 +201,7 @@ if (GETPOST('action') == 'sendmail') {
</main>
<!-- Modal -->
<div
class="modal fade"

2
htdocs/install/doctemplates/websites/website_template-restaurant/website_pages.sql
View file

File diff suppressed because one or more lines are too long

17
htdocs/main.inc.php
View file

@ -2180,14 +2180,25 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
$toprightmenu .= $form->textwithtooltip('', $langs->trans("ModuleBuilder"), 2, 1, $text, 'login_block_elem', 2);
}
// Link to print main content area
// Link to print main content area (optioncss=print)
if (!getDolGlobalString('MAIN_PRINT_DISABLELINK') && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
$qs = dol_escape_htmltag($_SERVER["QUERY_STRING"]);
if (isset($_POST) && is_array($_POST)) {
foreach ($_POST as $key => $value) {
if ($key !== 'action' && $key !== 'password' && !is_array($value)) {
$qs .= '&'.$key.'='.urlencode($value);
if (in_array($key, array('action', 'massaction', 'password'))) {
continue;
}
if (!is_array($value)) {
if ($value !== '') {
$qs .= '&'.$key.'='.urlencode($value);
}
} else {
foreach ($value as $value2) {
if ($value2 !== '') {
$qs .= '&'.$key.'[]='.urlencode($value2);
}
}
}
}
}

2
htdocs/multicurrency/multicurrency_rate.php
View file

@ -40,7 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/multicurrency.lib.php';
// Load translation files required by the page
$langs->loadLangs(array('multicurrency'));
$langs->loadLangs(array('admin', 'multicurrency'));
// Get Parameters
$action = GETPOST('action', 'alpha');

2
htdocs/product/stock/stockatdate.php
View file

@ -427,7 +427,7 @@ if (!empty($search_fk_warehouse)) {
}
}
if ($productid > 0) {
$param .= '&productid='.$productid;
$param .= '&productid='.(int) $productid;
}
if (GETPOST('dateday', 'int') > 0) {
$param .= '&dateday='.GETPOST('dateday', 'int');

2
htdocs/salaries/virement_request.php
View file

@ -104,7 +104,7 @@ if ($id > 0 || !empty($ref)) {
$permissiontoread = $user->rights->salaries->read;
$permissiontoadd = $user->rights->salaries->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
$permissiontodelete = $user->rights->salaries->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
$permissiontodelete = $user->rights->salaries->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_UNPAID);
$moreparam = '';
if ($type == 'bank-transfer') {