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

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

Browse Source 
Conflicts:
	htdocs/core/class/html.form.class.php
This commit is contained in:
Laurent Destailleur 2021-07-08 23:45:26 +02:00
commit 463fadb776
5 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/accountancy/customer/index.php
View File

@ -158,6 +158,9 @@ if ($action == 'validatehistory') {
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa4 ON " . $alias_societe_perentity . ".accountancy_code_sell = aa4.account_number AND aa4.active = 1 AND aa4.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa4.entity = ".$conf->entity; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa4 ON " . $alias_societe_perentity . ".accountancy_code_sell = aa4.account_number AND aa4.active = 1 AND aa4.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa4.entity = ".$conf->entity;
$sql .= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0"; $sql .= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
$sql .= " AND l.product_type <= 2"; $sql .= " AND l.product_type <= 2";
if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
$sql .= " AND f.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
}
dol_syslog('htdocs/accountancy/customer/index.php'); dol_syslog('htdocs/accountancy/customer/index.php');
$result = $db->query($sql); $result = $db->query($sql);

3
htdocs/accountancy/supplier/index.php
View File

@ -166,6 +166,9 @@ if ($action == 'validatehistory') {
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa4 ON " . $alias_product_perentity . ".accountancy_code_buy = aa4.account_number AND aa4.active = 1 AND aa4.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa4.entity = ".$conf->entity; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa4 ON " . $alias_product_perentity . ".accountancy_code_buy = aa4.account_number AND aa4.active = 1 AND aa4.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa4.entity = ".$conf->entity;
$sql .= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0"; $sql .= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
$sql .= " AND l.product_type <= 2"; $sql .= " AND l.product_type <= 2";
if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
$sql .= " AND f.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
}
dol_syslog('htdocs/accountancy/supplier/index.php'); dol_syslog('htdocs/accountancy/supplier/index.php');

3
htdocs/core/class/html.form.class.php
View File

@ -1252,6 +1252,9 @@ class Form
if (is_null($ajaxoptions)) { if (is_null($ajaxoptions)) {
$ajaxoptions = array(); $ajaxoptions = array();
} }
require_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
// No immediate load of all database // No immediate load of all database
$placeholder = ''; $placeholder = '';
if ($selected && empty($selected_input_value)) { if ($selected && empty($selected_input_value)) {

3
htdocs/theme/eldy/global.inc.php
View File

@ -4530,6 +4530,9 @@ div#card-errors {
.ui-dialog-content { .ui-dialog-content {
} }
.ui-dialog.ui-corner-all.ui-widget.ui-widget-content.ui-front.ui-dialog-buttons.ui-draggable {
z-index: 1002 !important; /* Default 101 with jquery, top menu have a z-index of 1000 */
}
/* ============================================================================== */ /* ============================================================================== */
/* For content of image preview */ /* For content of image preview */

3
htdocs/theme/md/style.css.php
View File

@ -4474,6 +4474,9 @@ div#card-errors {
font-size: <?php print $fontsize; ?>px !important; font-size: <?php print $fontsize; ?>px !important;
} }
.ui-dialog.ui-corner-all.ui-widget.ui-widget-content.ui-front.ui-dialog-buttons.ui-draggable {
z-index: 1002 !important; /* Default 101 with jquery, top menu have a z-index of 1000 */
}
/* ============================================================================== */ /* ============================================================================== */
/* For content of image preview */ /* For content of image preview */