'; + print '
'; - print ''; - print '
'; diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php index a8a24e67d9d..a70bb710937 100644 --- a/htdocs/accountancy/bookkeeping/list.php +++ b/htdocs/accountancy/bookkeeping/list.php @@ -1,7 +1,7 @@ * Copyright (C) 2013-2016 Florian Henry
';
+ print $form->selectDate($search_date_validation_start, 'date_validation_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
+ print '
';
+ print '';
+ print $form->selectDate($search_date_validation_end, 'date_validation_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
+ print '
';
+ print '| '.$langs->trans("Filter").' | |
| '.$langs->trans("Member").' | '; +print img_picto('', 'company', 'class="pictofixedwidth"'); print $form->select_company($id,'memberid','',1); print ' |
| '.$langs->trans("User").' | '; -print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); +print img_picto('', 'user', 'class="pictofixedwidth"'); +print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'widthcentpercentminusx maxwidth300'); print ' |
'; @@ -187,8 +189,8 @@ foreach ($data as $val) { //print ''; print ''; print '
\n"; print "
\n"; - -$selectedvalue = $conf->global->AGENDA_DISABLE_EXT; -if ($selectedvalue == 1) { - $selectedvalue = 0; -} else { - $selectedvalue = 1; -} - print "
| '.$langs->trans("AgendaExtNb", $key)." | "; // Name - print ''; + print ' | '; // URL - print ' | '; + print ' | '; // Offset TZ - print ' | '; + print ' | '; // Color (Possible colors are limited by Google) print ' | '; //print $formadmin->selectColor($conf->global->$color, "google_agenda_color".$key, $colorlist); - print $formother->selectColor((GETPOST("AGENDA_EXT_COLOR".$key) ?GETPOST("AGENDA_EXT_COLOR".$key) : $conf->global->$color), "AGENDA_EXT_COLOR".$key, 'extsitesconfig', 1, '', 'hideifnotset'); + print $formother->selectColor((GETPOST("AGENDA_EXT_COLOR".$key) ?GETPOST("AGENDA_EXT_COLOR".$key) : getDolGlobalString($color)), "AGENDA_EXT_COLOR".$key, 'extsitesconfig', 1, '', 'hideifnotset'); print ' | '; print "
| '.$langs->trans("Name").' | '; @@ -272,7 +273,9 @@ foreach ($dirmodels as $reldir) { } } } -print "
\n"; +print "
\n"; /* @@ -301,6 +304,7 @@ if ($resql) { } +print '
';
print "\n";
print "
';
+print '
';
print "| '.$langs->trans("Name").' | '; @@ -414,6 +418,7 @@ foreach ($dirmodels as $reldir) { } print '
"; /* @@ -421,6 +426,8 @@ print "
"; */ print load_fiche_titre($langs->trans("OtherOptions"), '', ''); + +print '
';
print '';
print '
';
+print '
';
print '| '.$langs->trans("Parameter").' | '; @@ -469,6 +476,7 @@ print "
'; diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index df691eba688..56971457f76 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -115,7 +115,7 @@ if ($action == 'add') { $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes ("; $sql .= "box_id, position, box_order, fk_user, entity"; $sql .= ") VALUES ("; - $sql .= $boxid['value'].", ".((int) $pos).", '".(($nbboxonleft > $nbboxonright) ? 'B01' : 'A01')."', ".$fk_user.", ".$conf->entity; + $sql .= ((int) $boxid['value']).", ".((int) $pos).", '".(($nbboxonleft > $nbboxonright) ? 'B01' : 'A01')."', ".((int) $fk_user).", ".$conf->entity; $sql .= ")"; dol_syslog("boxes.php activate box", LOG_DEBUG); @@ -149,11 +149,6 @@ if ($action == 'delete') { if (!empty($obj->box_id)) { $db->begin(); - // Remove all personalized setup when a box is activated or disabled (why removing all ? We removed only removed boxes) - // $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param"; - // $sql.= " WHERE param LIKE 'MAIN_BOXES_%'"; - // $resql = $db->query($sql); - $sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes"; $sql .= " WHERE entity = ".$conf->entity; $sql .= " AND box_id=".((int) $obj->box_id); @@ -184,6 +179,7 @@ if ($action == 'switch') { $newsecondnum = preg_replace('/[a-zA-Z]+/', '', $newsecond); $newsecond = sprintf("%s%02d", $newsecondchar ? $newsecondchar : 'A', $newsecondnum + 1); } + $sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order='".$db->escape($newfirst)."' WHERE rowid=".((int) $objfrom->rowid); dol_syslog($sql); $resultupdatefrom = $db->query($sql); @@ -426,7 +422,7 @@ foreach ($boxactivated as $key => $box) { $hasnext = ($key < (count($boxactivated) - 1)); $hasprevious = ($key != 0); print '
';
-print "\n";
-print "
'; print '
'; print load_fiche_titre($langs->trans("ConfigurationFile").' ('.$conffile.')', '', 'folder'); -print '$dolibarr_main_prod: '.$dolibarr_main_prod; +print '$dolibarr_main_prod: '.($dolibarr_main_prod ? $dolibarr_main_prod : '0'); if (empty($dolibarr_main_prod)) { print ' '.img_picto('', 'warning').' '.$langs->trans("IfYouAreOnAProductionSetThis", 1); } @@ -245,8 +245,22 @@ if (empty($dolibarr_main_restrict_ip)) { print ''.$langs->trans("None").''; //print ' ('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("IPsOfUsers")).')'; } + print '
'; +if (empty($conf->global->SECURITY_DISABLE_TEST_ON_OBFUSCATED_CONF)) { + print '$dolibarr_main_db_pass: '; + if (!empty($dolibarr_main_db_pass) && empty($dolibarr_main_db_encrypted_pass)) { + print img_picto('', 'warning').' '.$langs->trans("DatabasePasswordNotObfuscated").' ('.$langs->trans("Recommanded").': '.$langs->trans("SetOptionTo", $langs->transnoentitiesnoconv("MainDbPasswordFileConfEncrypted"), yn(1)).')'; + //print ' ('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("IPsOfUsers")).')'; + } else { + print img_picto('', 'tick').' '.$langs->trans("DatabasePasswordObfuscated"); + } + + print '
'; +} + + // Menu security @@ -277,7 +291,7 @@ if ($conf->global->MAIN_SECURITY_HASH_ALGO != 'password_hash') { print '
'; -print 'MAIN_SECURITY_ANTI_SSRF_SERVER_IP = '.(empty($conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP) ? ''.$langs->trans("Undefined").'' : $conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP)."
"; +print 'MAIN_SECURITY_ANTI_SSRF_SERVER_IP = '.(empty($conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP) ? ''.$langs->trans("Undefined").' ('.$langs->trans("Example").': static-ips-of-server - '.$langs->trans("Note").': common loopback ip like 127.*.*.*, [::1] are already added)' : $conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP)."
"; print '
'; print 'MAIN_ALLOW_SVG_FILES_AS_IMAGES = '.(empty($conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES) ? '0 ('.$langs->trans("Recommanded").': 0)' : $conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES)."
"; @@ -315,6 +329,7 @@ $securityevent = new Events($db); $eventstolog = $securityevent->eventstolog; print ''.$langs->trans("AuditedSecurityEvents").': '; +$out = ''; if (!empty($eventstolog) && is_array($eventstolog)) { // Loop on each event type $i = 0; @@ -324,18 +339,22 @@ if (!empty($eventstolog) && is_array($eventstolog)) { $value = empty($conf->global->$key) ? '' : $conf->global->$key; if ($value) { if ($i > 0) { - print ', '; + $out .= ', '; } - print ''.$key.''; + $out .= ''.$key.''; $i++; } } } - print '
'; -} else { - print img_warning().' '.$langs->trans("NoSecurityEventsAreAduited", $langs->transnoentities("Home").' - '.$langs->transnoentities("Setup").' - '.$langs->transnoentities("Audit")).'
'; + print $out; } +if (empty($out)) { + print img_warning().' '.$langs->trans("NoSecurityEventsAreAduited", $langs->transnoentities("Home").' - '.$langs->transnoentities("Setup").' - '.$langs->transnoentities("Security").' - '.$langs->transnoentities("Audit")).'
'; +} + +print '
'; + // Modules/Applications diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php index 362b29c0163..3fa2e5d0af9 100644 --- a/htdocs/admin/translation.php +++ b/htdocs/admin/translation.php @@ -296,19 +296,8 @@ if ($mode == 'overwrite') { print '';
print '';
print ' ';
- // Limit to superadmin
- /*if (! empty($conf->multicompany->enabled) && !$user->entity)
- {
- print '';
- print '';
- print ' ';
- print '';
- }
- else
- {*/
- print ' ';
- print '';
- //}
+ print ' ';
+ print '';
print '';
print " \n";
print '';
@@ -500,7 +489,7 @@ if ($mode == 'searchkey') {
//}
print '';
// Action column
- print '';
+ print ' ';
$searchpicto = $form->showFilterAndCheckAddButtons(!empty($massactionbutton) ? 1 : 0, 'checkforselect', 1);
print $searchpicto;
print ' ';
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index 83649d46a28..6d8cfe21f00 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -109,6 +109,7 @@ if ($action == 'set_default') {
}
}
+
/*
* View
*/
diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 15d31140874..1f59762c865 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -200,7 +200,7 @@ class Setup extends DolibarrApi
$sql = "SELECT id, code, type, libelle as label, module";
$sql .= " FROM ".MAIN_DB_PREFIX."c_paiement as t";
$sql .= " WHERE t.entity IN (".getEntity('c_paiement').")";
- $sql .= " AND t.active = ".$active;
+ $sql .= " AND t.active = ".((int) $active);
// Add sql filters
if ($sqlfilters) {
if (!DolibarrApi::_checkFilters($sqlfilters)) {
@@ -1055,7 +1055,7 @@ class Setup extends DolibarrApi
$sql = "SELECT rowid AS id, zip, town, fk_county, fk_pays AS fk_country";
$sql .= " FROM ".MAIN_DB_PREFIX."c_ziptown as t";
- $sql .= " AND t.active = ".$active;
+ $sql .= " AND t.active = ".((int) $active);
if ($zipcode) {
$sql .= " AND t.zip LIKE '%".$this->db->escape($zipcode)."%'";
}
@@ -1125,7 +1125,7 @@ class Setup extends DolibarrApi
$sql = "SELECT rowid as id, code, sortorder, libelle as label, libelle_facture as descr, type_cdr, nbjour, decalage, module";
$sql .= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
$sql .= " WHERE t.entity IN (".getEntity('c_payment_term').")";
- $sql .= " AND t.active = ".$active;
+ $sql .= " AND t.active = ".((int) $active);
// Add sql filters
if ($sqlfilters) {
if (!DolibarrApi::_checkFilters($sqlfilters)) {
@@ -1183,7 +1183,7 @@ class Setup extends DolibarrApi
$sql = "SELECT rowid as id, code, libelle as label, description, tracking, module";
$sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as t";
$sql .= " WHERE t.entity IN (".getEntity('c_shipment_mode').")";
- $sql .= " AND t.active = ".$active;
+ $sql .= " AND t.active = ".((int) $active);
// Add sql filters
if ($sqlfilters) {
if (!DolibarrApi::_checkFilters($sqlfilters)) {
@@ -1307,7 +1307,7 @@ class Setup extends DolibarrApi
$sql = "SELECT t.rowid, t.entity, t.code, t.label, t.url, t.icon, t.active";
$sql .= " FROM ".MAIN_DB_PREFIX."c_socialnetworks as t";
$sql .= " WHERE t.entity IN (".getEntity('c_socialnetworks').")";
- $sql .= " AND t.active = ".$active;
+ $sql .= " AND t.active = ".((int) $active);
// Add sql filters
if ($sqlfilters) {
if (!DolibarrApi::_checkFilters($sqlfilters)) {
diff --git a/htdocs/asset/class/asset_type.class.php b/htdocs/asset/class/asset_type.class.php
index 36c654c28ba..335cd63115a 100644
--- a/htdocs/asset/class/asset_type.class.php
+++ b/htdocs/asset/class/asset_type.class.php
@@ -332,7 +332,7 @@ class AssetType extends CommonObject
/**
* Return array of Asset objects for asset type this->id (or all if this->id not defined)
*
- * @param string $excludefilter Filter to exclude. This parameter must not be provided by input of users
+ * @param string $excludefilter Filter string to exclude. This parameter must not be provided by input of users
* @param int $mode 0=Return array of asset instance
* 1=Return array of asset instance without extra data
* 2=Return array of asset id only
@@ -347,7 +347,7 @@ class AssetType extends CommonObject
$sql = "SELECT a.rowid";
$sql .= " FROM ".MAIN_DB_PREFIX."asset as a";
$sql .= " WHERE a.entity IN (".getEntity('asset').")";
- $sql .= " AND a.fk_asset_type = ".$this->id;
+ $sql .= " AND a.fk_asset_type = ".((int) $this->id);
if (!empty($excludefilter)) {
$sql .= ' AND ('.$excludefilter.')';
}
diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php
index 91e46269994..b4ee3a0a175 100644
--- a/htdocs/asset/document.php
+++ b/htdocs/asset/document.php
@@ -128,7 +128,7 @@ if ($id > 0 || !empty($ref)) {
print dol_get_fiche_end();
$modulepart = 'asset';
- $permission = $user->rights->asset->write;
+ $permissiontoadd = $user->rights->asset->write;
$permtoedit = $user->rights->asset->write;
$param = '&id='.$object->id;
include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php
index 1e906677e7d..056a73328dc 100644
--- a/htdocs/asset/list.php
+++ b/htdocs/asset/list.php
@@ -103,7 +103,7 @@ foreach ($object->fields as $key => $val) {
// List of fields to search into when doing a "search in all"
$fieldstosearchall = array();
foreach ($object->fields as $key => $val) {
- if ($val['searchall']) {
+ if (!empty($val['searchall'])) {
$fieldstosearchall['t.'.$key] = $val['label'];
}
}
@@ -542,6 +542,12 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
if (!$i) {
$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
}
+ if (!isset($totalarray['val'])) {
+ $totalarray['val'] = array();
+ }
+ if (!isset($totalarray['val']['t.'.$key])) {
+ $totalarray['val']['t.'.$key] = 0;
+ }
$totalarray['val']['t.'.$key] += $object->$key;
}
}
diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php
index 6b59c009ae7..265c12dd49c 100644
--- a/htdocs/blockedlog/admin/blockedlog_list.php
+++ b/htdocs/blockedlog/admin/blockedlog_list.php
@@ -613,8 +613,10 @@ jQuery(document).ready(function () {
var fk_block = $(this).attr("data-blockid");
$.ajax({
- url:"../ajax/block-info.php?id="+fk_block
- ,dataType:"html"
+ method: "GET",
+ data: { token: \''.currentToken().'\' },
+ url: "'.DOL_URL_ROOT.'/blockedlog/ajax/block-info.php?id="+fk_block,
+ dataType: "html"
}).done(function(data) {
jQuery("#dialogforpopup").html(data);
});
@@ -630,10 +632,11 @@ if (!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY) && !empty($conf->glob
'."\n";
}
if (!GETPOSTISSET("no_email") && !empty($object->email)) {
- $result=$object->getNoEmail();
- if ($result<0) {
+ $result = $object->getNoEmail();
+ if ($result < 0) {
setEventMessages($object->error, $object->errors, 'errors');
}
}
print '';
print ''.$form->selectyesno('no_email', (GETPOSTISSET("no_email") ? GETPOST("no_email", 'int') : $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS), 1, false, ($conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS==-1)).' ';
+ print ''.$form->selectyesno('no_email', (GETPOSTISSET("no_email") ? GETPOST("no_email", 'int') : $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS), 1, false, ($conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == -1)).' ';
print ' ';
}
@@ -1080,8 +1078,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print ''."\n";
}
if (!GETPOSTISSET("no_email") && !empty($object->email)) {
- $result=$object->getNoEmail();
- if ($result<0) {
+ $result = $object->getNoEmail();
+ if ($result < 0) {
setEventMessages($object->error, $object->errors, 'errors');
}
}
@@ -1315,8 +1313,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
// Unsubscribe opt-out
if (!empty($conf->mailing->enabled)) {
- $result=$object->getNoEmail();
- if ($result<0) {
+ $result = $object->getNoEmail();
+ if ($result < 0) {
setEventMessages($object->error, $object->errors, 'errors');
}
print ''.$langs->trans("No_Email").' '.yn($object->no_email).'
\n"; if ($returnvalue) { if ($hideerrors) { diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php index e279ced2a3d..6f5d2ccb891 100644 --- a/htdocs/core/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -1043,7 +1043,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $ $regType = array(); if (preg_match('/\{(t+)\}/i', $mask, $regType)) { $masktype = $regType[1]; - $masktype_value = substr(preg_replace('/^TE_/', '', $objsoc->typent_code), 0, dol_strlen($regType[1])); // get n first characters of thirdpaty typent_code (where n is length in mask) + $masktype_value = substr(preg_replace('/^TE_/', '', $objsoc->typent_code), 0, dol_strlen($regType[1])); // get n first characters of thirdparty typent_code (where n is length in mask) $masktype_value = str_pad($masktype_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask } else { $masktype = ''; @@ -2679,57 +2679,6 @@ if (!function_exists('dolEscapeXML')) { } -/** - * Return automatic or manual in current language - * - * @param string $automaticmanual Value to test (1, 'automatic', 'true' or 0, 'manual', 'false') - * @param integer $case 1=Yes/No, 0=yes/no, 2=Disabled checkbox, 3=Disabled checkbox + Automatic/Manual - * @param int $color 0=texte only, 1=Text is formated with a color font style ('ok' or 'error'), 2=Text is formated with 'ok' color. - * @return string HTML string - */ -function autoOrManual($automaticmanual, $case = 1, $color = 0) -{ - global $langs; - $result = 'unknown'; - $classname = ''; - if ($automaticmanual == 1 || strtolower($automaticmanual) == 'automatic' || strtolower($automaticmanual) == 'true') { // A mettre avant test sur no a cause du == 0 - $result = $langs->trans('automatic'); - if ($case == 1 || $case == 3) { - $result = $langs->trans("Automatic"); - } - if ($case == 2) { - $result = ''; - } - if ($case == 3) { - $result = ' '.$result; - } - - $classname = 'ok'; - } elseif ($automaticmanual == 0 || strtolower($automaticmanual) == 'manual' || strtolower($automaticmanual) == 'false') { - $result = $langs->trans("manual"); - if ($case == 1 || $case == 3) { - $result = $langs->trans("Manual"); - } - if ($case == 2) { - $result = ''; - } - if ($case == 3) { - $result = ' '.$result; - } - - if ($color == 2) { - $classname = 'ok'; - } else { - $classname = 'error'; - } - } - if ($color) { - return ''.$result.''; - } - return $result; -} - - /** * Convert links to local wrapper to medias files into a string into a public external URL readable on internet * diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php index 9feddb6f7f5..f87e7b7b4cd 100644 --- a/htdocs/core/lib/geturl.lib.php +++ b/htdocs/core/lib/geturl.lib.php @@ -24,7 +24,9 @@ /** * Function to get a content from an URL (use proxy if proxy defined). * Support Dolibarr setup for timeout and proxy. - * Enhancement of CURL to add an anti SSRF protection. + * Enhancement of CURL to add an anti SSRF protection: + * - you can set MAIN_SECURITY_ANTI_SSRF_SERVER_IP to set static ip of server + * - common local lookup ips like 127.*.*.* are automatically added * * @param string $url URL to call. * @param string $postorget 'POST', 'GET', 'HEAD', 'PUT', 'PUTALREADYFORMATED', 'POSTALREADYFORMATED', 'DELETE' @@ -199,12 +201,13 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation = } } if ($localurl == 1) { // Only local url allowed (dangerous, may allow to get metadata on server or make internal port scanning) + // Deny ips NOT like 10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16, 0.0.0.0/8, 169.254.0.0/16, 127.0.0.0/8 et 240.0.0.0/4, ::1/128, ::/128, ::ffff:0:0/96, fe80::/10... if (filter_var($iptocheck, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) { $info['http_code'] = 400; $info['content'] = 'Error bad hostname '.$iptocheck.'. Must be a local URL.'; break; } - if (!empty($conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP) && !in_array($iptocheck, explode(',', '127.0.0.1,::1,'.$conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP))) { + if (!empty($conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP) && !in_array($iptocheck, explode(',', $conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP))) { $info['http_code'] = 400; $info['content'] = 'Error bad hostname IP (IP is not a local IP defined into list MAIN_SECURITY_SERVER_IP). Must be a local URL in allowed list.'; break; diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php index 0a0ebe3ce02..0ccb6a415fc 100644 --- a/htdocs/core/lib/images.lib.php +++ b/htdocs/core/lib/images.lib.php @@ -590,7 +590,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small', break; } - if (!is_resource($img)) { + if (!is_resource($img) && !($img instanceof \GdImage)) { dol_syslog('Failed to detect type of image. We found infoImg[2]='.$infoImg[2], LOG_WARNING); return 0; } diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php index 16891214ca5..3838829f8cd 100644 --- a/htdocs/core/lib/invoice.lib.php +++ b/htdocs/core/lib/invoice.lib.php @@ -458,8 +458,9 @@ function getPurchaseInvoicePieChart($socid = 0) /** * Return an HTML table that contains a pie chart of the number of customers or supplier invoices - * @param string $mode Can be customer or fourn - * @return string A HTML table that contains a pie chart of customers or supplier invoices + * + * @param string $mode Can be 'customers' or 'suppliers' + * @return string A HTML table that contains a pie chart of customers or supplier invoices */ function getNumberInvoicesPieChart($mode) { @@ -487,48 +488,55 @@ function getNumberInvoicesPieChart($mode) $sql .= ", sum(".$db->ifsql("f.date_lim_reglement > '".date_format($datenowadd30, 'Y-m-d')."'", 1, 0).") as nbnotlate30"; if ($mode == 'customers') { $sql .= " FROM ".MAIN_DB_PREFIX."facture as f"; - } elseif ($mode == 'fourn') { + } elseif ($mode == 'fourn' || $mode == 'suppliers') { $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f"; } else { return ''; } $sql .= " WHERE f.type <> 2"; $sql .= " AND f.fk_statut = 1"; + if (isset($user->socid) && $user->socid > 0) { + $sql .= " AND f.fk_soc = ".((int) $user->socid); + } + $resql = $db->query($sql); if ($resql) { $num = $db->num_rows($resql); $i = 0; $total = 0; $dataseries = array(); + while ($i < $num) { $obj = $db->fetch_object($resql); - $dataseries = array(array($langs->trans('InvoiceLate30Days'),$obj->nblate30) - ,array($langs->trans('InvoiceLate15Days'),$obj->nblate15-$obj->nblate30) - ,array($langs->trans('InvoiceLateMinus15Days'),$obj->nblatenow-$obj->nblate15) - ,array($langs->trans('InvoiceNotLate'),$obj->nbnotlatenow-$obj->nbnotlate15) - ,array($langs->trans('InvoiceNotLate15Days'),$obj->nbnotlate15-$obj->nbnotlate30) - ,array($langs->trans('InvoiceNotLate30Days'),$obj->nbnotlate30)); + $dataseries = array(array($langs->trans('InvoiceLate30Days'), $obj->nblate30) + ,array($langs->trans('InvoiceLate15Days'), $obj->nblate15 - $obj->nblate30) + ,array($langs->trans('InvoiceLateMinus15Days'), $obj->nblatenow - $obj->nblate15) + ,array($langs->trans('InvoiceNotLate'), $obj->nbnotlatenow - $obj->nbnotlate15) + ,array($langs->trans('InvoiceNotLate15Days'), $obj->nbnotlate15 - $obj->nbnotlate30) + ,array($langs->trans('InvoiceNotLate30Days'), $obj->nbnotlate30)); $i++; } foreach ($dataseries as $key=>$value) { - $total+=$value[1]; + $total += $value[1]; } $colorseries = array($badgeStatus8, $badgeStatus1, $badgeStatus3, $badgeStatus4, $badgeStatus11, '-'.$badgeStatus11); - if ($conf->use_javascript_ajax) { - $result = ''.$langs->trans("Mask").': ';
- $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
+ $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
$texte .= ' ';
diff --git a/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php b/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
index 36a2b30e6e0..16e0f666774 100644
--- a/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
+++ b/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
@@ -73,7 +73,7 @@ class mod_chequereceipt_thyme extends ModeleNumRefChequeReceipts
// Parametrage du prefix
$texte .= ''.$langs->trans("Mask").': ';
- $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
+ $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
$texte .= ' ';
diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
index 33b31135caf..239ec7639ec 100644
--- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -3,7 +3,7 @@
* Copyright (C) 2012 Juanjo Menent
* Copyright (C) 2014 Marcos García
* Copyright (C) 2016 Charlie Benke
- * Copyright (C) 2018-2019 Philippe Grand
+ * Copyright (C) 2018-2021 Philippe Grand
* Copyright (C) 2018-2019 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
@@ -85,13 +85,13 @@ class doc_generic_order_odt extends ModelePDFCommandes
$this->marge_haute = 0;
$this->marge_basse = 0;
- $this->option_logo = 1; // Affiche logo
- $this->option_tva = 0; // Gere option tva COMMANDE_TVAOPTION
- $this->option_modereg = 0; // Affiche mode reglement
- $this->option_condreg = 0; // Affiche conditions reglement
- $this->option_codeproduitservice = 0; // Affiche code produit-service
- $this->option_multilang = 1; // Dispo en plusieurs langues
- $this->option_escompte = 0; // Affiche si il y a eu escompte
+ $this->option_logo = 1; // Display logo
+ $this->option_tva = 0; // Manage the vat option COMMANDE_TVAOPTION
+ $this->option_modereg = 0; // Display payment mode
+ $this->option_condreg = 0; // Display payment terms
+ $this->option_codeproduitservice = 0; // Display product-service code
+ $this->option_multilang = 1; // Available in several languages
+ $this->option_escompte = 0; // Displays if there has been a discount
$this->option_credit_note = 0; // Support credit notes
$this->option_freetext = 1; // Support add of a personalised text
$this->option_draft_watermark = 0; // Support add of a watermark on drafts
@@ -158,7 +158,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
$texte .= $conf->global->COMMANDE_ADDON_PDF_ODT_PATH;
$texte .= '';
$texte .= ''.$langs->trans("Mask").': ';
- $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
+ $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
$texte .= ' ';
diff --git a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
index 7b451287ae1..b1e441175d9 100644
--- a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
+++ b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
@@ -84,13 +84,13 @@ class doc_generic_contract_odt extends ModelePDFContract
$this->marge_haute = 0;
$this->marge_basse = 0;
- $this->option_logo = 1; // Affiche logo
- $this->option_tva = 0; // Gere option tva CONTRACT_TVAOPTION
- $this->option_modereg = 0; // Affiche mode reglement
- $this->option_condreg = 0; // Affiche conditions reglement
- $this->option_codeproduitservice = 0; // Affiche code produit-service
- $this->option_multilang = 1; // Dispo en plusieurs langues
- $this->option_escompte = 0; // Affiche si il y a eu escompte
+ $this->option_logo = 1; // Display logo
+ $this->option_tva = 0; // Manage the vat CONTRACT_TVAOPTION
+ $this->option_modereg = 0; // Display payment mode
+ $this->option_condreg = 0; // Display payment terms
+ $this->option_codeproduitservice = 0; // Display product-service code
+ $this->option_multilang = 1; // Available in several languages
+ $this->option_escompte = 0; // Displays if there has been a discount
$this->option_credit_note = 0; // Support credit notes
$this->option_freetext = 1; // Support add of a personalised text
$this->option_draft_watermark = 0; // Support add of a watermark on drafts
@@ -157,7 +157,7 @@ class doc_generic_contract_odt extends ModelePDFContract
$texte .= $conf->global->CONTRACT_ADDON_PDF_ODT_PATH;
$texte .= '';
$texte .= ''.$langs->trans("Mask").': ';
- $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
+ $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
$texte .= ' ';
$texte .= '
';
diff --git a/htdocs/core/modules/delivery/mod_delivery_saphir.php b/htdocs/core/modules/delivery/mod_delivery_saphir.php
index af1900803c8..d5ac288b52a 100644
--- a/htdocs/core/modules/delivery/mod_delivery_saphir.php
+++ b/htdocs/core/modules/delivery/mod_delivery_saphir.php
@@ -83,7 +83,7 @@ class mod_delivery_saphir extends ModeleNumRefDeliveryOrder
// Parametrage du prefix
$texte .= ''.$langs->trans("Mask").': ';
- $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
+ $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
$texte .= ' ';
diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
index 797530a6c13..8a2b6b2b121 100644
--- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
+++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
@@ -3,7 +3,7 @@
* Copyright (C) 2012 Juanjo Menent
* Copyright (C) 2014 Marcos García
* Copyright (C) 2016 Charlie Benke
- * Copyright (C) 2018-2019 Philippe Grand
+ * Copyright (C) 2018-2021 Philippe Grand
* Copyright (C) 2018-2019 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
@@ -86,13 +86,13 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
$this->marge_haute = 0;
$this->marge_basse = 0;
- $this->option_logo = 1; // Affiche logo
- $this->option_tva = 0; // Gere option tva EXPEDITION_TVAOPTION
- $this->option_modereg = 0; // Affiche mode reglement
- $this->option_condreg = 0; // Affiche conditions reglement
- $this->option_codeproduitservice = 0; // Affiche code produit-service
- $this->option_multilang = 1; // Dispo en plusieurs langues
- $this->option_escompte = 0; // Affiche si il y a eu escompte
+ $this->option_logo = 1; // Display logo
+ $this->option_tva = 0; // Manage the vat option EXPEDITION_TVAOPTION
+ $this->option_modereg = 0; // Display payment mode
+ $this->option_condreg = 0; // Display payment terms
+ $this->option_codeproduitservice = 0; // Display product-service code
+ $this->option_multilang = 1; // Available in several languages
+ $this->option_escompte = 0; // Displays if there has been a discount
$this->option_credit_note = 0; // Support credit notes
$this->option_freetext = 1; // Support add of a personalised text
$this->option_draft_watermark = 0; // Support add of a watermark on drafts
@@ -182,7 +182,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
// Add input to upload a new template file.
$texte .= ''.$langs->trans("Mask").': ';
- $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
+ $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
$texte .= ' ';
$texte .= '
- * Copyright (C) 2016-2019 Philippe Grand
+ * Copyright (C) 2016-2021 Philippe Grand
* Copyright (C) 2018-2020 Frédéric France
* Copyright (C) 2018 Francis Appels
* Copyright (C) 2019 Markus Welters
@@ -151,13 +151,13 @@ class pdf_standard extends ModeleExpenseReport
$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
- $this->option_logo = 1; // Affiche logo
- $this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
- $this->option_modereg = 1; // Affiche mode reglement
- $this->option_condreg = 1; // Affiche conditions reglement
- $this->option_codeproduitservice = 1; // Affiche code produit-service
- $this->option_multilang = 1; // Dispo en plusieurs langues
- $this->option_escompte = 0; // Affiche si il y a eu escompte
+ $this->option_logo = 1; // Display logo
+ $this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
+ $this->option_modereg = 1; // Display payment mode
+ $this->option_condreg = 1; // Display payment terms
+ $this->option_codeproduitservice = 1; // Display product-service code
+ $this->option_multilang = 1; // Available in several languages
+ $this->option_escompte = 0; // Displays if there has been a discount
$this->option_credit_note = 0; // Support credit notes
$this->option_freetext = 1; // Support add of a personalised text
$this->option_draft_watermark = 1; // Support add of a watermark on drafts
diff --git a/htdocs/core/modules/expensereport/mod_expensereport_sand.php b/htdocs/core/modules/expensereport/mod_expensereport_sand.php
index 195667692f1..482b8c06431 100644
--- a/htdocs/core/modules/expensereport/mod_expensereport_sand.php
+++ b/htdocs/core/modules/expensereport/mod_expensereport_sand.php
@@ -82,7 +82,7 @@ class mod_expensereport_sand extends ModeleNumRefExpenseReport
// Parametrage du prefix
$texte .= ''.$langs->trans("Mask").': ';
- $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
+ $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
$texte .= ' ';
diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index eb48373a443..0d360269d46 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -85,13 +85,13 @@ class doc_generic_invoice_odt extends ModelePDFFactures
$this->marge_haute = 0;
$this->marge_basse = 0;
- $this->option_logo = 1; // Affiche logo
- $this->option_tva = 0; // Gere option tva FACTURE_TVAOPTION
- $this->option_modereg = 0; // Affiche mode reglement
- $this->option_condreg = 0; // Affiche conditions reglement
- $this->option_codeproduitservice = 0; // Affiche code produit-service
- $this->option_multilang = 1; // Dispo en plusieurs langues
- $this->option_escompte = 0; // Affiche si il y a eu escompte
+ $this->option_logo = 1; // Display logo
+ $this->option_tva = 0; // Manage the vat option FACTURE_TVAOPTION
+ $this->option_modereg = 0; // Display payment mode
+ $this->option_condreg = 0; // Display payment terms
+ $this->option_codeproduitservice = 0; // Display product-service code
+ $this->option_multilang = 1; // Available in several languages
+ $this->option_escompte = 0; // Displays if there has been a discount
$this->option_credit_note = 0; // Support credit notes
$this->option_freetext = 1; // Support add of a personalised text
$this->option_draft_watermark = 0; // Support add of a watermark on drafts
@@ -158,7 +158,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
$texte .= $conf->global->FACTURE_ADDON_PDF_ODT_PATH;
$texte .= '';
$texte .= ''.$langs->trans("Mask").' ('.$langs->trans("InvoiceStandard").'): ';
- $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
+ $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
$texte .= ' ';
@@ -84,17 +84,17 @@ class mod_facture_mercure extends ModeleNumRefFactures
// Prefix setting of replacement invoices
$texte .= ''.$langs->trans("Mask").' ('.$langs->trans("InvoiceReplacement").'): ';
- $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
+ $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
$texte .= ''.$langs->trans("Mask").' ('.$langs->trans("InvoiceAvoir").'): ';
- $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
+ $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
$texte .= ''.$langs->trans("Mask").' ('.$langs->trans("InvoiceDeposit").'): ';
- $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
+ $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
$texte .= ''.$langs->trans("Mask").': ';
- $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
+ $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
$texte .= ' ';
diff --git a/htdocs/core/modules/holiday/mod_holiday_immaculate.php b/htdocs/core/modules/holiday/mod_holiday_immaculate.php
index b8cb33f550e..000c7881561 100644
--- a/htdocs/core/modules/holiday/mod_holiday_immaculate.php
+++ b/htdocs/core/modules/holiday/mod_holiday_immaculate.php
@@ -85,7 +85,7 @@ class mod_holiday_immaculate extends ModelNumRefHolidays
$tooltip .= $langs->trans("GenericMaskCodes5");
$texte .= ''.$langs->trans("Mask").': ';
- $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
+ $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
$texte .= ' ';
$texte .= '
* Copyright (C) 2014 Marcos García
* Copyright (C) 2016 Charlie Benke
- * Copyright (C) 2018-2019 Philippe Grand
+ * Copyright (C) 2018-2021 Philippe Grand
* Copyright (C) 2018 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
@@ -85,18 +85,18 @@ class doc_generic_mo_odt extends ModelePDFMo
$this->marge_haute = 0;
$this->marge_basse = 0;
- $this->option_logo = 1; // Affiche logo
- $this->option_tva = 0; // Gere option tva
- $this->option_modereg = 0; // Affiche mode reglement
- $this->option_condreg = 0; // Affiche conditions reglement
- $this->option_codeproduitservice = 0; // Affiche code produit-service
- $this->option_multilang = 1; // Dispo en plusieurs langues
- $this->option_escompte = 0; // Affiche si il y a eu escompte
+ $this->option_logo = 1; // Display logo
+ $this->option_tva = 0; // Manage the vat option
+ $this->option_modereg = 0; // Display payment mode
+ $this->option_condreg = 0; // Display payment terms
+ $this->option_codeproduitservice = 0; // Display product-service code
+ $this->option_multilang = 1; // Available in several languages
+ $this->option_escompte = 0; // Displays if there has been a discount
$this->option_credit_note = 0; // Support credit notes
$this->option_freetext = 1; // Support add of a personalised text
$this->option_draft_watermark = 0; // Support add of a watermark on drafts
- // Recupere emetteur
+ // Get source company
$this->emetteur = $mysoc;
if (!$this->emetteur->country_code) {
$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
@@ -158,7 +158,7 @@ class doc_generic_mo_odt extends ModelePDFMo
$texte .= $conf->global->MRP_MO_ADDON_PDF_ODT_PATH;
$texte .= '';
$texte .= ''.$langs->trans("Mask").': ';
- $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
+ $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
$texte .= ' ';
diff --git a/htdocs/core/modules/mrp/modules_mo.php b/htdocs/core/modules/mrp/modules_mo.php
index 82a1a9f3b56..454df89bcde 100644
--- a/htdocs/core/modules/mrp/modules_mo.php
+++ b/htdocs/core/modules/mrp/modules_mo.php
@@ -52,7 +52,7 @@ abstract class ModelePDFMo extends CommonDocGenerator
// phpcs:enable
global $conf;
- $type = 'mo';
+ $type = 'mrp';
$list = array();
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/core/modules/payment/mod_payment_ant.php b/htdocs/core/modules/payment/mod_payment_ant.php
index 10926805721..dca32b26505 100644
--- a/htdocs/core/modules/payment/mod_payment_ant.php
+++ b/htdocs/core/modules/payment/mod_payment_ant.php
@@ -82,7 +82,7 @@ class mod_payment_ant extends ModeleNumRefPayments
// Parametrage du prefix
$texte .= ''.$langs->trans("Mask").': ';
- $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
+ $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
$texte .= ' ';
diff --git a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
index 19a752d5be7..1acf50dd95a 100644
--- a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
+++ b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
@@ -83,18 +83,18 @@ class doc_generic_product_odt extends ModelePDFProduct
$this->marge_haute = 0;
$this->marge_basse = 0;
- $this->option_logo = 1; // Affiche logo
- $this->option_tva = 0; // Gere option tva PRODUCT_TVAOPTION
- $this->option_modereg = 0; // Affiche mode reglement
- $this->option_condreg = 0; // Affiche conditions reglement
- $this->option_codeproduitservice = 0; // Affiche code produit-service
- $this->option_multilang = 1; // Dispo en plusieurs langues
- $this->option_escompte = 0; // Affiche si il y a eu escompte
+ $this->option_logo = 1; // Display logo
+ $this->option_tva = 0; // Manage the vat option PRODUCT_TVAOPTION
+ $this->option_modereg = 0; // Display payment mode
+ $this->option_condreg = 0; // Display payment terms
+ $this->option_codeproduitservice = 0; // Display product-service code
+ $this->option_multilang = 1; // Available in several languages
+ $this->option_escompte = 0; // Displays if there has been a discount
$this->option_credit_note = 0; // Support credit notes
$this->option_freetext = 1; // Support add of a personalised text
$this->option_draft_watermark = 0; // Support add of a watermark on drafts
- // Recupere emetteur
+ // Get source company
$this->emetteur = $mysoc;
if (!$this->emetteur->country_code) {
$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
@@ -161,7 +161,7 @@ class doc_generic_product_odt extends ModelePDFProduct
$texte .= $conf->global->PRODUCT_ADDON_PDF_ODT_PATH;
$texte .= '';
$texte .= ''.$langs->trans("Mask").' ('.$langs->trans("ProductCodeModel").'): ';
- $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
+ $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
$texte .= ' ';
@@ -124,7 +124,7 @@ class mod_codeproduct_elephant extends ModeleProductCode
// Parametrage du prefix suppliers
$texte .= ''.$langs->trans("Mask").' ('.$langs->trans("ServiceCodeModel").'): ';
- $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
+ $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
$texte .= ''.$langs->trans("Mask").': ';
- $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
+ $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
$texte .= ' ';
diff --git a/htdocs/core/modules/product_batch/mod_sn_advanced.php b/htdocs/core/modules/product_batch/mod_sn_advanced.php
index 74f36a55fe6..8117b9e6c6e 100644
--- a/htdocs/core/modules/product_batch/mod_sn_advanced.php
+++ b/htdocs/core/modules/product_batch/mod_sn_advanced.php
@@ -80,7 +80,7 @@ class mod_sn_advanced extends ModeleNumRefBatch
// Parametrage du prefix
$texte .= ''.$langs->trans("Mask").': ';
- $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
+ $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
$texte .= ' ';
diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index d007b421fd7..233180630b0 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -120,18 +120,18 @@ class doc_generic_project_odt extends ModelePDFProjects
$this->marge_haute = 0;
$this->marge_basse = 0;
- $this->option_logo = 1; // Affiche logo
- $this->option_tva = 0; // Gere option tva COMMANDE_TVAOPTION
- $this->option_modereg = 0; // Affiche mode reglement
- $this->option_condreg = 0; // Affiche conditions reglement
- $this->option_codeproduitservice = 0; // Affiche code produit-service
- $this->option_multilang = 1; // Dispo en plusieurs langues
- $this->option_escompte = 0; // Affiche si il y a eu escompte
+ $this->option_logo = 1; // Display logo
+ $this->option_tva = 0; // Manage the vat option COMMANDE_TVAOPTION
+ $this->option_modereg = 0; // Display payment mode
+ $this->option_condreg = 0; // Display payment terms
+ $this->option_codeproduitservice = 0; // Display product-service code
+ $this->option_multilang = 1; // Available in several languages
+ $this->option_escompte = 0; // Displays if there has been a discount
$this->option_credit_note = 0; // Support credit notes
$this->option_freetext = 1; // Support add of a personalised text
$this->option_draft_watermark = 0; // Support add of a watermark on drafts
- // Recupere emetteur
+ // Get source company
$this->emetteur = $mysoc;
if (!$this->emetteur->pays_code) {
$this->emetteur->pays_code = substr($langs->defaultlang, -2); // Par defaut, si n'etait pas defini
@@ -449,7 +449,7 @@ class doc_generic_project_odt extends ModelePDFProjects
$texte .= $conf->global->PROJECT_ADDON_PDF_ODT_PATH;
$texte .= '';
$texte .= ''.$langs->trans("Mask").': ';
- $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
+ $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
$texte .= ' ';
diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index 2d263aae6c0..566c7f07a2e 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -121,21 +121,21 @@ class doc_generic_task_odt extends ModelePDFTask
$this->marge_haute = 0;
$this->marge_basse = 0;
- $this->option_logo = 1; // Affiche logo
- $this->option_tva = 0; // Gere option tva COMMANDE_TVAOPTION
- $this->option_modereg = 0; // Affiche mode reglement
- $this->option_condreg = 0; // Affiche conditions reglement
- $this->option_codeproduitservice = 0; // Affiche code produit-service
- $this->option_multilang = 0; // Dispo en plusieurs langues
- $this->option_escompte = 0; // Affiche si il y a eu escompte
+ $this->option_logo = 1; // Display logo
+ $this->option_tva = 0; // Manage the vat option COMMANDE_TVAOPTION
+ $this->option_modereg = 0; // Display payment mode
+ $this->option_condreg = 0; // Display payment terms
+ $this->option_codeproduitservice = 0; // Display product-service code
+ $this->option_multilang = 0; // Available in several languages
+ $this->option_escompte = 0; // Displays if there has been a discount
$this->option_credit_note = 0; // Support credit notes
$this->option_freetext = 1; // Support add of a personalised text
$this->option_draft_watermark = 0; // Support add of a watermark on drafts
- // Recupere emetteur
+ // Get source company
$this->emetteur = $mysoc;
if (!$this->emetteur->pays_code) {
- $this->emetteur->pays_code = substr($langs->defaultlang, -2); // Par defaut, si n'etait pas defini
+ $this->emetteur->pays_code = substr($langs->defaultlang, -2); // By default, if was not defined
}
}
@@ -416,7 +416,7 @@ class doc_generic_task_odt extends ModelePDFTask
$texte .= $conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH;
$texte .= '';
$texte .= ''.$langs->trans("Mask").': ';
- $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
+ $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
$texte .= ' ';
diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
index 4a292d4a97b..9c7e0af4df0 100644
--- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
+++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
@@ -82,18 +82,18 @@ class doc_generic_proposal_odt extends ModelePDFPropales
$this->marge_haute = 0;
$this->marge_basse = 0;
- $this->option_logo = 1; // Affiche logo
- $this->option_tva = 0; // Gere option tva PROPALE_TVAOPTION
- $this->option_modereg = 0; // Affiche mode reglement
- $this->option_condreg = 0; // Affiche conditions reglement
- $this->option_codeproduitservice = 0; // Affiche code produit-service
- $this->option_multilang = 1; // Dispo en plusieurs langues
- $this->option_escompte = 0; // Affiche si il y a eu escompte
+ $this->option_logo = 1; // Display logo
+ $this->option_tva = 0; // Manage the vat option PROPALE_TVAOPTION
+ $this->option_modereg = 0; // Display payment mode
+ $this->option_condreg = 0; // Display payment terms
+ $this->option_codeproduitservice = 0; // Display product-service code
+ $this->option_multilang = 1; // Available in several languages
+ $this->option_escompte = 0; // Displays if there has been a discount
$this->option_credit_note = 0; // Support credit notes
$this->option_freetext = 1; // Support add of a personalised text
$this->option_draft_watermark = 0; // Support add of a watermark on drafts
- // Recupere emetteur
+ // Get source company
$this->emetteur = $mysoc;
if (!$this->emetteur->country_code) {
$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
@@ -160,7 +160,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
$texte .= $conf->global->PROPALE_ADDON_PDF_ODT_PATH;
$texte .= '';
$texte .= ''.$langs->trans("Mask").': ';
- $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
+ $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
$texte .= ' ';
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index b69ebdeb828..9f85aca1aff 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -209,7 +209,7 @@ class pdf_paiement
$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
}
if (!empty($socid)) {
- $sql .= " AND s.rowid = ".$socid;
+ $sql .= " AND s.rowid = ".((int) $socid);
}
// If global param PAYMENTS_REPORT_GROUP_BY_MOD is set, payement are ordered by paiement_code
if (!empty($conf->global->PAYMENTS_REPORT_GROUP_BY_MOD)) {
diff --git a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
index 13a05b3378d..93dbc4995b4 100644
--- a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
+++ b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
@@ -80,18 +80,18 @@ class doc_generic_reception_odt extends ModelePdfReception
$this->marge_haute = 0;
$this->marge_basse = 0;
- $this->option_logo = 1; // Affiche logo
- $this->option_tva = 0; // Gere option tva RECEPTION_TVAOPTION
- $this->option_modereg = 0; // Affiche mode reglement
- $this->option_condreg = 0; // Affiche conditions reglement
- $this->option_codeproduitservice = 0; // Affiche code produit-service
- $this->option_multilang = 1; // Dispo en plusieurs langues
- $this->option_escompte = 0; // Affiche si il y a eu escompte
+ $this->option_logo = 1; // Display logo
+ $this->option_tva = 0; // Manage the vat option RECEPTION_TVAOPTION
+ $this->option_modereg = 0; // Display payment mode
+ $this->option_condreg = 0; // Display payment terms
+ $this->option_codeproduitservice = 0; // Display product-service code
+ $this->option_multilang = 1; // Available in several languages
+ $this->option_escompte = 0; // Displays if there has been a discount
$this->option_credit_note = 0; // Support credit notes
$this->option_freetext = 1; // Support add of a personalised text
$this->option_draft_watermark = 0; // Support add of a watermark on drafts
- // Recupere emetteur
+ // Get source company
$this->emetteur = $mysoc;
if (!$this->emetteur->country_code) {
$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
@@ -153,7 +153,7 @@ class doc_generic_reception_odt extends ModelePdfReception
$texte .= $conf->global->RECEPTION_ADDON_PDF_ODT_PATH;
$texte .= '';
$texte .= ''.$langs->trans("Mask").': ';
- $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
+ $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
$texte .= ' ';
$texte .= ' ';
- $texte .= '';
+ $texte .= '';
$texte .= ' ';
$texte .= ' '.$langs->trans("Mask").' ('.$langs->trans("CustomerCodeModel").'): ';
- $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
+ $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
$texte .= ' ';
@@ -140,7 +140,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
// Parametrage du prefix suppliers
$texte .= ''.$langs->trans("Mask").' ('.$langs->trans("SupplierCodeModel").'): ';
- $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
+ $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
$texte .= '
| '.$langs->trans("Name").' | '; print ''.$langs->trans("Description").' | '; print ''.$langs->trans("Status")." | \n"; @@ -498,6 +498,7 @@ print load_fiche_titre($langs->trans("SuggestedPaymentModesIfNotDefinedInOrder") print '"; @@ -594,6 +597,8 @@ print '
| '.$langs->trans("Parameter").' | '; @@ -704,6 +709,8 @@ if ($conf->stock->enabled) { */ print '
'; @@ -712,6 +719,8 @@ print '
'; */ print load_fiche_titre($langs->trans("Notifications"), '', ''); + +print '
';
print '';
print '
';
+print '
';
// End of page
llxFooter();
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 0c6da346285..804ed9934bf 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -418,7 +418,7 @@ print '| '.$langs->trans("Parameter").' | '; @@ -725,6 +734,7 @@ print ''; print " |
';
-print '';
+print '
';
+print '';
print '
';
if (!empty($mysoc->logo_small)) {
if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
print '';
- print '.')
';
+ print '';
print '
';
} elseif (!empty($mysoc->logo)) {
if (!file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) {
@@ -487,10 +487,12 @@ if (!empty($mysoc->logo_small)) {
}
$imgThumbSmall = vignette($conf->mycompany->dir_output.'/logos/'.$mysoc->logo, $maxwidthmini, $maxheightmini, '_small', $quality);
print '';
- print ').')
';
+ print '';
print '
';
}
- print '';
+ print '';
+ print ''.img_delete($langs->trans("Delete"), '', 'marginleftonly').'';
+ print '
';
} elseif (!empty($mysoc->logo)) {
if (file_exists($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
print '';
@@ -508,8 +510,8 @@ print '
';
-print '';
+print '
';
+print '';
print '
';
if (!empty($mysoc->logo_squarred_small)) {
if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_small)) {
@@ -551,20 +553,21 @@ print ''; // IDs of the company (country-specific) +print '
';
print '';
-print '
';
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index b1dd28956dc..e94dd6bad39 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -39,9 +39,11 @@ if (!$user->admin) {
// Allow/Disallow change to clear passwords once passwords are crypted
$allow_disable_encryption = true;
+
/*
* Actions
*/
+
if ($action == 'setgeneraterule') {
if (!dolibarr_set_const($db, 'USER_PASSWORD_GENERATED', $_GET["value"], 'chaine', 0, '', $conf->entity)) {
dol_print_error($db);
@@ -215,6 +217,7 @@ if (is_resource($handle)) {
}
asort($arrayhandler);
+print '
'; + + print '
| '.$langs->trans("CompanyIds").' | '.$langs->trans("Value").' | |
| '.$langs->trans("CompanyIds").' | '.$langs->trans("Value").' | |
| '; -print ' | ||
| '; print $form->textwithpicto($langs->trans("GDPRContact"), $langs->trans("GDPRContactDesc")); print ' | '; -print 'global->MAIN_INFO_GDPR) ? $conf->global->MAIN_INFO_GDPR : ''))).'"> | |
| '; @@ -656,6 +659,7 @@ print ''; print ' | '; @@ -456,7 +456,7 @@ if ($mode == 'template' && $user->admin) { if ($action != 'edittemplate') { print '||
| '; + print ' | '; print ' | '; print ''; diff --git a/htdocs/admin/reception_setup.php b/htdocs/admin/reception_setup.php index 7cc9ae3e3be..e9a4a724871 100644 --- a/htdocs/admin/reception_setup.php +++ b/htdocs/admin/reception_setup.php @@ -465,7 +465,7 @@ print " |
| ';
print $form->textwithpicto($langs->trans("WatermarkOnDraftContractCards"), $htmltext).' '; -print ''; +print ''; print " |
';
print '';
print '
';
+print '
';
+
print '';
//if($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK == 1)
@@ -273,45 +278,47 @@ print '';
if ($conf->global->USER_PASSWORD_GENERATED == "Perso") {
$tabConf = explode(";", $conf->global->USER_PASSWORD_PATTERN);
print '| '.$langs->trans("RuleForGeneratedPasswords").' | '; @@ -266,6 +269,8 @@ foreach ($arrayhandler as $key => $module) { } } print '
'; + + print '
';
print '';
print '
';
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index d74c4d5dbf7..68066a2aebc 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -490,7 +490,7 @@ print "';
print $form->textwithpicto($langs->trans("WatermarkOnDraftProposal"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').'
'; print ' ';
-print '';
+print '';
print ' ';
print '';
print "
| '.$langs->trans("PasswordPatternDesc").' | '; + print ''.$langs->trans("PasswordPatternDesc").' | '; print '|||
| '.$langs->trans("MinLength")." | "; - print ''; + print ' | '; print ' | ||
| '.$langs->trans("NbMajMin")." | "; - print ''; + print ' | '; print ' | ||
| '.$langs->trans("NbNumMin")." | "; - print ''; + print ' | '; print ' | ||
| '.$langs->trans("NbSpeMin")." | "; - print ''; + print ' | '; print ' | ||
| '.$langs->trans("NbIteConsecutive")." | "; - print ''; + print ' | '; print ' | ||
| '.$langs->trans("NoAmbiCaracAutoGeneration")." | "; - print ''.($tabConf[5] ? $langs->trans("Activated") : $langs->trans("Disabled")).' | '; + print ''.($tabConf[5] ? $langs->trans("Activated") : $langs->trans("Disabled")).' | '; print '||
'; print '
'; print '
'; print load_fiche_titre($langs->trans("ConfigurationFile").' ('.$conffile.')', '', 'folder'); -print '$dolibarr_main_prod: '.$dolibarr_main_prod; +print '$dolibarr_main_prod: '.($dolibarr_main_prod ? $dolibarr_main_prod : '0'); if (empty($dolibarr_main_prod)) { print ' '.img_picto('', 'warning').' '.$langs->trans("IfYouAreOnAProductionSetThis", 1); } @@ -245,8 +245,22 @@ if (empty($dolibarr_main_restrict_ip)) { print ''.$langs->trans("None").''; //print ' ('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("IPsOfUsers")).')'; } + print '
'; +if (empty($conf->global->SECURITY_DISABLE_TEST_ON_OBFUSCATED_CONF)) { + print '$dolibarr_main_db_pass: '; + if (!empty($dolibarr_main_db_pass) && empty($dolibarr_main_db_encrypted_pass)) { + print img_picto('', 'warning').' '.$langs->trans("DatabasePasswordNotObfuscated").' ('.$langs->trans("Recommanded").': '.$langs->trans("SetOptionTo", $langs->transnoentitiesnoconv("MainDbPasswordFileConfEncrypted"), yn(1)).')'; + //print ' ('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("IPsOfUsers")).')'; + } else { + print img_picto('', 'tick').' '.$langs->trans("DatabasePasswordObfuscated"); + } + + print '
'; +} + + // Menu security @@ -277,7 +291,7 @@ if ($conf->global->MAIN_SECURITY_HASH_ALGO != 'password_hash') { print '
'; -print 'MAIN_SECURITY_ANTI_SSRF_SERVER_IP = '.(empty($conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP) ? ''.$langs->trans("Undefined").'' : $conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP)."
"; +print 'MAIN_SECURITY_ANTI_SSRF_SERVER_IP = '.(empty($conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP) ? ''.$langs->trans("Undefined").' ('.$langs->trans("Example").': static-ips-of-server - '.$langs->trans("Note").': common loopback ip like 127.*.*.*, [::1] are already added)' : $conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP)."
"; print '
'; print 'MAIN_ALLOW_SVG_FILES_AS_IMAGES = '.(empty($conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES) ? '0 ('.$langs->trans("Recommanded").': 0)' : $conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES)."
"; @@ -315,6 +329,7 @@ $securityevent = new Events($db); $eventstolog = $securityevent->eventstolog; print ''.$langs->trans("AuditedSecurityEvents").': '; +$out = ''; if (!empty($eventstolog) && is_array($eventstolog)) { // Loop on each event type $i = 0; @@ -324,18 +339,22 @@ if (!empty($eventstolog) && is_array($eventstolog)) { $value = empty($conf->global->$key) ? '' : $conf->global->$key; if ($value) { if ($i > 0) { - print ', '; + $out .= ', '; } - print ''.$key.''; + $out .= ''.$key.''; $i++; } } } - print '
'; -} else { - print img_warning().' '.$langs->trans("NoSecurityEventsAreAduited", $langs->transnoentities("Home").' - '.$langs->transnoentities("Setup").' - '.$langs->transnoentities("Audit")).'
'; + print $out; } +if (empty($out)) { + print img_warning().' '.$langs->trans("NoSecurityEventsAreAduited", $langs->transnoentities("Home").' - '.$langs->transnoentities("Setup").' - '.$langs->transnoentities("Security").' - '.$langs->transnoentities("Audit")).'
'; +} + +print '
'; + // Modules/Applications diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php index 362b29c0163..3fa2e5d0af9 100644 --- a/htdocs/admin/translation.php +++ b/htdocs/admin/translation.php @@ -296,19 +296,8 @@ if ($mode == 'overwrite') { print '
\n"; if ($returnvalue) { if ($hideerrors) { diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php index e279ced2a3d..6f5d2ccb891 100644 --- a/htdocs/core/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -1043,7 +1043,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $ $regType = array(); if (preg_match('/\{(t+)\}/i', $mask, $regType)) { $masktype = $regType[1]; - $masktype_value = substr(preg_replace('/^TE_/', '', $objsoc->typent_code), 0, dol_strlen($regType[1])); // get n first characters of thirdpaty typent_code (where n is length in mask) + $masktype_value = substr(preg_replace('/^TE_/', '', $objsoc->typent_code), 0, dol_strlen($regType[1])); // get n first characters of thirdparty typent_code (where n is length in mask) $masktype_value = str_pad($masktype_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask } else { $masktype = ''; @@ -2679,57 +2679,6 @@ if (!function_exists('dolEscapeXML')) { } -/** - * Return automatic or manual in current language - * - * @param string $automaticmanual Value to test (1, 'automatic', 'true' or 0, 'manual', 'false') - * @param integer $case 1=Yes/No, 0=yes/no, 2=Disabled checkbox, 3=Disabled checkbox + Automatic/Manual - * @param int $color 0=texte only, 1=Text is formated with a color font style ('ok' or 'error'), 2=Text is formated with 'ok' color. - * @return string HTML string - */ -function autoOrManual($automaticmanual, $case = 1, $color = 0) -{ - global $langs; - $result = 'unknown'; - $classname = ''; - if ($automaticmanual == 1 || strtolower($automaticmanual) == 'automatic' || strtolower($automaticmanual) == 'true') { // A mettre avant test sur no a cause du == 0 - $result = $langs->trans('automatic'); - if ($case == 1 || $case == 3) { - $result = $langs->trans("Automatic"); - } - if ($case == 2) { - $result = ''; - } - if ($case == 3) { - $result = ' '.$result; - } - - $classname = 'ok'; - } elseif ($automaticmanual == 0 || strtolower($automaticmanual) == 'manual' || strtolower($automaticmanual) == 'false') { - $result = $langs->trans("manual"); - if ($case == 1 || $case == 3) { - $result = $langs->trans("Manual"); - } - if ($case == 2) { - $result = ''; - } - if ($case == 3) { - $result = ' '.$result; - } - - if ($color == 2) { - $classname = 'ok'; - } else { - $classname = 'error'; - } - } - if ($color) { - return ''.$result.''; - } - return $result; -} - - /** * Convert links to local wrapper to medias files into a string into a public external URL readable on internet * diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php index 9feddb6f7f5..f87e7b7b4cd 100644 --- a/htdocs/core/lib/geturl.lib.php +++ b/htdocs/core/lib/geturl.lib.php @@ -24,7 +24,9 @@ /** * Function to get a content from an URL (use proxy if proxy defined). * Support Dolibarr setup for timeout and proxy. - * Enhancement of CURL to add an anti SSRF protection. + * Enhancement of CURL to add an anti SSRF protection: + * - you can set MAIN_SECURITY_ANTI_SSRF_SERVER_IP to set static ip of server + * - common local lookup ips like 127.*.*.* are automatically added * * @param string $url URL to call. * @param string $postorget 'POST', 'GET', 'HEAD', 'PUT', 'PUTALREADYFORMATED', 'POSTALREADYFORMATED', 'DELETE' @@ -199,12 +201,13 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation = } } if ($localurl == 1) { // Only local url allowed (dangerous, may allow to get metadata on server or make internal port scanning) + // Deny ips NOT like 10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16, 0.0.0.0/8, 169.254.0.0/16, 127.0.0.0/8 et 240.0.0.0/4, ::1/128, ::/128, ::ffff:0:0/96, fe80::/10... if (filter_var($iptocheck, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) { $info['http_code'] = 400; $info['content'] = 'Error bad hostname '.$iptocheck.'. Must be a local URL.'; break; } - if (!empty($conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP) && !in_array($iptocheck, explode(',', '127.0.0.1,::1,'.$conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP))) { + if (!empty($conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP) && !in_array($iptocheck, explode(',', $conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP))) { $info['http_code'] = 400; $info['content'] = 'Error bad hostname IP (IP is not a local IP defined into list MAIN_SECURITY_SERVER_IP). Must be a local URL in allowed list.'; break; diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php index 0a0ebe3ce02..0ccb6a415fc 100644 --- a/htdocs/core/lib/images.lib.php +++ b/htdocs/core/lib/images.lib.php @@ -590,7 +590,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small', break; } - if (!is_resource($img)) { + if (!is_resource($img) && !($img instanceof \GdImage)) { dol_syslog('Failed to detect type of image. We found infoImg[2]='.$infoImg[2], LOG_WARNING); return 0; } diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php index 16891214ca5..3838829f8cd 100644 --- a/htdocs/core/lib/invoice.lib.php +++ b/htdocs/core/lib/invoice.lib.php @@ -458,8 +458,9 @@ function getPurchaseInvoicePieChart($socid = 0) /** * Return an HTML table that contains a pie chart of the number of customers or supplier invoices - * @param string $mode Can be customer or fourn - * @return string A HTML table that contains a pie chart of customers or supplier invoices + * + * @param string $mode Can be 'customers' or 'suppliers' + * @return string A HTML table that contains a pie chart of customers or supplier invoices */ function getNumberInvoicesPieChart($mode) { @@ -487,48 +488,55 @@ function getNumberInvoicesPieChart($mode) $sql .= ", sum(".$db->ifsql("f.date_lim_reglement > '".date_format($datenowadd30, 'Y-m-d')."'", 1, 0).") as nbnotlate30"; if ($mode == 'customers') { $sql .= " FROM ".MAIN_DB_PREFIX."facture as f"; - } elseif ($mode == 'fourn') { + } elseif ($mode == 'fourn' || $mode == 'suppliers') { $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f"; } else { return ''; } $sql .= " WHERE f.type <> 2"; $sql .= " AND f.fk_statut = 1"; + if (isset($user->socid) && $user->socid > 0) { + $sql .= " AND f.fk_soc = ".((int) $user->socid); + } + $resql = $db->query($sql); if ($resql) { $num = $db->num_rows($resql); $i = 0; $total = 0; $dataseries = array(); + while ($i < $num) { $obj = $db->fetch_object($resql); - $dataseries = array(array($langs->trans('InvoiceLate30Days'),$obj->nblate30) - ,array($langs->trans('InvoiceLate15Days'),$obj->nblate15-$obj->nblate30) - ,array($langs->trans('InvoiceLateMinus15Days'),$obj->nblatenow-$obj->nblate15) - ,array($langs->trans('InvoiceNotLate'),$obj->nbnotlatenow-$obj->nbnotlate15) - ,array($langs->trans('InvoiceNotLate15Days'),$obj->nbnotlate15-$obj->nbnotlate30) - ,array($langs->trans('InvoiceNotLate30Days'),$obj->nbnotlate30)); + $dataseries = array(array($langs->trans('InvoiceLate30Days'), $obj->nblate30) + ,array($langs->trans('InvoiceLate15Days'), $obj->nblate15 - $obj->nblate30) + ,array($langs->trans('InvoiceLateMinus15Days'), $obj->nblatenow - $obj->nblate15) + ,array($langs->trans('InvoiceNotLate'), $obj->nbnotlatenow - $obj->nbnotlate15) + ,array($langs->trans('InvoiceNotLate15Days'), $obj->nbnotlate15 - $obj->nbnotlate30) + ,array($langs->trans('InvoiceNotLate30Days'), $obj->nbnotlate30)); $i++; } foreach ($dataseries as $key=>$value) { - $total+=$value[1]; + $total += $value[1]; } $colorseries = array($badgeStatus8, $badgeStatus1, $badgeStatus3, $badgeStatus4, $badgeStatus11, '-'.$badgeStatus11); - if ($conf->use_javascript_ajax) { - $result = '
';
- $result .= '';
- $result .= '
';
+ $result .= '
';
+
return $result;
} else {
dol_print_error($db);
@@ -603,7 +615,7 @@ function getCustomerInvoiceDraftTable($maxCount = 500, $socid = 0)
$sql .= " s.nom, s.rowid, s.email, s.code_client, s.code_compta, s.code_fournisseur, s.code_compta_fournisseur,";
$sql .= " cc.rowid, cc.code";
if (!$user->rights->societe->client->voir && !$socid) {
- $sql.= ", sc.fk_soc, sc.fk_user";
+ $sql .= ", sc.fk_soc, sc.fk_user";
}
// Add Group from hooks
@@ -734,7 +746,7 @@ function getDraftSupplierTable($maxCount = 500, $socid = 0)
$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
}
if ($socid) {
- $sql .= " AND f.fk_soc = ".$socid;
+ $sql .= " AND f.fk_soc = ".((int) $socid);
}
// Add where from hooks
$parameters = array();
@@ -842,8 +854,8 @@ function getCustomerInvoiceLatestEditTable($maxCount = 5, $socid = 0)
{
global $conf, $db, $langs, $user;
- $sql = "SELECT f.rowid, f.entity, f.ref, f.fk_statut as status, f.paye, s.nom as socname, s.rowid as socid, s.canvas, s.client,";
- $sql .= " f.datec";
+ $sql = "SELECT f.rowid, f.entity, f.ref, f.fk_statut as status, f.paye, f.type, f.total_ht, f.total_tva, f.total_ttc, f.datec,";
+ $sql .= " s.nom as socname, s.rowid as socid, s.canvas, s.client";
$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
$sql .= ", ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) {
@@ -892,6 +904,10 @@ function getCustomerInvoiceLatestEditTable($maxCount = 5, $socid = 0)
$objectstatic->ref = $obj->ref;
$objectstatic->paye = $obj->paye;
$objectstatic->statut = $obj->status;
+ $objectstatic->total_ht = $obj->total_ht;
+ $objectstatic->total_tva = $obj->total_tva;
+ $objectstatic->total_ttc = $obj->total_ttc;
+ $objectstatic->type = $obj->type;
$companystatic->id = $obj->socid;
$companystatic->name = $obj->socname;
@@ -940,8 +956,8 @@ function getPurchaseInvoiceLatestEditTable($maxCount = 5, $socid = 0)
{
global $conf, $db, $langs, $user;
- $sql = "SELECT f.rowid, f.entity, f.ref, f.fk_statut as status, f.paye, s.nom as socname, s.rowid as socid, s.canvas, s.client,";
- $sql .= " f.datec";
+ $sql = "SELECT f.rowid, f.entity, f.ref, f.fk_statut as status, f.paye, f.total_ht, f.total_tva, f.total_ttc, f.type, f.ref_supplier, f.datec,";
+ $sql .= " s.nom as socname, s.rowid as socid, s.canvas, s.client";
$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
$sql .= ", ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) {
@@ -950,7 +966,7 @@ function getPurchaseInvoiceLatestEditTable($maxCount = 5, $socid = 0)
$sql .= " WHERE f.fk_soc = s.rowid";
$sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
if ($socid) {
- $sql .= " AND f.fk_soc = ".$socid;
+ $sql .= " AND f.fk_soc = ".((int) $socid);
}
if (!$user->rights->societe->client->voir && !$socid) {
$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
@@ -990,6 +1006,10 @@ function getPurchaseInvoiceLatestEditTable($maxCount = 5, $socid = 0)
$objectstatic->ref = $obj->ref;
$objectstatic->paye = $obj->paye;
$objectstatic->statut = $obj->status;
+ $objectstatic->total_ht = $obj->total_ht;
+ $objectstatic->total_tva = $obj->total_tva;
+ $objectstatic->total_ttc = $obj->total_ttc;
+ $objectstatic->type = $obj->type;
$companystatic->id = $obj->socid;
$companystatic->name = $obj->socname;
@@ -1062,7 +1082,7 @@ function getCustomerInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
}
if ($socid) {
- $sql .= " AND f.fk_soc = ".$socid;
+ $sql .= " AND f.fk_soc = ".((int) $socid);
}
// Add where from hooks
$parameters = array();
@@ -1250,7 +1270,7 @@ function getPurchaseInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
}
if ($socid) {
- $sql .= " AND ff.fk_soc = ".$socid;
+ $sql .= " AND ff.fk_soc = ".((int) $socid);
}
// Add where from hooks
$parameters = array();
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 880c63970f7..4821bfde2b9 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -705,8 +705,8 @@ function pdf_pagehead(&$pdf, $outputlangs, $page_height)
{
global $conf;
- // Add a background image on document
- if (!empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF)) { // Warning, this option make TCPDF generation being crazy and some content disappeared behind the image
+ // Add a background image on document only if good setup of const
+ if (!empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF) && ($conf->global->MAIN_USE_BACKGROUND_ON_PDF != '-1')) { // Warning, this option make TCPDF generation being crazy and some content disappeared behind the image
$pdf->SetAutoPageBreak(0, 0); // Disable auto pagebreak before adding image
$pdf->Image($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_USE_BACKGROUND_ON_PDF, (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_X) ? $conf->global->MAIN_USE_BACKGROUND_ON_PDF_X : 0), (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y) ? $conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y : 0), 0, $page_height);
$pdf->SetAutoPageBreak(1, 0); // Restore pagebreak
@@ -1328,7 +1328,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
// ($textwasnotmodified is replaced with $textwasmodifiedorcompleted and we add completion).
// Set label
- // If we want another language, and if label is same than default language (we did force it to a specific value), we can use translation.
+ // If we want another language, and if label is same than default language (we did not force it to a specific value), we can use translation.
//var_dump($outputlangs->defaultlang.' - '.$langs->defaultlang.' - '.$label.' - '.$prodser->label);exit;
$textwasnotmodified = ($label == $prodser->label);
if (!empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && ($textwasnotmodified || $translatealsoifmodified)) {
@@ -1354,9 +1354,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
}
}
} elseif ($object->element == 'facture' || $object->element == 'facturefourn') {
- if ($object->type == $object::TYPE_DEPOSIT) {
- $desc = str_replace('(DEPOSIT)', $outputlangs->trans('Deposit'), $desc);
- }
+ $desc = str_replace('(DEPOSIT)', $outputlangs->trans('Deposit'), $desc);
}
// Description short of product line
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 9825b2dac2c..64cc72a8879 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -360,7 +360,8 @@ function product_lot_admin_prepare_head()
*/
function show_stats_for_company($product, $socid)
{
- global $conf, $langs, $user, $db;
+ global $conf, $langs, $user, $db, $hookmanager;
+
$form = new Form($db);
$nblines = 0;
@@ -558,6 +559,12 @@ function show_stats_for_company($product, $socid)
print '';
print '';
}
+ $parameters = array('socid'=>$socid);
+ $reshook = $hookmanager->executeHooks('addMoreProductStat', $parameters, $product, $nblines); // Note that $action and $object may have been modified by some hooks
+ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+ print $hookmanager->resPrint;
+
return $nblines++;
}
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index 880019d7b97..0814c0f4825 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -246,7 +246,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
//TODO Add link to expeditiondet_batch
$sql .= " WHERE e.entity IN (".getEntity('expedition').")";
- $sql .= " AND obj.fk_".$origin." = ".$origin_id;
+ $sql .= " AND obj.fk_".$origin." = ".((int) $origin_id);
$sql .= " AND obj.rowid = ed.fk_origin_line";
$sql .= " AND ed.fk_expedition = e.rowid";
if ($filter) {
diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index 4d9d4bb2fa2..43e12c9c490 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -248,6 +248,12 @@ function llxHeaderTicket($title, $head = "", $disablejs = 0, $disablehead = 0, $
print '';
}
+ if (!empty($conf->global->TICKET_IMAGE_PUBLIC_INTERFACE)) {
+ print '| '.$langs->trans("Statistics").' - '; - if ($mode == 'customers') { - $result .= $langs->trans("CustomerInvoice").' | '; - } elseif ($mode == 'fourn') { - $result .= $langs->trans("SupplierInvoice").''; - } else { - return ''; - } - $result .= '||
| '.$langs->trans("Statistics").' - '; + if ($mode == 'customers') { + $result .= $langs->trans("CustomerInvoice"); + } elseif ($mode == 'fourn' || $mode == 'suppliers') { + $result .= $langs->trans("SupplierInvoice"); + } else { + return ''; + } + $result .= ' | '; + $result .= '||
| '.$dolgraph->show($total ? 0 : 1).' | '; + $result .= ''.$dolgraph->show($total ? 0 : $langs->trans("NoOpenInvoice")).' | '; $result .= '|
';
+ print '
';
+ print '
';
+ }
+
print '';
print '';
@@ -336,7 +342,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
if (is_object($objcon) && $objcon->id > 0) {
$force_filter_contact = true;
$sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm_resources as r ON a.id = r.fk_actioncomm";
- $sql .= " AND r.element_type = '".$db->escape($objcon->table_element)."' AND r.fk_element = ".$objcon->id;
+ $sql .= " AND r.element_type = '".$db->escape($objcon->table_element)."' AND r.fk_element = ".((int) $objcon->id);
}
if (is_object($filterobj) && get_class($filterobj) == 'Societe') {
diff --git a/htdocs/core/lib/treeview.lib.php b/htdocs/core/lib/treeview.lib.php
index 255bc47d9a9..fda21e28a21 100644
--- a/htdocs/core/lib/treeview.lib.php
+++ b/htdocs/core/lib/treeview.lib.php
@@ -162,10 +162,9 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
print "\n".'';
if ($showfk) {
print '
';
} else {
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 6d01fcfee0a..cd9ae5ad297 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -110,7 +110,7 @@ function user_prepare_head($object)
$nbNote = 0;
$sql = "SELECT COUNT(n.rowid) as nb";
$sql .= " FROM ".MAIN_DB_PREFIX."notify_def as n";
- $sql .= " WHERE fk_user = ".$object->id;
+ $sql .= " WHERE fk_user = ".((int) $object->id);
$resql = $db->query($sql);
if ($resql) {
$num = $db->num_rows($resql);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 2232b3333dd..80ea1d5ea7b 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1373,7 +1373,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
$modecompta = 'CREANCES-DETTES';
if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') {
- $modecompta = 'BOOKKEEPING'; // Not yet implemented. Should be BOOKKEEPINGCOLLECTED
+ $modecompta = 'BOOKKEEPING'; // Not yet implemented.
}
if ($modecompta && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_invoice->enabled))) {
if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
@@ -1384,7 +1384,9 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
}
$modecompta = 'RECETTES-DEPENSES';
- //if (! empty($conf->accounting->enabled) && ! empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') $modecompta=''; // Not yet implemented. Should be BOOKKEEPINGCOLLECTED
+ if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') {
+ $modecompta = 'BOOKKEEPINGCOLLECTED'; // Not yet implemented.
+ }
if ($modecompta && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_invoice->enabled))) {
if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnoverCollected"), 2, $user->rights->accounting->comptarapport->lire);
@@ -1410,7 +1412,6 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
$newmenu->add("/compta/resultat/compteres.php?leftmenu=report","Compte de resultat",2,$user->rights->compta->resultat->lire);
$newmenu->add("/compta/resultat/bilan.php?leftmenu=report","Bilan",2,$user->rights->compta->resultat->lire);
*/
- $newmenu->add("/compta/stats/index.php?leftmenu=report", $langs->trans("ReportTurnover"), 1, $user->rights->compta->resultat->lire);
/*
$newmenu->add("/compta/stats/cumul.php?leftmenu=report","Cumule",2,$user->rights->compta->resultat->lire);
@@ -1419,14 +1420,32 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
$newmenu->add("/compta/stats/comp.php?leftmenu=report","Transforme",2,$user->rights->compta->resultat->lire);
}
*/
- $newmenu->add("/compta/stats/casoc.php?leftmenu=report", $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
- $newmenu->add("/compta/stats/cabyuser.php?leftmenu=report", $langs->trans("ByUsers"), 2, $user->rights->compta->resultat->lire);
- $newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=report", $langs->trans("ByProductsAndServices"), 2, $user->rights->compta->resultat->lire);
- $newmenu->add("/compta/stats/byratecountry.php?leftmenu=report", $langs->trans("ByVatRate"), 2, $user->rights->compta->resultat->lire);
+
+ $modecompta = 'CREANCES-DETTES';
+ $newmenu->add("/compta/stats/index.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ReportTurnover"), 1, $user->rights->compta->resultat->lire);
+ $newmenu->add("/compta/stats/casoc.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
+ $newmenu->add("/compta/stats/cabyuser.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByUsers"), 2, $user->rights->compta->resultat->lire);
+ $newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 2, $user->rights->compta->resultat->lire);
+ $newmenu->add("/compta/stats/byratecountry.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByVatRate"), 2, $user->rights->compta->resultat->lire);
+
+ $modecompta = 'RECETTES-DEPENSES';
+ $newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnoverCollected"), 1, $user->rights->compta->resultat->lire);
+ $newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
+ $newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 2, $user->rights->compta->resultat->lire);
+
//Achats
- $newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report", $langs->trans("ReportPurchaseTurnover"), 1, $user->rights->compta->resultat->lire);
- $newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report", $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
- $newmenu->add("/compta/stats/supplier_turnover_by_prodserv.php?leftmenu=accountancy_report", $langs->trans("ByProductsAndServices"), 2, $user->rights->compta->resultat->lire);
+ $modecompta = 'CREANCES-DETTES';
+ $newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnover"), 1, $user->rights->compta->resultat->lire);
+ $newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
+ $newmenu->add("/compta/stats/supplier_turnover_by_prodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 2, $user->rights->compta->resultat->lire);
+
+ /*
+ $modecompta = 'RECETTES-DEPENSES';
+ $newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnoverCollected"), 1, $user->rights->compta->resultat->lire);
+ $newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
+ $newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 2, $user->rights->compta->resultat->lire);
+ */
+
// Journals
$newmenu->add("/compta/journal/sellsjournal.php?leftmenu=report", $langs->trans("SellsJournal"), 1, $user->rights->compta->resultat->lire, '', '', '', 50);
$newmenu->add("/compta/journal/purchasesjournal.php?leftmenu=report", $langs->trans("PurchasesJournal"), 1, $user->rights->compta->resultat->lire, '', '', '', 51);
@@ -1598,21 +1617,19 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
}
// Inventory
- if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
- if (!empty($conf->stock->enabled)) {
- $langs->load("stocks");
- if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
- $newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("Inventories"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock', 0, '', '', '', img_picto('', 'inventory', 'class="pictofixedwidth"'));
- if ($usemenuhider || empty($leftmenu) || $leftmenu == "stock_inventories") {
- $newmenu->add("/product/inventory/card.php?action=create&leftmenu=stock_inventories", $langs->trans("NewInventory"), 1, $user->rights->stock->creer);
- $newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("List"), 1, $user->rights->stock->lire);
- }
- } else {
- $newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("Inventories"), 0, $user->rights->stock->inventory_advance->read, '', $mainmenu, 'stock', 0, '', '', '', img_picto('', 'inventory', 'class="pictofixedwidth"'));
- if ($usemenuhider || empty($leftmenu) || $leftmenu == "stock_inventories") {
- $newmenu->add("/product/inventory/card.php?action=create&leftmenu=stock_inventories", $langs->trans("NewInventory"), 1, $user->rights->stock->inventory_advance->write);
- $newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("List"), 1, $user->rights->stock->inventory_advance->read);
- }
+ if (!empty($conf->stock->enabled)) {
+ $langs->load("stocks");
+ if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+ $newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("Inventories"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock', 0, '', '', '', img_picto('', 'inventory', 'class="pictofixedwidth"'));
+ if ($usemenuhider || empty($leftmenu) || $leftmenu == "stock_inventories") {
+ $newmenu->add("/product/inventory/card.php?action=create&leftmenu=stock_inventories", $langs->trans("NewInventory"), 1, $user->rights->stock->creer);
+ $newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("List"), 1, $user->rights->stock->lire);
+ }
+ } else {
+ $newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("Inventories"), 0, $user->rights->stock->inventory_advance->read, '', $mainmenu, 'stock', 0, '', '', '', img_picto('', 'inventory', 'class="pictofixedwidth"'));
+ if ($usemenuhider || empty($leftmenu) || $leftmenu == "stock_inventories") {
+ $newmenu->add("/product/inventory/card.php?action=create&leftmenu=stock_inventories", $langs->trans("NewInventory"), 1, $user->rights->stock->inventory_advance->write);
+ $newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("List"), 1, $user->rights->stock->inventory_advance->read);
}
}
}
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 5fbfc05a9fb..3b7cc0d1184 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -1371,7 +1371,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
if ($command) {
$sql .= " AND command = '".$this->db->escape($command)."'";
}
- $sql .= " AND entity = ".$entity; // Must be exact entity
+ $sql .= " AND entity = ".((int) $entity); // Must be exact entity
$now = dol_now();
@@ -1612,7 +1612,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
$sql = "SELECT count(*)";
$sql .= " FROM ".MAIN_DB_PREFIX."const";
$sql .= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($name)."'";
- $sql .= " AND entity = ".$entity;
+ $sql .= " AND entity = ".((int) $entity);
$result = $this->db->query($sql);
if ($result) {
@@ -2197,7 +2197,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
$sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
$sql .= " WHERE ".$this->db->decrypt('name')." LIKE '".$this->db->escape($this->const_name)."_".strtoupper($key)."'";
- $sql .= " AND entity = ".$entity;
+ $sql .= " AND entity = ".((int) $entity);
dol_syslog(get_class($this)."::delete_const_".$key."", LOG_DEBUG);
if (!$this->db->query($sql)) {
diff --git a/htdocs/core/modules/bank/doc/pdf_ban.modules.php b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
index 1bbf2e14cc0..a87817cdc73 100644
--- a/htdocs/core/modules/bank/doc/pdf_ban.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
@@ -72,9 +72,9 @@ class pdf_ban extends ModeleBankAccountDoc
$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
- $this->option_logo = 1; // Affiche logo FAC_PDF_LOGO
- $this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
- $this->option_codeproduitservice = 1; // Affiche code produit-service
+ $this->option_logo = 1; // Display logo FAC_PDF_LOGO
+ $this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
+ $this->option_codeproduitservice = 1; // Display product-service code
// Retrieves transmitter
$this->emetteur = $mysoc;
diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
index f1ebc5bf64f..49e311f1c89 100644
--- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
@@ -75,9 +75,9 @@ class pdf_sepamandate extends ModeleBankAccountDoc
$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
- $this->option_logo = 1; // Affiche logo FAC_PDF_LOGO
- $this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
- $this->option_codeproduitservice = 1; // Affiche code produit-service
+ $this->option_logo = 1; // Display logo FAC_PDF_LOGO
+ $this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
+ $this->option_codeproduitservice = 1; //Display product-service code
// Retrieves transmitter
$this->emetteur = $mysoc;
diff --git a/htdocs/core/modules/barcode/doc/phpbarcode.modules.php b/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
index 56c2a12fee6..fe36f7604c2 100644
--- a/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
+++ b/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
@@ -186,6 +186,11 @@ class modPhpbarcode extends ModeleBarCode
global $conf, $filebarcode;
dol_mkdir($conf->barcode->dir_temp);
+ if (!is_writable($conf->barcode->dir_temp)) {
+ $this->error = "Failed to write in temp directory ".$conf->barcode->dir_temp;
+ dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+ return -1;
+ }
$file = $conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png';
diff --git a/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php b/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
index 90b7cd4f543..df9ec39546d 100644
--- a/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
+++ b/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
@@ -158,6 +158,12 @@ class modTcpdfbarcode extends ModeleBarCode
global $conf, $_GET;
dol_mkdir($conf->barcode->dir_temp);
+ if (!is_writable($conf->barcode->dir_temp)) {
+ $this->error = "Failed to write in temp directory ".$conf->barcode->dir_temp;
+ dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+ return -1;
+ }
+
$file = $conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png';
$tcpdfEncoding = $this->getTcpdfEncodingType($encoding);
diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
index 7bbedd0aa67..0d1bee3c28a 100644
--- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
@@ -107,7 +107,7 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
// Mask parameter
//$texte.= ''.$langs->trans("Mask").' ('.$langs->trans("BarCodeModel").'): ';
$texte .= ''.$langs->trans("Mask").': ';
- $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
+ $texte .= ''.$form->textwithpicto('', $tooltip, 1, 1).' ';
$texte .= ' ';
$texte .= '
| '; - print ' '; - print $tab[$x]['title']; - print ' (fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')'; - print ' | '; + print ''.$tab[$x]['title'].''; + print ' (fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')'; + print ' | '; print $tab[$x]['buttons']; print ' |
';
- $texte .= '';
+ $texte .= '';
$texte .= '
';
// Scan directories
@@ -278,7 +278,11 @@ class doc_generic_bom_odt extends ModelePDFBom
//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
dol_mkdir($conf->bom->dir_temp);
-
+ if (!is_writable($conf->bom->dir_temp)) {
+ $this->error = "Failed to write in temp directory ".$conf->bom->dir_temp;
+ dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+ return -1;
+ }
// If CUSTOMER contact defined on order, we use it
$usecontact = false;
diff --git a/htdocs/core/modules/bom/mod_bom_advanced.php b/htdocs/core/modules/bom/mod_bom_advanced.php
index 71bd2788c82..d590c3ff70c 100644
--- a/htdocs/core/modules/bom/mod_bom_advanced.php
+++ b/htdocs/core/modules/bom/mod_bom_advanced.php
@@ -79,7 +79,7 @@ class mod_bom_advanced extends ModeleNumRefboms
// Parametrage du prefix
$texte .= '';
- $texte .= '';
+ $texte .= '';
$texte .= '
';
// Scan directories
@@ -182,7 +182,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
// Add input to upload a new template file.
$texte .= ''.$langs->trans("UploadNewTemplate").' ';
$texte .= '';
- $texte .= '';
+ $texte .= '';
$texte .= '
';
$texte .= '';
@@ -290,7 +290,11 @@ class doc_generic_order_odt extends ModelePDFCommandes
//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
dol_mkdir($conf->commande->dir_temp);
-
+ if (!is_writable($conf->commande->dir_temp)) {
+ $this->error = "Failed to write in temp directory ".$conf->commande->dir_temp;
+ dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+ return -1;
+ }
// If CUSTOMER contact defined on order, we use it
$usecontact = false;
diff --git a/htdocs/core/modules/commande/mod_commande_saphir.php b/htdocs/core/modules/commande/mod_commande_saphir.php
index 4099686c1b6..8b4ccdfaba7 100644
--- a/htdocs/core/modules/commande/mod_commande_saphir.php
+++ b/htdocs/core/modules/commande/mod_commande_saphir.php
@@ -79,7 +79,7 @@ class mod_commande_saphir extends ModeleNumRefCommandes
// Parametrage du prefix
$texte .= '';
- $texte .= '';
+ $texte .= '';
$texte .= '
';
// Scan directories
@@ -168,7 +168,7 @@ class doc_generic_contract_odt extends ModelePDFContract
// Add input to upload a new template file.
$texte .= ''.$langs->trans("UploadNewTemplate").' ';
$texte .= '';
- $texte .= '';
+ $texte .= '';
$texte .= '
';
$texte .= '';
@@ -278,7 +278,11 @@ class doc_generic_contract_odt extends ModelePDFContract
//print "conf->contrat->dir_temp=".$conf->contrat->dir_temp;
dol_mkdir($conf->contrat->dir_temp);
-
+ if (!is_writable($conf->contrat->dir_temp)) {
+ $this->error = "Failed to write in temp directory ".$conf->contrat->dir_temp;
+ dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+ return -1;
+ }
// If CUSTOMER contact defined on contract, we use it
$usecontact = false;
diff --git a/htdocs/core/modules/contract/mod_contract_magre.php b/htdocs/core/modules/contract/mod_contract_magre.php
index d696ac06fdd..dcaee5eadbc 100644
--- a/htdocs/core/modules/contract/mod_contract_magre.php
+++ b/htdocs/core/modules/contract/mod_contract_magre.php
@@ -85,7 +85,7 @@ class mod_contract_magre extends ModelNumRefContracts
$tooltip .= $langs->trans("GenericMaskCodes5");
$texte .= ''.$langs->trans("UploadNewTemplate").' ';
$texte .= '';
- $texte .= '';
+ $texte .= '';
$texte .= '
';
$texte .= '';
@@ -290,7 +290,11 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
dol_mkdir($conf->expedition->dir_temp);
-
+ if (!is_writable($conf->expedition->dir_temp)) {
+ $this->error = "Failed to write in temp directory ".$conf->expedition->dir_temp;
+ dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+ return -1;
+ }
// If SHIPMENT contact defined on invoice, we use it
$usecontact = false;
diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index 42999248026..aed43ea40ac 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -139,7 +139,7 @@ class pdf_espadon extends ModelePdfExpedition
$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
- $this->option_logo = 1;
+ $this->option_logo = 1; // Display logo
// Get source company
$this->emetteur = $mysoc;
diff --git a/htdocs/core/modules/expedition/mod_expedition_ribera.php b/htdocs/core/modules/expedition/mod_expedition_ribera.php
index 0303dfde3dc..79bbcbdb481 100644
--- a/htdocs/core/modules/expedition/mod_expedition_ribera.php
+++ b/htdocs/core/modules/expedition/mod_expedition_ribera.php
@@ -80,7 +80,7 @@ class mod_expedition_ribera extends ModelNumRefExpedition
$tooltip .= $langs->trans("GenericMaskCodes5");
$texte .= '';
- $texte .= '';
+ $texte .= '';
$texte .= '
';
// Scan directories
@@ -181,7 +181,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
// Add input to upload a new template file.
$texte .= ''.$langs->trans("UploadNewTemplate").' ';
$texte .= '';
- $texte .= '';
+ $texte .= '';
$texte .= '
';
$texte .= '';
@@ -291,7 +291,11 @@ class doc_generic_invoice_odt extends ModelePDFFactures
//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
dol_mkdir($conf->facture->dir_temp);
-
+ if (!is_writable($conf->facture->dir_temp)) {
+ $this->error = "Failed to write in temp directory ".$conf->facture->dir_temp;
+ dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+ return -1;
+ }
// If BILLING contact defined on invoice, we use it
$usecontact = false;
diff --git a/htdocs/core/modules/facture/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php
index 70fde36f549..32e06f285a9 100644
--- a/htdocs/core/modules/facture/mod_facture_mercure.php
+++ b/htdocs/core/modules/facture/mod_facture_mercure.php
@@ -76,7 +76,7 @@ class mod_facture_mercure extends ModeleNumRefFactures
// Setting the prefix
$texte .= '';
- $texte .= '';
+ $texte .= '';
$texte .= '
';
// Scan directories
@@ -171,7 +171,7 @@ class doc_generic_member_odt extends ModelePDFMember
// Add input to upload a new template file.
$texte .= ''.$langs->trans("UploadNewTemplate").' ';
$texte .= '';
- $texte .= '';
+ $texte .= '';
$texte .= '
';
$texte .= '';
@@ -279,7 +279,11 @@ class doc_generic_member_odt extends ModelePDFMember
//print "conf->adherent->dir_temp=".$conf->adherent->dir_temp;
dol_mkdir($conf->adherent->dir_temp);
-
+ if (!is_writable($conf->adherent->dir_temp)) {
+ $this->error = "Failed to write in temp directory ".$conf->adherent->dir_temp;
+ dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+ return -1;
+ }
// If CUSTOMER contact defined on member, we use it
$usecontact = false;
diff --git a/htdocs/core/modules/member/modules_cards.php b/htdocs/core/modules/member/modules_cards.php
index 0e041a17559..937e8a06870 100644
--- a/htdocs/core/modules/member/modules_cards.php
+++ b/htdocs/core/modules/member/modules_cards.php
@@ -48,7 +48,7 @@ class ModelePDFCards
* @param integer $maxfilenamelength Max length of value to show
* @return array List of templates
*/
- public function liste_modeles($db, $maxfilenamelength = 0)
+ public static function liste_modeles($db, $maxfilenamelength = 0)
{
// phpcs:enable
global $conf;
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index b296fa3b32c..a9765f45ada 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -120,8 +120,36 @@ class modFacture extends DolibarrModules
$arraydate = dol_getdate(dol_now());
$datestart = dol_mktime(23, 0, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
$this->cronjobs = array(
- 0=>array('label'=>'RecurringInvoices', 'jobtype'=>'method', 'class'=>'compta/facture/class/facture-rec.class.php', 'objectname'=>'FactureRec', 'method'=>'createRecurringInvoices', 'parameters'=>'', 'comment'=>'Generate recurring invoices', 'frequency'=>1, 'unitfrequency'=>3600 * 24, 'priority'=>50, 'status'=>1, 'test'=>'$conf->facture->enabled', 'datestart'=>$datestart),
- 1=>array('label'=>'SendEmailsRemindersOnInvoiceDueDate', 'jobtype'=>'method', 'class'=>'compta/facture/class/facture.class.php', 'objectname'=>'Facture', 'method'=>'sendEmailsRemindersOnInvoiceDueDate', 'parameters'=>"10,all,EmailTemplateCode", 'comment'=>'Send an emails when the unpaid invoices reach a due date + n days = today. First param is the offset n of days, second parameter is "all" or a payment mode code, last paramater is the code of email template to use (an email template with EmailTemplateCode must exists. the version in the language of the thirdparty will be used in priority).', 'frequency'=>1, 'unitfrequency'=>3600 * 24, 'priority'=>50, 'status'=>0, 'test'=>'$conf->facture->enabled', 'datestart'=>$datestart),
+ 0 => array(
+ 'label'=>'RecurringInvoices',
+ 'jobtype'=>'method',
+ 'class'=>'compta/facture/class/facture-rec.class.php',
+ 'objectname'=>'FactureRec',
+ 'method'=>'createRecurringInvoices',
+ 'parameters'=>'',
+ 'comment'=>'Generate recurring invoices',
+ 'frequency'=>1,
+ 'unitfrequency'=>3600 * 24,
+ 'priority'=>50,
+ 'status'=>1,
+ 'test'=>'$conf->facture->enabled',
+ 'datestart'=>$datestart
+ ),
+ 1 => array(
+ 'label'=>'SendEmailsRemindersOnInvoiceDueDate',
+ 'jobtype'=>'method',
+ 'class'=>'compta/facture/class/facture.class.php',
+ 'objectname'=>'Facture',
+ 'method'=>'sendEmailsRemindersOnInvoiceDueDate',
+ 'parameters'=>"10,all,EmailTemplateCode",
+ 'comment'=>'Send an emails when the unpaid invoices reach a due date + n days = today. First param is the offset n of days, second parameter is "all" or a payment mode code, last paramater is the code of email template to use (an email template with EmailTemplateCode must exists. the version in the language of the thirdparty will be used in priority).',
+ 'frequency'=>1,
+ 'unitfrequency'=>3600 * 24,
+ 'priority'=>50,
+ 'status'=>0,
+ 'test'=>'$conf->facture->enabled',
+ 'datestart'=>$datestart
+ ),
);
// Permissions
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index 71f101014ad..fae1cfc0eb8 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -488,7 +488,8 @@ class modFournisseur extends DolibarrModules
$tmp = '';
$tmpparam = unserialize($obj->param); // $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
if ($tmpparam['options'] && is_array($tmpparam['options'])) {
- $tmp = array_shift(array_keys($tmpparam['options']));
+ $array_keys = array_keys($tmpparam['options']);
+ $tmp = array_shift($array_keys);
}
if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) {
$typeFilter = "List:".$tmp;
diff --git a/htdocs/core/modules/modSalaries.class.php b/htdocs/core/modules/modSalaries.class.php
index 759804b409e..3464a5e14b3 100644
--- a/htdocs/core/modules/modSalaries.class.php
+++ b/htdocs/core/modules/modSalaries.class.php
@@ -101,7 +101,7 @@ class modSalaries extends DolibarrModules
$r++;
$this->rights[$r][0] = 511;
- $this->rights[$r][1] = 'Read payments of employee salaries (yours and your subordinates)';
+ $this->rights[$r][1] = 'Read employee salaries and payments (yours and your subordinates)';
$this->rights[$r][2] = 'r';
$this->rights[$r][3] = 0;
$this->rights[$r][4] = 'read';
@@ -125,7 +125,7 @@ class modSalaries extends DolibarrModules
$r++;
$this->rights[$r][0] = 517;
- $this->rights[$r][1] = 'Read payments of salariests of every employee';
+ $this->rights[$r][1] = 'Read salaries and payments of all employees';
$this->rights[$r][2] = 'r';
$this->rights[$r][3] = 0;
$this->rights[$r][4] = 'readall';
diff --git a/htdocs/core/modules/modWorkstation.class.php b/htdocs/core/modules/modWorkstation.class.php
index b0fae39bb52..8e2d676bf27 100755
--- a/htdocs/core/modules/modWorkstation.class.php
+++ b/htdocs/core/modules/modWorkstation.class.php
@@ -263,73 +263,12 @@ class modWorkstation extends DolibarrModules
$this->menu = array();
$r = 0;
// Add here entries to declare new menus
- /* BEGIN MODULEBUILDER TOPMENU */
- /*$this->menu[$r++] = array(
- 'fk_menu'=>'', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
- 'type'=>'top', // This is a Top menu entry
- 'titre'=>$langs->trans('GPAO'),
- 'mainmenu'=>'gpao',
- 'leftmenu'=>'',
- 'url'=>'/workstation/workstationindex.php',
- 'langs'=>'workstation@workstation', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
- 'position'=>1000 + $r,
- 'enabled'=>'$conf->workstation->enabled', // Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled.
- 'perms'=>'1', // Use 'perms'=>'$user->rights->workstation->workstation->read' if you want your menu with a permission rules
- 'target'=>'',
- 'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
- );*/
- /* END MODULEBUILDER TOPMENU */
- /* BEGIN MODULEBUILDER LEFTMENU WORKSTATION
- $this->menu[$r++]=array(
- 'fk_menu'=>'fk_mainmenu=workstation', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
- 'type'=>'left', // This is a Top menu entry
- 'titre'=>'Workstation',
- 'mainmenu'=>'workstation',
- 'leftmenu'=>'workstation',
- 'url'=>'/workstation/workstationindex.php',
- 'langs'=>'workstation@workstation', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
- 'position'=>1000+$r,
- 'enabled'=>'$conf->workstation->enabled', // Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled.
- 'perms'=>'$user->rights->workstation->workstation->read', // Use 'perms'=>'$user->rights->workstation->level1->level2' if you want your menu with a permission rules
- 'target'=>'',
- 'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
- );
- $this->menu[$r++]=array(
- 'fk_menu'=>'fk_mainmenu=workstation,fk_leftmenu=workstation', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
- 'type'=>'left', // This is a Left menu entry
- 'titre'=>'List_Workstation',
- 'mainmenu'=>'workstation',
- 'leftmenu'=>'workstation_workstation_list',
- 'url'=>'/workstation/workstation_list.php',
- 'langs'=>'workstation@workstation', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
- 'position'=>1000+$r,
- 'enabled'=>'$conf->workstation->enabled', // Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
- 'perms'=>'$user->rights->workstation->workstation->read', // Use 'perms'=>'$user->rights->workstation->level1->level2' if you want your menu with a permission rules
- 'target'=>'',
- 'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
- );
- $this->menu[$r++]=array(
- 'fk_menu'=>'fk_mainmenu=workstation,fk_leftmenu=workstation', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
- 'type'=>'left', // This is a Left menu entry
- 'titre'=>'New_Workstation',
- 'mainmenu'=>'workstation',
- 'leftmenu'=>'workstation_workstation_new',
- 'url'=>'/workstation/workstation_card.php?action=create',
- 'langs'=>'workstation@workstation', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
- 'position'=>1000+$r,
- 'enabled'=>'$conf->workstation->enabled', // Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
- 'perms'=>'$user->rights->workstation->workstation->write', // Use 'perms'=>'$user->rights->workstation->level1->level2' if you want your menu with a permission rules
- 'target'=>'',
- 'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
- );
- */
-
$this->menu[$r++]=array(
// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
'fk_menu'=>'fk_mainmenu=mrp',
// This is a Left menu entry
'type'=>'left',
- 'titre'=>$langs->trans('Workstations'),
+ 'titre'=>'Workstations',
'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth"'),
'mainmenu'=>'mrp',
'leftmenu'=>'workstation_workstation',
@@ -350,7 +289,7 @@ class modWorkstation extends DolibarrModules
'fk_menu'=>'fk_mainmenu=mrp,fk_leftmenu=workstation_workstation',
// This is a Left menu entry
'type'=>'left',
- 'titre'=>$langs->trans('WorkstationCreate'),
+ 'titre'=>'WorkstationCreate',
'mainmenu'=>'mrp',
'leftmenu'=>'workstation_workstation_left_create',
'url'=>'/workstation/workstation_card.php?action=create',
@@ -370,7 +309,7 @@ class modWorkstation extends DolibarrModules
'fk_menu'=>'fk_mainmenu=mrp,fk_leftmenu=workstation_workstation',
// This is a Left menu entry
'type'=>'left',
- 'titre'=>$langs->trans('List'),
+ 'titre'=>'List',
'mainmenu'=>'mrp',
'leftmenu'=>'workstation_workstation_left_list',
'url'=>'/workstation/workstation_list.php',
diff --git a/htdocs/core/modules/movement/doc/pdf_standard.modules.php b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
index 82d930a1aac..e029c4d5d66 100644
--- a/htdocs/core/modules/movement/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
@@ -137,12 +137,12 @@ class pdf_stdandard extends ModelePDFMovement
$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
- $this->option_logo = 1; // Affiche logo
- $this->option_codestockservice = 0; // Affiche code stock-service
- $this->option_multilang = 1; // Dispo en plusieurs langues
+ $this->option_logo = 1; // Display logo
+ $this->option_codestockservice = 0; // Display stock-service code
+ $this->option_multilang = 1; // Available in several languages
$this->option_freetext = 0; // Support add of a personalised text
- // Recupere emetteur
+ // Get source company
$this->emetteur = $mysoc;
if (!$this->emetteur->country_code) {
$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
@@ -529,8 +529,8 @@ class pdf_stdandard extends ModelePDFMovement
if (!empty($conf->global->MAIN_MULTILANGS)) { // si l'option est active
$sql = "SELECT label";
$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
- $sql .= " WHERE fk_product=".$objp->rowid;
- $sql .= " AND lang='".$this->db->escape($langs->getDefaultLang())."'";
+ $sql .= " WHERE fk_product = ".((int) $objp->rowid);
+ $sql .= " AND lang = '".$this->db->escape($langs->getDefaultLang())."'";
$sql .= " LIMIT 1";
$result = $this->db->query($sql);
diff --git a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
index 374ae5b4337..e93ecd1af0a 100644
--- a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
+++ b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
@@ -3,7 +3,7 @@
* Copyright (C) 2012 Juanjo Menent ';
- $texte .= '';
+ $texte .= '';
$texte .= '
';
// Scan directories
@@ -175,7 +175,7 @@ class doc_generic_mo_odt extends ModelePDFMo
$texte .= '';
// Show list of found files
foreach ($listoffiles as $file) {
- $texte .= '- '.$file['name'].' '.img_picto('', 'listlight').'
'; + $texte .= '- '.$file['name'].' '.img_picto('', 'listlight').'
'; } $texte .= '
';
}
@@ -284,8 +284,12 @@ class doc_generic_mo_odt extends ModelePDFMo
//print "file=".$file;
//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
- dol_mkdir($conf->bom->dir_temp);
-
+ dol_mkdir($conf->mrp->dir_temp);
+ if (!is_writable($conf->mrp->dir_temp)) {
+ $this->error = "Failed to write in temp directory ".$conf->mrp->dir_temp;
+ dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+ return -1;
+ }
// If CUSTOMER contact defined on order, we use it
$usecontact = false;
@@ -342,11 +346,13 @@ class doc_generic_mo_odt extends ModelePDFMo
dol_syslog($e->getMessage(), LOG_INFO);
return -1;
}
+
// After construction $odfHandler->contentXml contains content and
// [!-- BEGIN row.lines --]*[!-- END row.lines --] has been replaced by
// [!-- BEGIN lines --]*[!-- END lines --]
//print html_entity_decode($odfHandler->__toString());
//print exit;
+ /*
// Make substitutions into odt of freetext
@@ -379,20 +385,22 @@ class doc_generic_mo_odt extends ModelePDFMo
foreach ($tmparray as $key => $value) {
try {
- if (preg_match('/logo$/', $key)) { // Image
+ if (preg_match('/logo$/', $key)) {
+ // Image
if (file_exists($value)) {
$odfHandler->setImage($key, $value);
} else {
$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
}
- } else // Text
- {
+ } else {
+ // Text
$odfHandler->setVars($key, $value, true, 'UTF-8');
}
} catch (OdfException $e) {
dol_syslog($e->getMessage(), LOG_INFO);
}
}
+
// Replace tags of lines
try {
$foundtagforlines = 1;
@@ -403,6 +411,7 @@ class doc_generic_mo_odt extends ModelePDFMo
$foundtagforlines = 0;
dol_syslog($e->getMessage(), LOG_INFO);
}
+
if ($foundtagforlines) {
$linenumber = 0;
foreach ($object->lines as $line) {
@@ -445,14 +454,14 @@ class doc_generic_mo_odt extends ModelePDFMo
$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
$reshook = $hookmanager->executeHooks('beforeODTSave', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-
+ */
// Write new file
if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
try {
$odfHandler->exportAsAttachedPDF($file);
} catch (Exception $e) {
$this->error = $e->getMessage();
- dol_syslog($e->getMessage(), LOG_INFO);
+ dol_syslog('Error in exportAsAttachedPDF: '.$e->getMessage(), LOG_INFO);
return -1;
}
} else {
@@ -460,7 +469,7 @@ class doc_generic_mo_odt extends ModelePDFMo
$odfHandler->saveToDisk($file);
} catch (Exception $e) {
$this->error = $e->getMessage();
- dol_syslog($e->getMessage(), LOG_INFO);
+ dol_syslog('Error in saveToDisk: '.$e->getMessage(), LOG_INFO);
return -1;
}
}
diff --git a/htdocs/core/modules/mrp/mod_mo_advanced.php b/htdocs/core/modules/mrp/mod_mo_advanced.php
index 3d70ded1ba2..14292f7f896 100644
--- a/htdocs/core/modules/mrp/mod_mo_advanced.php
+++ b/htdocs/core/modules/mrp/mod_mo_advanced.php
@@ -80,7 +80,7 @@ class mod_mo_advanced extends ModeleNumRefMos
// Parametrage du prefix
$texte .= ''; + $texte .= '- '.$file['name'].' '.img_picto('', 'listlight').'
'; } $texte .= '
';
- $texte .= '';
+ $texte .= '';
$texte .= '
';
// Scan directories
@@ -302,7 +302,11 @@ class doc_generic_product_odt extends ModelePDFProduct
//print "conf->product->dir_temp=".$conf->product->dir_temp;
dol_mkdir($conf->product->dir_temp);
-
+ if (!is_writable($conf->product->dir_temp)) {
+ $this->error = "Failed to write in temp directory ".$conf->product->dir_temp;
+ dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+ return -1;
+ }
// If CUSTOMER contact defined on product, we use it
$usecontact = false;
diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index 99b6ff69236..815fc4d1c66 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -137,12 +137,12 @@ class pdf_standard extends ModelePDFProduct
$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
- $this->option_logo = 1; // Affiche logo
- $this->option_codeproduitservice = 0; // Affiche code produit-service
- $this->option_multilang = 1; // Dispo en plusieurs langues
+ $this->option_logo = 1; // Display logo
+ $this->option_codeproduitservice = 0; // Display product-service code
+ $this->option_multilang = 1; // Available in several languages
$this->option_freetext = 0; // Support add of a personalised text
- // Recupere emetteur
+ // Get source company
$this->emetteur = $mysoc;
if (!$this->emetteur->country_code) {
$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php
index 0a302c0fb6b..5936476e079 100644
--- a/htdocs/core/modules/product/mod_codeproduct_elephant.php
+++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php
@@ -116,7 +116,7 @@ class mod_codeproduct_elephant extends ModeleProductCode
// Parametrage du prefix customers
$texte .= '';
- $texte .= '';
+ $texte .= '';
$texte .= '
';
// Scan directories
@@ -574,6 +574,11 @@ class doc_generic_project_odt extends ModelePDFProjects
//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
dol_mkdir($conf->projet->dir_temp);
+ if (!is_writable($conf->projet->dir_temp)) {
+ $this->error = "Failed to write in temp directory ".$conf->projet->dir_temp;
+ dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+ return -1;
+ }
// If PROJECTLEADER contact defined on project, we use it
$usecontact = false;
@@ -742,7 +747,7 @@ class doc_generic_project_odt extends ModelePDFProjects
$sql .= ", u.lastname, u.firstname, t.thm";
$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
$sql .= " , ".MAIN_DB_PREFIX."user as u";
- $sql .= " WHERE t.fk_task =".$task->id;
+ $sql .= " WHERE t.fk_task =".((int) $task->id);
$sql .= " AND t.fk_user = u.rowid";
$sql .= " ORDER BY t.task_date DESC";
diff --git a/htdocs/core/modules/project/mod_project_universal.php b/htdocs/core/modules/project/mod_project_universal.php
index 3ab4079c1b7..480d19396c3 100644
--- a/htdocs/core/modules/project/mod_project_universal.php
+++ b/htdocs/core/modules/project/mod_project_universal.php
@@ -83,7 +83,7 @@ class mod_project_universal extends ModeleNumRefProjects
// Parametrage du prefix
$texte .= '';
- $texte .= '';
+ $texte .= '';
$texte .= '
';
// Scan directories
@@ -524,6 +524,11 @@ class doc_generic_task_odt extends ModelePDFTask
//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
dol_mkdir($conf->projet->dir_temp);
+ if (!is_writable($conf->task->dir_temp)) {
+ $this->error = "Failed to write in temp directory ".$conf->task->dir_temp;
+ dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+ return -1;
+ }
$socobject = $project->thirdparty;
@@ -657,7 +662,7 @@ class doc_generic_task_odt extends ModelePDFTask
$sql .= ", u.lastname, u.firstname";
$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
$sql .= " , ".MAIN_DB_PREFIX."user as u";
- $sql .= " WHERE t.fk_task =".$object->id;
+ $sql .= " WHERE t.fk_task =".((int) $object->id);
$sql .= " AND t.fk_user = u.rowid";
$sql .= " ORDER BY t.task_date DESC";
diff --git a/htdocs/core/modules/project/task/mod_task_universal.php b/htdocs/core/modules/project/task/mod_task_universal.php
index 011ac381254..3a6ef89f3fb 100644
--- a/htdocs/core/modules/project/task/mod_task_universal.php
+++ b/htdocs/core/modules/project/task/mod_task_universal.php
@@ -83,7 +83,7 @@ class mod_task_universal extends ModeleNumRefTask
// Parametrage du prefix
$texte .= '';
- $texte .= '';
+ $texte .= '';
$texte .= '
';
// Scan directories
@@ -209,7 +209,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
// Add input to upload a new template file.
$texte .= ''.$langs->trans("UploadNewTemplate").' ';
$texte .= '';
- $texte .= '';
+ $texte .= '';
$texte .= '
';
$texte .= '';
@@ -318,7 +318,11 @@ class doc_generic_proposal_odt extends ModelePDFPropales
//print "conf->propal->dir_temp=".$conf->propal->dir_temp;
dol_mkdir($conf->propal->multidir_temp[$object->entity]);
-
+ if (!is_writable($conf->propal->dir_temp)) {
+ $this->error = "Failed to write in temp directory ".$conf->propal->dir_temp;
+ dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+ return -1;
+ }
// If CUSTOMER contact defined on proposal, we use it
$usecontact = false;
diff --git a/htdocs/core/modules/propale/mod_propale_saphir.php b/htdocs/core/modules/propale/mod_propale_saphir.php
index 5fb7eeaa6fb..ce78f341319 100644
--- a/htdocs/core/modules/propale/mod_propale_saphir.php
+++ b/htdocs/core/modules/propale/mod_propale_saphir.php
@@ -85,7 +85,7 @@ class mod_propale_saphir extends ModeleNumRefPropales
// Parametrage du prefix
$texte .= '';
- $texte .= '';
+ $texte .= '';
$texte .= '
';
// Scan directories
@@ -282,7 +282,11 @@ class doc_generic_reception_odt extends ModelePdfReception
//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
dol_mkdir($conf->reception->dir_temp);
-
+ if (!is_writable($conf->reception->dir_temp)) {
+ $this->error = "Failed to write in temp directory ".$conf->reception->dir_temp;
+ dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+ return -1;
+ }
// If BILLING contact defined on invoice, we use it
$usecontact = false;
diff --git a/htdocs/core/modules/reception/doc/pdf_squille.modules.php b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
index 0e4474b6b8c..f7ba7a42842 100644
--- a/htdocs/core/modules/reception/doc/pdf_squille.modules.php
+++ b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
@@ -32,7 +32,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
*/
class pdf_squille extends ModelePdfReception
{
- public $emetteur; // Objet societe qui emet
+ /**
+ * Issuer
+ * @var Societe object that emits
+ */
+ public $emetteur;
/**
@@ -58,7 +62,7 @@ class pdf_squille extends ModelePdfReception
$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
- $this->option_logo = 1;
+ $this->option_logo = 1; // Display logo
// Get source company
$this->emetteur = $mysoc;
diff --git a/htdocs/core/modules/reception/mod_reception_moonstone.php b/htdocs/core/modules/reception/mod_reception_moonstone.php
index bcab451ab9e..0d0ced20eb4 100644
--- a/htdocs/core/modules/reception/mod_reception_moonstone.php
+++ b/htdocs/core/modules/reception/mod_reception_moonstone.php
@@ -61,7 +61,7 @@ class mod_reception_moonstone extends ModelNumRefReception
$tooltip .= $langs->trans("GenericMaskCodes5");
$texte .= ''.$langs->trans("UploadNewTemplate").' ';
$texte .= '';
- $texte .= '';
+ $texte .= '';
$texte .= '
';
$texte .= '';
@@ -266,6 +266,11 @@ class doc_generic_odt extends ModeleThirdPartyDoc
//exit;
dol_mkdir($conf->societe->multidir_temp[$object->entity]);
+ if (!is_writable($conf->societe->multidir_temp[$object->entity])) {
+ $this->error = "Failed to write in temp directory ".$conf->societe->multidir_temp[$object->entity];
+ dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+ return -1;
+ }
// Open and load template
require_once ODTPHP_PATH.'odf.php';
diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php
index 9ddf77abe44..705564e7e8e 100644
--- a/htdocs/core/modules/societe/mod_codeclient_elephant.php
+++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php
@@ -132,7 +132,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
// Parametrage du prefix customers
$texte .= '';
- $texte .= '';
+ $texte .= '';
$texte .= '
';
// Scan directories
@@ -179,7 +179,7 @@ class doc_generic_stock_odt extends ModelePDFStock
// Add input to upload a new template file.
$texte .= ''.$langs->trans("UploadNewTemplate").' ';
$texte .= '';
- $texte .= '';
+ $texte .= '';
$texte .= '
';
$texte .= '';
@@ -291,7 +291,11 @@ class doc_generic_stock_odt extends ModelePDFStock
//print "conf->product->dir_temp=".$conf->product->dir_temp;
dol_mkdir($conf->product->dir_temp);
-
+ if (!is_writable($conf->product->dir_temp)) {
+ $this->error = "Failed to write in temp directory ".$conf->product->dir_temp;
+ dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+ return -1;
+ }
// If CUSTOMER contact defined on stock, we use it
$usecontact = false;
diff --git a/htdocs/core/modules/stock/doc/pdf_standard.modules.php b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
index a57b996086b..ebc109151d6 100644
--- a/htdocs/core/modules/stock/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
@@ -137,12 +137,12 @@ class pdf_standard extends ModelePDFStock
$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
- $this->option_logo = 1; // Affiche logo
- $this->option_codestockservice = 0; // Affiche code stock-service
- $this->option_multilang = 1; // Dispo en plusieurs langues
+ $this->option_logo = 1; // Display logo
+ $this->option_codestockservice = 0; // Display product-service code
+ $this->option_multilang = 1; // Available in several languages
$this->option_freetext = 0; // Support add of a personalised text
- // Recupere emetteur
+ // Get source company
$this->emetteur = $mysoc;
if (!$this->emetteur->country_code) {
$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
@@ -315,7 +315,7 @@ class pdf_standard extends ModelePDFStock
$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps, ".MAIN_DB_PREFIX."product as p";
$sql .= " WHERE ps.fk_product = p.rowid";
$sql .= " AND ps.reel <> 0"; // We do not show if stock is 0 (no product in this warehouse)
- $sql .= " AND ps.fk_entrepot = ".$object->id;
+ $sql .= " AND ps.fk_entrepot = ".((int) $object->id);
$sql .= $this->db->order($sortfield, $sortorder);
//dol_syslog('List products', LOG_DEBUG);
diff --git a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
index 3cf0a4a209e..57d5798c29e 100644
--- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
+++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
@@ -93,7 +93,7 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
// Setting the prefix
$texte .= '';
- $texte .= '';
+ $texte .= '';
$texte .= '
';
// Scan directories
@@ -280,8 +280,12 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
//print "file=".$file;
//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
- dol_mkdir($conf->commande->dir_temp);
-
+ dol_mkdir($conf->fournisseur->commande->dir_temp);
+ if (!is_writable($conf->fournisseur->commande->dir_temp)) {
+ $this->error = "Failed to write in temp directory ".$conf->fournisseur->commande->dir_temp;
+ dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+ return -1;
+ }
// If CUSTOMER contact defined on order, we use it
$usecontact = false;
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
index 245897e1956..dc898c98cb5 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -148,13 +148,13 @@ class pdf_cornas extends ModelePDFSuppliersOrders
$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
- $this->option_logo = 1; // Affiche logo
- $this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
- $this->option_modereg = 1; // Affiche mode reglement
- $this->option_condreg = 1; // Affiche conditions reglement
- $this->option_codeproduitservice = 1; // Affiche code produit-service
- $this->option_multilang = 1; // Dispo en plusieurs langues
- $this->option_escompte = 0; // Affiche si il y a eu escompte
+ $this->option_logo = 1; // Display logo
+ $this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
+ $this->option_modereg = 1; // Display payment mode
+ $this->option_condreg = 1; // Display payment terms
+ $this->option_codeproduitservice = 1; // Display product-service code
+ $this->option_multilang = 1; //Available in several languages
+ $this->option_escompte = 0; // Displays if there has been a discount
$this->option_credit_note = 0; // Support credit notes
$this->option_freetext = 1; // Support add of a personalised text
$this->option_draft_watermark = 1; // Support add of a watermark on drafts
diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
index a609eeade08..c691b1448ef 100644
--- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
+++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
@@ -85,7 +85,7 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
// Parametrage du prefix
$texte .= '';
- $texte .= '';
+ $texte .= '';
$texte .= '
';
// Scan directories
@@ -315,7 +315,11 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
//print "conf->propal->dir_temp=".$conf->propal->dir_temp;
dol_mkdir($conf->supplier_proposal->dir_temp);
-
+ if (!is_writable($conf->supplier_proposal->dir_temp)) {
+ $this->error = "Failed to write in temp directory ".$conf->supplier_proposal->dir_temp;
+ dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+ return -1;
+ }
// If BILLING contact defined on invoice, we use it
$usecontact = false;
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index cbcec7cfdd9..5bd9b8cf339 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -145,13 +145,13 @@ class pdf_aurore extends ModelePDFSupplierProposal
$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
- $this->option_logo = 1; // Affiche logo
- $this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
- $this->option_modereg = 1; // Affiche mode reglement
- $this->option_condreg = 1; // Affiche conditions reglement
- $this->option_codeproduitservice = 1; // Affiche code produit-service
- $this->option_multilang = 1; // Dispo en plusieurs langues
- $this->option_escompte = 1; // Affiche si il y a eu escompte
+ $this->option_logo = 1; // Display logo
+ $this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
+ $this->option_modereg = 1; // Display payment mode
+ $this->option_condreg = 1; // Display payment terms
+ $this->option_codeproduitservice = 1; // Display product-service code
+ $this->option_multilang = 1; // Available in several languages
+ $this->option_escompte = 1; // Displays if there has been a discount
$this->option_credit_note = 1; // Support credit notes
$this->option_freetext = 1; // Support add of a personalised text
$this->option_draft_watermark = 1; //Support add of a watermark on drafts
diff --git a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
index adf53aed4e6..3b8754d9928 100644
--- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
+++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
@@ -85,7 +85,7 @@ class mod_supplier_proposal_saphir extends ModeleNumRefSupplierProposal
// Parametrage du prefix
$texte .= '';
- $texte .= '';
+ $texte .= '';
$texte .= '
';
// Scan directories
@@ -167,7 +167,7 @@ class doc_generic_ticket_odt extends ModelePDFTicket
// Add input to upload a new template file.
$texte .= ''.$langs->trans("UploadNewTemplate").' ';
$texte .= '';
- $texte .= '';
+ $texte .= '';
$texte .= '
';
$texte .= '';
@@ -222,7 +222,7 @@ class doc_generic_ticket_odt extends ModelePDFTicket
// Load translation files required by the page
$outputlangs->loadLangs(array("main", "companies", "bills", "dict"));
- if ($conf->user->dir_output) {
+ if ($conf->ticket->dir_output) {
// If $object is id instead of object
if (!is_object($object)) {
$id = $object;
@@ -236,7 +236,7 @@ class doc_generic_ticket_odt extends ModelePDFTicket
$object->fetch_thirdparty();
- $dir = $conf->user->dir_output;
+ $dir = $conf->ticket->dir_output;
$objectref = dol_sanitizeFileName($object->ref);
if (!preg_match('/specimen/i', $objectref)) {
$dir .= "/".$objectref;
@@ -274,10 +274,14 @@ class doc_generic_ticket_odt extends ModelePDFTicket
//print "newdir=".$dir;
//print "newfile=".$newfile;
//print "file=".$file;
- //print "conf->user->dir_temp=".$conf->user->dir_temp;
-
- dol_mkdir($conf->user->dir_temp);
+ //print "conf->ticket->dir_temp=".$conf->ticket->dir_temp;
+ dol_mkdir($conf->ticket->dir_temp);
+ if (!is_writable($conf->ticket->dir_temp)) {
+ $this->error = "Failed to write in temp directory ".$conf->ticket->dir_temp;
+ dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+ return -1;
+ }
// If CUSTOMER contact defined on user, we use it
$usecontact = false;
@@ -306,7 +310,7 @@ class doc_generic_ticket_odt extends ModelePDFTicket
$odfHandler = new odf(
$srctemplatepath,
array(
- 'PATH_TO_TMP' => $conf->user->dir_temp,
+ 'PATH_TO_TMP' => $conf->ticket->dir_temp,
'ZIP_PROXY' => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
'DELIMITER_LEFT' => '{',
'DELIMITER_RIGHT' => '}'
diff --git a/htdocs/core/modules/ticket/mod_ticket_universal.php b/htdocs/core/modules/ticket/mod_ticket_universal.php
index 1a528359221..f60b1f16481 100644
--- a/htdocs/core/modules/ticket/mod_ticket_universal.php
+++ b/htdocs/core/modules/ticket/mod_ticket_universal.php
@@ -81,7 +81,7 @@ class mod_ticket_universal extends ModeleNumRefTicket
// Parametrage du prefix
$texte .= '';
- $texte .= '';
+ $texte .= '';
$texte .= '
';
// Scan directories
@@ -199,7 +199,7 @@ class doc_generic_user_odt extends ModelePDFUser
// Add input to upload a new template file.
$texte .= ''.$langs->trans("UploadNewTemplate").' ';
$texte .= '';
- $texte .= '';
+ $texte .= '';
$texte .= '
';
$texte .= '';
@@ -309,7 +309,11 @@ class doc_generic_user_odt extends ModelePDFUser
//print "conf->user->dir_temp=".$conf->user->dir_temp;
dol_mkdir($conf->user->dir_temp);
-
+ if (!is_writable($conf->user->dir_temp)) {
+ $this->error = "Failed to write in temp directory ".$conf->user->dir_temp;
+ dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+ return -1;
+ }
// If CUSTOMER contact defined on user, we use it
$usecontact = false;
diff --git a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
index 45a9469753e..5a1bca6377d 100644
--- a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
+++ b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
@@ -84,18 +84,18 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
$this->marge_haute = 0;
$this->marge_basse = 0;
- $this->option_logo = 1; // Affiche logo
- $this->option_tva = 0; // Gere option tva USERGROUP_TVAOPTION
- $this->option_modereg = 0; // Affiche mode reglement
- $this->option_condreg = 0; // Affiche conditions reglement
- $this->option_codeproduitservice = 0; // Affiche code produit-service
- $this->option_multilang = 1; // Dispo en plusieurs langues
- $this->option_escompte = 0; // Affiche si il y a eu escompte
+ $this->option_logo = 1; // Display logo
+ $this->option_tva = 0; // Manage the vat option USERGROUP_TVAOPTION
+ $this->option_modereg = 0; // Display payment mode
+ $this->option_condreg = 0; // Display payment terms
+ $this->option_codeproduitservice = 0; // Display product-service code
+ $this->option_multilang = 1; // Available in several languages
+ $this->option_escompte = 0; // Displays if there has been a discount
$this->option_credit_note = 0; // Support credit notes
$this->option_freetext = 1; // Support add of a personalised text
$this->option_draft_watermark = 0; // Support add of a watermark on drafts
- // Recupere emetteur
+ // Get source company
$this->emetteur = $mysoc;
if (!$this->emetteur->country_code) {
$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
@@ -162,7 +162,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
$texte .= $conf->global->USERGROUP_ADDON_PDF_ODT_PATH;
$texte .= '';
$texte .= '';
- $texte .= '';
+ $texte .= '';
$texte .= '
';
// Scan directories
@@ -299,7 +299,11 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
//print "conf->user->dir_temp=".$conf->user->dir_temp;
dol_mkdir($conf->user->dir_temp);
-
+ if (!is_writable($conf->user->dir_temp)) {
+ $this->error = "Failed to write in temp directory ".$conf->user->dir_temp;
+ dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+ return -1;
+ }
// If CUSTOMER contact defined on user, we use it
$usecontact = false;
diff --git a/htdocs/core/modules/workstation/mod_workstation_advanced.php b/htdocs/core/modules/workstation/mod_workstation_advanced.php
index 4e23219581c..bf783542c75 100755
--- a/htdocs/core/modules/workstation/mod_workstation_advanced.php
+++ b/htdocs/core/modules/workstation/mod_workstation_advanced.php
@@ -80,7 +80,7 @@ class mod_workstation_advanced extends ModeleNumRefWorkstation
// Parametrage du prefix
$texte .= 'Contact:con