'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '
';
-print '| '.$langs->trans("Month").' | ';
+print '
| '.$langs->trans("Month").' | ';
for ($annee = $year_start; $annee <= $year_end; $annee++) {
- print ''.$annee.' | ';
+ print ''.$annee.' | ';
}
print '
';
print '';
-print '| | ';
+print ' | ';
for ($annee = $year_start; $annee <= $year_end; $annee++) {
- print ''.$langs->trans("Debit").' | '.$langs->trans("Credit").' | ';
+ print ''.$langs->trans("Debit").' | '.$langs->trans("Credit").' | ';
}
print '
';
@@ -214,7 +212,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++) {
for ($mois = 1; $mois < 13; $mois++) {
print '';
- print "| ".dol_print_date(dol_mktime(1, 1, 1, $mois, 1, 2000), "%B")." | ";
+ print ''.dol_print_date(dol_mktime(1, 1, 1, $mois, 1, 2000), "%B")." | ";
for ($annee = $year_start; $annee <= $year_end; $annee++) {
$case = sprintf("%04d-%02d", $annee, $mois);
@@ -237,10 +235,10 @@ for ($mois = 1; $mois < 13; $mois++) {
}
// Total debit-credit
-print '
| '.$langs->trans("Total")." | ";
+print '
| '.$langs->trans("Total")." | ";
for ($annee = $year_start; $annee <= $year_end; $annee++) {
- print ''. (isset($totsorties[$annee]) ? price($totsorties[$annee]) : '') .' | ';
- print ''. (isset($totentrees[$annee]) ? price($totentrees[$annee]) : '') .' | ';
+ print ''. (isset($totsorties[$annee]) ? price($totsorties[$annee]) : '') .' | ';
+ print ''. (isset($totentrees[$annee]) ? price($totentrees[$annee]) : '') .' | ';
}
print "
\n";
@@ -322,7 +320,7 @@ if ($result < 0) {
$tblyear[2] = array();
for ($annee = 0; $annee < 3; $annee++) {
- $sql = "SELECT date_format(b.datev,'%m')";
+ $sql = "SELECT date_format(b.datev, '%m')";
$sql .= ", SUM(b.amount)";
$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
$sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
@@ -334,7 +332,7 @@ if ($result < 0) {
if ($id && GETPOST("option") != 'all') {
$sql .= " AND b.fk_account IN (".$db->sanitize($id).")";
}
- $sql .= " GROUP BY date_format(b.datev,'%m');";
+ $sql .= " GROUP BY date_format(b.datev, '%m');";
$resql = $db->query($sql);
if ($resql) {
@@ -371,12 +369,12 @@ if ($result < 0) {
$title = $langs->transnoentities("Credit").' - '.$langs->transnoentities("Year").': '.($year - 2).' - '.($year - 1)." - ".$year;
$graph_datas = array();
for ($i = 0; $i < 12; $i++) {
- $graph_datas[$i] = array($labels[$i], $data_year_0[$i], $data_year_1[$i], $data_year_2[$i]);
+ $graph_datas[$i] = array($labels[$i], $data_year_2[$i], $data_year_1[$i], $data_year_0[$i]);
}
$px1 = new DolGraph();
$px1->SetData($graph_datas);
- $px1->SetLegend(array(($year), ($year - 1), ($year - 2)));
+ $px1->SetLegend(array(($year - 2), ($year - 1), $year));
$px1->SetLegendWidthMin(180);
$px1->SetMaxValue($px1->GetCeilMaxValue() < 0 ? 0 : $px1->GetCeilMaxValue());
$px1->SetMinValue($px1->GetFloorMinValue() > 0 ? 0 : $px1->GetFloorMinValue());
@@ -405,7 +403,7 @@ if ($result < 0) {
$tblyear[2] = array();
for ($annee = 0; $annee < 3; $annee++) {
- $sql = "SELECT date_format(b.datev,'%m')";
+ $sql = "SELECT date_format(b.datev, '%m')";
$sql .= ", SUM(b.amount)";
$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
$sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
@@ -417,7 +415,7 @@ if ($result < 0) {
if ($id && GETPOST("option") != 'all') {
$sql .= " AND b.fk_account IN (".$db->sanitize($id).")";
}
- $sql .= " GROUP BY date_format(b.datev,'%m');";
+ $sql .= " GROUP BY date_format(b.datev, '%m');";
$resql = $db->query($sql);
if ($resql) {
@@ -433,6 +431,7 @@ if ($result < 0) {
dol_print_error($db);
}
}
+
// Chargement de labels et data_xxx pour tableau 4 Movements
$labels = array();
$data_year_0 = array();
@@ -452,12 +451,12 @@ if ($result < 0) {
$title = $langs->transnoentities("Debit").' - '.$langs->transnoentities("Year").': '.($year - 2).' - '.($year - 1)." - ".$year;
$graph_datas = array();
for ($i = 0; $i < 12; $i++) {
- $graph_datas[$i] = array($labels[$i], $data_year_0[$i], $data_year_1[$i], $data_year_2[$i]);
+ $graph_datas[$i] = array($labels[$i], $data_year_2[$i], $data_year_1[$i], $data_year_0[$i]);
}
$px2 = new DolGraph();
$px2->SetData($graph_datas);
- $px2->SetLegend(array(($year), ($year - 1), ($year - 2)));
+ $px2->SetLegend(array(($year - 2), ($year - 1), $year));
$px2->SetLegendWidthMin(180);
$px2->SetMaxValue($px2->GetCeilMaxValue() < 0 ? 0 : $px2->GetCeilMaxValue());
$px2->SetMinValue($px2->GetFloorMinValue() > 0 ? 0 : $px2->GetFloorMinValue());
@@ -480,9 +479,9 @@ if ($result < 0) {
unset($tblyear[2]);
print ''; // do not use class="center" here, it will have no effect for the js graph inside.
- print $show1;
+ print $show2; // debit
print '
'; // do not use class="center" here, it will have no effect for the js graph inside.
- print $show2;
+ print $show1; // credit
print '
'.$langs->trans('Type').': '.$this->type_label;
- if (!empty($this->type_accountancy_code)) {
- $label .= ' ('.$langs->trans('AccountancyCode').': '.$this->type_accountancy_code.')';
+ if (isModEnabled('accounting') || !empty($this->type_accountancy_code)) {
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+ $label .= ' ('.$langs->trans('AccountancyCode').': '.(empty($this->type_accountancy_code) ? $langs->trans("Unknown") : length_accountg($this->type_accountancy_code)).')';
}
}
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 82a25fd2678..266bae09fc0 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -107,7 +107,7 @@ if (!empty($permtodelete) && empty($permissiontodelete)) {
}
// Mass actions. Controls on number of lines checked.
-$maxformassaction = (!getDolGlobalString('MAIN_LIMIT_FOR_MASS_ACTIONS') ? 1000 : $conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS);
+$maxformassaction = getDolGlobalInt('MAIN_LIMIT_FOR_MASS_ACTIONS', 1000);
if ($massaction && is_array($toselect) && count($toselect) < 1) {
$error++;
setEventMessages($langs->trans("NoRecordSelected"), null, "warnings");
diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index 31297131479..9a5e139d361 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -26,7 +26,7 @@
/**
* Class to manage a WYSIWYG editor.
- * Usage: $doleditor=new DolEditor('body',$message,320,'toolbar_mailing');
+ * Usage: $doleditor = new DolEditor('body', $message, 320, 'toolbar_mailing');
* $doleditor->Create();
*/
class DolEditor
@@ -188,23 +188,31 @@ class DolEditor
* Output edit area inside the HTML stream.
* Output depends on this->tool (fckeditor, ckeditor, textarea, ...)
*
- * @param int $noprint 1=Return HTML string instead of printing it to output
- * @param string $morejs Add more js. For example: ".on( \'saveSnapshot\', function(e) { alert(\'ee\'); });". Used by CKEditor only.
- * @param boolean $disallowAnyContent Disallow to use any content. true=restrict to a predefined list of allowed elements. Used by CKEditor only.
- * @param string $titlecontent Show title content before editor area. Used by ACE editor only.
- * @param string $option For ACE editor, set the source language ('html', 'php', 'javascript', 'json', ...)
- * @param string $moreparam Add extra tags to the textarea
- * @param string $morecss Add extra css to the textarea
+ * @param int $noprint 1=Return HTML string instead of printing it to output
+ * @param string $morejs Add more js. For example: ".on( \'saveSnapshot\', function(e) { alert(\'ee\'); });". Used by CKEditor only.
+ * @param boolean|string $restrictContent Decide which content is allowed. Used by CKEditor only.
+ * true = restrict allowed content to a predefined list of allowed elements.
+ * false = allow anything
+ * string = true + add values into string
+ * @param string $titlecontent Show title content before editor area. Used by ACE editor only.
+ * @param string $option For ACE editor, set the source language ('html', 'php', 'javascript', 'json', ...)
+ * @param string $moreparam Add extra tags to the textarea
+ * @param string $morecss Add extra css to the textarea
* @return void|string
*/
- public function Create($noprint = 0, $morejs = '', $disallowAnyContent = true, $titlecontent = '', $option = '', $moreparam = '', $morecss = '')
+ public function Create($noprint = 0, $morejs = '', $restrictContent = true, $titlecontent = '', $option = '', $moreparam = '', $morecss = '')
{
// phpcs:enable
global $conf, $langs;
$fullpage = false;
+
+ $extraAllowedContent = 'a[target];section[contenteditable,id];div{float,display}';
+ if (is_string($restrictContent)) {
+ $extraAllowedContent = $restrictContent;
+ }
if (isset($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT)) {
- $disallowAnyContent = !getDolGlobalString('FCKEDITOR_ALLOW_ANY_CONTENT'); // Only predefined list of html tags are allowed or all
+ $restrictContent = !getDolGlobalString('FCKEDITOR_ALLOW_ANY_CONTENT'); // Only predefined list of html tags are allowed or all
}
$found = 0;
@@ -214,9 +222,7 @@ class DolEditor
if (in_array($this->tool, array('textarea', 'ckeditor'))) {
$found = 1;
- //$out.= '